trickery 0.0.1 → 0.0.2

data/lib/trickery/deep_ostruct.rb

@@ -3,18 +3,18 @@ require 'ostruct'
 module Trickery
   module DeepOstruct
 
-    def deep_ostruct(opts)
-      OpenStruct.new.tap do |o|
-        opts.each do |key, value|
-          o.send key.to_s + '=',
-                 case value
-                 when Hash
+    def deep_ostruct(values)
+      case values
+      when Hash
+        OpenStruct.new.tap do |o|
+          values.each do |key, value|
+            o.send key.to_s + '=',
                    deep_ostruct(value)
-                 when Array
-                   value.map { |v| deep_ostruct(v) }
-                 else value
-                 end
+          end
         end
+      when Array
+        values.map { |v| deep_ostruct(v) }
+      else values
       end
     end
 

data/lib/trickery/hash/deep_merge.rb

@@ -0,0 +1,10 @@
+class ::Hash
+  def deep_merge(*hashes)
+    merger = proc do |key, v1, v2|
+      Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2
+    end
+    hashes.inject(self) do |result, other|
+      result.merge(other, &merger)
+    end
+  end
+end

data/lib/trickery/hash/deep_ostruct.rb

@@ -0,0 +1,21 @@
+require 'ostruct'
+
+class ::Hash
+
+  def deep_ostruct(values=nil)
+    values ||= self
+    case values
+    when Hash
+      OpenStruct.new.tap do |o|
+        values.each do |key, value|
+          o.send key.to_s + '=',
+                 deep_ostruct(value)
+        end
+      end
+    when Array
+      values.map { |v| deep_ostruct(v) }
+    else values
+    end
+  end
+
+end

data/lib/trickery/version.rb

@@ -1,3 +1,3 @@
 module Trickery
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/trickery/hash/deep_merge_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+require File.expand_path(File.join(%w(.. .. .. .. lib trickery hash deep_merge)), __FILE__)
+
+describe Hash do
+
+  it 'responds to deep_merge' do
+    assert { {}.respond_to?(:deep_merge) }
+  end
+
+  it 'merges deeply' do
+    assert { { a: { b: 0 } } == { a: { b: 1 } }.deep_merge({ a: { b: 0 } }) }
+  end
+
+  it 'merges multiple' do
+    a = { a: { b: 0, c: 3 } }
+    b = { a: { b: 1, c: 4 } }
+    c = { a: { b: 2 } }
+    assert { { a: { b: 2, c: 4 } } == a.deep_merge(b, c) }
+  end
+
+  it 'merges nil' do
+    a = { a: { b: 0 } }
+    b = { a: { b: nil } }
+    assert { { a: { b: nil } } == a.deep_merge(b) }
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trickery
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,9 +107,12 @@ files:
 - lib/trickery/cmd_runner.rb
 - lib/trickery/config.rb
 - lib/trickery/deep_ostruct.rb
+- lib/trickery/hash/deep_merge.rb
+- lib/trickery/hash/deep_ostruct.rb
 - lib/trickery/version.rb
 - spec/spec_helper.rb
 - spec/trickery/deep_ostruct_spec.rb
+- spec/trickery/hash/deep_merge_spec.rb
 - trickery.gemspec
 homepage: https://github.com/branch14/trickery
 licenses:
@@ -126,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4414155239521418392
+      hash: 3366191683089287710
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -135,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4414155239521418392
+      hash: 3366191683089287710
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -145,3 +148,4 @@ summary: Reusable ruby trickery.
 test_files:
 - spec/spec_helper.rb
 - spec/trickery/deep_ostruct_spec.rb
+- spec/trickery/hash/deep_merge_spec.rb