dry-behaviour 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1d7d5dd7d7c114719b6115ba84f5f87f48af2c9
-  data.tar.gz: 1ac765378c852e5dc1ca62bdf85cb97edc243531
+  metadata.gz: eca195e7f40df7dbd0ff8719938bbca1c717c82c
+  data.tar.gz: 820195b2a867f6e5c1a350b991108259b47c5888
 SHA512:
-  metadata.gz: 3ad61d9eb05c86fb8b78699f914e1fef407db682250fb45a5c5533724d1e8ee5472b743b969254f29310cb641c355474854b69c912b60459ac116c4214fde00d
-  data.tar.gz: eeb6c9852daaf477a95ae691a78bbb2b401397f8e7359972d4eee267bd746577b21f7ab8a514e9668d575587aecd4cecb78077b1ed14d52339454ad6e92faf93
+  metadata.gz: f106a7ad2a2a4548d17aeeb0053cd8875ce8126330b5cd3ae4d51219e73b564a2a6fe29ab9841e31ac3e506e1746013a96dde1d40ed094ecf18fe09e5fa7e4e4
+  data.tar.gz: bb91d87c3442fd30ea5887a33ca604000d1789f9a60907d0a9b3d2f29ab37966a3ff8b9574a22414307c22309d1ea2d2b0e15f4eb8ec606717d2b24ca1dc496c

data/.github/workflows/ci.yml

@@ -0,0 +1,20 @@
+name: Ruby
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Ruby 2.3.8
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.3.8
+    - name: Build and test with Rake
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        bundle exec rspec

data/.github/workflows/gempush.yml

@@ -0,0 +1,44 @@
+name: Dry-Behaviour Gem
+
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Ruby 2.3.8
+      uses: ruby/setup-ruby@v1
+      with:
+        version: 2.3.8
+
+    - name: Publish to GPR
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:github: Bearer ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
+      env:
+        GEM_HOST_API_KEY: ${{secrets.GPR_AUTH_TOKEN}}
+        OWNER: username
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.3.8

data/README.md

@@ -60,6 +60,45 @@ expect(Protocols::Adder.add(nil, 10)).to eq(10)
 expect(Protocols::Adder.add_default(1)).to eq(6)
 ```
 
+### Arguments types
+
+Normally, one would use a simple notation to declare a method. It includes `:this` receiver
+in te very first position and some optional required arguments afterward.
+
+```ruby
+  defmethod :add, :this, :addend
+  ...
+  defimpl ... do
+    def add(this, addend); this + addend; end
+  end
+```
+
+If the argument is not generic (optional, or splatted, or keyword,) its type must be explicitly
+specified in the protocol definition as shown below.
+
+```ruby
+  defprotocol implicit_inheritance: true do
+    defmethod :with_def_argument, :this, [:foo_opt, :opt]
+    defmethod :with_def_keyword_argument, :this, [:foo_key, :key]
+    defmethod :with_req_keyword_argument, :this, [:foo_key, :keyreq]
+
+    def with_def_argument(this, foo_opt = :super); foo_opt; end
+    def with_def_keyword_argument(this, foo_key: :super); foo_key; end
+    def with_req_keyword_argument(this, foo_key:); foo_key; end
+  ...
+```
+
+That said, `:addend` argument declaration is a syntactic sugar for `[:addend, :req]`.
+Possible values for the type are:
+
+```ruby
+PARAM_TYPES = %i[req opt rest key keyrest keyreq block]
+```
+
+Please note, that the signature of the method and its implementation must exactly match.
+One cannot declare a method to have a `keyreq` argument and then make it defaulted in the
+implementation. That is done by design.
+
 ## Guards
 
 Starting with `v0.5.0` we support multiple function clauses and guards.

data/dry-behaviour.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.executables   = []
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'bundler', '> 1.10'
   spec.add_development_dependency 'awesome_print', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'benchmark-ips', '~> 2.7'

data/lib/dry/behaviour/black_tie.rb

@@ -54,15 +54,22 @@ module Dry
         end.reject(&:nil?).first
       end
 
-      BlackTie.protocols[self].each do |method, *_| # FIXME: CHECK ARITY HERE
-        singleton_class.send :define_method, method do |receiver = nil, *args|
+      BlackTie.protocols[self].each do |method, *_m_args, **_m_kwargs| # FIXME: CHECK ARITY HERE
+        singleton_class.send :define_method, method do |receiver, *args, **kwargs|
           impl = implementation_for(receiver)
+
           raise Dry::Protocol::NotImplemented.new(
             :protocol, inspect,
             method: method, receiver: receiver, args: args, self: self
           ) unless impl
+
           begin
-            impl[method].(*args.unshift(receiver))
+            # [AM] [v1] [FIXME] for modern rubies `if` is redundant
+            if kwargs.empty?
+              impl[method].(*args.unshift(receiver))
+            else
+              impl[method].(*args.unshift(receiver), **kwargs)
+            end
           rescue => e
             raise Dry::Protocol::NotImplemented.new(
                 :nested, inspect,
@@ -89,7 +96,7 @@ module Dry
             BlackTie.Logger.warn(UNKNOWN_TYPE_DECLARATION % [Dry::BlackTie.proto_caller, type, self.inspect, name])
             type = nil
           end
-          [type || PARAM_TYPES.include?(p) ? p : :req, p]
+          [type || (PARAM_TYPES.include?(p) ? p : :req), p]
         end
       BlackTie.protocols[self][name] = params
     end
@@ -109,8 +116,13 @@ module Dry
           (NORMALIZE_KEYS.(protocol) - meths).each_with_object(meths) do |m, acc|
             if BlackTie.protocols[protocol][:__implicit_inheritance__]
               mod.singleton_class.class_eval do
-                define_method m do |this, *♿_args, &♿_λ|
-                  super(this, *♿_args, &♿_λ)
+                define_method m do |this, *♿_args, **♿_kwargs, &♿_λ|
+                  # [AM] [v1] [FIXME] for modern rubies `if` is redundant
+                  if ♿_kwargs.empty?
+                    super(this, *♿_args, &♿_λ)
+                  else
+                    super(this, *♿_args, **♿_kwargs, &♿_λ)
+                  end
                 end
               end
             else
@@ -124,12 +136,12 @@ module Dry
         end.each do |m|
           target = [target] unless target.is_a?(Array)
           target.each do |tgt|
+            params = mod.method(m).parameters.reject { |_, v| v.to_s[/\A♿_/] }
+            proto = BlackTie.protocols[protocol]
             ok =
               mds.map(&:first).include?(m) ||
-              [
-                BlackTie.protocols[protocol][m],
-                mod.method(m).parameters.reject { |_, v| v.to_s[/\A♿_/] }
-              ].map(&:first).reduce(:==)
+              ((proto[m] == {} || proto[:__implicit_inheritance__]) && [[:req], [:rest]].include?(params.map(&:first))) ||
+              [proto[m], params].map { |args| args.map(&:first) }.reduce(:==)
 
             # TODO[1.0] raise NotImplemented(:arity)
             BlackTie.Logger.warn(
@@ -143,7 +155,7 @@ module Dry
     end
     module_function :defimpl
 
-    PARAM_TYPES = %i[req opt rest keyrest block]
+    PARAM_TYPES = %i[req opt rest key keyrest keyreq block]
 
     DELEGATE_METHOD = lambda do |klazz, (source, target)|
       klazz.class_eval do

data/lib/dry/behaviour/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Behaviour
-    VERSION = '0.11.1'.freeze
+    VERSION = '0.12.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-behaviour
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Aleksei Matiushkin
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-03 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -105,11 +105,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
+- ".github/workflows/gempush.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
+- ".tool-versions"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -148,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Tiny library inspired by Elixir protocol pattern.

data/.travis.yml

@@ -1,7 +0,0 @@
-language: ruby
-rvm:
-  - 2.1.1
-  - 2.1.10
-  - 2.2.2
-  - 2.5.1
-before_install: gem install bundler -v 1.14.6