dry-behaviour 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 080e9972673cdf92dbb1ebe72b097fe8faa05fca
-  data.tar.gz: 7f62264785dda9bf3423bf5bc48176724d70a4db
+  metadata.gz: 822ccca7591e84e8f437fb9942ed3e2b0857ebbe
+  data.tar.gz: 80cc1b146e8caf3a3292c3ffc55cf0f88d64b9a6
 SHA512:
-  metadata.gz: c0e50166e9843097a4147cd70924fcb3bae533cd3e38f8265795d4d1ee5087ebbaa363bf1df64f6f9ad81a1e0a5e4832d85cf05599463aea83f9ce85eba69aa5
-  data.tar.gz: 6c39fcdcb28bb5b82648d993b9985ea9402505e72cf745d352270f53b11aa4405163afef5be68aefafd2bf85267270c7c1ce3e84a3c4785211ae7adce26ea08a
+  metadata.gz: 8fdff2c37197e6ea799e23618a33cb06f8fce388a67ad0a24f79b5e1cf2afe89ee6ab7d7fcfbb2cbab15789740e3ac7cdbc6ccf463644e6df7b85e6f8f8239c6
+  data.tar.gz: b52c34a6dc9d690f6807b6b810bb6b336b278b8ac039e23352a200f02fa526e093e118888bb0c8452098ffddbdbac01309b5768281e1c19b39e0de4780e964c1

data/lib/dry/behaviour/black_tie.rb

@@ -1,5 +1,4 @@
 module Dry
-  # rubocop:disable Style/VariableName
   # rubocop:disable Style/AsciiIdentifiers
   # rubocop:disable Style/MultilineBlockChain
   # rubocop:disable Style/EmptyCaseCondition
@@ -30,7 +29,7 @@ module Dry
         singleton_class.send :define_method, method do |receiver, *args|
           receiver.class.ancestors.lazy.map do |c|
             BlackTie.implementations[self].fetch(c, nil)
-          end.reject(&:nil?).first[method].(receiver, *args)
+          end.reject(&:nil?).first[method].(*args.unshift(receiver))
         end
       end
     end
@@ -39,26 +38,34 @@ module Dry
       BlackTie.protocols[self][name] = params
     end
 
+    DELEGATE_METHOD = lambda do |klazz, (source, target)|
+      klazz.class_eval do
+        define_method source do |this, *args, **params, &λ|
+          case
+          when !args.empty? && !params.empty? then this.send(target, *args, **params, &λ)
+          when !args.empty? then this.send(target, *args, &λ)
+          when !params.empty? then this.send(target, **params, &λ)
+          else this.send(target, &λ)
+          end
+        end
+      end
+    end
+
     def defimpl(protocol = nil, target: nil, delegate: [], map: {})
       raise if target.nil? || !block_given? && delegate.empty? && map.empty?
 
       mds = normalize_map_delegates(delegate, map)
       Module.new do
-        mds.each do |k, v|
-          singleton_class.class_eval do
-            define_method k do |this, *args, **params, &λ|
-              case
-              when !args.empty? && !params.empty? then this.send(v, *args, **params, &λ)
-              when !args.empty? then this.send(v, *args, &λ)
-              when !params.empty? then this.send(v, **params, &λ)
-              else this.send(v, &λ)
-              end
-            end
-          end
-        end
+        mds.each(&DELEGATE_METHOD.curry[singleton_class])
         singleton_class.class_eval(&Proc.new) if block_given? # block takes precedence
       end.tap do |mod|
-        mod.methods(false).each do |m|
+        mod.methods(false).tap do |meths|
+          (BlackTie.protocols[protocol || self].keys - meths).each_with_object(meths) do |m, acc|
+            safe_logger.warn("Implicit delegate #{(protocol || self).inspect}##{m} to #{target}")
+            DELEGATE_METHOD.(mod.singleton_class, [m] * 2)
+            acc << m
+          end
+        end.each do |m|
           BlackTie.implementations[protocol || self][target][m] = mod.method(m).to_proc
         end
       end
@@ -67,6 +74,15 @@ module Dry
 
     private
 
+    def safe_logger
+      if Kernel.const_defined?('::Rails')
+        Rails.logger
+      else
+        require 'logger'
+        Logger.new($stdout)
+      end
+    end
+
     def normalize_map_delegates(delegate, map)
       [*delegate, *map].map do |e|
         case e
@@ -83,5 +99,4 @@ module Dry
   # rubocop:enable Style/EmptyCaseCondition
   # rubocop:enable Style/MultilineBlockChain
   # rubocop:enable Style/AsciiIdentifiers
-  # rubocop:enable Style/VariableName
 end

data/lib/dry/behaviour/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Behaviour
-    VERSION = '0.1.1'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-behaviour
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Aleksei Matiushkin