easy_diff 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWJhY2NkMDUwNDViYWQ2Nzk5OTc0YTE4ODJjYTM4MTBmNmQ0MzYxNw==
+  data.tar.gz: !binary |-
+    ZDAwZWZjNmY5ZTY4NjJkYTgzYjJiMzUxNmNiMzNkNGI2NjZhMGQyNQ==
+SHA512:
+  metadata.gz: !binary |-
+    MzEzZDE5OWY3ODBiYmEzZjJlNmE3MWZmNWYwMDM0OTMzZTEzZWUwMzMyODkz
+    YWRiNzA3ZTUxNDhiNWU4OTJiYTQxNDM0YWM1ZjZjZjYxOWM4NWM0Y2QwYjc2
+    NDNhMzRhODY5NjQxMTczMmQ1ZTJhZmJkMzJlM2IzNDY5Njc1MTY=
+  data.tar.gz: !binary |-
+    ZDViMzFiZGUzZjU0MmQ0NzYzMmFjYjJmYTM3YWNiZDk0MWVhMGZmYzFjMzU1
+    ZTUzOWY4YzViZGI2ZjQ1MGVlZDc2NWMxMDY2ZjNhOTdiMzIxODdjNWZkYjkw
+    OTQyOTYxODY0M2YwZTUwOGU2ODg3ZDZlODQxNGMyMGVlZWUxYzM=

data/Gemfile

@@ -8,7 +8,6 @@ source "http://rubygems.org"
 group :development do
   gem "rspec", "~> 2.4.0"
   gem "yard", "~> 0.6.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
+  gem "jeweler"
+  gem "simplecov", ">= 0", require: false
 end

data/Gemfile.lock

@@ -1,14 +1,52 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.3.8)
+    builder (3.2.2)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.1.3)
-    git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    docile (1.1.5)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.9.1)
+    github_api (0.12.4)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.6)
+      oauth2
+    hashie (3.4.2)
+    highline (1.7.3)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
-    rake (0.8.7)
-    rcov (0.9.9)
+      rdoc
+    json (1.8.3)
+    jwt (1.5.1)
+    mini_portile (0.6.2)
+    multi_json (1.11.2)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.6.4)
+    rake (10.4.2)
+    rdoc (4.2.0)
+      json (~> 1.4)
     rspec (2.4.0)
       rspec-core (~> 2.4.0)
       rspec-expectations (~> 2.4.0)
@@ -17,14 +55,19 @@ GEM
     rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.4.0)
-    yard (0.6.4)
+    simplecov (0.10.0)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    thread_safe (0.3.5)
+    yard (0.6.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
-  rcov
+  jeweler
   rspec (~> 2.4.0)
+  simplecov
   yard (~> 0.6.0)

data/README.rdoc

@@ -54,7 +54,8 @@ The first contains what has to be removed from self to create the second hash. T
 
 === Hash#easy_merge
 
-Takes a hash and recursively merges it with self. Arrays are merged by the union operation and then sorted.
+Takes a hash and recursively merges it with self. Arrays are merged by the union operation and then sorted. Arrays of Hashes are sorted by invoking +#sort+ on each Hash to make them comparable.
+
 Using Hash#easy_merge! will modify self instead of returning a new hash.
 
   original = {

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/easy_diff.gemspec

@@ -51,20 +51,20 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, ["~> 2.4.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, ["~> 2.4.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end
 

data/lib/easy_diff/core.rb

@@ -56,7 +56,9 @@ module EasyDiff
         added_keys.each{ |key| original[key] = easy_merge!(original[key], added[key])}
       elsif original.is_a?(Array) && added.is_a?(Array)
         original |=  added
-        original.sort!
+        original.sort_by! { |item|
+          item.is_a?(Hash) ? item.sort : item
+        }
       else
         original = added.safe_dup
       end

data/spec/easy_diff_spec.rb

@@ -131,4 +131,30 @@ describe EasyDiff do
     removed.should == {:possibly_empty_string => ""}
     added.should == {:possibly_empty_string => "not empty"}
   end
+
+  it "should merge Arrays containing Hashes" do
+    original = {
+      "key" => [
+        {"c" => "1"},
+        {"a" => "2"},
+        {"a" => "1"},
+      ]
+    }
+
+    to_merge = {
+      "key" => [
+        {"b" => "2"},
+      ]
+    }
+
+    merged = original.easy_merge to_merge
+    merged.should == {
+      "key" => [
+        {"a" => "1"},
+        {"a" => "2"},
+        {"b" => "2"},
+        {"c" => "1"},
+      ]
+    }
+  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: easy_diff
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Abner Qian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,47 +34,27 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rcov
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -121,31 +96,25 @@ files:
 homepage: http://github.com/Blargel/easy_diff
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1698235666282817780
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.29
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Recursive diff, merge, and unmerge for hashes and arrays.
-test_files:
-- spec/easy_diff_spec.rb
-- spec/spec_helper.rb
+test_files: []