rfunk 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26cfa05b2043925d0cb51bc6d2095a1cdbd42b89
-  data.tar.gz: 805b6ac9de954b84d2d16ae8573dae3888c0c8ec
+  metadata.gz: 6579f662e130f4cdabcc91e46617cedb9a497ec6
+  data.tar.gz: 21584e48ad127ceb7f776f36da1a2d9b88cd3176
 SHA512:
-  metadata.gz: b0bb62f992b78353e8fe43420c6daa413770d7db7c93efce0b1ed39636d8c42127cbb0ef928b5aaa32906fcd7e8f08d093c5770641066ee55270c5099dc0e87a
-  data.tar.gz: fce111b77077fa444634fbb097f5b905216ce6f981c4e4b5b9e63875796d42fc9924101dba4bbdb34953d7ccffa968ad7da0a9f241930c81d39d1ff1c5b373a7
+  metadata.gz: 253bb8ffe3a96eedad4d3006323e0d8a6d2d57a5c07510e60a751f9d4d79c853ebb9229fb5652580cdc95037e08f57539c8614c5d1958fd1434ca68019e7f937
+  data.tar.gz: 433b260802c1c656791119b5812e91d191b7d34578abc4728de7b6a8dff3628cf543f274e5fb3d9e4c10e5fa162f050d89a418679be99c5f56af1c241e06391b

data/lib/rfunk/attribute/attribute_function.rb

@@ -1,13 +1,26 @@
 module RFunk
   module AttributeFunction
-    def fun(method_name, &block)
+    def fun(definition, &block)
+      method_definition = method_definition(definition)
+
       lambda = lambda { |*args|
-        Function.new(self, &block).execute(*args)
+        Function.new(self, method_definition, &block).execute(*args)
       }
 
-      define_method method_name, &lambda
+      define_method method_definition.value(0).value, &lambda
     end
 
-    [:func, :defn].each { |m| alias_method m, :fun }
+    [:fn, :func, :defn].each { |m| alias_method m, :fun }
+
+    private
+
+    def method_definition(definition)
+      case definition
+      when Hash
+        Tuple(definition.keys.first, definition.values.first)
+      else
+        Tuple(definition, None())
+      end
+    end
   end
 end

data/lib/rfunk/attribute/error_checking.rb

@@ -4,14 +4,12 @@ module RFunk
       raise type, 'The condition was not met!' unless value
     end
 
+    def raise_expected_return_type(name, value, type)
+      raise_return_type_with_message name, value, type, 'return'
+    end
+
     def raise_expected_type(name, value, type)
-      case value
-      when Some
-        expected_type?(name, value.value, type)
-      when None
-      else
-        expected_type?(name, value, type)
-      end
+      raise_return_type_with_message name, value, type, 'attribute'
     end
 
     def raise_not_found(key, attributes)
@@ -29,10 +27,29 @@ module RFunk
 
     private
 
-    def expected_type?(name, value, type)
+    def raise_return_type_with_message(name, value, type, message)
+      case value
+      when Some
+        expected_type?(name, value.value, type, message)
+      when None
+      else
+        expected_type?(name, value, type, message)
+      end
+    end
+
+    def expected_type?(name, value, type, message)
+      case type
+      when Some
+        raise_type(name, value, type.value, message)
+      when None
+      else
+        raise_type(name, value, type, message)
+      end
+    end
+
+    def raise_type(name, value, type, message)
       unless value.is_a?(type)
-        message = "Expected a type of '#{type}' for attribute '#{name}'"
-        raise TypeError, message
+        raise TypeError, "Expected a type of '#{type}' for #{message} '#{name}'"
       end
     end
   end

data/lib/rfunk/attribute/function.rb

@@ -2,8 +2,9 @@ module RFunk
   class Function
     attr_reader :this
 
-    def initialize(this, &block)
+    def initialize(this, method_definition, &block)
       @this = this
+      @method_definition = method_definition
       @block = block
       @variables = {}
     end
@@ -51,14 +52,17 @@ module RFunk
           }
         end
 
-        Option(instance_eval(&body_block)).tap {
+        Option(instance_eval(&body_block)).tap { |body|
           if post_block
-            instance_eval(&post_block).tap { |r|
-              error_checking.raise_condition_error(PostConditionError, r)
+            instance_eval(&post_block).tap { |post|
+              error_checking.raise_condition_error(PostConditionError, post)
             }
           end
+
+          validate_return_type(body)
         }
       else
+        validate_return_type(result)
         Option(result)
       end
     end
@@ -69,11 +73,17 @@ module RFunk
 
     private
 
-    attr_reader :block, :pre_block, :post_block, :body_block
+    attr_reader :block, :pre_block, :post_block, :body_block, :method_definition
     attr_accessor :variables
 
     def error_checking
       @error_checking ||= ErrorChecking.new
     end
+
+    def validate_return_type(result)
+      error_checking.raise_expected_return_type method_definition.value(0).value,
+                                                result,
+                                                method_definition.value(1)
+    end
   end
 end

data/lib/rfunk/version.rb

@@ -1,3 +1,3 @@
 module RFunk
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfunk
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Alex Falkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_nine