method_pattern 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 422890fc9550a6b721a10c8202183520526cd9bc
-  data.tar.gz: 476ff0fc0a52db7e699998714603f9db3867458e
+  metadata.gz: ad178a56d4c759b0776f91601fde1f40eff08221
+  data.tar.gz: 9d6117c475302d52b9047edcd87efa69db7b27e4
 SHA512:
-  metadata.gz: 9970b20986dee6229c22daed99db1a5332533126700abd6401510422db9cefdf3b46a03e8ee3a9eb333c989b35a37e662b5de1ecf3783329e4754b298fea1c71
-  data.tar.gz: d35dcabc7023e7445f26c67607113b90c07fc2f85a0fed555b32f862d984d747d90f543fe39d384abf6cb89bc9d38805ee34ff1ae41bae40cf25964ae94529c9
+  metadata.gz: b3ce4ef3f75239681c4939961a8c6d0102a8f20d7a3579a1a88fbbe0be9951092981a1997b4d0b9f7b4ac6b7f7fe651ca6d2e90cde6afcff2ccfb8a3827fbeca
+  data.tar.gz: b151bc6df67519d9e88af1dc24726e825d5243a2ed1b097895613e662501b6d2d26262b40488820aa55fe07f311f221667075e2991009018663b09c65cebf135

data/README.md

@@ -57,14 +57,19 @@ This example will handle 0 and 1 as special cases and all other integers are fun
 
 Notice that we could pass in a class or even a range for our pattern. There are several things we can use:
 
-- Strings: `with('hello') { ... }`
-- Numbers: `with(15) { ... }`
-- Symbol: `with(:foo) { ... }`
-- Class: `with(Integer) { ... }`
-- Regex: `with(/foo/) { ... }`
-- Range: `with(0...10) { ... }`
-
-It's not just for single arguments"
+- Strings: `with('hello') { |str| ... }` matches an exact string
+- Numbers: `with(15) { |num| ... }` matches an exact number
+- Symbol: `with(:foo) { |sym| ... }` matches a particular symbol
+- Class: `with(Integer) { |num| ... }` matches any instance of the given class
+- Regex: `with(/foo/) { |str| ... }` matches any string that matches the regex
+- Range: `with(0...10) { |num| ... }` matches any value covered by the range
+- Proc/lambda: `with(-> n { n > 3 }) { |n| ... }` matches if the proc returns a truthy value
+
+Note that the method arguments are passed to the block. This lets the block become the method body.
+
+### It's not just for single arguments
+
+You can pass multiple patterns to `with` and it will match them in order:
 
 ```ruby
 defn :baz do

data/lib/method_pattern.rb

@@ -6,7 +6,7 @@ module MethodPattern
     fn.instance_exec(&definition)
 
     define_method name do |*args, &block|
-      instance_exec(*args, &fn.match(*args))
+      instance_exec(*args, &fn.match(args))
     end
   end
 
@@ -21,12 +21,12 @@ module MethodPattern
     end
 
     def with *patterns, &block
-      @patterns << Pattern.new(*patterns, block)
+      @patterns << Pattern.new(patterns, block)
     end
 
-    def match *args
+    def match args
       @patterns.each do |pattern|
-        if pattern.match? *args
+        if pattern.match? args
           return pattern.block
         end
       end
@@ -37,15 +37,17 @@ module MethodPattern
     class Pattern
       attr_reader :accepted, :block
 
-      def initialize *accepted, block
+      def initialize accepted, block
         @accepted = accepted
         @block = block
       end
 
-      def match? *args
-        @accepted.each_with_index.reduce(true) do |result, (pattern, index)|
-          result && match_arg?(pattern, args[index])
+      def match? args
+        @accepted.each_with_index do |pattern, index|
+          return false unless match_arg?(pattern, args[index])
         end
+
+        true
       end
 
       def match_arg? pattern, arg
@@ -53,9 +55,11 @@ module MethodPattern
         when Hash
           return false unless arg.is_a? Hash
 
-          pattern.reduce(true) do |result, (key, value)|
-            result && arg.key?(key) && match_arg?(value, arg[key])
+          pattern.each do |key, value|
+            return false unless arg.key?(key) && match_arg?(value, arg[key])
           end
+
+          true
         else
           pattern === arg
         end

data/lib/method_pattern/version.rb

@@ -1,3 +1,3 @@
 module MethodPattern
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: method_pattern
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jamie Gaskins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-25 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler