suture 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03b931eb888e1ce5e2d66f44c82063095b2d77b7
-  data.tar.gz: 395821b0b2c7075bfebddec65debbe8dc1860f4b
+  metadata.gz: f33e4939ed0c1027f6785cc54be152ea672ebdb4
+  data.tar.gz: bec9bab57ef345f7095cabf4ece4c84e242b79e1
 SHA512:
-  metadata.gz: f909ce361c7a0b62da87a7332b022725d1c38e02d52c6aa0b4e7f884be841750e2d8b763f8b805cc48f6eff09ebe639d26d330254ef6a04933bba81076e3a335
-  data.tar.gz: f054acf5f1bb4a577b67973df7f093d26a93258cd2435c86c93885c7e6f4f4c5e7b17c5b5d5a516c4756cbf7816e2cdef990a4fd04191da8f41d519de16cc938
+  metadata.gz: 6ddae427868b0b514a8d4b6c3b413f0185c15321e5cfd0acea5ed044a60d78c5232dba4b4cbb3219b33abca7bfad9350a85aff05849f97dc8f1215d341b650f1
+  data.tar.gz: 15ef4a1b3af52821d69f1c3aa6997b123bcbcdc0570ce6296cf420caf7437f64083a4442bc278427ccb302fb806705faba8acf2ca0c531cac20450fbaf3c2fb7

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## [v1.1.0](https://github.com/testdouble/suture/tree/v1.1.0) (2016-09-18)
+[Full Changelog](https://github.com/testdouble/suture/compare/v1.0.0...v1.1.0)
+
+**Merged pull requests:**
+
+- Return the old result when call\_both mismatches and raise is disable [\#63](https://github.com/testdouble/suture/pull/63) ([searls](https://github.com/searls))
+- excludes example/ from codeclimate analysis [\#62](https://github.com/testdouble/suture/pull/62) ([JoshTGreenwood](https://github.com/JoshTGreenwood))
+- update version in CHANGELOG \[ci skip\] [\#59](https://github.com/testdouble/suture/pull/59) ([y-yagi](https://github.com/y-yagi))
+
 ## [v1.0.0](https://github.com/testdouble/suture/tree/v1.0.0) (2016-09-07)
 [Full Changelog](https://github.com/testdouble/suture/compare/v0.5.0...v1.0.0)
 

data/lib/suture/error/result_mismatch.rb

@@ -16,11 +16,11 @@ module Suture::Error
         Arguments: ```
           #{@plan.args.inspect}
         ```
-        The new code path returned: ```
-          #{@new_result.inspect}
+        The new code path #{@new_result.errored? ? "raised error" : "returned value"}: ```
+          #{@new_result.value.inspect}
         ```
-        The old code path returned: ```
-          #{@old_result.inspect}
+        The old code path #{@old_result.errored? ? "raised error" : "returned value"}: ```
+          #{@old_result.value.inspect}
         ```
 
         Here's what we recommend you do next:

data/lib/suture/surgeon/auditor.rb

@@ -1,42 +1,73 @@
 require "suture/error/result_mismatch"
+require "suture/value/result"
+require "suture/util/compares_results"
 require "suture/util/scalpel"
 
 module Suture::Surgeon
   class Auditor
     include Suture::Adapter::Log
 
+    def initialize
+      @scalpel = Suture::Util::Scalpel.new
+    end
+
     def operate(plan)
-      scalpel = Suture::Util::Scalpel.new
-      new_result = scalpel.cut(plan, :new)
-      old_result = scalpel.cut(plan, :old)
-      if !plan.comparator.call(old_result, new_result)
+      new_result = result_for(plan, :new)
+      old_result = result_for(plan, :old)
+      if !comparable?(plan, old_result, new_result)
         handle_mismatch(plan, old_result, new_result)
       else
-        new_result
+        return_result(new_result)
       end
     end
 
     private
 
+    def result_for(plan, path)
+      begin
+        Suture::Value::Result.returned(@scalpel.cut(plan, path))
+      rescue StandardError => error
+        Suture::Value::Result.errored(error)
+      end
+    end
+
+    def comparable?(plan, old_result, new_result)
+      Suture::Util::ComparesResults.new(plan.comparator).compare(
+        old_result,
+        new_result
+      )
+    end
+
     def handle_mismatch(plan, old_result, new_result)
       log_warning(plan, old_result, new_result)
       if plan.raise_on_result_mismatch
         raise Suture::Error::ResultMismatch.new(plan, new_result, old_result)
       elsif plan.return_old_on_result_mismatch
-        old_result
+        return_result(old_result)
       else
-        new_result
+        return_result(new_result)
+      end
+    end
+
+    def return_result(result)
+      if result.errored?
+        raise result.value
+      else
+        return result.value
       end
     end
 
     def log_warning(plan, old_result, new_result)
       log_warn <<-MSG.gsub(/^ {8}/,'')
         Seam #{plan.name.inspect} is set to :call_both the :new and :old code
-        paths, but they did not match. The new result was: ```
-          #{new_result.inspect}
+        paths, but they did not match.
+
+        The new result #{new_result.errored? ? "raised" : "returned"}: ```
+          #{new_result.value.inspect}
         ```
-        The old result was: ```
-          #{old_result.inspect}
+
+        The old result #{old_result.errored? ? "raised" : "returned"}: ```
+          #{old_result.value.inspect}
         ```
       MSG
     end

data/lib/suture/version.rb

@@ -1,3 +1,3 @@
 module Suture
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suture
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Justin Searls
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-18 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3