rescue_from 1.0.2 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f488fa7588e49b071fcb350631b12fe444f0f1e2845fa57f2a9db921115911b
-  data.tar.gz: c0bbf74ee8a5c532fa5be18747c7e6a7a0fa9a601a23befa72d67f7d49b479ef
+  metadata.gz: 1e7cf4a9bf36425ce3acf49eb954ebcc4c54b2a4a0cec6b5fbce7431becf1217
+  data.tar.gz: 9b532f17f235307cb4fab085e33a03e4faa0484acb6d1d56057e93d177f05b8c
 SHA512:
-  metadata.gz: 1ea89e38ee82859686dfc16bf62bbd60fd5973f4a63ddeea161addeead5142b1e541ae2a89abd424d67f44ae1a38bba9f4a4b90cfa9edfac2235b0af445ac575
-  data.tar.gz: cd18ef11397838fa802b6ddbbfea67d6e8cfffd21bfed3d8d8c4056123af9dede7f8b5a948eb4583fe424bd4cc1a12dba43d98e8ecb7f168019c338aa4795bfa
+  metadata.gz: a13694ba98c354c60c14e1a2d52aaf3ca72cbf3ab35920b59d5b9bbb91052bcbaea22e41931f492131965b16471604bacdc8677b662e8d9bd2148461c431396b
+  data.tar.gz: 318c354c114a880558120dc648568c6508c02ebea4933f06f287de59a5fc325e6f1534b9362dbd0138b1dcc0947afdc07e70040a1fc1b9df88d94ce3c8bb4b1b

data/CHANGELOG.md

@@ -8,6 +8,22 @@
 ### Bug fixes
 )-->
 
+## 2.0.1 2025-01-20
+
+### Bug fixes
+
+- Relaxed dependency.
+
+## 2.0.0 2023-08-31
+
+### Breaking changes
+
+- Changed `self`-binding of exception handlers. Now handlers are executed in the same context as the method that raised the exception.
+
+### New features
+
+- Added RBS type signatures.
+
 ## 1.0.2 2023-08-30
 
 ### Bug fixes

data/README.md

@@ -7,7 +7,7 @@ An imitation of `ActiveSupport::Rescuable` that relies on Ruby's callbacks to re
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'rescue_from', '~> 1.0'
+gem 'rescue_from', '~> 2.0'
 ```
 
 And then execute:
@@ -29,15 +29,15 @@ Simply extend with `RescueFrom::Rescuable` any class or module that you want to
 ```ruby
 class DataImporter
   extend RescueFrom::Rescuable
-  
+
   rescue_from JSON::ParserError do
     []
   end
-  
+
   def temperature_data
     JSON.parse File.read('temperatures.json')
   end
-  
+
   def humidity_data
     JSON.parse File.read('humidity.json')
   end
@@ -51,17 +51,19 @@ Both `#temperature_data` and `#humidity_data` will return an empty array if the
 ```ruby
 class Service
   extend RescueFrom::Rescuable
-  
+
   rescue_from(proc {|e| !e.message.start_with? 'failure'}) do
     nil
   end
-  
+
   ...
 end
 ```
 
 If no pattern matches the exception, it will be reraised.
 
