rspec-rcv 0.2.7 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea556cb01b7fded7ef4069546c612373ec3771cb
-  data.tar.gz: 91afb1fbd251eea0283f5258f1fefc3d6853b530
+  metadata.gz: e7f7ef0b816b8ffa81a6688ed6fc90b75f7d05be
+  data.tar.gz: 1c91a8426617d6653bf3e950bb9e2b3bb88498f6
 SHA512:
-  metadata.gz: 29606e35351ee13f1e9671b8abf344d432faaba9e77212ce472c58cf7ac78e0a201e33bdefb9884d4ac196a4a71cf44059d731e837a9ff70e586d5feb964acd5
-  data.tar.gz: 16c627bdce506c00f07c231bd021af1d5456941371a3bfb65523f4c6b8f910d35216f86ef7c0ccc38c6b2ee69426fd64d1febb786355a58fff1517685fc6092d
+  metadata.gz: 064bd72d4c9ee31f49558dfe3a8699ad1b597c6e0ca3a2a51745be7b0998f1682c03079dd1dc139838c40852f7153f9c3986c9d6ada963616e409c1f360d4efa
+  data.tar.gz: a0a3b38024c03f308398df8e4c219aefcc2cc5c3b76e12a7c5e5f806252dd3016bab9c6e82dcde2792e6a9c2acb2381467909fe56491dd479e8308cece6d62fe

data/lib/rspec-rcv/handler.rb

@@ -1,4 +1,5 @@
 require 'diffy'
+require 'json-compare'
 
 module RSpecRcv
   class Handler
@@ -18,7 +19,7 @@ module RSpecRcv
         eq = opts[:compare_with].call(existing_data["data"], data, opts)
 
         if !eq && opts[:fail_on_changed_output]
-          raise_error!(output)
+          raise_error!(output, JsonCompare.get_diff(existing_data["data"], data, opts.fetch(:ignore_keys, [])))
         end
 
         return :same if eq
@@ -56,35 +57,61 @@ module RSpecRcv
                          end
     end
 
-    def raise_error!(output)
+    def raise_error!(output, json_compare_output)
       diff = Diffy::Diff.new(existing_file, output).to_s
-      data_index = diff.lines.find_index{ |line| line =~ /"data":/ } # keys before data are un-important
 
-      removed = []
-      added = []
-
-      diff.lines[data_index..-1].each do |line|
-        key = line.split("\"")[1]
-        next if key.nil?
-        next if opts.fetch(:ignore_keys, []).include?(key.to_s)
-        next if opts.fetch(:ignore_keys, []).include?(key.to_sym)
-
-        if line.start_with?("-")
-          removed << key
-        elsif line.start_with?("+")
-          added << key
-        end
-      end
+      combined = JsonOutputCombiner.new(json_compare_output).combine
+      removed = combined[:remove]
+      added = combined[:append]
+      updated = combined[:update]
 
       raise RSpecRcv::DataChangedError.new(<<-EOF)
 Existing data will be overwritten. Turn off this feature with fail_on_changed_output=false
 
 #{diff}
 
-The following keys were added: #{added.uniq}
-The following keys were removed: #{removed.uniq}
+The following keys were added: #{added.uniq.map(&:to_s)}
+The following keys were removed: #{removed.uniq.map(&:to_s)}
+The following keys were updated: #{updated.uniq.map(&:to_s)}
+
 This fixture is located at #{path}
       EOF
     end
   end
 end
+
+class JsonOutputCombiner
+  def initialize(output)
+    @output = output
+  end
+
+  def combine
+    compact_compare_output(@output, key: "")
+  end
+
+  private
+
+  KEYS_TO_COMBINE = [:update, :append, :remove]
+
+  def combine_results(a, b)
+    KEYS_TO_COMBINE.each do |key|
+      a[key] += b[key]
+    end
+  end
+
+  def compact_compare_output(output, key:)
+    result = { update: [], append: [], remove: [] }
+    return result unless output.is_a?(Hash)
+
+    KEYS_TO_COMBINE.each do |combine_key|
+      output.fetch(combine_key, {}).each do |update_key, nested_output|
+        new_key = "#{key}#{key.empty? ? '' : '.'}#{update_key}"
+        result[combine_key] << new_key
+        nested_result = compact_compare_output(nested_output, key: new_key)
+        combine_results(result, nested_result)
+      end
+    end
+
+    result
+  end
+end

data/lib/rspec-rcv/version.rb

@@ -1,3 +1,3 @@
 module RSpecRcv
-  VERSION = "0.2.7"
+  VERSION = "0.3.1"
 end

data/rspec-rcv.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0.0'
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "pry"
   spec.add_runtime_dependency "rspec"
   spec.add_runtime_dependency "diffy"
+  spec.add_runtime_dependency "json-compare"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rcv
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.1
 platform: ruby
 authors:
 - Stephen Bussey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-15 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json-compare
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - steve.bussey@salesloft.com
@@ -109,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Export results of rspec tests to disk for integration testing.