rfunk 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8bec17463922dd4c70a584ccafd24973bb29de2
-  data.tar.gz: 161a3098109d8701ec9c728ea4978614874aa7d0
+  metadata.gz: 063f99ddc73ca7ec1f670674f3be7e90bdc077d5
+  data.tar.gz: 7a2960caa00efc87d550c78754581f5f96f16909
 SHA512:
-  metadata.gz: a22230f56cbc42906a1a2496e7fc104f0d582de7131381f6a871a59044d975b4b325603fa7963a7ad57c249dcff25bf9c9a91ce5bf4261f1cb54f814a32fc541
-  data.tar.gz: 40ba8fa669edce325f246b1d0681a8d9709c7542be93510bb5b5e71b65950e52a1219c3a0eadf1575406ba6d7b2f2d80fd34606ecc095a9a9f30f0eee76a7877
+  metadata.gz: ab8c129b60df6f8650f475afa5b0707cd8ffd8df4d39c67c389efb8c362696eb1df183a6861e3a81a25c0f9aeb567f60732af3dca160d4fc0dba42a6ad3c326e
+  data.tar.gz: c9c7a897333250ea44cf49c6b4968db76141f89943a1b3efd2461d9fb4bc99495efc8d0004a0c546dd277dde92b718acd726a7692c32237bbf26850ae67ebcf2

data/lib/rfunk/attribute/assertion_error.rb

@@ -0,0 +1,4 @@
+module RFunk
+  class AssertionError < StandardError
+  end
+end

data/lib/rfunk/attribute/attribute.rb

@@ -1,7 +1,7 @@
 module RFunk
   module Attribute
     def self.included(base)
-      base.extend(ClassMethods)
+      base.extend(RFunk::AttributeDefinition)
       base.extend(RFunk::AttributeFunction)
     end
 
@@ -10,26 +10,6 @@ module RFunk
       with_attributes(options)
     end
 
-    module ClassMethods
-      def attribute(name, type, options = {})
-        AttributeVariable.new.add(instance: self,
-                                  name: name,
-                                  type: type,
-                                  options: options)
-
-        define_method(name) { |value = nil|
-          if value
-            ErrorChecking.new.raise_expected_type(name, value, type)
-            Immutable.new.create(instance: self,
-                                 variable_name: variable_name(name),
-                                 value: value)
-          else
-            Option(self.instance_variable_get(variable_name(name)))
-          end
-        }
-      end
-    end
-
     private
 
     def attributes

data/lib/rfunk/attribute/attribute_definition.rb

@@ -0,0 +1,21 @@
+module RFunk
+  module AttributeDefinition
+    def attribute(name, type, options = {})
+      AttributeVariable.new.add(instance: self,
+                                name: name,
+                                type: type,
+                                options: options)
+
+      define_method(name) { |value = nil|
+        if value
+          ErrorChecking.new.raise_expected_type(name, value, type)
+          Immutable.new.create(instance: self,
+                               variable_name: variable_name(name),
+                               value: value)
+        else
+          Option(self.instance_variable_get(variable_name(name)))
+        end
+      }
+    end
+  end
+end

data/lib/rfunk/attribute/attribute_function.rb

@@ -2,7 +2,7 @@ module RFunk
   module AttributeFunction
     def fun(method_name, &block)
       lambda = lambda { |*args|
-        instance_exec(*args.unshift(Function.new), &block)
+        Function.new(self, &block).execute(*args)
       }
 
       define_method method_name, &lambda

data/lib/rfunk/attribute/error_checking.rb

@@ -1,5 +1,9 @@
 module RFunk
   class ErrorChecking
+    def raise_condition_error(type, value)
+      raise type, 'The condition was not met!' unless value
+    end
+
     def raise_expected_type(name, value, type)
       case value
       when Some

data/lib/rfunk/attribute/function.rb

@@ -1,6 +1,10 @@
 module RFunk
   class Function
-    def initialize
+    attr_reader :this
+
+    def initialize(this, &block)
+      @this = this
+      @block = block
       @variables = {}
     end
 
@@ -9,7 +13,7 @@ module RFunk
         if variables.empty?
           self.variables = options
         else
-          ErrorChecking.new.raise_immutable(options, variables)
+          error_checking.raise_immutable(options, variables)
           self.variables = variables.merge(options)
         end
       else
@@ -17,8 +21,59 @@ module RFunk
       end
     end
 
+    def assert(&_)
+      if yield
+        true
+      else
+        raise AssertionError
+      end
+    end
+
+    def pre(&block)
+      @pre_block = block
+    end
+
+    def post(&block)
+      @post_block = block
+    end
+
+    def body(&block)
+      @body_block = block
+    end
+
+    def execute(*args)
+      result = instance_exec(*args, &block)
+
+      if body_block
+        if pre_block
+          instance_eval(&pre_block).tap { |r|
+            error_checking.raise_condition_error(PreConditionError, r)
+          }
+        end
+
+        Option(instance_eval(&body_block)).tap {
+          if post_block
+            instance_eval(&post_block).tap { |r|
+              error_checking.raise_condition_error(PostConditionError, r)
+            }
+          end
+        }
+      else
+        Option(result)
+      end
+    end
+
+    def method_missing(method, *arguments, &block)
+      this.send(method, *arguments, &block)
+    end
+
     private
 
+    attr_reader :block, :pre_block, :post_block, :body_block
     attr_accessor :variables
+
+    def error_checking
+      @error_checking ||= ErrorChecking.new
+    end
   end
 end

data/lib/rfunk/attribute/post_condition_error.rb

@@ -0,0 +1,4 @@
+module RFunk
+  class PostConditionError < StandardError
+  end
+end

data/lib/rfunk/attribute/pre_condition_error.rb

@@ -0,0 +1,4 @@
+module RFunk
+  class PreConditionError < StandardError
+  end
+end

data/lib/rfunk/version.rb

@@ -1,3 +1,3 @@
 module RFunk
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'
 end

data/lib/rfunk.rb

@@ -5,11 +5,15 @@ require 'ice_nine/core_ext/object'
 
 require 'rfunk/attribute/immutable'
 require 'rfunk/attribute/not_found_error'
+require 'rfunk/attribute/pre_condition_error'
+require 'rfunk/attribute/post_condition_error'
+require 'rfunk/attribute/assertion_error'
 require 'rfunk/attribute/immutable_error'
 require 'rfunk/attribute/attribute_variable'
 require 'rfunk/attribute/error_checking'
 require 'rfunk/attribute/attribute_type'
 require 'rfunk/attribute/function'
+require 'rfunk/attribute/attribute_definition'
 require 'rfunk/attribute/attribute_function'
 require 'rfunk/attribute/attribute'
 require 'rfunk/maybe/option'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfunk
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Alex Falkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_nine
@@ -74,7 +74,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/rfunk.rb
+- lib/rfunk/attribute/assertion_error.rb
 - lib/rfunk/attribute/attribute.rb
+- lib/rfunk/attribute/attribute_definition.rb
 - lib/rfunk/attribute/attribute_function.rb
 - lib/rfunk/attribute/attribute_type.rb
 - lib/rfunk/attribute/attribute_variable.rb
@@ -83,6 +85,8 @@ files:
 - lib/rfunk/attribute/immutable.rb
 - lib/rfunk/attribute/immutable_error.rb
 - lib/rfunk/attribute/not_found_error.rb
+- lib/rfunk/attribute/post_condition_error.rb
+- lib/rfunk/attribute/pre_condition_error.rb
 - lib/rfunk/either/either.rb
 - lib/rfunk/either/failure.rb
 - lib/rfunk/either/success.rb