mc-settings 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/setting.rb

@@ -138,9 +138,10 @@ class Setting
     else
       v
     end
-
-    if out.is_a?(Hash)
-      collapse_hashes(out, args)
+    if out.is_a?(Hash) && !args.empty?
+        collapse_hashes(out, args)
+    elsif out.is_a?(Hash) && out.has_key?('default')
+      out['default']
     else
       out
     end

data/mc-settings.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mc-settings}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edwin Cruz", "Colin Shield"]
-  s.date = %q{2011-06-01}
+  s.date = %q{2011-06-07}
   s.description = %q{implement custom keys indenendently of environment}
   s.email = %q{rubydev@modcloth.com}
   s.extra_rdoc_files = [
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "mc-settings.gemspec",
     "spec/fixtures/joes-colors.yml",
     "spec/fixtures/sample.yml",
+    "spec/fixtures/shipping.yml",
     "spec/mc_settings_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/settings_helper.rb"

data/spec/fixtures/shipping.yml

@@ -0,0 +1,34 @@
+shipping_config:
+  default: Defaulted
+  domestic:
+    service: MyService
+    countries:
+      - "US"
+    non_shippable_regions:
+      - "US-AS"
+      - "US-GU"
+      - "US-MP"
+      - "US-PR"
+      - "US-UM"
+      - "US-VI"
+      - "US-AF"
+      - "US-AA"
+      - "US-AC"
+      - "US-AE"
+      - "US-AM"
+      - "US-AP"
+      - "US-FM"
+      - "US-PW"
+      - "US-MH"
+  international:
+    service: Foo
+    countries:
+      - "GU"
+      - "VI"
+      - "AS"
+      - "MP"
+      - "UM"
+      - "FR"
+      - "GR"
+      - "RU"
+    shipping_carrier: Bar

data/spec/mc_settings_spec.rb

@@ -126,4 +126,21 @@ describe Setting do
     end
 
   end
+  context "Complex nested configs" do
+    before :each do
+      Setting.reload(
+          :path  => File.join(File.dirname(__FILE__)) + '/fixtures',
+          :files => ['shipping.yml']
+      )
+    end
+    it "should build correct tree with arrays and default values " do
+      Setting.shipping_config.should == "Defaulted"
+      Setting.shipping_config(:domestic, :non_shippable_regions).first.should == "US-AS"
+      Setting.shipping_config(:international, :service).should == 'Foo'
+      Setting.shipping_config(:international, :countries).size.should > 0
+      Setting.shipping_config(:international, :shipping_carrier).should == 'Bar'
+      #backward compatibility:
+      Setting.shipping_config(:domestic)['non_shippable_regions'].size.should > 0
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mc-settings
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Edwin Cruz
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-01 00:00:00 -05:00
+date: 2011-06-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,6 +115,7 @@ files:
 - mc-settings.gemspec
 - spec/fixtures/joes-colors.yml
 - spec/fixtures/sample.yml
+- spec/fixtures/shipping.yml
 - spec/mc_settings_spec.rb
 - spec/spec_helper.rb
 - spec/support/settings_helper.rb