babel_diff 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40e5cff53898404621639f5920c9187d447a5944
-  data.tar.gz: cfb4ed4465ac118ee9886269eb81f91135156037
+  metadata.gz: 636cfb635813720ebceed48ded1eea465486bcde
+  data.tar.gz: a645857700b111c53dd4f467e87e9cd66a247e97
 SHA512:
-  metadata.gz: c8ca5d822dbc325c367eedc74e087d64fb1d0b4eb90065febbd650f089475433767677905e952ed4c6cc50fbc7a89855c28436aeab95cdd98b30dc3d6fec577a
-  data.tar.gz: b94bc9b0cc0f06be9a5f753797c35e68deaf4f10c2692905d8fecdf6f7334c72bce79085abc63148cf4b31f2104d2416d04cab23fdbc0f4af98227d555c07afd
+  metadata.gz: db1ff545db9294c18c2261482b90922cc71f800806a8fef30463a53af59718c54d3d71087cc78d0db887614e1ab4f874a88fec221922b6f9e706194dc70c0f0c
+  data.tar.gz: ee0c4a2297c52df41a54e851afeb89bfa42b9cce3c6d6e4086d1e4abab70b130be44c1f4a1beedcecaa83f1dbfe02c7efbc3b3ef72bed39b06e3a2897ee6d3e3

data/lib/babel_diff/version.rb

@@ -1,3 +1,3 @@
 module BabelDiff
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/babel_diff/yaml_differ.rb

@@ -4,71 +4,48 @@ require 'pry'
 module BabelDiff
   class YamlDiffer < Struct.new(:current_version, :previous_version)
     def updates
-      process_difference(current_version_hash) unless @processed
+      process_difference unless @processed
       @processed = true
-      updates_hash.to_yaml
+
+      unflatten(updates_hash).to_yaml
     end
 
     def additions
-      process_difference(current_version_hash) unless @processed
+      process_difference unless @processed
       @processed = true
-      additions_hash.to_yaml
+
+      unflatten(additions_hash).to_yaml
     end
 
-    def process_difference(current_hash, keys = [])
-      current_hash.each do |key, value|
-        keys << key
-        if value.is_a? Hash
-          process_difference(value, keys)
-        else
-          if previous_version_is_missing_key?(keys)
-            add_key_to_additions(keys, value)
-          elsif  previous_version_value_is_different?(keys, value)
-            add_key_to_updates(keys, value)
-          end
+    def process_difference
+      current = HashFlattener.new(current_version_hash).flatten
+      previous = HashFlattener.new(previous_version_hash).flatten
+
+      current.each do |k,v|
+        if ! previous.has_key?(k)
+          additions_hash[k] = v
+        elsif previous[k] != v
+          updates_hash[k] = v
         end
-        keys.pop
       end
     end
 
-    def previous_version_is_missing_key?(keys)
-      current_value = previous_version_hash
-      keys.each do |key|
-        current_value = current_value[key]
-        return true if current_value.nil?
-      end
 
-      return false
-    end
+    private
 
-    def previous_version_value_is_different?(keys, value)
-      current_value = previous_version_hash
-      keys.each do |key|
-        current_value = current_value[key]
-      end
+    def unflatten(hash)
+      {}.tap do |unflattened_hash|
+        hash.each do |k,v|
+          keys = k.split(".")
+          current_hash = unflattened_hash
 
-      return current_value != value
-    end
+          keys[0...-1].each { |key| current_hash = current_hash[key] ||= {} }
 
-    def add_key_to_updates(keys, value)
-      current_value = updates_hash
-      keys[0...-1].each do |key|
-        current_value = current_value[key] ||= {}
-      end
-      current_value[keys.last] = value
-    end
-
-    def add_key_to_additions(keys, value)
-      current_value = additions_hash
-      keys[0...-1].each do |key|
-        current_value = current_value[key] ||= {}
+          current_hash[keys.last] = v
+        end
       end
-      current_value[keys.last] = value
     end
 
-
-    private
-
     def updates_hash
       @updated_hash ||= {}
     end
@@ -85,4 +62,24 @@ module BabelDiff
       YAML.load(current_version) || {}
     end
   end
+
+  class HashFlattener < Struct.new(:hash)
+
+    def flatten(current_hash = hash, keys = [])
+      current_hash.each do |key, value|
+        new_keys = keys.dup << key
+        if value.is_a? Hash
+          flatten(value, new_keys)
+        else
+          flat_hash[new_keys.join(".")] = value
+        end
+      end
+
+      flat_hash
+    end
+
+    def flat_hash
+      @_flat_hash ||= {}
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babel_diff
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ryan McGarvey