Merge branch 'master' of git@github.com:binarylogic/settingslogic

binarylogic
2 parents 2c806c14 3cc435ff
Showing 4 changed files with 42 additions and 1 deletions Show diff stats
lib/settingslogic/settings.rb
test/application3.yml
test/setting_test.rb
test/test_helper.rb
@@ -40,10 +40,13 @@ module Settingslogic
         root_path = defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/config/" : ""
         file_path = name_or_hash.is_a?(Symbol) ? "#{root_path}#{name_or_hash}.yml" : name_or_hash
         self.update YAML.load(ERB.new(File.read(file_path)).result).to_hash
-        self.update self[RAILS_ENV] if defined?(RAILS_ENV)
       else
         raise ArgumentError.new("Your settings must be a hash, a symbol representing the name of the .yml file in your config directory, or a string representing the abosolute path to your settings file.")
       end
+      if defined?(RAILS_ENV)
+        rails_env = self.keys.include?(RAILS_ENV) ? RAILS_ENV : RAILS_ENV.to_sym
+        self.update self[rails_env] if self[rails_env]
+      end
       define_settings!
     end
  
@@ -66,6 +69,9 @@ module Settingslogic
               def #{key}
                 @#{key} ||= self[#{key.inspect}]
               end
+              def #{key}=(value)
+                @#{key} = value
+              end
             end_eval
           end
         end
@@ -0,0 +1,9 @@
+neat:
+  cool:
+    awesome: <%= "Ben" + "Johnson" %>
+
+silly: 5
+fun: <%= 5 * 5 %>
+
+test:
+  silly: "test_specific"
@@ -40,4 +40,24 @@ class TestSetting &lt; Test::Unit::TestCase
     assert_equal 5, settings1.silly
     assert_equal 25, settings1.fun
   end
+  
+  def test_environment_specific_settings
+    in_test_environment do
+      settings1 = Settings.new(File.dirname(__FILE__) + '/application3.yml')
+      assert_equal 25, settings1.fun
+      assert_equal "test_specific", settings1.silly
+    end
+  end
+  
+  def test_environment_specific_settings_when_initialized_with_hash
+    in_test_environment do
+      settings1 = Settings.new(
+          :silly => 5,
+          'fun' => 25,
+          :test => { :silly => "test_specific" }
+        )
+      assert_equal 25, settings1.fun
+      assert_equal "test_specific", settings1.silly
+    end
+  end
 end
 \ No newline at end of file
@@ -18,4 +18,10 @@ class Test::Unit::TestCase
     configure
     Settingslogic::Settings.reset!
   end
+  
+  def in_test_environment(&block)
+    Settingslogic::Settings.const_set :RAILS_ENV, "test"
+    block.call
+    Settingslogic::Settings.send :remove_const, :RAILS_ENV
+  end
 end
 \ No newline at end of file
...	...	@@ -40,10 +40,13 @@ module Settingslogic
40	40	root_path = defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/config/" : ""
41	41	file_path = name_or_hash.is_a?(Symbol) ? "#{root_path}#{name_or_hash}.yml" : name_or_hash
42	42	self.update YAML.load(ERB.new(File.read(file_path)).result).to_hash
43		- self.update self[RAILS_ENV] if defined?(RAILS_ENV)
44	43	else
45	44	raise ArgumentError.new("Your settings must be a hash, a symbol representing the name of the .yml file in your config directory, or a string representing the abosolute path to your settings file.")
46	45	end
	46	+ if defined?(RAILS_ENV)
	47	+ rails_env = self.keys.include?(RAILS_ENV) ? RAILS_ENV : RAILS_ENV.to_sym
	48	+ self.update self[rails_env] if self[rails_env]
	49	+ end
47	50	define_settings!
48	51	end
49	52
...	...	@@ -66,6 +69,9 @@ module Settingslogic
66	69	def #{key}
67	70	@#{key} \|\|= self[#{key.inspect}]
68	71	end
	72	+ def #{key}=(value)
	73	+ @#{key} = value
	74	+ end
69	75	end_eval
70	76	end
71	77	end
...	...
...	...	@@ -0,0 +1,9 @@
	1	+neat:
	2	+ cool:
	3	+ awesome: <%= "Ben" + "Johnson" %>
	4	+
	5	+silly: 5
	6	+fun: <%= 5 * 5 %>
	7	+
	8	+test:
	9	+ silly: "test_specific"
...	...
...	...	@@ -40,4 +40,24 @@ class TestSetting < Test::Unit::TestCase
40	40	assert_equal 5, settings1.silly
41	41	assert_equal 25, settings1.fun
42	42	end
	43	+
	44	+ def test_environment_specific_settings
	45	+ in_test_environment do
	46	+ settings1 = Settings.new(File.dirname(__FILE__) + '/application3.yml')
	47	+ assert_equal 25, settings1.fun
	48	+ assert_equal "test_specific", settings1.silly
	49	+ end
	50	+ end
	51	+
	52	+ def test_environment_specific_settings_when_initialized_with_hash
	53	+ in_test_environment do
	54	+ settings1 = Settings.new(
	55	+ :silly => 5,
	56	+ 'fun' => 25,
	57	+ :test => { :silly => "test_specific" }
	58	+ )
	59	+ assert_equal 25, settings1.fun
	60	+ assert_equal "test_specific", settings1.silly
	61	+ end
	62	+ end
43	63	end
44	64	\ No newline at end of file
...	...
...	...	@@ -18,4 +18,10 @@ class Test::Unit::TestCase
18	18	configure
19	19	Settingslogic::Settings.reset!
20	20	end
	21	+
	22	+ def in_test_environment(&block)
	23	+ Settingslogic::Settings.const_set :RAILS_ENV, "test"
	24	+ block.call
	25	+ Settingslogic::Settings.send :remove_const, :RAILS_ENV
	26	+ end
21	27	end
22	28	\ No newline at end of file
...	...