injectable 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec59b943de91947c9572d9bba1473f94392e5d2629b702e10dd03e98c6bb7a3a
-  data.tar.gz: e7e6dc95644f502e5100c3ee2f4e23c06bc40ac453e69ae1cc66bf3d6f2de329
+  metadata.gz: 39e5192fdea17f097ed9a59e790d420cc57c948d634d62295cf1b4060423b57e
+  data.tar.gz: 03df6db3f7c4d49eed4333800a8d1f58a8621d030285327f0bc9b0fc46b12ba6
 SHA512:
-  metadata.gz: 85852a19057697f19140004c32eeadc49bc0cc9276bceccfe2b98a0d0a65ecbcf7e3a7ae8f9ac34267fdc0d10aacf34d163202ed6bc6cfa35baa05fbc52db150
-  data.tar.gz: db94ab469130da0d7c54dd6debb3c2ad0064b4cae0654fe2038bfb2bcb1e592efbf4c5ec0ccac2ff5bf6c8b3605f6331207b80c1d8c2b58d27c9f7662a72106e
+  metadata.gz: b68bf39f92aaccd38780cda67bddf53d3f95eecfcc9a00028787f56a9075d03356fa2533708827deeb5c12441bc007132e8934e6c353de1e109284923764a76f
+  data.tar.gz: c9a3fb6173b26269589bcea5ac45a02c86a81df8c6b956405067f7f483afbbf78f395a3678fe98b96b2d02582edad45c2a8d6444fd777e16cea25c33647c4c91

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ### Unreleased
 
+### 2.1.1 - 2021-03-15
+
+* bug fixes
+  * Address final Ruby 2.7 warnings (#24)
+
 ### 2.1.0 - 2021-01-05
 
 * enhancements

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    injectable (2.1.0)
+    injectable (2.1.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/injectable/dependency.rb

@@ -2,15 +2,34 @@ module Injectable
   # Initialize a dependency based on the options or the block passed
   Dependency = Struct.new(:name, :block, :class, :call, :with, :depends_on, keyword_init: true) do
     def instance(args: [], namespace: nil)
-      args = wrap_args(args)
-      wrap_call build_instance(args, namespace: namespace)
+      positional_args, kwargs = split_args(args)
+
+      wrap_call build_instance(positional_args, kwargs, namespace: namespace)
     end
 
     private
 
-    def wrap_args(args)
+    def split_args(args)
+      args = preprocess_args(args)
+
+      return [[], {}] if args.empty?
+
+      kwargs = args.pop
+
+      if kwargs.is_a?(Hash) && kwargs.keys.all? { |key| key.is_a?(Symbol) }
+        [args, kwargs]
+      else
+        [args << kwargs, {}]
+      end
+    end
+
+    def preprocess_args(args)
       args = with unless with.nil?
-      args.is_a?(Array) ? args : [args]
+      wrap_args(args)
+    end
+
+    def wrap_args(args)
+      args.is_a?(Array) ? args.clone : [args]
     end
 
     def wrap_call(the_instance)
@@ -23,10 +42,17 @@ module Injectable
       the_instance.public_method(call)
     end
 
-    def build_instance(args, namespace:)
-      return klass(namespace: namespace).new(*args) if block.nil?
+    def build_instance(args, kwargs, namespace:)
+      return build_instance_26(args, kwargs, namespace: namespace) if RUBY_VERSION < '2.7'
 
-      block.call(*args)
+      instantiator = block || klass(namespace: namespace).method(:new)
+      if kwargs.empty?
+        # otherwise an empty hash will be added in ruby 2.7, which could be taken as
+        # positional argument instead.
+        instantiator.call(*args)
+      else
+        instantiator.call(*args, **kwargs)
+      end
     end
 
     def klass(namespace:)
@@ -40,5 +66,11 @@ module Injectable
     def camelcased
       @camelcased ||= name.to_s.split('_').map(&:capitalize).join
     end
+
+    def build_instance_26(args, kwargs, namespace:)
+      args << kwargs if kwargs.any?
+
+      block.nil? ? klass(namespace: namespace).new(*args) : block.call(*args)
+    end
   end
 end

data/lib/injectable/version.rb

@@ -1,3 +1,3 @@
 module Injectable
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.1.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: injectable
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Papipo
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler