squire 1.2.0 → 1.2.1

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+### 1.2.1
+
+* Fix minor bug with ActiveSupport Hash#deep_merge! omitting block for false keys. 
+  More: https://github.com/rails/rails/pull/12072 (Waiting for merge and release in new ActiveSupport version).
+  Fix is temporararly included in squire/core_ext/hash/deep_merge.rb
+
+  *Samuel Molnár*
+
+### 1.2.0
+
+* Full support for YAML, Hash
+* DSL for Base class, config key delegation via method missing.
+* Support for Settingslogic-like API via Squire::Base.
+
+  *Samuel Molnár*

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

@@ -0,0 +1,30 @@
+# TODO: Wait for this pull to be merged and released in new version of ActiveSupport.
+# https://github.com/rails/rails/pull/12072
+
+class Hash
+  # Returns a new hash with +self+ and +other_hash+ merged recursively.
+  #
+  #   h1 = {x: {y: [4,5,6]}, z: [7,8,9]}
+  #   h2 = {x: {y: [7,8,9]}, z: "xyz"}
+  #
+  #   h1.deep_merge(h2) #=> {:x => {:y => [7, 8, 9]}, :z => "xyz"}
+  #   h2.deep_merge(h1) #=> {:x => {:y => [4, 5, 6]}, :z => [7, 8, 9]}
+  #   h1.deep_merge(h2) { |key, old, new| Array.wrap(old) + Array.wrap(new) }
+  #   #=> {:x => {:y => [4, 5, 6, 7, 8, 9]}, :z => [7, 8, 9, "xyz"]}
+  def deep_merge(other_hash, &block)
+    dup.deep_merge!(other_hash, &block)
+  end
+
+  # Same as +deep_merge+, but modifies +self+.
+  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
+      end
+    end
+    self
+  end
+end

data/lib/squire/settings.rb

@@ -61,7 +61,7 @@ module Squire
       else
         value = get_value(key)
 
-        unless value
+        if value.nil?
           raise MissingSettingError.new("Missing setting in '#{key}' in '#{@path}'.")
         end
 
@@ -80,7 +80,7 @@ module Squire
     #   settings.nested.a
     # it returns +settings.a+.
     def get_value(key)
-      return @table[key] if @table[key]
+      return @table[key] unless @table[key].nil?
       return @parent.get_value(key) if @parent
     end
 

data/lib/squire/version.rb

@@ -1,3 +1,3 @@
 module Squire
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/lib/squire.rb

@@ -1,6 +1,7 @@
 require 'active_support/concern'
 require 'active_support/core_ext/hash/keys'
-require 'active_support/core_ext/hash/deep_merge'
+# require 'active_support/core_ext/hash/deep_merge'
+require 'squire/core_ext/hash/deep_merge'
 require 'active_support/core_ext/hash/except'
 require 'squire/version'
 require 'squire/exceptions'

data/spec/squire/configuration_spec.rb

@@ -8,13 +8,15 @@ describe Squire::Configuration do
       defaults: {
         nested: {
           b: 3,
-          c: 4
+          c: 4,
+          d: true
         }
       },
       development: {
         a: 1,
         nested: {
-          b: 2
+          b: 2,
+          d: false
         }
       },
       production: {
@@ -66,6 +68,7 @@ describe Squire::Configuration do
 
       subject.settings.a.should eql(1)
       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
     end
   end

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

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Hash do
+  describe '#deep_merge' do
+    let(:a) {{ a: 1, b: 2, c: 3, nested: { a: 1 }}}
+    let(:b) {{ a: 1, c: 3, d: 4, nested: { a: 2, b: 3 }}}
+
+    it 'should merge hashes deeply' do
+      merge = { a: 1, b: 2, c: 3, d: 4, nested: { a: 2, b: 3 }}
+
+      a.deep_merge(b).should eql(merge)
+    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 }}
+
+      (a.deep_merge(b) { |key, old, new| [key, old, new] }).should eql(merge)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squire
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -132,6 +132,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -140,6 +141,7 @@ files:
 - lib/squire.rb
 - lib/squire/base.rb
 - lib/squire/configuration.rb
+- lib/squire/core_ext/hash/deep_merge.rb
 - lib/squire/exceptions.rb
 - lib/squire/parser.rb
 - lib/squire/parser/hash.rb
@@ -151,6 +153,7 @@ files:
 - spec/spec_helper.rb
 - spec/squire/base_spec.rb
 - spec/squire/configuration_spec.rb
+- spec/squire/core_ext/hash/deep_merge_spec.rb
 - spec/squire/parser/hash_spec.rb
 - spec/squire/parser/yaml_spec.rb
 - spec/squire/proxy_spec.rb
@@ -188,6 +191,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/squire/base_spec.rb
 - spec/squire/configuration_spec.rb
+- spec/squire/core_ext/hash/deep_merge_spec.rb
 - spec/squire/parser/hash_spec.rb
 - spec/squire/parser/yaml_spec.rb
 - spec/squire/proxy_spec.rb