Fixing stack too deep bug when configs had nested hashes

Author: Edwin Cruz

lib/setting.rb

@@ -138,9 +138,10 @@ def collapse_hashes(v, args)
     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

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

spec/mc_settings_spec.rb

@@ -126,4 +126,21 @@
     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