recoverable 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3cd84a75cc65ec1edb7af123525092ef9f0194a
-  data.tar.gz: def900fb2218f4dd57e45f7f7abc1b8ced7ceffe
+  metadata.gz: dcb4ca3801d95816c2f2fc8c7219d4ae77b86738
+  data.tar.gz: d804c1e859e19de3ac18d2c3cf0bbedc809004a0
 SHA512:
-  metadata.gz: 51bea1cac9ba766e6739541e6a5b83a77787a38c7315c100ee1f9ea421c851ac476d9bb97e4b6e5626314c1bfde5c8ebf28467f9ed9a47531cd78cfdff550ec2
-  data.tar.gz: 2b86282e90d387b9655d7ae312295b82a6ff92790d15eab23cef8b99bc8ed2c297683918b1b33e663897ad305f23e589d7015e921c35ffd41bffa4f2c170cbe0
+  metadata.gz: 9357f909a7e4a17fd79fb24257c9df343fa874a85d769d665f7ecae1c2a452ef8d4dcd602409d8c4781280b1a6735e5f747dc03a152d205d5a45a4f52f3d7b30
+  data.tar.gz: d1757b043a62dbab6f9f9f5e148a3d931f68ad0e00c107ea630cf160a490e14ebcd3f7833128b879b15e617dd653c6bda829294832bcf250273bca0d1ff0a0b6

data/README.md

@@ -138,7 +138,7 @@ Recoverable also allows you to configure a custom error handling method. This sh
       baz
     end
 
-    def handle_error(:error)
+    def handle_error(error:)
       "#{error} was retried twice, raised and then this method was called."
     end
   end

data/lib/recoverable/base.rb

@@ -33,46 +33,13 @@ module Recoverable
     req_params = retrieve_required_parameters(instance, custom_handler)
 
     return instance.send(custom_handler) if req_params.empty?
-
-    custom_handler_args = fetch_handler_args(args, instance, req_params, error)
-    instance.send(custom_handler, custom_handler_args)
+    instance.send(custom_handler, *args, { error: error })
   end
 
   def retrieve_required_parameters(instance, custom_handler)
     unbound_method = instance.class.instance_method(custom_handler)
     unbound_method.parameters.map{|p| p[1] if p[0] == :keyreq }.compact
   end
-
-  def fetch_handler_args(args, instance, req_params, error)
-    custom_handler_args = {error: error}
-    local_args          = fetch_local_args(args)
-    evaluateables       = evaluateable_keys_on(instance)
-    generate_custom_handler_args(req_params: req_params, evaluateables: evaluateables, local_args: local_args, instance: instance, custom_handler_args: custom_handler_args)
-  end
-
-  def generate_custom_handler_args(req_params:, evaluateables:, local_args:, instance:, custom_handler_args:)
-    req_params.each do |key|
-      custom_handler_args[key]   = instance.send(:eval, key.to_s)  if evaluateables.include?(key)
-      custom_handler_args[key] ||= local_args[key] if local_args.keys.include?(key)
-    end
-
-    custom_handler_args
-  end
-
-  def fetch_instance_variables(instance)
-    instance_variables.map { |name| name[1..-1].to_sym }
-  end
-
-  def fetch_local_args(args)
-    args.map(&:to_a).flatten(1).to_h
-  end
-
-  def evaluateable_keys_on(instance)
-    fetch_instance_variables(instance) +
-    instance.send(:public_methods) +
-    instance.send(:local_variables)
-  end
-
 end
 
 

data/lib/recoverable/version.rb

@@ -1,3 +1,3 @@
 module Recoverable
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/recoverable_spec.rb

@@ -214,24 +214,24 @@ RSpec.describe Recoverable do
           extend Recoverable
           recover :bar, tries: 2, on: CustomError, custom_handler: :handle_error
 
-          def bar(arg:nil)
+          def bar(string, array, arg: nil)
             baz
           end
 
           def baz; end
 
-          def handle_error(error:, arg:)
-            arg
+          def handle_error(*args, error:)
+            args
           end
 
         end
 
-        subject { instance.bar(arg: "I'm a keyword Arg")}
+        subject { instance.bar('foo', ['bar', 'baz'], arg: "I'm a keyword Arg")}
 
         it "has access to the keyword args" do
           allow_any_instance_of(self.class::TestClass).to receive(:baz).and_raise(CustomError)
           expect{ subject }.to_not raise_error(Recoverable::RetryCountExceeded)
-          expect(subject).to eq("I'm a keyword Arg")
+          expect(subject).to eq(["foo", ["bar", "baz"], {:arg=>"I'm a keyword Arg"}])
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recoverable
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ben Jacobs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-byebug