mumukit-core 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78e756bba387ca8a2bd6a2f49f60d4de28c3b6191fd74ebb7e4f6b1d0080b617
-  data.tar.gz: 8b511a6014dfcec02463c3f8a72aa831d1252a323962d3d9fa3272693f07f33c
+  metadata.gz: 624663db1c388c4edce0d607f1932c049004246c6a90e1ec5719beeef6aacdee
+  data.tar.gz: 061f70162e4c1fd9418cc2084cb4679123b33bb6616be1e058812f6983721ea2
 SHA512:
-  metadata.gz: 986c2b699aec7723dd4f30d22aa5766d4716f172c82551b11d55283b02f1af1d2898777f645fd68381166099af43c4ff0c7eabd8c8ad44216b376e7a207cacf1
-  data.tar.gz: acb5580d6f0026eb444762f42e3b8ac2818b1575e3441d732e6a29b04c329031bc6da3f77091b92a6cf7d8af4683f6321cc80b4e247ba95866471fcec69674d1
+  metadata.gz: 10e9553c6876db756916559cfd9113a222e026eb0b21b9f2ee45333536032e269736ad21c0013f902184e49da576a6e1366cf13431eb341433c7034b730715c1
+  data.tar.gz: 38f22a0c8a1062674e14111491e93af03ab0b09934b7227fe39dc1c471d41d3be84dfd46254452f1078f403b483ae52294edc03de93902f21eadfc1685c81cf6

data/lib/mumukit/core/configurable.rb

@@ -10,7 +10,7 @@ module Mumukit::Core
     end
 
     def config
-      @config ||= defaults
+      @config ||= defaults.dup
     end
 
     def defaults

data/lib/mumukit/core/hash.rb

@@ -25,4 +25,37 @@ class Hash
     s2 = Set.new(other)
     { deletions: (s1 - s2).to_h, additions: (s2 - s1).to_h }
   end
+
+  def deep_diff(other)
+    diff = diff(other)
+    deep_diff = diff.dup
+    deep_deletions = deep_diff[:deletions]
+    deep_additions = deep_diff[:additions]
+
+    diff[:deletions].each do |k, v|
+      added_v = diff[:additions][k]
+      next if !diff[:additions].include?(k) || v.class != added_v.class
+      if Array === v
+        values = v.zip(added_v)
+        deep_deletions[k] = []
+        deep_additions[k] = []
+        values.select { |v1, v2| v1 != v2 }.each do |v1, v2|
+          if Hash === v1 && Hash === v2
+            sub_diff = v1.deep_diff(v2)
+            deep_deletions[k] << sub_diff[:deletions]
+            deep_additions[k] << sub_diff[:additions]
+          else
+            deep_deletions[k] << v1
+            deep_additions[k] << v2
+          end
+        end
+      elsif Hash === v
+        sub_diff = v.deep_diff(added_v)
+        deep_deletions[k] = sub_diff[:deletions]
+        deep_additions[k] = sub_diff[:additions]
+      end
+    end
+
+    deep_diff
+  end
 end

data/lib/mumukit/core/rspec.rb

@@ -16,7 +16,7 @@
     message = proc do |actual|
       expected_hash = as_matcher_json(expected, options)
       actual_hash = as_matcher_json(actual, options)
-      diff = expected_hash.diff(actual_hash)
+      diff = expected_hash.deep_diff(actual_hash)
       <<-EOS
       expected: #{expected_hash} (#{expected.class})
            got: #{actual_hash} (#{actual.class})

data/lib/mumukit/core/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Core
-    VERSION = '1.8.0'
+    VERSION = '1.9.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-core
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2018-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler