callable-mixin 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 963cf5da4e14188c462b46f0f7a9cfc546cc189d4b464f5d265f2f6806a9b0d1
-  data.tar.gz: 1610376b0f5f392f3f6dd2bc87a926eae0baf3c8c1f6a6751380857f7957250a
+  metadata.gz: f02bb980d5c43522ab33033a546c9b9418bb02cec29dcc1ef7254413c9beaf7f
+  data.tar.gz: 796a78f8e6f06b9518742cde7b3fd6101921bad24b8201a0bcd26e0befff1a3d
 SHA512:
-  metadata.gz: 258cb27a1405b6cdefca5c17e132864d54f0d895a8e73a6138cc2ba9b0bad92545e2cab8f17a52b214040d910fd34497e6046425fe4217cf405ccf8cffa42377
-  data.tar.gz: 32e8483f9145fb9660243276d5406a86cd41215df09ef90df59763420111d3a7f0227b85fca11cde468428bc851c11c924467043ff9c0ee66c287045584da5a1
+  metadata.gz: 7be17d2dc903fe4b37bb4b5a8003296e36c6dfde4cefecfaf5ec5305ae02800b14088bc90443b74fb78796e49191def264b67b7b0aee9c00c0651f62e37673ce
+  data.tar.gz: 7d6b34a18d7bf1bf4ce34d919d8f0fbc3803bcc1a94cccb78d96f27db63e0a4f3667174d3fa53879aaf899c2705f2c85928e8f4354cdc1b4df5b440b5409bac2

data/lib/callable/mixin.rb

@@ -18,12 +18,13 @@ module Callable
     # @raise  [ConstructionError] when instantiation fails
     def call(*args, **kwargs, &block)
       inst = begin
-        # avoids Ruby 2.0–2.6 quirk
-        if kwargs.empty?
-          new(*args, &block)
-        else
-          new(*args, **kwargs, &block)
-        end
+        # avoids Ruby 2.3–2.6 quirk
+        kwargs.empty? ? new(*args, &block) : new(*args, **kwargs, &block)
+      rescue ArgumentError => error
+        raise if error.class != ArgumentError
+        raise ConstructionError,
+              "Failed to construct #{name}.new with the supplied arguments: #{error.message}",
+              error.backtrace
       end
 
       if block_given? && inst.method(:call).arity.zero?
@@ -31,10 +32,6 @@ module Callable
       else
         inst.call
       end
-    rescue ArgumentError => error
-      raise ConstructionError,
-            "Failed to construct #{name}.new with the supplied arguments: #{error.message}",
-            error.backtrace
     end
   end
 end

data/lib/callable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Callable
-  VERSION = '0.1.0'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: callable-mixin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Michael Crowther