rspec-rcv 0.2.2 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62b3a8d716c6ffce6fe323ef1892cfd80c6f922f
-  data.tar.gz: 6a55d9f3d6dcfb74a4a723001efa2b13cbca04ed
+  metadata.gz: 8825f55c2ec3a93214642eb39530026990cf9670
+  data.tar.gz: b5e3196e7d63da1ba024ee61e8c772d285788505
 SHA512:
-  metadata.gz: 91074435ecde69054339d80bfae8cae50cd1d8bd7ad718a32dbd6bafe1f2776751759d3412f57768b616ea076e40ae5993dccedfacf178b51fa94fe913eea086
-  data.tar.gz: 978ebe2eb26c108a1b387e4668c268608d4efc852ccb57f33ab9b8faa20e5f5c3b6a4e289a0f0428eb6c58791f5cf94483cfb179447f19b0e5fe2d0a6f030366
+  metadata.gz: 841cebf017ad6a4687e00bcbccba9c64ca4070b5c687528f47a35ddda3ef9838a5ae1597870bd9398ca92c03a49c1c312e56913a82699f52975d8c5a27fe6068
+  data.tar.gz: 4f5b88ec81b959c6cf00e9e8e6f4c02c055e97f9c6687e2fe096957139b61a299c60ba6d382850decd393f2ed28a5d2d6813fefbbf2cfd0a1fa41a22a44a79d0

data/lib/rspec-rcv.rb

@@ -27,6 +27,6 @@ module RSpecRcv
   end
 
   def config(overrides=nil)
-    @configuration.opts(overrides)
+    configuration.opts(overrides)
   end
 end

data/lib/rspec-rcv/handler.rb

@@ -9,7 +9,7 @@ module RSpecRcv
     end
 
     def call
-      return if existing_data && existing_data["file"] == file_path && existing_data["data"] == data
+      return :no_change if existing_data && existing_data["file"] == file_path && existing_data["data"] == data
 
       output = { recorded_at: Time.now, file: file_path, data: data }
       output = opts[:codec].export_with(output) + "\n"
@@ -18,17 +18,18 @@ module RSpecRcv
         eq = opts[:compare_with].call(existing_data["data"], data, opts)
 
         if !eq && opts[:fail_on_changed_output]
-          diff = Diffy::Diff.new(existing_file, output)
-          raise RSpecRcv::DataChangedError.new("Existing data will be overwritten. Turn off this feature with fail_on_changed_output=false\n\n#{diff}")
+          raise_error!(output)
         end
 
-        return if eq
+        return :same if eq
       end
 
       FileUtils.mkdir_p(File.dirname(path))
       File.open(path, 'w') do |file|
         file.write(output)
       end
+
+      return :to_disk
     end
 
     private
@@ -54,5 +55,35 @@ module RSpecRcv
                            opts[:codec].decode_with(File.read(path))
                          end
     end
+
+    def raise_error!(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
+
+      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}
+      EOF
+    end
   end
 end

data/lib/rspec-rcv/version.rb

@@ -1,3 +1,3 @@
 module RSpecRcv
-  VERSION = "0.2.2"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rcv
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.6
 platform: ruby
 authors:
 - Stephen Bussey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler