rfunk 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c7fa7d2d0ae8bb59de9d14f9393c7fc99c9225e
-  data.tar.gz: 617c897cd4843dd3ef0782b40f20c70edd4ecf7d
+  metadata.gz: c1093410c5b9f09c2d27a51264793c2b018a6591
+  data.tar.gz: 09c356f3da1466a01486c6dc3dc164f392616e5e
 SHA512:
-  metadata.gz: 036a43078df1545a68c123d85b53b4800009c1a7f4242e2959aa288925fa74b5b5df213243b883557db40d64703c0c0e3ba24d18481aee59a0836233f838300a
-  data.tar.gz: c824e1f69c3dff059959e22f830aa886d06e822648afdcc8c659612b2cb9a066a97ecf0ca749a7a84867fda7982480252b06d153694746c2c929e66e5b4fdcc4
+  metadata.gz: af3cf4a13a0a8e29f13879b8d24cbe9dd260c84f28773105cbfc6d484027d0a4c38c96107e7e0976f066c4ed72542d7b9a5ca56b2a5cabf6f6a18cdabfa8adb7
+  data.tar.gz: e7013c2584a0971ea445e798df3c85ea50feec45b061f75a81789c4e33332872c7a406a6960445f262cdfc6c43c9f08f2577fd9c702df4e9ed525f2b930dbd05

data/lib/rfunk/attribute/attribute.rb

@@ -1,9 +1,8 @@
 module RFunk
   module Attribute
-    include RFunk::Variable
-
     def self.included(base)
       base.extend(ClassMethods)
+      base.extend(RFunk::AttributeFunction)
     end
 
     def initialize(options = {})

data/lib/rfunk/attribute/attribute_function.rb

@@ -0,0 +1,11 @@
+module RFunk
+  module AttributeFunction
+    def fun(method_name, &block)
+      lambda = lambda { |*args|
+        block.call(Function.new, *args)
+      }
+
+      define_method method_name, &lambda
+    end
+  end
+end

data/lib/rfunk/attribute/function.rb

@@ -0,0 +1,24 @@
+module RFunk
+  class Function
+    def initialize
+      @variables = {}
+    end
+
+    def var(options)
+      if options.is_a?(Hash)
+        if variables.empty?
+          self.variables = options
+        else
+          ErrorChecking.new.raise_immutable(options, variables)
+          self.variables = variables.merge(options)
+        end
+      else
+        Some(Some(variables)[options])
+      end
+    end
+
+    private
+
+    attr_accessor :variables
+  end
+end

data/lib/rfunk/maybe/none.rb

@@ -14,12 +14,27 @@ module RFunk
       self
     end
 
+    def coerce(other)
+      [other, 0]
+    end
+
+    def to_str
+      ''
+    end
+
+    def to_ary
+      []
+    end
+
+    def to_hash
+      {}
+    end
+
     protected
 
     def enum
       []
     end
-
   end
 
   def None(value = nil)

data/lib/rfunk/maybe/some.rb

@@ -1,5 +1,7 @@
 module RFunk
   class Some < Option
+    extend Forwardable
+
     def initialize(value)
       @value = value
     end
@@ -26,6 +28,18 @@ module RFunk
       value <=> other.value
     end
 
+    def coerce(other)
+      [other, value]
+    end
+
+    [:to_str, :to_ary, :to_hash].each { |k|
+      define_method(k) {
+        value
+      }
+    }
+
+    def_delegators :@value, :to_s, :inspect, :respond_to?
+
     protected
 
     def enum

data/lib/rfunk/tuple.rb

@@ -2,6 +2,7 @@ module RFunk
   class Tuple
     def initialize(values)
       @values = values
+      deep_freeze
     end
 
     def value(*args)

data/lib/rfunk/version.rb

@@ -1,3 +1,3 @@
 module RFunk
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/lib/rfunk.rb

@@ -8,7 +8,8 @@ require 'rfunk/attribute/immutable_error'
 require 'rfunk/attribute/attribute_variable'
 require 'rfunk/attribute/error_checking'
 require 'rfunk/attribute/attribute_type'
-require 'rfunk/attribute/variable'
+require 'rfunk/attribute/function'
+require 'rfunk/attribute/attribute_function'
 require 'rfunk/attribute/attribute'
 require 'rfunk/maybe/option'
 require 'rfunk/maybe/none'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfunk
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Alex Falkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_nine
@@ -61,13 +61,14 @@ extra_rdoc_files: []
 files:
 - lib/rfunk.rb
 - lib/rfunk/attribute/attribute.rb
+- lib/rfunk/attribute/attribute_function.rb
 - lib/rfunk/attribute/attribute_type.rb
 - lib/rfunk/attribute/attribute_variable.rb
 - lib/rfunk/attribute/error_checking.rb
+- lib/rfunk/attribute/function.rb
 - lib/rfunk/attribute/immutable.rb
 - lib/rfunk/attribute/immutable_error.rb
 - lib/rfunk/attribute/not_found_error.rb
-- lib/rfunk/attribute/variable.rb
 - lib/rfunk/either/either.rb
 - lib/rfunk/either/failure.rb
 - lib/rfunk/either/success.rb

data/lib/rfunk/attribute/variable.rb

@@ -1,21 +0,0 @@
-module RFunk
-  module Variable
-    def var(options)
-      name = "#{self.class.to_s.downcase}_#{caller_locations(1, 1)[0].label}"
-      name = variable_name("#{name}_#{Digest::MD5.hexdigest(name)}")
-
-      if options.is_a?(Hash)
-        variable = self.instance_variable_get(name)
-
-        if variable
-          ErrorChecking.new.raise_immutable(options, variable)
-          self.instance_variable_set(name, variable.merge(options))
-        else
-          self.instance_variable_set(name, options)
-        end
-      else
-        Some(Some(self.instance_variable_get(name))[options])
-      end
-    end
-  end
-end