funtools 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6162644033dfb0b9f74e9160309669f04c2515f
-  data.tar.gz: 05e8411ba686b59b795d704d7137d8d5eaa70cf2
+  metadata.gz: 85c1455381faf2166f294f26ce8b18012c1865e3
+  data.tar.gz: 1a36bf917be530c0081faff2d9c5dfa3890bf985
 SHA512:
-  metadata.gz: d8b8d0ae31a9584ac89608d90612fad08965d96e64a4bf94009d5d5658ff8e2b68581f3b14380c69e5e4e665792998e1be68448fb876fd2ae3485537c71d4660
-  data.tar.gz: fabe23f7ac2a025750a415a2a4485f1aeb58c585f39acc5090f2e81062407505d45159117226c4750f7fbaeb2a499712a2b1ba26ea18fa7348b7d3d3f89c7dc4
+  metadata.gz: dcb8af919e949195458d5481baa423b03434d05f12d05eb6ef6585066a680db4c7ce7f7bfc28e0bad684f9287ab920cf0959c7be9a9d7277ccff62361845719c
+  data.tar.gz: 0b7c58ed9c8e6f69e995dfaf9bf0d4120cdc4d64ab0f27506b9bf75af5b85ef7907f156cd7bebb0a97dd6b829ac7479aca995f26f5be090fe75dec4c5cfb794f

data/lib/funtools.rb

@@ -5,5 +5,5 @@ require 'funtools/composition'
 require 'funtools/pattern-matching'
 
 module Funtools
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/lib/funtools/types.rb

@@ -1,15 +1,63 @@
 class Object
-  # Public: Define a method in the current scope which will execute a given
-  # block recursively until a fixpoint is reached.
+  # Internal: Check a value to make sure it conforms to a given type.
+  #
+  # value - Value to be checked against types.
+  # type  - Type definition to be used for type checking.
+  #
+  # Raises TypeError if the value does not match the expected type.
+  # Returns value.
+  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
+
+  # Internal: Align a set of expected types with the arguments given in a
+  # method call.
+  #
+  # typedefs - Array of types against which arguments should be checked.
+  # a        - Array of arguments passed to a given method.
+  #
+  # Returns a 2-dimensional Array containing [Typedef, Value].
+  align_types = ->(typedefs, 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
+
+  # Public: Define a method in the current scope which wraps an already-defined
+  # method, enforcing a type check on all arguments and the return value.
   #
   # sym   - Symbol defining the name of the method to be created.
-  # block - Block containing the logic for the function to be created.
+  # args  - Zero or more types specified to correspond to arguments expected to
+  #         be passed to the method in question.
+  # ret   - Type the method in question is expected to return.
   #
   # Returns nothing.
-  def settype(sym, *args, ret)
+  define_method(:settype) do |sym, *args, ret|
     message    = :define_method if respond_to?(:define_method, true)
     message  ||= :define_singleton_method
-    old_method = self.method(sym)
+    old_method = begin method(sym) rescue instance_method(sym) end
     params     = old_method.parameters
 
     typedefs = old_method.parameters.select do |kind,_|
@@ -18,41 +66,10 @@ class Object
       [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)
+      method = old_method.is_a?(Method) ? old_method : old_method.bind(self)
+      align_types.(typedefs, n).each { |pair| check_type.(*pair) }
+      check_type.(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.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Tina Wuest
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies: []
 description: Tools to assist in programming in a more functional style
 email: tina@wuest.me