funtools 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bf1edf4748979cc1a8bd8fd7036f196acf79be5
-  data.tar.gz: a74f26963a2927a2ccda5fc40e6fe692a700f7ea
+  metadata.gz: 147a7fd803443d3bc56481e35023bfe25a9c6510
+  data.tar.gz: 81b7a9752e0bc7af02b4a713e77fa0b88afa67e7
 SHA512:
-  metadata.gz: 1b2ae38662110e25e6fc4ca33963bf88a8736533904a94b227082d452be1b308ac294d300d6c882458bc2ddd1a501311fed933459a8a671b27df619d7cb01785
-  data.tar.gz: db923606370ba41994b62aa1429131d4654bc01cb3ca5af141ee8d3b0176c6667ed017b866050cbffe310f4d218dc237f4b2d7edeb7799e6146d2d50f221cf9c
+  metadata.gz: 7991f402cc958d2872f038e2d48ad180224771a5488a7500744b97955b5a7db227f3b6d306bc6f13eb267391e84f6fb64ddd89ef4a8c791a2fd7bf5c1dc2b046
+  data.tar.gz: b372da0baad485064622feceb0fecccae595a8b2273a6f20beadb61816055e7fc0daac467a0eba2577a12b7bf7ebd2f7a9a2d06aade9cc1325787ba9c856f1fd

data/lib/funtools/pattern-matching.rb

@@ -7,6 +7,7 @@ class Object
   #
   # Returns nothing.
   def defpattern(sym)
+    old_method = self.class.method(sym) if self.class.method_defined?(:sym)
     patterns = []
     self.class.send(:define_method, sym) do |*l, &b|
       patterns << ->(*n) do
@@ -16,7 +17,7 @@ class Object
           if flat_m.length == flat_n.length
             e = flat_m.zip(n.flatten)
             unless e.reject { |e| e[0].nil? || e[0]==e[1] }.any?
-              b.call(*flat_n)
+              instance_exec(*flat_n, &b)
             end
           end
         end.(l.flatten)
@@ -25,13 +26,20 @@ class Object
 
     yield
 
+    if old_method
+      self.class.send(:define_method, sym, &old_method)
+    else
+      self.class.send(:remove_method, sym)
+    end
+
     message   = :define_method if respond_to?(:define_method, true)
     message ||= :define_singleton_method
     self.send(message, sym) do |*args|
       patterns.each do |pattern|
-        result = pattern[args]
-        break result unless result.nil?
+        result = instance_exec(*args, &pattern)
+        return result unless result.nil?
       end
+      nil
     end
   end
 end

data/lib/funtools/recursion.rb

@@ -11,7 +11,11 @@ class Object
     message ||= :define_singleton_method
     self.send(message, sym) do |*n|
       last = nil
-      [1].cycle.reduce(n) { |c, e| break c if last == c; last = c; block[c] }
+      [1].cycle.reduce(n) do |c, e|
+        break c if last == c
+        last = c
+        instance_exec(c, &block)
+      end
     end
   end
 end

data/lib/funtools.rb

@@ -3,5 +3,5 @@ require 'funtools/composition'
 require 'funtools/pattern-matching'
 
 module Funtools
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: funtools
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Tina Wuest
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-14 00:00:00.000000000 Z
 dependencies: []
 description: Tools to assist in programming in a more functional style
 email: tina@wuest.me