rfunk 0.10.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62eadf99b770f0a7b858ec63d74bbf43a2e0fcd9
-  data.tar.gz: 43c0275f0e81ab6802c9f7acf4b37d6c05254800
+  metadata.gz: d842be09b09aa3bd5fef713471aea24b9072965d
+  data.tar.gz: 53415832787bb21820efb40e8280dd550e0843a3
 SHA512:
-  metadata.gz: 7c8b2e6b5c23fee2d9359aa0a60e38ed798cab3992eb5708a569d90b8fc788c1a689ec490c5228bf835367b139ce60d67589d0927b1a03ae91d96b6a19f550f9
-  data.tar.gz: b7b1866df97a5e3ba8b241dc1822460516a507ae007f139e8d31a759f93a1f91eeacb35fb443432a189037f183bef6d664042e7fe4d66ff839d2e9d76954c296
+  metadata.gz: 6952bb646f377abcf5731c686385165e4b602ea9af3a7a352757dd343991ea927750022be1379765bfbe9e0d97ff171f48f2b0d5592a0917ee2f0628c2beaaa1
+  data.tar.gz: 40ffc430e2e6710a26fb6f88dcc15b7c3b2a38ae252cdd4862019fd244028a5cd23a5e742705bb7982261ebe4703f3ffdf7273c1118624b6f7cf84aa5b69ad6b

data/lib/rfunk/attribute/attribute.rb

@@ -13,7 +13,7 @@ module RFunk
     private
 
     def attributes
-      AttributeVariable.new.attributes(self.class)
+      RFunk::AttributeVariable.new.attributes(self.class)
     end
 
     def with_defaults
@@ -25,13 +25,13 @@ module RFunk
 
     def with_attributes(options)
       options.each { |key, value|
-        ErrorChecking.new.raise_not_found(key, attributes)
+        RFunk::ErrorChecking.new.raise_not_found(key, attributes)
         set_variable(attributes[key], key, value)
       }
     end
 
     def set_variable(attribute, key, value)
-      ErrorChecking.new.raise_expected_attribute_type(key, value, attribute.type)
+      RFunk::ErrorChecking.new.raise_expected_attribute_type(key, value, attribute.type)
       self.instance_variable_set(variable_name(key), value)
     end
 

data/lib/rfunk/attribute/attribute_definition.rb

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

data/lib/rfunk/attribute/attribute_function.rb

@@ -2,7 +2,7 @@ module RFunk
   module AttributeFunction
     def fun(definition, &block)
       function_definition = function_definition(definition)
-      lambda = -> (*args) { Function.new(self, function_definition, &block).execute(*args) }
+      lambda = -> (*args) { RFunk::Function.new(self, function_definition, &block).execute(*args) }
 
       define_method function_definition.value(0).value, &lambda
     end
@@ -14,10 +14,10 @@ module RFunk
     def function_definition(definition)
       case definition
       when Hash
-        return_type = TypeAnnotation.new(definition.values.first.to_s)
-        Tuple(definition.keys.first, return_type)
+        return_type = RFunk::TypeAnnotation.new(definition.values.first.to_s)
+        RFunk::Tuple(definition.keys.first, return_type)
       else
-        Tuple(definition, None())
+        RFunk::Tuple(definition)
       end
     end
   end

data/lib/rfunk/attribute/attribute_variable.rb

@@ -7,7 +7,7 @@ module RFunk
       name = options.fetch(:name)
       attributes = attributes(instance)
 
-      attributes[name] = AttributeType.new(name, options.fetch(:type), options.fetch(:options))
+      attributes[name] = RFunk::AttributeType.new(name, options.fetch(:type), options.fetch(:options))
       attributes(instance, attributes)
     end
 

data/lib/rfunk/attribute/error_checking.rb

@@ -26,16 +26,16 @@ module RFunk
     def raise_immutable(options, variable)
       keys = options.keys.select { |k| variable.has_key?(k) }
       message = "Could not set variables '#{keys}', because variables are immutable."
-      raise ImmutableError, message if keys.any?
+      raise RFunk::ImmutableError, message if keys.any?
     end
 
     private
 
     def raise_return_type_with_message(name, value, type, message)
       case value
