dry-behaviour 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c27c0695413fb84924f27453989fd85836066d0f
-  data.tar.gz: 48217fe055d56c59e4842e28f9eddbc597a48a80
+  metadata.gz: d3191f3934db794f8482d4abc4854e9fe20667e4
+  data.tar.gz: 68ce5932e3873146760b37b5a542a27b1dcb2579
 SHA512:
-  metadata.gz: a9e4ca4ed497dd76ed2caf2797d1570f3e7184ae4fe54497b15e84f9a7a3199858c2bfff2cab124a8b3d8d6bbb10617dec3bd397a36ae2580da9b40927f35fb2
-  data.tar.gz: 38f727f407f90ff7398798410962e08b8d32e95d99fcf1c3eabc6722c1dc6673c4a978a0bb502cf4cea1ec0e7c4960b9c94ba6b373e0df411e972e081268b661
+  metadata.gz: ac7997b358b608b996fa5525eb46b1286455bf98fd8ec04c694420ca0d2a5324ea31d2a6115a2b09b57a91c02b907002015b15c4aff654e91049817e183f604c
+  data.tar.gz: 73868bad1e0b42419118f649c6a150259698e9d561ec77573fe8b62d5f0dc22f4b472d829bd86c2e11096497e5e7b29f3eb7ca93fa5861859b5222fb7378c595

data/README.md

@@ -4,7 +4,9 @@
 
 **Tiny library inspired by Elixir [`protocol`](http://elixir-lang.org/getting-started/protocols.html) pattern.**
 
-## Declaration
+## Protocols
+
+### Declaration
 
 ```ruby
 require 'dry/behaviour'
@@ -45,7 +47,7 @@ module Protocols
 end
 ```
 
-## Usage
+### Usage
 
 ```ruby
 expect(Protocols::Adder.add(5, 3)).to eq(8)
@@ -58,6 +60,40 @@ expect(Protocols::Adder.add(nil, 10)).to eq(10)
 expect(Protocols::Adder.add_default(1)).to eq(6)
 ```
 
+## Guards
+
+Starting with `v0.5.0` we support multiple function clauses and guards.
+
+```ruby
+class GuardTest
+  include Dry::Guards
+
+  def a(p, p2 = nil, *_a, when: { p: Integer, p2: String }, **_b, &cb); 1; end
+  def a(p, _p2 = nil, *_a, when: { p: Integer }, **_b, &cb); 2; end
+  def a(p, _p2 = nil, *_a, when: { p: Float }, **_b, &cb); 3; end
+  def a(p, _p2 = nil, *_a, when: { p: ->(v) { v < 42 } }, **_b, &cb); 4; end
+  def a(_p, _p2 = nil, *_a, when: { cb: ->(v) { !v.nil? } }, **_b, &cb); 5; end
+  def a(p1, p2, p3); 6; end
+  def a(p, _p2 = nil, *_a, **_b, &cb); 'ALL'; end
+
+  def b(p, &cb)
+    'NOT GUARDED'
+  end
+end
+
+gt = GuardTest.new
+
+it 'performs routing to function clauses as by guards' do
+  expect(gt.a(42, 'Hello')).to eq(1)
+  expect(gt.a(42)).to eq(2)
+  expect(gt.a(3.14)).to eq(3)
+  expect(gt.a(3)).to eq(4)
+  # expect(gt.a('Hello', &-> { puts 0 })).to eq(5) NYI
+  expect(gt.a(*%w|1 2 3|)).to eq(6)
+  expect(gt.a('Hello')).to eq('ALL')
+end
+```
+
 ## Authors
 
 @am-kantox, @saverio-kantox & @kantox

data/lib/dry/behaviour/cerberus.rb

@@ -93,10 +93,13 @@ module Dry
                                         end
               next if hash.nil?
               hash.all? do |param, condition|
-                idx = m.parameters.index { |_type, var| var == param }
+                type_var, idx = m.parameters.each_with_index.detect { |(_type, var), idx| var == param }
                 # rubocop:disable Style/CaseEquality
                 # rubocop:disable Style/RescueModifier
-                idx && condition === args[idx] rescue false # FIXME: more accurate
+                idx && (case type_var.first
+              when :req, :opt then condition === args[idx] rescue false
+                        when :block then condition === cb
+                        end)
                 # rubocop:enable Style/RescueModifier
                 # rubocop:enable Style/CaseEquality
               end

data/lib/dry/behaviour/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Behaviour
-    VERSION = '0.5.0'.freeze
+    VERSION = '0.5.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-behaviour
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Aleksei Matiushkin
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Tiny library inspired by Elixir protocol pattern.