funtools 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 760735a64660eda23cf109045b3696041da6e8a4
-  data.tar.gz: 610702e131264a06618c6e4a31b7742ca5e7e623
+  metadata.gz: b6162644033dfb0b9f74e9160309669f04c2515f
+  data.tar.gz: 05e8411ba686b59b795d704d7137d8d5eaa70cf2
 SHA512:
-  metadata.gz: 225ca09218729ba85fab9a6fa331b1d8f3d3fd7a6a857ae28f06cb945e7c26daaf5da98f7797a6a054477a294f73463d78cd239d175a6ed919bf2a14e9af1f39
-  data.tar.gz: d340f6d4c99996b7202f4a7ce1273d8850f68e6c842800646186a838781af57aa7b1a0240c0428df924e080841b523f1fe2a1fba121c43d2327cd195e60dedcd
+  metadata.gz: d8b8d0ae31a9584ac89608d90612fad08965d96e64a4bf94009d5d5658ff8e2b68581f3b14380c69e5e4e665792998e1be68448fb876fd2ae3485537c71d4660
+  data.tar.gz: fabe23f7ac2a025750a415a2a4485f1aeb58c585f39acc5090f2e81062407505d45159117226c4750f7fbaeb2a499712a2b1ba26ea18fa7348b7d3d3f89c7dc4

data/lib/funtools.rb

@@ -1,8 +1,9 @@
 require 'funtools/cons'
+require 'funtools/types'
 require 'funtools/recursion'
 require 'funtools/composition'
 require 'funtools/pattern-matching'
 
 module Funtools
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

data/lib/funtools/cons.rb

@@ -58,8 +58,8 @@ class Cons
           left, right = right.car, right.cdr
         end
       else
-          block.(right) unless right.nil?
-          right = nil
+        block.(right) unless right.nil?
+        right = nil
       end
     end
   end

data/lib/funtools/types.rb

@@ -0,0 +1,58 @@
+class Object
+  # Public: Define a method in the current scope which will execute a given
+  # block recursively until a fixpoint is reached.
+  #
+  # sym   - Symbol defining the name of the method to be created.
+  # block - Block containing the logic for the function to be created.
+  #
+  # Returns nothing.
+  def settype(sym, *args, ret)
+    message    = :define_method if respond_to?(:define_method, true)
+    message  ||= :define_singleton_method
+    old_method = self.method(sym)
+    params     = old_method.parameters
+
+    typedefs = old_method.parameters.select do |kind,_|
+      kind != :block
+    end.each_with_index.map do |req,index|
+      [req.first, args[index]]
+    end
+
+    check_type = ->(value, type) do
+      case type
+      when Class, Module
+        unless value.is_a?(type)
+          raise(TypeError, "Expected #{type}; got #{value.class}")
+        end
+      when Enumerable
+        unless type.map { |kind| value.is_a?(kind) }.any?
+          raise(TypeError, "Expected one of: #{type.join(', ')}; got #{value.class}")
+        end
+      else
+        raise(TypeError, "Unable to test type against #{type.class}")
+      end
+      value
+    end
+
+    align_types = ->(a) do
+      pivot = typedefs.index(typedefs.select { |k,n| k == :rest }.flatten)
+
+      if pivot
+        types_min = pivot + 1
+        args_num  = a.length - types_min
+        rest_min  = a.length - (args_num + 1)
+
+        typedefs[0...pivot].to_a.zip(a[0...pivot].to_a) +
+        a[pivot, args_num].to_a.zip([typedefs[pivot]].cycle).map(&:reverse) +
+        typedefs[types_min..-1].to_a.zip(a[rest_min..-1].to_a)
+      else
+        typedefs.zip(a)
+      end.reject { |t, v| v.nil? && t.first == :opt }.map { |t, v| [v, t.last] }
+    end
+
+    self.send(message, sym) do |*n, &b|
+      align_types.(n).each { |pair| check_type.(*pair) }
+      check_type.(old_method.(*n, &b), ret)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: funtools
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Tina Wuest
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies: []
 description: Tools to assist in programming in a more functional style
 email: tina@wuest.me
@@ -21,6 +21,7 @@ files:
 - lib/funtools/cons.rb
 - lib/funtools/pattern-matching.rb
 - lib/funtools/recursion.rb
+- lib/funtools/types.rb
 homepage: https://gitlab.com/wuest/funtools
 licenses:
 - MIT