+Handlers are called in the context of the receiver of the method that raised the exception.
+
 If you want to call a given method bypassing the automatic exception handling, you can append `_without_rescue` to its name:
 
 ```ruby
@@ -105,7 +107,7 @@ If you want to limit automatic exception handling to only certain methods, you c
 
 class Service
   extend RescueFrom::Rescuable
-  
+
   ACTIONS = [:create, :update, :delete]
 
   def self.should_rescue_in? method_name

data/lib/rescue_from/rescuable.rb

@@ -29,7 +29,7 @@ module RescueFrom
 
     def relabel *patterns, to:, &message_generator
       rescue_from(*patterns) do |e|
-        raise to, message_generator.call(e)
+        raise to, instance_exec(e, &message_generator)
       end
     end
 
@@ -47,8 +47,9 @@ module RescueFrom
       return if overrider.method_defined? name
 
       method_without_rescue = instance_method name
+      name_without_rescue = :"#{name}_without_rescue"
 
-      overrider.define_method :"#{name}_without_rescue" do |*args, **kwargs, &block|
+      overrider.define_method name_without_rescue do |*args, **kwargs, &block|
         method_without_rescue.bind_call(self, *args, **kwargs, &block)
       end
 
@@ -63,9 +64,19 @@ module RescueFrom
           .filter_map { |ancestor_overrider| ancestor_overrider.handler_for e }
           .first
           .otherwise { raise e }
-          .therefore { |handler| handler.call e }
+          .therefore { |handler| instance_exec(e, name, &handler) }
       end
       # rubocop:enable Lint/RescueException
+
+      if private_method_defined? name
+        overrider.class_exec do
+          private name, name_without_rescue
+        end
+      elsif protected_method_defined? name
+        overrider.class_exec do
+          protected name, name_without_rescue
+        end
+      end
     end
   end
 end

data/lib/rescue_from/version.rb

@@ -1,3 +1,3 @@
 module RescueFrom
-  VERSION = '1.0.2'.freeze
+  VERSION = '2.0.1'.freeze
 end

data/lib/rescue_from.rb

@@ -1,3 +1,3 @@
 require 'therefore'
-require_relative "rescue_from/version"
+require_relative 'rescue_from/version'
 require_relative 'rescue_from/rescuable'

data/rescue_from.gemspec

@@ -0,0 +1,33 @@
+require_relative 'lib/rescue_from/version'
+
+Gem::Specification.new do |spec|
+  spec.name = 'rescue_from'
+  spec.version = RescueFrom::VERSION
+  spec.authors = ['Moku S.r.l.', 'Riccardo Agatea']
+  spec.email = ['info@moku.io']
+  spec.license = 'MIT'
+
+  spec.summary = 'An imitation of ActiveSupport::Rescuable that relies on Ruby\'s callbacks to reduce boilerplate code.'
+  spec.description = 'An imitation of ActiveSupport::Rescuable that relies on Ruby\'s callbacks to reduce ' \
+                     'boilerplate code.'
+  spec.homepage = 'https://github.com/moku-io/rescue_from'
+  spec.required_ruby_version = '>= 2.6.0'
+
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = 'https://github.com/moku-io/rescue_from'
+  spec.metadata['changelog_uri'] = 'https://github.com/moku-io/rescue_from/blob/master/CHANGELOG.md'
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir __dir__ do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|circleci)|appveyor)})
+    end
+  end
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.add_dependency 'activesupport'
+  spec.add_dependency 'therefore', '~> 1.0'
+end

data/sig/lib/rescue_from/rescuable.rbs

@@ -0,0 +1,7 @@
+module RescueFrom
+  module Rescuable[T]
+    def rescue_from: (*Array::_Pattern[Exception] patterns) { () [self: T] -> untyped } -> void
+    def relabel: (*Array::_Pattern[Exception] patterns, to: Exception) { () [self: T] -> (String | untyped) } -> void
+    def should_rescue_in?: (Symbol method_name) -> bool
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rescue_from
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.1
 platform: ruby
 authors:
 - Moku S.r.l.
@@ -9,22 +9,22 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-30 00:00:00.000000000 Z
+date: 2025-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: therefore
   requirement: !ruby/object:Gem::Requirement
@@ -58,7 +58,8 @@ files:
 - lib/rescue_from/overrider.rb
 - lib/rescue_from/rescuable.rb
 - lib/rescue_from/version.rb
-- sig/rescue_from.rbs
+- rescue_from.gemspec
+- sig/lib/rescue_from/rescuable.rbs
 homepage: https://github.com/moku-io/rescue_from
 licenses:
 - MIT
@@ -81,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: An imitation of ActiveSupport::Rescuable that relies on Ruby's callbacks

data/sig/rescue_from.rbs

@@ -1,4 +0,0 @@
-module RescueFrom
-  VERSION: String
-  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
-end