patch_utils 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10a5d7b6c2fa8fc358ac8b47a1ba8a8e4df4ecee
-  data.tar.gz: dc15778636814c7932b2310f0e11013e3ccec958
+  metadata.gz: 5537fe95975adea086f8d941bc7c4dd50d4f58e7
+  data.tar.gz: 8653e5a852dc0129973d359bf019e57eca548a62
 SHA512:
-  metadata.gz: 1877b89fe38a9b45a948a5026baf3b6a5e88a9a0e6a52ed26537c052d01c128e84f49c35a6f9cbfddb1ae330d7ac6be13e81515cd42b2e27f383d8bd81b16db6
-  data.tar.gz: e629ef33dfff7f4e73e96394134acd2fc2af8d62f9c5bd8ef4c42d49f95f0ff2cb4c5e2fba464ca97334e73a4e2cc090097aeebca12606391c85cd0e15351c90
+  metadata.gz: 99bcbdfc12cb679e72688a5e8cc8e3894e09e0723a37c57ce5b998fae96c8749e02277e2a1e44a7164875e41a59fd28834ba87e3e13cf16db5cb71b06347b310
+  data.tar.gz: cce78a2258e92fbd841a6bfe0735b194f97a8782c5ede8784a86544d14a481519bdec5376ed6525c60b41a2d8582a5c72e1c917f973162bcb51d2d12c21af65d

data/lib/patch_utils/hash_diff.rb

@@ -0,0 +1,55 @@
+# encoding:utf-8
+#
+# Get diff from two hashes. (or from other data structure)
+# return format: {:from => , :to => }
+#
+# HashDiff.get_diff 1, 1 # => nil
+# HashDiff.get_diff 1, 2 # => {:from=>1, :to=>2}
+# HashDiff.get_diff({:a => 1, :b => 2, :c => '4'}, {:a => 4, :b => true, :c => 5}) do |x, y| x.is_a?(Fixnum) || y.is_a?(TrueClass) end # => {:from=>{:c=>"4"}, :to=>{:c=>5}}
+# HashDiff.get_diff [1,2,3],[1,4,5] # => {:from=>[2,3], :to=>[4,5]}
+# a = {:a_num=>1, :same_num=>0, :an_other_num=>3, :create=>{:user=>["new", "save"]}, :an_array=>[1, 2, 3], :complex_json=>{:a=>{:b=>{:c=>"d", :f=>"x"}}}}
+# b = {:a_num=>2, :same_num=>0, :update=>{:user=>["edit", "update"]}, :an_array=>[1, 2, 4], :an_other_array=>["x"], :complex_json=>{:a=>{:b=>{:c=>"d", :f=>"g"}, :h=>"i"}}}
+# HashDiff.get_diff a, b # =>
+# {:from=>{:a_num=>1, :an_other_num=>3, :create=>{:user=>["new", "save"]}, :an_array=>[3], :complex_json=>{:a=>{:b=>{:f=>"x"}}}}, :to=>{:a_num=>2, :update=>{:user=>["edit", "update"]}, :an_array=>[4], :an_other_array=>["x"], :complex_json=>{:a=>{:b=>{:f=>"g"}, :h=>"i"}}}}
+
+class HashDiff
+  def self.get_diff h1, h2, &blk
+    if block_given?
+      return nil if yield(h1, h2)
+    else
+      return nil if h1 == h2
+    end
+
+    if h1.is_a?(Array) && h2.is_a?(Array)
+      return {:from => (h1 - h2), :to => (h2 - h1)}
+    end
+
+    if h1.is_a?(Hash) && h2.is_a?(Hash)
+      all_keys = (h1.keys | h2.keys)
+      from = h1.clone
+      to = h2.clone
+      all_keys.each do |k|
+        if h1.keys.include?(k) && h2.keys.include?(k)
+          if block_given?
+            if yield(h1[k], h2[k])
+              from.delete(k)
+              to.delete(k)
+            end
+          else
+            if h1[k] == h2[k]
+              from.delete(k)
+              to.delete(k)
+            end
+          end
+          _diff = self.get_diff(h1[k], h2[k], &blk)
+          if _diff.present?
+            from[k] = _diff[:from]
+            to[k] = _diff[:to]
+          end
+        end
+      end
+      return {:from => from, :to => to}
+    end
+    {:from => h1, :to => h2}
+  end
+end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: patch_utils
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - zzqwdss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies: []
 description: some useful utils and monkey patches
-email: zzqwdss@163.com
+email: zzqwdss@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -19,10 +19,12 @@ files:
 - lib/patch_utils.rb
 - lib/patch_utils/active_support_encoding.rb
 - lib/patch_utils/hash.rb
+- lib/patch_utils/hash_diff.rb
 - lib/patch_utils/string.rb
 - lib/patch_utils/time_with_zone.rb
 homepage: http://rubygems.org/gems/patch_utils
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -30,18 +32,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: patch_utils by zzqwdss
 test_files: []
+has_rdoc: