meld 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d28b02559c91c8dc55627f5ddbeca8c27d6accb6
-  data.tar.gz: 027e2e81e919e098d51eefc0465101e5af2e2e9e
+  metadata.gz: b51b7e506fd31218fc910168885864ffd44fe24f
+  data.tar.gz: 2656279b91f4f527ef5c9a256620091b8c22c8fb
 SHA512:
-  metadata.gz: a6c8eb2a81ad1bc078ce6bea8b0585701045792747e534691aa676e6e7d2d3cc9fc2c192038452abc9fe5bf98657d0294fcc092dd52b10cf9a96231803ada0e0
-  data.tar.gz: 71720e7ce7e01ef288564df301bd043994a45941d96e356c9d26893ae8507f8c33328104b5df45ff0e76a171cf3aa7c2209dcbd94c9cf23538fb925462450bf8
+  metadata.gz: eb1bd6ca73cc2fc7756de17b35ac2ee3cc6822000745f4ab117e3e8f7d7a9160421ee515a51ec597327061f48235277065d2ef4798e42402c8b82045ba2c820b
+  data.tar.gz: d64560178d81d1c2c1e50ac90e4ed87ce72e8dee4b1da8a53ddb3f31be33eaec48d50420ae2bdfaf88d14bc58e569f16dd6954ae1de31725368d4a229a7aff93

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+sudo: false
 cache: bundler
 rvm:
 - 2.1.0
@@ -8,4 +9,6 @@ notifications:
   email: false
   irc:
     template:
-      - '%{repository}/%{branch}/%{build_number}: %{message} -- %{build_url}'
+    - '%{repository}/%{branch}/%{build_number}: %{message} -- %{build_url}'
+    channels:
+    - irc.oftc.net#akerl

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+# 1.0.0 / 2015-01-22
+
+* [ENHANCEMENT] Stabilized API
+

data/README.md

@@ -14,7 +14,21 @@ Utility library for combining objects
 
 ### Deep hash merge -- .deep_merge
 
-This will merge nested hashes
+This will merge nested hashes:
+
+```
+require 'meld/hash/deep_merge'
+
+a = { x: 4, y: { dogs: 3, cats: 5 }, z: { pizza: 10 } }
+b = { y: { dogs: 6, fish: 2 } }
+c = a.deep_merge(b)
+p c
+# {:x=>4, :y=>{:dogs=>6, :cats=>5, :fish=>2}, :z=>{:pizza=>10}}
+
+a.deep_merge! b
+p a
+# {:x=>4, :y=>{:dogs=>6, :cats=>5, :fish=>2}, :z=>{:pizza=>10}}
+```
 
 Credit for the method goes to [this StackOverflow answer](http://stackoverflow.com/questions/9381553/ruby-merge-nested-hash)
 

data/lib/meld/hash/deep_merge.rb

@@ -1,16 +1,14 @@
-module Kernel
-  # From https://gist.github.com/ku/e17e3d65ec4c37b60149
-  # From http://stackoverflow.com/questions/9381553/ruby-merge-nested-hash
-  class Hash
-    def deep_merge!(second)
-      merger = proc do |_, v1, v2|
-        [v1, v2].all? { |x| x.is_a? Hash } ? v1.merge(v2, &merger) : v2
-      end
-      merge!(second, &merger)
+# From https://gist.github.com/ku/e17e3d65ec4c37b60149
+# From http://stackoverflow.com/questions/9381553/ruby-merge-nested-hash
+class Hash
+  def deep_merge!(second)
+    merger = proc do |_, v1, v2|
+      [v1, v2].all? { |x| x.is_a? Hash } ? v1.merge(v2, &merger) : v2
     end
+    merge!(second, &merger)
+  end
 
-    def deep_merge(second)
-      dup.deep_merge! second
-    end
+  def deep_merge(second)
+    dup.deep_merge! second
   end
 end

data/meld.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'meld'
-  s.version     = '0.0.2'
+  s.version     = '1.0.0'
   s.date        = Time.now.strftime("%Y-%m-%d")
 
   s.summary     = 'Utility library for combining objects'
@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split
   s.test_files  = `git ls-files spec/*`.split
 
-  s.add_development_dependency 'rubocop', '~> 0.26.0'
-  s.add_development_dependency 'rake', '~> 10.3.2'
+  s.add_development_dependency 'rubocop', '~> 0.28.0'
+  s.add_development_dependency 'rake', '~> 10.4.0'
   s.add_development_dependency 'coveralls', '~> 0.7.1'
   s.add_development_dependency 'rspec', '~> 3.1.0'
   s.add_development_dependency 'fuubar', '~> 2.0.0'

data/spec/meld/hash/deep_merge_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Hash do
+  let(:first) do
+    { x: 4, y: { a: 6, b: 5 } }
+  end
+  let(:second) do
+    { z: 9, y: { a: 9, c: 8 } }
+  end
+  let(:result) do
+    { x: 4, y: { a: 9, b: 5, c: 8 }, z: 9 }
+  end
+
+  describe '#deep_merge!' do
+    it 'merges subhashes' do
+      first.deep_merge!(second)
+      expect(first).to eql result
+    end
+
+    it 'overwrites original object' do
+      copy = first.dup
+      first.deep_merge!(second)
+      expect(first).not_to eql copy
+    end
+  end
+
+  describe '#deep_merge' do
+    it 'merges subhashes' do
+      third = first.deep_merge(second)
+      expect(third).to eql result
+    end
+
+    it 'does not overwrite original object' do
+      copy = first.dup
+      first.deep_merge(second)
+      expect(first).to eql copy
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meld
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-25 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.28.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.28.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: 10.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: 10.4.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +90,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -97,6 +98,7 @@ files:
 - lib/meld.rb
 - lib/meld/hash/deep_merge.rb
 - meld.gemspec
+- spec/meld/hash/deep_merge_spec.rb
 - spec/meld_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/akerl/meld
@@ -124,5 +126,6 @@ signing_key:
 specification_version: 4
 summary: Utility library for combining objects
 test_files:
+- spec/meld/hash/deep_merge_spec.rb
 - spec/meld_spec.rb
 - spec/spec_helper.rb