verbalize 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3597fd0a4fe2e3ee402bc43159dc23229910575d
-  data.tar.gz: 550e8867c47c8242bc01640c111fa149d8d24d36
+  metadata.gz: af1f862ae8c6cbaef0af29e87c01e805cd667be3
+  data.tar.gz: 3080e524a6b251d8633dab8673951f75371058fa
 SHA512:
-  metadata.gz: 042bc2b94824e56ef38fbd5ca2c0959f92e3ed95cb3fda6aa6a4eeeead5c31763ead385a42e9068c44d23ee52e7f689facfaaf6f9ee8d0694c4b283f8e10966d
-  data.tar.gz: 2e5611c685bf82d323017990fc5040c61d7cd32bee5a1359760ce3b8830fda7be9dba43c1cc06216c132737e385c1aa8c790e91740f13ef650166c34051b2433
+  metadata.gz: ec18ba755d82586787fa4dfea0220a5321092ee8aad1a2791eb6088e3fa19aef645375e1f5dd7a4808a2dd55556db6f0b5beaa5a362c9f054bf4decb823199d7
+  data.tar.gz: 7abe67eebe6e6785b1e0ed92cd844a8819ff7cd7a3841f0b65655351ac57e36a376833446e3398052d95272df910ebf80996859d6d276b6479d4959a671ea98a

data/circle.yml

@@ -1,6 +1,6 @@
 machine:
   ruby:
-    version: '2.1'
+    version: '2.2'
 
 test:
   post:

data/lib/verbalize.rb

@@ -1,13 +1,15 @@
 require 'verbalize/version'
 require 'verbalize/build_initialize_method'
-require 'verbalize/build_action_method'
+require 'verbalize/build_safe_action_method'
+require 'verbalize/build_dangerous_action_method'
 require 'verbalize/build_attribute_readers'
 require 'verbalize/result'
 
 module Verbalize
-  def fail!(failure_value)
-    @verbalize_outcome = :error
-    throw :verbalize_error, failure_value
+  VerbalizeError = Class.new(StandardError)
+
+  def fail!(failure_value = nil)
+    throw(:verbalize_error, Result.new(outcome: :error, value: failure_value))
   end
 
   def self.included(target)
@@ -36,7 +38,13 @@ module Verbalize
 
       optional_keywords = Array(optional)
 
-      class_eval BuildActionMethod.call(
+      class_eval BuildSafeActionMethod.call(
+        required_keywords: required_keywords,
+        optional_keywords: optional_keywords,
+        method_name:       method_name
+      )
+
+      class_eval BuildDangerousActionMethod.call(
         required_keywords: required_keywords,
         optional_keywords: optional_keywords,
         method_name:       method_name
@@ -53,10 +61,22 @@ module Verbalize
     end
 
     def call
-      action  = new
-      value   = catch(:verbalize_error) { action.send(:call) }
-      outcome = action.instance_variable_get(:@verbalize_outcome) || :ok
-      Result.new(outcome: outcome, value: value)
+      action = new
+      result = catch(:verbalize_error) { action.send(:call) }
+      if result.is_a?(Result)
+        result
+      else
+        Result.new(outcome: :ok, value: result)
+      end
+    end
+
+    def call!
+      new.send(:call)
+    rescue UncaughtThrowError => uncaught_throw_error
+      fail_value = uncaught_throw_error.value.last
+      error = VerbalizeError.new("Unhandled fail! called with: #{fail_value.inspect}.")
+      error.set_backtrace(uncaught_throw_error.backtrace[2..-1])
+      raise error
     end
   end
 end

data/lib/verbalize/build_dangerous_action_method.rb

@@ -0,0 +1,21 @@
+require_relative 'build_method_base'
+
+module Verbalize
+  class BuildDangerousActionMethod < BuildMethodBase
+    private
+
+    def declaration
+      "def self.#{method_name}!(#{declaration_keyword_arguments})"
+    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.last.inspect}.")
+  error.set_backtrace(uncaught_throw_error.backtrace[2..-1])
+  raise error
+      BODY
+    end
+  end
+end

data/lib/verbalize/build_initialize_method.rb

@@ -12,7 +12,7 @@ module Verbalize
       return if all_keywords.empty?
 
       lines = all_keywords.map do |keyword|
-        "@#{keyword} = #{keyword}"
+        "  @#{keyword} = #{keyword}"
       end
 
       lines.join("\n")

data/lib/verbalize/build_method_base.rb

@@ -22,7 +22,7 @@ class BuildMethodBase
   attr_reader :required_keywords, :optional_keywords, :method_name
 
   def parts
-    [declaration, body, 'end']
+    [declaration, body, "end\n"]
   end
 
   def declaration
@@ -49,4 +49,8 @@ class BuildMethodBase
     return if all_keywords.empty?
     (required_keyword_segments + optional_keyword_segments).join(', ')
   end
+
+  def initialize_keywords_and_values
+    all_keywords.map { |variable| "#{variable}: #{variable}" }.join(', ')
+  end
 end

data/lib/verbalize/build_safe_action_method.rb

@@ -0,0 +1,23 @@
+require_relative 'build_method_base'
+
+module Verbalize
+  class BuildSafeActionMethod < BuildMethodBase
+    private
+
+    def declaration
+      "def self.#{method_name}(#{declaration_keyword_arguments})"
+    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
+    end
+  end
+end

data/lib/verbalize/version.rb

@@ -1,3 +1,3 @@
 module Verbalize
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: verbalize
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Zach Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,10 +113,11 @@ files:
 - bin/setup
 - circle.yml
 - lib/verbalize.rb
-- lib/verbalize/build_action_method.rb
 - lib/verbalize/build_attribute_readers.rb
+- lib/verbalize/build_dangerous_action_method.rb
 - lib/verbalize/build_initialize_method.rb
 - lib/verbalize/build_method_base.rb
+- lib/verbalize/build_safe_action_method.rb
 - lib/verbalize/result.rb
 - lib/verbalize/version.rb
 - verbalize.gemspec

data/lib/verbalize/build_action_method.rb

@@ -1,24 +0,0 @@
-require_relative 'build_method_base'
-
-module Verbalize
-  class BuildActionMethod < BuildMethodBase
-    private
-
-    def declaration
-      "def self.#{method_name}(#{declaration_keyword_arguments})"
-    end
-
-    def body
-      [
-        "action = new(#{initialize_keyword_arguments})",
-        "value = catch(:verbalize_error) { action.send(#{method_name.inspect}) }",
-        'outcome = action.instance_variable_get(:@verbalize_outcome) || :ok',
-        'Result.new(outcome: outcome, value: value)'
-      ].join("\n")
-    end
-
-    def initialize_keyword_arguments
-      all_keywords.map { |variable| "#{variable}: #{variable}" }.join(', ')
-    end
-  end
-end