the_help 3.0.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58c4ca451c960bbd6f54ee05d9a786db32365e8630cd57d1730d21b1e23b4b28
-  data.tar.gz: d6b16972071beed84aebb226bf77be94e8e04bdc38ea8eb452170da903287e05
+  metadata.gz: b1529f0d2832e0d69096c3a00b7bf5a909b75f8b14b59a1a49aed87248d4935a
+  data.tar.gz: 80f2d717ef93107427856d2057672381067ef52939083f79dae38932df8c4b23
 SHA512:
-  metadata.gz: 31854f6f5c438280a532d0f9674f10409873164fa240b06716939972d72dd28de48244dc9ab0b160d5714d9c351d5f37da2323cbf33780bcf4c62d23aeadbf2b
-  data.tar.gz: 59f1e173753355dbbaec54c1d4411c49184ff769e3a84061c5f81413e634761a9b959b86d8ffe9ff86bc54c3b2b316671bd75f477ee3fe693e7fbf7883ba6671
+  metadata.gz: 376ecebb8cd352e0217f8d27fe3f7784ab2bf258454da67f9abdf1b68ba67bf99214f683e8041ef68e016ccb55cfe2492910eae0521652469ffe0b77b86d5e4a
+  data.tar.gz: b476d0491c4cb3a2f1c9a0149b1ac385d0f4ac6d033d4f0de8a061be6e1c47bbcda58a01fab928d0b93855aaeb14ffcc59d7030913923182479c4ecff54829ca

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# TheHelp Changelog #
+
+## 3.3.0 ##
+
+* Calling `#stop!` with no arguments in a service definition will now check that a result was set
+  with either `#result.success` or `#result.error` and raise `TheHelp::NoResultError` if no result
+  was set.
+
+* You can now call `#stop!` with both a `type:` and `value:` argument. `type:` can be either
+  `:error` (the default) or `:success`, and `value:` can be any object. Calling in this manner
+  will set the service result to the specified type and value.

data/Gemfile.lock

@@ -1,50 +1,55 @@
 PATH
   remote: .
   specs:
-    the_help (3.0.0)
+    the_help (3.3.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
-    byebug (11.0.1)
-    diff-lcs (1.3)
-    jaro_winkler (1.5.3)
-    parallel (1.18.0)
-    parser (2.6.5.0)
-      ast (~> 2.4.0)
+    ast (2.4.1)
+    byebug (11.1.3)
+    diff-lcs (1.4.4)
+    parallel (1.19.2)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (13.0.1)
+    regexp_parser (1.8.2)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    rubocop (0.75.1)
-      jaro_winkler (~> 1.5.1)
+    rspec-support (3.9.4)
+    rubocop (0.93.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.1.0)
+      parser (>= 2.7.1.5)
     ruby-progressbar (1.10.1)
-    unicode-display_width (1.6.0)
-    yard (0.9.20)
+    unicode-display_width (1.7.0)
+    yard (0.9.25)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   byebug
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 0.50)
   the_help!

data/README.md

@@ -118,6 +118,33 @@ call_service(MyService, foo: false)
 # raises the exception ArgumentError with the message 'foo must be true'
 ```
 
+If you want to make sure the exception's backtrace points to the correct line of code, raise the
+exception in a block provided to the `#error` method:
+
+```ruby
+class MyService < TheHelp::Service
+  authorization_policy allow_all: true
+
+  input :foo
+
+  main do
+    if foo
+      result.success 'bar'
+    else
+      result.error { raise ArgumentError.new('foo must be true') }
+    end
+  end
+end
+
+call_service(MyService, foo: false)
+# raises the exception ArgumentError with the message 'foo must be true'
+```
+
+With the block form, the backtrace will point to the line where the exception was first raised
+rather than to the `#value!` method, however all other code execution will continue until the
+point where the `#value!` method is called (as long as the exception is a subtype of
+`StandardError`.)
+
 ### Running Callbacks
 
 In some cases a simple success or error result is not sufficient to describe the various results

data/lib/the_help/service.rb

@@ -150,18 +150,42 @@ module TheHelp
         self
       end
 
-      def input(name, **options)
-        attr_accessor name, make_private: true
-        if options.key?(:default)
-          required_inputs.delete(name)
-          define_method(name) do
-            instance_variable_get("@#{name}") || options[:default]
-          end
+      # Defines a service input
+      #
+      # The specified input becomes a named parameter for the service's `#call` method.
+      #
+      # @param name [Symbol] This becomes the name of the input parameter
+      #
+      # @param block [Proc] If a block is provided, the contents of the block will be executed in
+      #                     the scope of the service instance in order to provide the default
+      #                     value of the input. This is different than providing a Proc to the
+      #                     `:default` option, which would simply return the Proc itself as the
+      #                     default value rather than calling it.
+      #
+      # @option options [Object] :default If specified (and no block is given), this becomes the
+      #                                   literal default value for the input.
+      def input(name, **options, &block)
+        if options.key?(:default) || block
+          make_optional_input(name, options[:default], &block)
         else
+          attr_accessor name, make_private: true
           required_inputs << name
         end
         self
       end
+
+      private
+
+      def make_optional_input(name, default, &block)
+        attr_writer name
+        private "#{name}="
+        default_routine = block || -> { default }
+        define_method("_#{name}", &default_routine)
+        define_method(name) do
+          instance_variable_get("@#{name}") || send("_#{name}")
+        end
+        required_inputs.delete(name)
+      end
     end
 
     # Holds the result of running a service as well as the execution status
@@ -194,8 +218,16 @@ module TheHelp
         freeze
       end
 
-      def error(value)
-        self.value = value
+      def error(value = nil, &block)
+        self.value = if block_given?
+                       begin
+                        self.value = block.call
+                       rescue StandardError => e
+                         e
+                       end
+                     else
+                       value
+                     end
         self.status = :error
         freeze
       end
@@ -231,16 +263,21 @@ module TheHelp
     # @return [TheHelp::Service::Result]
     def call
       validate_service_definition
+
       catch(:stop) do
         authorize
         log_service_call
         main
         check_result!
-        self.block_result = yield result if block_given?
       end
+
+      self.block_result = yield result if block_given?
+
       throw :stop if stop_caller
+
       return block_result if block_given?
-      return result
+
+      result
     end
 
     private
@@ -283,11 +320,20 @@ module TheHelp
       return if authorized?
       logger.warn("Unauthorized attempt to access #{self.class.name}/#{__id__} " \
                   "as #{context.inspect}")
-      run_callback(not_authorized, service: self.class, context: context)
+      result.error run_callback(not_authorized, service: self.class, context: context)
       stop!
     end
 
-    def stop!
+    def stop!(type: :error, **opts)
+      if opts.has_key?(:value)
+        if type == :success
+          result.success value
+        else
+          result.error value
+        end
+      else
+        check_result!
+      end
       throw :stop
     end
 

data/lib/the_help/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TheHelp
-  VERSION = '3.0.0'
+  VERSION = '3.3.1'
 end

data/the_help.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'byebug'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.50'
   spec.add_development_dependency 'yard'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: the_help
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.3.1
 platform: ruby
 authors:
 - John Wilger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +93,7 @@ files:
 - ".rubocop.yml"
 - ".tool-versions"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock