squire 1.2.5 → 1.2.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDJkODhmYWNjYmIyYzNkNTUwN2RmNTNjZDFjYmY3Mzk0MDIwYjU3NA==
+    NWY4ODFlMTY4YzIzYjlkNmVlNTIyYWQ2ODJkYzQ1M2UxYmU4ZjNlOQ==
   data.tar.gz: !binary |-
-    ODgxZTg2YzhjOWEyYTExMTI1YzdkZDgzODg4OTRkZTZmNGI5OGI5Nw==
+    NTZjNmZiM2JjNTY1ZjhjNmI2ZGE2YWRjZDllMjQyMjlhYzlmM2QwMg==
 SHA512:
   metadata.gz: !binary |-
-    OGRhNWMwNjgzZDljYjA3MmFlZTg3YmY1YmM0Nzk3ZDMxMjU2OGRjMmE0OWY0
-    YTY2MzZjN2RjNWYyNTA4NWZmODdiMjZkZTkxODk4OWZkMTRjMmMxYWNhMmQz
-    ZjJjZjQ2Y2Y3YWVmZmFjZTk0OWEwNTlhZDljODRkOWVmZGEyNGY=
+    ZDE2ZTNlYWQwMmU2OTdjMTg1MGE5ZGI5OTJkYTcxNWRmNDcxNmJkN2UzMTdj
+    YTRkNjZkMTViZTQ3YWIyMzYxYzk4MmEzNGUwZTFhMTE3Y2MzNmUzOGQwYWYy
+    YzNmZmE2Zjc3NDU5ZDU4ZjQ4YTBhMTczOTQ5M2ZmNGJmNWZiYWM=
   data.tar.gz: !binary |-
-    ZmRlMWNjYjAzOTFmMTBlMDQ0NWIzODQwZTMyOTEyMGUzODFiOTA5MTU3Y2I2
-    MDQyNjZmY2MwZWZkN2U3OGMwZWRhMWY5OTM4MjI2ZTk0NWU1MTVhZDA3OTYx
-    YTEyNDYwMjAxZTFiMWQ3MDNhZDUzZTUwMDNjN2FkYzZkNGJmZDQ=
+    MGQ4Nzg3Yjc3Yjc4MjFjOTBmZTg0ZTM2ZTVhZjk1NzkxNWE3NGM0NGM2Y2Zk
+    MGMzMGMxMjg5Y2UwM2U5NmQ0NTQ2YzZkNjkzMjM2Nzk2ZTVhMDA1NThlNTI4
+    OTlhNWNkYzA1YjBmNGUyNzRiZjcxNDUzNzM5OTdlOThlZDM2ODY=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.2.6
+* Fix fatal bug overriding base values
+  * Samuel Molnár
+
 ### 1.2.5
 * Use HashWithIndifferentAccess for accessing parser result
 * Add better string representation of Squire::Settings

data/lib/squire/configuration.rb

@@ -76,7 +76,7 @@ module Squire
       if base_namespace
         hash.except(base_namespace).each do |key, values|
           # favours value from namespace over value from defaults
-          values.deep_merge!(hash[base_namespace]) { |_, value, _| value }
+          hash[key] = hash[base_namespace].deep_merge(values) { |_, default, value| value.nil? ? default : value }
         end
       end
 

data/lib/squire/core_ext/hash/deep_merge.rb

@@ -19,10 +19,11 @@ class Hash
   def deep_merge!(other_hash, &block)
     other_hash.each_pair do |k,v|
       tv = self[k]
+
       if tv.is_a?(Hash) && v.is_a?(Hash)
         self[k] = tv.deep_merge(v, &block)
       else
-        self[k] = block && !tv.nil? ? block.call(k, tv, v) : v
+        self[k] = block ? block.call(k, tv, v) : v
       end
     end
     self

data/lib/squire/version.rb

@@ -1,3 +1,3 @@
 module Squire
-  VERSION = '1.2.5'
+  VERSION = '1.2.6'
 end

data/spec/squire/configuration_spec.rb

@@ -1,15 +1,13 @@
 require 'spec_helper'
 
 describe Squire::Configuration do
-  subject { described_class.new }
-
   let(:hash) {
     {
       defaults: {
         nested: {
           b: 3,
-          c: 4,
-          d: true
+          d: true,
+          c: 4
         }
       },
       development: {
@@ -20,7 +18,10 @@ describe Squire::Configuration do
         }
       },
       production: {
-        a: 3
+        a: 3,
+        nested: {
+          b: 4
+        }
       }
     }
   }
@@ -70,6 +71,13 @@ describe Squire::Configuration do
       subject.settings.nested.b.should eql(2) # from development.nested.b
       subject.settings.nested.d.should be_false # from development.nested.d
       subject.settings.nested.c.should eql(4) # from defaults.nested.c
+
+      subject.source    hash
+      subject.namespace :production, base: :defaults
+
+      subject.settings.a.should eql(3)
+      subject.settings.nested.b.should eql(4) # from development.nested.b
+      subject.settings.nested.d.should be_true # from development.nested.d
     end
   end
 

data/spec/squire/core_ext/hash/deep_merge_spec.rb

@@ -12,7 +12,7 @@ describe Hash do
     end
 
     it 'should merge hashes deeply with block' do
-      merge = { a: [:a, 1, 1], b: 2, c: [:c, 3, 3], d: 4, nested: { a: [:a, 1, 2], b: 3 }}
+      merge = { a: [:a, 1, 1], b: 2, c: [:c, 3, 3], d: [:d, nil, 4], nested: { a: [:a, 1, 2], b: [:b, nil, 3] }}
 
       (a.deep_merge(b) { |key, old, new| [key, old, new] }).should eql(merge)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squire
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Samuel Molnar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport