rfunk 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d842be09b09aa3bd5fef713471aea24b9072965d
-  data.tar.gz: 53415832787bb21820efb40e8280dd550e0843a3
+  metadata.gz: b86ea072b8641826aaa1c6ae805f908dfd5e5020
+  data.tar.gz: 14d4524321d24ab95b17cea3d0644c4bdaca7f4d
 SHA512:
-  metadata.gz: 6952bb646f377abcf5731c686385165e4b602ea9af3a7a352757dd343991ea927750022be1379765bfbe9e0d97ff171f48f2b0d5592a0917ee2f0628c2beaaa1
-  data.tar.gz: 40ffc430e2e6710a26fb6f88dcc15b7c3b2a38ae252cdd4862019fd244028a5cd23a5e742705bb7982261ebe4703f3ffdf7273c1118624b6f7cf84aa5b69ad6b
+  metadata.gz: 00d216f4079806989219261e8bfea826a0edafe373a3f8a5fa4296473eece58ab37b83b90304152a86a74d29f75c13290e3d09b680f4334334751fb3e457149c
+  data.tar.gz: de6abb927459d4c379a9b146e77f0cb5c5d6d03ef41a2c4e59e7480a264ec7f72fd47f298bea9572593ce7afacbe8670c92187060e9da7201cf8baf3ca6f5632

data/lib/rfunk/attribute/attribute.rb

@@ -17,22 +17,22 @@ module RFunk
     end
 
     def with_defaults
-      attributes.each { |key, attribute|
+      attributes.each do |key, attribute|
         value = attribute.options[:default]
         set_variable(attribute, key, value) if value
-      }
+      end
     end
 
     def with_attributes(options)
-      options.each { |key, value|
+      options.each do |key, value|
         RFunk::ErrorChecking.new.raise_not_found(key, attributes)
         set_variable(attributes[key], key, value)
-      }
+      end
     end
 
     def set_variable(attribute, key, value)
       RFunk::ErrorChecking.new.raise_expected_attribute_type(key, value, attribute.type)
-      self.instance_variable_set(variable_name(key), value)
+      instance_variable_set(variable_name(key), value)
     end
 
     def variable_name(name)

data/lib/rfunk/attribute/attribute_definition.rb

@@ -6,16 +6,22 @@ module RFunk
                                        type: type,
                                        options: options)
 
-      define_method(name) { |value = nil|
+      create_method(name, type)
+    end
+
+    private
+
+    def create_method(name, type)
+      define_method(name) do |value = nil|
         if 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
-          RFunk::Option(self.instance_variable_get(variable_name(name)))
+          RFunk::Option(instance_variable_get(variable_name(name)))
         end
-      }
+      end
     end
   end
 end

data/lib/rfunk/attribute/attribute_type.rb

@@ -1,4 +1,3 @@
 module RFunk
-  class AttributeType < Struct.new(:name, :type, :options)
-  end
+  AttributeType = Struct.new(:name, :type, :options)
 end

data/lib/rfunk/attribute/error_checking.rb

@@ -1,7 +1,7 @@
 module RFunk
   class ErrorChecking
     def raise_condition_error(type, value)
-      raise type, 'The condition was not met!' unless value
+      fail type, 'The condition was not met!' unless value
     end
 
     def raise_expected_return_type(name, value, type)
@@ -17,16 +17,15 @@ module RFunk
     end
 
     def raise_not_found(key, attributes)
-      unless attributes.key?(key)
-        message = "Attribute with name '#{key}' does not exist. The only available attributes are '#{attributes.keys}'"
-        raise RFunk::NotFoundError, message
-      end
+      return if attributes.key?(key)
+      message = "Attribute with name '#{key}' does not exist. The only available attributes are '#{attributes.keys}'"
+      fail RFunk::NotFoundError, message
     end
 
     def raise_immutable(options, variable)
-      keys = options.keys.select { |k| variable.has_key?(k) }
+      keys = options.keys.select { |k| variable.key?(k) }
       message = "Could not set variables '#{keys}', because variables are immutable."
-      raise RFunk::ImmutableError, message if keys.any?
+      fail RFunk::ImmutableError, message if keys.any?
     end
 
     private
@@ -52,9 +51,8 @@ module RFunk
     end
 
     def raise_type(name, value, type, message)
-      unless value.is_a?(type)
-        raise TypeError, "Expected a type of '#{type}' for #{message} '#{name}'"
-      end
+      return if value.is_a?(type)
+      fail TypeError, "Expected a type of '#{type}' for #{message} '#{name}'"
     end
   end
 end

data/lib/rfunk/attribute/function.rb

@@ -26,7 +26,7 @@ module RFunk
       if yield
         true
       else
-        raise RFunk::AssertionError
+        fail RFunk::AssertionError
       end
     end
 
@@ -43,25 +43,11 @@ module RFunk
     end
 
     def execute(*args)
-      validate_parameter_types *args
+      validate_parameter_types(*args)
       return_value = instance_exec(*args, &block)
 
       if body_block
-        if pre_block
-          instance_eval(&pre_block).tap { |r|
-            error_checking.raise_condition_error(RFunk::PreConditionError, r)
-          }
-        end
-
-        RFunk::Option(instance_eval(&body_block)).tap { |body|
-          if post_block
-            instance_eval(&post_block).tap { |post|
-              error_checking.raise_condition_error(RFunk::PostConditionError, post)
-            }
-          end
-
-          validate_return_type(body)
-        }
+        execute_body_block
       else
         validate_return_type(return_value)
         RFunk::Option(return_value)
@@ -77,6 +63,20 @@ module RFunk
     attr_reader :block, :pre_block, :post_block, :body_block, :function_definition
     attr_accessor :variables
 
+    def execute_body_block
+      execute_block pre_block, RFunk::PreConditionError
+
+      RFunk::Option(instance_eval(&body_block)).tap do |body|
+        execute_block post_block, RFunk::PostConditionError
+        validate_return_type(body)
+      end
+    end
+
+    def execute_block(block, error)
+      return unless block
+      instance_eval(&block).tap { |r| error_checking.raise_condition_error(error, r) }
+    end
+
     def error_checking
       RFunk::Lazy(-> { RFunk::ErrorChecking.new }).value
     end
@@ -89,10 +89,10 @@ module RFunk
 
     def validate_parameter_types(*args)
       values = args.zip(type_annotation.parameters)
-      values.each_with_index { |v, i|
+      values.each_with_index do |v, i|
         tuple = RFunk::Tuple(*v)
         error_checking.raise_expected_parameter_type(i + 1, tuple.value(0), tuple.value(1))
-      }
+      end
     end
 
     def function_name

data/lib/rfunk/attribute/immutable.rb

@@ -5,15 +5,12 @@ module RFunk
       variable_name = options.fetch(:variable_name)
       value = options.fetch(:value)
 
-      instance.class.new.tap { |object|
-        instance.instance_variables.select { |v| v != variable_name }.each { |v|
-          previous_value = instance.instance_variable_get(v)
-          object.instance_variable_set(v, previous_value)
-        }
+      instance.class.new.tap do |object|
+        create_instance_variables(instance, object, variable_name)
 
         object.instance_variable_set(variable_name, value)
         object.deep_freeze if should_deep_freeze?(value)
-      }
+      end
     end
 
     private
@@ -21,5 +18,12 @@ module RFunk
     def should_deep_freeze?(value)
       ['Hamster'].none? { |m| value.class.to_s.include?(m) }
     end
+
+    def create_instance_variables(instance, object, variable_name)
+      instance.instance_variables.select { |v| v != variable_name }.each do |v|
+        previous_value = instance.instance_variable_get(v)
+        object.instance_variable_set(v, previous_value)
+      end
+    end
   end
 end

data/lib/rfunk/attribute/type_annotation.rb

@@ -7,10 +7,20 @@ module RFunk
       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
+      @parameters = create_parameters(parameters)
+      @return = create_return(split)
+    end
+
+    private
+
+    def create_parameters(parameters)
+      parameters.flat_map { |v| v[0].split(',').map { |p| Object.const_get(p.strip) } }
+    end
+
+    def create_return(split)
+      RFunk::Option(split.map do |v|
+                      v.count == 2 ? Object.const_get(v[1].strip) : Object.const_get(v[0].strip)
+                    end.first).value
     end
   end
 end

data/lib/rfunk/either/either.rb

@@ -33,7 +33,7 @@ module RFunk
   private
 
   def lambda?(value)
-    value.respond_to?(:lambda?) and value.lambda?
+    value.respond_to?(:lambda?) && value.lambda?
   end
 
   def either_with_lambda(lambda)

data/lib/rfunk/maybe/none.rb

@@ -10,7 +10,7 @@ module RFunk
       RFunk::Option(other)
     end
 
-    def method_missing(method, *arguments, &block)
+    def method_missing(_method, *_arguments, &_block)
       self
     end
 

data/lib/rfunk/maybe/some.rb

@@ -32,11 +32,7 @@ module RFunk
       [other, value]
     end
 
-    [:to_str, :to_ary, :to_hash].each { |k|
-      define_method(k) {
-        value
-      }
-    }
+    [:to_str, :to_ary, :to_hash].each { |k| define_method(k) { value } }
 
     def_delegators :@value, :to_s, :inspect, :respond_to?, :class
 

data/lib/rfunk/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfunk
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alex Falkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-04 00:00:00.000000000 Z
+date: 2015-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_nine
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby-ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: hamster
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.7.1
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.34.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.34.2
 description: See https://github.com/alexfalkowski/rfunk/blob/master/README.md
 email:
 - alexrfalkowski@gmail.com
@@ -159,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Functional Programming in Ruby