-      when Some
+      when RFunk::Some
         expected_type?(name, value.value, type, message)
-      when None
+      when RFunk::None
       else
         expected_type?(name, value, type, message)
       end
@@ -43,9 +43,9 @@ module RFunk
 
     def expected_type?(name, value, type, message)
       case type
-      when Some
+      when RFunk::Some
         raise_type(name, value, type.value, message)
-      when None
+      when RFunk::None
       else
         raise_type(name, value, type, message)
       end

data/lib/rfunk/attribute/function.rb

@@ -18,7 +18,7 @@ module RFunk
           self.variables = variables.merge(options)
         end
       else
-        Some(Some(variables)[options])
+        RFunk::Some(RFunk::Some(variables)[options])
       end
     end
 
@@ -26,7 +26,7 @@ module RFunk
       if yield
         true
       else
-        raise AssertionError
+        raise RFunk::AssertionError
       end
     end
 
@@ -49,14 +49,14 @@ module RFunk
       if body_block
         if pre_block
           instance_eval(&pre_block).tap { |r|
-            error_checking.raise_condition_error(PreConditionError, r)
+            error_checking.raise_condition_error(RFunk::PreConditionError, r)
           }
         end
 
-        Option(instance_eval(&body_block)).tap { |body|
+        RFunk::Option(instance_eval(&body_block)).tap { |body|
           if post_block
             instance_eval(&post_block).tap { |post|
-              error_checking.raise_condition_error(PostConditionError, post)
+              error_checking.raise_condition_error(RFunk::PostConditionError, post)
             }
           end
 
@@ -64,7 +64,7 @@ module RFunk
         }
       else
         validate_return_type(return_value)
-        Option(return_value)
+        RFunk::Option(return_value)
       end
     end
 
@@ -78,7 +78,7 @@ module RFunk
     attr_accessor :variables
 
     def error_checking
-      Lazy(-> { ErrorChecking.new }).value
+      RFunk::Lazy(-> { RFunk::ErrorChecking.new }).value
     end
 
     def validate_return_type(return_value)
@@ -90,7 +90,7 @@ module RFunk
     def validate_parameter_types(*args)
       values = args.zip(type_annotation.parameters)
       values.each_with_index { |v, i|
-        tuple = Tuple(*v)
+        tuple = RFunk::Tuple(*v)
         error_checking.raise_expected_parameter_type(i + 1, tuple.value(0), tuple.value(1))
       }
     end

data/lib/rfunk/attribute/type_annotation.rb

@@ -3,23 +3,14 @@ module RFunk
     attr_reader :parameters, :return
 
     def initialize(annotation)
-      case Option(annotation)
-      when Some
-        @annotation = annotation.split('->')
-        @parameters = if @annotation.count == 2
-                        @annotation[0].split(',').map { |p| Object.const_get(p.strip) }
-                      else
-                        []
-                      end
-        @return = if @annotation.count == 2
-                    Object.const_get(@annotation[1].strip)
-                  else
-                    Object.const_get(@annotation[0].strip)
-                  end
-      else
-        @parameters = []
-        @return = None()
-      end
+      option = RFunk::Option(annotation)
+      split = option.split('->')
+      parameters = split.select { |v| v.count == 2 }
+
+      @parameters = parameters.flat_map { |v| v[0].split(',').map { |p| Object.const_get(p.strip) } }
+      @return = RFunk::Option(split.map { |v|
+        v.count == 2 ? Object.const_get(v[1].strip) : Object.const_get(v[0].strip)
+      }.first).value
     end
   end
 end

data/lib/rfunk/either/either.rb

@@ -6,10 +6,10 @@ module RFunk
 
     def result
       case value
-      when Some, None
+      when RFunk::Some, RFunk::None
         value
       else
-        Option(value)
+        RFunk::Option(value)
       end
     end
 

data/lib/rfunk/either/failure.rb

@@ -9,11 +9,11 @@ module RFunk
     end
 
     def or(value)
-      Failure(value)
+      RFunk::Failure(value)
     end
   end
 
   def Failure(value)
-    Failure.new(value)
+    RFunk::Failure.new(value)
   end
 end

data/lib/rfunk/either/success.rb

@@ -14,6 +14,6 @@ module RFunk
   end
 
   def Success(value)
-    Success.new(value)
+    RFunk::Success.new(value)
   end
 end

data/lib/rfunk/lazy.rb

@@ -8,7 +8,7 @@ module RFunk
 
     def value
       atomic.update { @value ||= lambda.call.tap { self.created = true } }
-      Option(atomic.value)
+      RFunk::Option(atomic.value)
     end
 
     def created?
@@ -22,6 +22,6 @@ module RFunk
   end
 
   def Lazy(lambda)
-    Lazy.new(lambda)
+    RFunk::Lazy.new(lambda)
   end
 end

data/lib/rfunk/maybe/none.rb

@@ -1,13 +1,13 @@
 module RFunk
-  class None < Option
+  class None < RFunk::Option
     include Singleton
 
     def value(default = None())
-      Option(default)
+      RFunk::Option(default)
     end
 
     def or(other)
-      Option(other)
+      RFunk::Option(other)
     end
 
     def method_missing(method, *arguments, &block)
@@ -38,6 +38,6 @@ module RFunk
   end
 
   def None(value = nil)
-    Option(value)
+    RFunk::Option(value)
   end
 end

data/lib/rfunk/maybe/option.rb

@@ -10,18 +10,18 @@ module RFunk
   end
 
   def Option(value)
-    if [Some, None].map { |t| value.is_a?(t) }.any?
+    if [RFunk::Some, RFunk::None].map { |t| value.is_a?(t) }.any?
       value
     elsif nothing?(value)
-      None.instance
+      RFunk::None.instance
     else
-      Some.new(value)
+      RFunk::Some.new(value)
     end
   end
 
   private
 
   def nothing?(value)
-    value.nil? || (value.respond_to?(:empty?) && value.empty?) || value == None.instance
+    value.nil? || (value.respond_to?(:empty?) && value.empty?) || value == RFunk::None.instance
   end
 end

data/lib/rfunk/maybe/some.rb

@@ -6,7 +6,7 @@ module RFunk
       @value = value
     end
 
-    def value(_ = None())
+    def value(_ = RFunk::None())
       @value
     end
 
@@ -15,7 +15,7 @@ module RFunk
     end
 
     def method_missing(method, *arguments, &block)
-      Option(value.send(method, *arguments, &block))
+      RFunk::Option(value.send(method, *arguments, &block))
     end
 
     def ==(other)
@@ -48,6 +48,6 @@ module RFunk
   end
 
   def Some(value)
-    Option(value)
+    RFunk::Option(value)
   end
 end

data/lib/rfunk/tuple.rb

@@ -9,11 +9,9 @@ module RFunk
       index = args[0]
 
       if args.length == 1
-        Option(values[index])
+        RFunk::Option(values[index])
       else
-        self.class.new(values.dup.tap { |v|
-          v[index] = Option(args[1])
-        })
+        self.class.new(values.dup.tap { |v| v[index] = RFunk::Option(args[1]) })
       end
     end
 
@@ -23,6 +21,6 @@ module RFunk
   end
 
   def Tuple(*values)
-    Tuple.new(values)
+    RFunk::Tuple.new(values)
   end
 end

data/lib/rfunk/version.rb

@@ -1,3 +1,3 @@
 module RFunk
-  VERSION = '0.10.0'
+  VERSION = '1.0.0'
 end

data/lib/rfunk.rb

@@ -26,5 +26,3 @@ require 'rfunk/either/either'
 require 'rfunk/either/failure'
 require 'rfunk/either/success'
 require 'rfunk/tuple'
-
-include RFunk

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfunk
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Alex Falkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2015-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_nine
@@ -30,70 +30,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby-ext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: hamster
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rspec-given
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.4
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.4
+        version: 3.7.0
 description: See https://github.com/alexfalkowski/rfunk/blob/master/README.md
 email:
 - alexrfalkowski@gmail.com
@@ -145,9 +159,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Functional Programming in Ruby
 test_files: []
-has_rdoc: