dry-behaviour 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a166f19773e33836c9c2a8bf2440166c735a55b
-  data.tar.gz: 80deda3626f5a67ccbbb317e0595f4a86981cf40
+  metadata.gz: 597908ea5e4f168109a48128ea4992cd86652edc
+  data.tar.gz: 3945b08a31f1f62784dd9873d1f7a6ded0f94072
 SHA512:
-  metadata.gz: 5bceef51d78eff3bc1f738cab5ce30baa3215d4507a3c7ec5ff080166b98974cc11b3be47db8694ae4aad290d3d7b3a9633a0d0396cdeb7e7987792ac43eb0d6
-  data.tar.gz: ea08dff7a62904ebcfde0799c50218ebc0f43b51fc98cf09f15b1a0163eccdcae4fa965e5c7622563a0e2aa73b5db015dc92ac67591f785ba6230811717821f9
+  metadata.gz: 7f205f7f1427902ab7b55713496b4da292c0a31f887db84127ae672347fa0fc23ff9fb113e80b029b366e84bc71adcdf33011ce2cca82bc1118ef4a4da2d88de
+  data.tar.gz: 820ff1120fd32773cd93a2e1efe879b56205a6e0104b0c53df5a72743d362203fa6367f3000400effc6f81748603bb17634286ec7e92829458ef462469a35d2c

data/README.md

@@ -64,6 +64,29 @@ expect(Protocols::Adder.add_default(1)).to eq(6)
 
 ## Changelog
 
+### `0.4.0` :: Protocol-wide methods are allowed to call from inside implementation
+
+```ruby
+module Protocols::Adder
+  include Dry::Protocol
+
+  defprotocol do
+    defmethod :add, :this, :other
+    def default
+      42
+    end
+  end
+end
+
+Dry::Protocol.defimpl target: Integer do
+  def add(this)
+    this + default #⇒ 47 when called as Protocols::Adder.add(5)
+  end
+end
+```
+
+**NB** At the moment works only for external `defimpl`.
+
 ### `0.3.1` :: `implemented_for?` and `implementation_for`
 
 ### `0.3.0` :: version bump

data/lib/dry/behaviour/black_tie.rb

@@ -5,6 +5,7 @@ module Dry
   # rubocop:disable Metrics/PerceivedComplexity
   # rubocop:disable Metrics/CyclomaticComplexity
   # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Style/MethodName
   module BlackTie
     class << self
       def protocols
@@ -24,8 +25,8 @@ module Dry
       class_eval(&Proc.new)
       (instance_methods(false) - ims).each { |m| class_eval { module_function m } }
 
-      singleton_class.send :define_method, :method_missing do |method, *args|
-        raise Dry::Protocol::NotImplemented.new(:method, self.inspect, method)
+      singleton_class.send :define_method, :method_missing do |method, *_args|
+        raise Dry::Protocol::NotImplemented.new(:method, inspect, method)
       end
 
       singleton_class.send :define_method, :implementation_for do |receiver|
@@ -38,8 +39,14 @@ module Dry
         singleton_class.send :define_method, method do |receiver = nil, *args|
           impl = implementation_for(receiver)
 
-          raise Dry::Protocol::NotImplemented.new(:protocol, self.inspect, receiver.class) unless impl
-          impl[method].(*args.unshift(receiver))
+          raise Dry::Protocol::NotImplemented.new(:protocol, inspect, receiver.class) unless impl
+          begin
+            impl[method].(*args.unshift(receiver))
+          rescue NoMethodError => e
+            raise Dry::Protocol::NotImplemented.new(:method, inspect, e.message)
+          rescue ArgumentError => e
+            raise Dry::Protocol::NotImplemented.new(:method, inspect, "#{method} (#{e.message})")
+          end
         end
       end
     end
@@ -68,33 +75,40 @@ module Dry
       Module.new do
         mds.each(&DELEGATE_METHOD.curry[singleton_class])
         singleton_class.class_eval(&Proc.new) if block_given? # block takes precedence
+        if protocol
+          extend protocol
+        else # FIXME:
+          BlackTie.Logger.warn('Cross-calling protocol methods is not yet implemented for inplace declarated implementations.')
+        end
       end.tap do |mod|
+        protocol ||= self
+
         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}")
+          (BlackTie.protocols[protocol].keys - meths).each_with_object(meths) do |m, acc|
+            BlackTie.Logger.warn("Implicit delegate #{protocol.inspect}##{m} to #{target}")
             DELEGATE_METHOD.(mod.singleton_class, [m] * 2)
             acc << m
           end
         end.each do |m|
           [*target].each do |tgt|
-            BlackTie.implementations[protocol || self][tgt][m] = mod.method(m).to_proc
+            BlackTie.implementations[protocol][tgt][m] = mod.method(m).to_proc
           end
         end
       end
     end
     module_function :defimpl
 
-    private
-
-    def safe_logger
-      if Kernel.const_defined?('::Rails')
-        Rails.logger
-      else
-        require 'logger'
-        Logger.new($stdout)
-      end
+    def self.Logger
+      @logger ||= if Kernel.const_defined?('::Rails')
+                    Rails.logger
+                  else
+                    require 'logger'
+                    Logger.new($stdout)
+                  end
     end
 
+    private
+
     def normalize_map_delegates(delegate, map)
       [*delegate, *map].map do |e|
         case e
@@ -105,6 +119,7 @@ module Dry
     end
     module_function :normalize_map_delegates
   end
+  # rubocop:enable Style/MethodName
   # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/CyclomaticComplexity
   # rubocop:enable Metrics/PerceivedComplexity

data/lib/dry/behaviour/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Behaviour
-    VERSION = '0.3.1'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-behaviour
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Aleksei Matiushkin
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-08 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler