dry-behaviour 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e7a01d677751e7f1cdf88e273a82ae180e1db9b
-  data.tar.gz: 815e8290f586e7d69407ab1ac6106f05ae044de1
+  metadata.gz: 080e9972673cdf92dbb1ebe72b097fe8faa05fca
+  data.tar.gz: 7f62264785dda9bf3423bf5bc48176724d70a4db
 SHA512:
-  metadata.gz: 79b23ad0703c404ce7094b2cdabd164ca0a5a4fa3331190b8198e08e4ea48692a4910a6dbabd39d8d0dab8296556f8e9939c46d72800d78c7dc04bf4d79b42d4
-  data.tar.gz: 122a43832c1aa251ee832d2dbdef28c84034175170deb646afae0cf5d66df1a6f0e74b7a7fec70ef911dee9aaf1c4a3e310b5f41dbcf1f588b7a7fc9b6db3436
+  metadata.gz: c0e50166e9843097a4147cd70924fcb3bae533cd3e38f8265795d4d1ee5087ebbaa363bf1df64f6f9ad81a1e0a5e4832d85cf05599463aea83f9ce85eba69aa5
+  data.tar.gz: 6c39fcdcb28bb5b82648d993b9985ea9402505e72cf745d352270f53b11aa4405163afef5be68aefafd2bf85267270c7c1ce3e84a3c4785211ae7adce26ea08a

data/README.md

@@ -39,14 +39,8 @@ module Protocols
       end
     end
 
-    defimpl for: Integer do
-      def add(this, other)
-        this + other
-      end
-      def subtract(this, other)
-        this - other
-      end
-    end
+    # delegate `to_s` as is, map `add` and `subtract` to `:+` and `:-` respectively
+    defimpl target: Integer, delegate: :to_s, map: { add: :+, subtract: :- }
   end
 end
 ```
@@ -68,6 +62,16 @@ expect(Protocols::Adder.add_default(1)).to eq(6)
 
 @am-kantox, @saverio-kantox & @kantox
 
+## Changelog
+
+### `0.1.1` :: delegate and map methods to receiver
+
+`defimpl` now accepts `delegate` and `map`:
+
+```ruby
+defimpl MyProto, target: MyClass, delegate: :to_s, map: { add: :+, subtract: :- }
+```
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/dry/behaviour/black_tie.rb

@@ -1,4 +1,11 @@
 module Dry
+  # rubocop:disable Style/VariableName
+  # rubocop:disable Style/AsciiIdentifiers
+  # rubocop:disable Style/MultilineBlockChain
+  # rubocop:disable Style/EmptyCaseCondition
+  # rubocop:disable Metrics/PerceivedComplexity
+  # rubocop:disable Metrics/CyclomaticComplexity
+  # rubocop:disable Metrics/AbcSize
   module BlackTie
     class << self
       def protocols
@@ -10,17 +17,15 @@ module Dry
       end
     end
 
-    def defprotocol(delegate: [])
+    def defprotocol
       raise if BlackTie.protocols.key?(self) # DUPLICATE DEF
-      raise unless block_given? || !delegate.empty?
-      # FIXME IMPLEMENT DELEGATES!
       raise unless block_given?
 
       ims = instance_methods(false)
       class_eval(&Proc.new)
       (instance_methods(false) - ims).each { |m| class_eval { module_function m } }
 
-      BlackTie.protocols[self].each do |method, *_| # FIXME CHECK PARAMS CORRESPONDENCE HERE
+      BlackTie.protocols[self].each do |method, *_| # FIXME: CHECK PARAMS CORRESPONDENCE HERE
         # receiver, *args = *args
         singleton_class.send :define_method, method do |receiver, *args|
           receiver.class.ancestors.lazy.map do |c|
@@ -30,19 +35,53 @@ module Dry
       end
     end
 
-    def defmethod name, *params
+    def defmethod(name, *params)
       BlackTie.protocols[self][name] = params
     end
 
-    def defimpl protocol = nil, **params
-      raise unless block_given?
-      raise if params[:for].nil?
+    def defimpl(protocol = nil, target: nil, delegate: [], map: {})
+      raise if target.nil? || !block_given? && delegate.empty? && map.empty?
 
-      Module.new { singleton_class.class_eval(&Proc.new) }.tap do |mod|
+      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
+        singleton_class.class_eval(&Proc.new) if block_given? # block takes precedence
+      end.tap do |mod|
         mod.methods(false).each do |m|
-          BlackTie.implementations[protocol || self][params[:for]][m] = mod.method(m).to_proc
+          BlackTie.implementations[protocol || self][target][m] = mod.method(m).to_proc
         end
       end
     end
+    module_function :defimpl
+
+    private
+
+    def normalize_map_delegates(delegate, map)
+      [*delegate, *map].map do |e|
+        case e
+        when Symbol, String then [e.to_sym] * 2
+        when Array then e.map(&:to_sym) if e.size == 2
+        end
+      end.compact
+    end
+    module_function :normalize_map_delegates
   end
+  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/CyclomaticComplexity
+  # rubocop:enable Metrics/PerceivedComplexity
+  # 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.0'.freeze
+    VERSION = '0.1.1'.freeze
   end
 end

data/lib/dry/behaviour.rb

@@ -2,13 +2,17 @@ require 'dry/behaviour/version'
 require 'dry/behaviour/black_tie'
 
 module Dry
-  module Behaviour
-    # Your code goes here...
-  end
-
   module Protocol
     def self.included(base)
       base.singleton_class.prepend(Dry::BlackTie)
     end
+
+    class << self
+      # rubocop:disable Style/AsciiIdentifiers
+      def defimpl(protocol = nil, target: nil, delegate: [], map: {}, &λ)
+        Dry::BlackTie.defimpl(protocol, target: target, delegate: delegate, map: map, &λ)
+      end
+      # rubocop:enable Style/AsciiIdentifiers
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-behaviour
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Aleksei Matiushkin
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler