verbalize 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a62bdd3cdb29ee92c019943093d0808d2083531
-  data.tar.gz: 236446bbba2989ca23cab20956aeddedefd3b22b
+  metadata.gz: 61174d8fa1734e70a63a74b34060d056515098ca
+  data.tar.gz: b3fc22d20687f9eba615606cdbc10865e56ea02f
 SHA512:
-  metadata.gz: d508c37312260b5916ffc08eb3d84fa73a7df7afe5220c143673d44d9cb384893a70281931f5c22aab1bd895eb29ed253ecb799c4442d788cf58da6e3ba2c0ba
-  data.tar.gz: 73e4886dd4c0f08ad21d7f7a134b8cb4949f34e4ef404f98a397ae5dbab338a62ff90613c0adb6772a7614ee9f3c6ba0834fde2638d6d99f470867b170f54480
+  metadata.gz: f3aeff77f6ce6012c78c597cfaadd60f19450e0cdfbd2c08e9f785b2a32b60d55685cc5571c97f0278a8c35795548811ade2e1dcc20209fe8bf7f9a600c5fbd5
+  data.tar.gz: f5c66899c7b5bcf67b088b92cbdeb1e81191d6479cea19204b9d8541cd144eec97a7f3b33e35a83ff67762429d703f05d896c8b3428e5ef679620de530eb69ab

data/.gitignore

@@ -7,3 +7,6 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+# Ignore rubymine files
+/.idea

data/.rubocop.yml

@@ -2,7 +2,7 @@ AllCops:
   TargetRubyVersion: 2.1
 
 Metrics/LineLength:
-  Max: 90
+  Max: 120
 
 Documentation:
   Enabled: false

data/lib/verbalize/build_dangerous_action_method.rb

@@ -9,13 +9,11 @@ module Verbalize
     end
 
     def body
-      <<-BODY.chomp
-  new(#{initialize_keywords_and_values}).send(:#{method_name})
-rescue UncaughtThrowError => uncaught_throw_error
-  error = VerbalizeError.new("Unhandled fail! called with: \#{uncaught_throw_error.value.value.inspect}.")
-  error.set_backtrace(uncaught_throw_error.backtrace[2..-1])
-  raise error
-      BODY
+      if all_keywords.empty?
+        "  __verbalized_send!(:#{method_name})"
+      else
+        "  __verbalized_send!(:#{method_name}, #{initialize_keywords_and_values})"
+      end
     end
   end
 end

data/lib/verbalize/build_safe_action_method.rb

@@ -9,15 +9,11 @@ module Verbalize
     end
 
     def body
-      <<-BODY.chomp
-  action = new(#{initialize_keywords_and_values})
-  result = catch(:verbalize_error) { action.send(#{method_name.inspect}) }
-  if result.is_a?(Result)
-    result
-  else
-    Result.new(outcome: :ok, value: result)
-  end
-      BODY
+      if all_keywords.empty?
+        "  __verbalized_send(:#{method_name})"
+      else
+        "  __verbalized_send(:#{method_name}, #{initialize_keywords_and_values})"
+      end
     end
   end
 end

data/lib/verbalize/version.rb

@@ -1,3 +1,3 @@
 module Verbalize
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.3.0'.freeze
 end

data/lib/verbalize.rb

@@ -6,10 +6,11 @@ require 'verbalize/build_attribute_readers'
 require 'verbalize/result'
 
 module Verbalize
+  THROWN_SYMBOL = :verbalize_error
   VerbalizeError = Class.new(StandardError)
 
   def fail!(failure_value = nil)
-    throw(:verbalize_error, Result.new(outcome: :error, value: failure_value))
+    throw(THROWN_SYMBOL, failure_value)
   end
 
   def self.included(target)
@@ -61,19 +62,30 @@ module Verbalize
     end
 
     def call
-      action = new
-      result = catch(:verbalize_error) { action.send(:call) }
-      if result.is_a?(Result)
-        result
-      else
-        Result.new(outcome: :ok, value: result)
-      end
+      __verbalized_send(:call)
     end
 
     def call!
-      new.send(:call)
+      __verbalized_send!(:call)
+    end
+
+    private
+
+    def __verbalized_send(method_name, *args)
+      outcome = :error
+      value = catch(:verbalize_error) do
+        value = new(*args).send(method_name)
+        # The outcome is :ok if the call didn't throw.
+        outcome = :ok
+        value
+      end
+      Result.new(outcome: outcome, value: value)
+    end
+
+    def __verbalized_send!(method_name, *args)
+      new(*args).send(method_name)
     rescue UncaughtThrowError => uncaught_throw_error
-      fail_value = uncaught_throw_error.value.value
+      fail_value = uncaught_throw_error.value
       error = VerbalizeError.new("Unhandled fail! called with: #{fail_value.inspect}.")
       error.set_backtrace(uncaught_throw_error.backtrace[2..-1])
       raise error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: verbalize
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Zach Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler