webmat-local_config 0.1.1 → 0.2.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 1
-:patch: 1
+:minor: 2
+:patch: 0
 :major: 0

data/lib/local_config.rb

@@ -8,7 +8,12 @@ module LocalConfig
     shared_config_file    = "#{RAILS_ROOT}/config/#{name}.yml"
     config_file = File.exists?(personal_config_file) ? personal_config_file : shared_config_file
 
-    config = HashWithIndifferentAccess.new YAML.load(File.read(config_file))
-    environment ? config[RAILS_ENV] : config
+    yaml = YAML.load(File.read(config_file))
+    if yaml.is_a? Hash
+      config = HashWithIndifferentAccess.new yaml
+      environment ? config[RAILS_ENV] : config
+    else
+      yaml
+    end
   end
 end

data/test/local_config_test.rb

@@ -41,13 +41,23 @@ class LocalConfigTest < Test::Unit::TestCase
     end
   end
 
+  context "reading no_env_ho_hash.yml which contains an array rather than a hash" do
+    setup do
+      @config = LocalConfig.load_config('no_env_no_hash', :environment => false)
+    end
+
+    should "load the array as is" do
+      assert_equal ['string 1 of the array', 'another string'], @config, @config.inspect
+    end
+  end
+
   context "reading no_env.yml" do
     setup do
       @config = LocalConfig.load_config('no_env', :environment => false)
     end
 
     should "return the values of the .yml file" do
-      assert_equal 'value', @config[:param]
+      assert_equal 'value', @config[:param], @config.inspect
     end
   end
 end

data/test/test_rails_root/config/no_env_no_hash.yml

@@ -0,0 +1,3 @@
+---
+- string 1 of the array
+- another string

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webmat-local_config
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Mathieu Martin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-04 00:00:00 -07:00
+date: 2009-06-03 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -31,6 +31,7 @@ files:
 - test/test_rails_root
 - test/test_rails_root/config
 - test/test_rails_root/config/no_env.yml
+- test/test_rails_root/config/no_env_no_hash.yml
 - test/test_rails_root/config/with_local.local.yml
 - test/test_rails_root/config/with_local.yml
 - test/test_rails_root/config/without_local.yml