the_help 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8430824b2d2a5a8b4fdf1925b234a81c9377f5916e352c967f15b084ba546386
-  data.tar.gz: 75a481c9cd39173aafd183ba79ee217bbce2474bcd5b1c3a7daee851cce813ba
+  metadata.gz: 23549e882a292bcd3a220b22e6761eca139ac452d0a5f4f7a46b318ba2702570
+  data.tar.gz: ab250ee41c17c458c54e9817a9cebe1781c36ce4211f7ed0bf274f4e28f63ea1
 SHA512:
-  metadata.gz: 9398f9ade624bf4f8ff0e843c69226ea652b39f7e713722f2559bb77daaf181593a99e0f0d28f12bfcd7e0d7cf9198a8ae69383e325a03328b81ae2992a0b49f
-  data.tar.gz: b050a8e67894e4fd5572c56cd76e0faf29269a847662ac06ca50da8d69ba1404b7793e84fe431a4fa91948edd389478d1349cde32eea6d933fd802b27918d91a
+  metadata.gz: 469d1d7513a3dd6cf7b6b5d9a34eb0580b0cbe3c5205996b1ef7240f8312777b4d44c17852c87ff435231c6f0d6a493588fc0f8097a9fa4e414a80fc6ba239a9
+  data.tar.gz: 99b3277a01c99017f2ba8f787a23a56da16a564a6a2e00ae8488f1af0e72844f100b34348c2ee2e79682f73160c3b3e4fe73497ff82bd3760d533446df88cbd9

data/.travis.yml

@@ -2,4 +2,5 @@ sudo: false
 language: ruby
 rvm:
   - 2.4.1
-before_install: gem install bundler -v 1.16.0.pre.2
+  - 3.0.1
+before_install: gem install bundler -v 2.2.15

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    the_help (3.4.0)
+    the_help (3.5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.1)
     byebug (11.1.3)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     parallel (1.19.2)
     parser (2.7.2.0)
       ast (~> 2.4.1)
@@ -16,19 +16,19 @@ GEM
     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.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.4)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
     rubocop (0.93.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
@@ -56,4 +56,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.17.3
+   2.2.15

data/lib/the_help/provides_callbacks.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'set'
+
 module TheHelp
   # Adds a callback DSL to including classes
   #
@@ -129,12 +131,12 @@ module TheHelp
 
       def _provides_callbacks_define_wrapper(name, without_logging)
         make_public = public_method_defined?(name)
-        define_method(name) do |*args|
+        define_method(name) do |*args, **options|
           if defined?(logger)
             logger.debug("#{self.class.name}/#{__id__} received callback " \
                          ":#{name}.")
           end
-          send(without_logging, *args)
+          send(without_logging, *args, **options)
           self
         end
         private name unless make_public

data/lib/the_help/service.rb

@@ -106,8 +106,8 @@ module TheHelp
       # Convenience method to instantiate the service and immediately call it
       #
       # Any arguments are passed to #initialize
-      def call(*args, &block)
-        new(*args).call(&block)
+      def call(*args, **options, &block)
+        new(*args, **options).call(&block)
       end
 
       # :nodoc:
@@ -341,17 +341,23 @@ module TheHelp
       raise TheHelp::NoResultError if result.pending?
     end
 
-    def run_callback(callback, *args)
+    def run_callback(callback, *args, **options)
       continue = false
       continue = catch(:stop) do
-        callback.call(*args)
+        if options.empty?
+          # Satisfies Ruby 2.4 and friends - where straightforward `, **options`
+          # still lands as separated `{}` parameter into the lambda..
+          callback.call(*args)
+        else
+          callback.call(*args, **options)
+        end
         true
       end
       self.stop_caller ||= !continue
     end
 
-    def delegate_to_service(*args)
-      call_service(*args) { |result| @result = result }
+    def delegate_to_service(*args, **options)
+      call_service(*args, **options) { |result| @result = result }
     end
   end
 end

data/lib/the_help/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: the_help
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - John Wilger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-13 00:00:00.000000000 Z
+date: 2022-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -87,7 +87,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"

data/.circleci/config.yml

@@ -1,35 +0,0 @@
-# Ruby CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-ruby/ for more details
-#
-version: 2
-jobs:
-  build:
-    docker:
-      # specify the version you desire here
-       - image: circleci/ruby:2.4.1
-
-    steps:
-      - checkout
-
-      # Download and cache dependencies
-      - restore_cache:
-          keys:
-          - v1-dependencies-{{ checksum "Gemfile.lock" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
-
-      - run:
-          name: install dependencies
-          command: |
-            bundle install --jobs=4 --retry=3 --path vendor/bundle
-
-      - save_cache:
-          paths:
-            - ./vendor/bundle
-          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
-
-      # run tests!
-      - run:
-          name: run tests
-          command: bundle exec rspec