rfunk 1.7.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b903a5e57ad02cb3ce4aad68527844a54e41c296
-  data.tar.gz: 52a6223d519be58a35360407524a16391d8a0bae
+SHA256:
+  metadata.gz: dc3829e8c2bfd946b7cb83442b4dc14576c7491c559e7cd813b35a02ea0f7624
+  data.tar.gz: c30bcb3d0f9c431195fbde08a6d2d505f8328d4ccb129bd4b1b5535b57aad0d5
 SHA512:
-  metadata.gz: d3518017a522c77111be0461cb8b13b72e73cafed66628f0187f83d46699bfb41c03a5851a0240bf006c9eb2e21b1bd955df58982946189ff723f880ca571388
-  data.tar.gz: 7f0a210a7177c8748a99c9d770b6139589712b31c59d34f2592b947e5974d03298a6724b103577ae2c2af147b477c95e52d191edcdd25f5b38a714893dac7760
+  metadata.gz: 1f1dd8062fef1b43d246d413a47d653b244e880132d937b4b47e6aab5b5e28c715384d0b6a0a969d5610aebdb51a3e5a3f8ddc70dd35df0e41a7f2fa9d32cad9
+  data.tar.gz: a9024ba13ff865215a690f0454df329155219e5e0c7cad44b3546de44778625b67eaedff809d8bb36ce934702dcfcc6777353a49eee38b3885eea2ab41d81b45

data/lib/rfunk.rb

@@ -28,3 +28,4 @@ require 'rfunk/either/success'
 require 'rfunk/tuple'
 require 'rfunk/match'
 require 'rfunk/match/pattern'
+require 'rfunk/match/error'

data/lib/rfunk/attribute/attribute_definition.rb

@@ -1,11 +1,7 @@
 module RFunk
   module AttributeDefinition
     def attribute(name, type, options = {})
-      RFunk::AttributeVariable.new.add(instance: self,
-                                       name: name,
-                                       type: type,
-                                       options: options)
-
+      RFunk::AttributeVariable.new.add(instance: self, name: name, type: type, options: options)
       create_method(name, type)
     end
 
@@ -15,9 +11,7 @@ module RFunk
       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)
+          RFunk::Immutable.new.create(instance: self, variable_name: variable_name(name), value: value)
         else
           RFunk.option(instance_variable_get(variable_name(name)))
         end

data/lib/rfunk/attribute/error_checking.rb

@@ -18,6 +18,7 @@ module RFunk
 
     def raise_not_found(key, attributes)
       return if attributes.key?(key)
+
       message = "Attribute with name '#{key}' does not exist. The only available attributes are '#{attributes.keys}'"
       raise RFunk::NotFoundError, message
     end
@@ -54,6 +55,7 @@ module RFunk
 
     def raise_type(name, value, type, message)
       return if value.is_a?(type)
+
       raise TypeError, "Expected a type of '#{type}' for #{message} '#{name}'"
     end
   end

data/lib/rfunk/attribute/function.rb

@@ -26,6 +26,7 @@ module RFunk
 
     def assert(&_)
       return true if yield
+
       raise RFunk::AssertionError
     end
 
@@ -73,17 +74,16 @@ module RFunk
 
     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
+      @error_checking ||= RFunk::ErrorChecking.new
     end
 
     def validate_return_type(return_value)
-      error_checking.raise_expected_return_type(function_name.value,
-                                                return_value,
-                                                type_annotation.return)
+      error_checking.raise_expected_return_type(function_name.value, return_value, type_annotation.return)
     end
 
     def validate_parameter_types(*args)

data/lib/rfunk/attribute/immutable.rb

@@ -20,7 +20,7 @@ module RFunk
     end
 
     def create_instance_variables(instance, object, variable_name)
-      instance.instance_variables.select { |v| v != variable_name }.each do |v|
+      instance.instance_variables.reject { |v| v == variable_name }.each do |v|
         previous_value = instance.instance_variable_get(v)
         object.instance_variable_set(v, previous_value)
       end

data/lib/rfunk/either/either.rb

@@ -41,7 +41,7 @@ module RFunk
 
     def either_with_lambda(lambda)
       RFunk.success(lambda.call)
-    rescue => e
+    rescue StandardError => e
       RFunk.failure(e)
     end
 

data/lib/rfunk/match.rb

@@ -4,11 +4,11 @@ module RFunk
       pattern = RFunk::Match::Pattern.new
       yield(pattern)
 
-      pattern.cases.each do |t|
-        return t.last.call(option.identity) if t.first == option.key
-      end
+      pattern_case = pattern.cases.find { |t| t.first == option.key || t.first == :_ }
 
-      RFunk.none
+      return pattern_case.last.call(option.identity) if pattern_case
+
+      raise RFunk::Match::Error, "Could not match for option '#{option.key}'."
     end
   end
 end

data/lib/rfunk/match/error.rb

@@ -0,0 +1,6 @@
+module RFunk
+  module Match
+    class Error < StandardError
+    end
+  end
+end

data/lib/rfunk/maybe/none.rb

@@ -2,8 +2,24 @@ module RFunk
   class None < RFunk::Option
     include Singleton
 
-    def value(default = RFunk.none)
-      RFunk.option(default)
+    class << self
+      def create(_)
+        instance
+      end
+
+      def satisfies?(value)
+        value.nil? || empty?(value)
+      end
+
+      private
+
+      def empty?(value)
+        value.respond_to?(:empty?) && value.empty?
+      end
+    end
+
+    def value
+      RFunk::None.instance
     end
 
     def or(other)
@@ -46,8 +62,8 @@ module RFunk
   end
 
   class << self
-    def none(value = nil)
-      RFunk.option(value)
+    def none
+      RFunk::None.instance
     end
   end
 end

data/lib/rfunk/maybe/option.rb

@@ -1,33 +1,25 @@
 module RFunk
   class Option
     include Enumerable
+    extend Forwardable
 
-    def each(&block)
-      return enum_for(:enum) if block.nil?
+    class << self
+      def inherited(subclass)
+        @descendants ||= []
+        @descendants << subclass
+      end
 
-      enum.each { |v| yield v }
+      attr_reader :descendants
     end
+
+    def_delegators :enum, :each
   end
 
   class << self
     def option(value)
-      if [RFunk::Some, RFunk::None].map { |t| value.is_a?(t) }.any?
-        value
-      elsif nothing?(value)
-        RFunk::None.instance
-      else
-        RFunk::Some.new(value)
-      end
-    end
-
-    private
-
-    def nothing?(value)
-      value.nil? || empty?(value) || value == RFunk::None.instance
-    end
+      return value if RFunk::Option.descendants.map { |t| value.is_a?(t) }.any?
 
-    def empty?(value)
-      value.respond_to?(:empty?) && value.empty?
+      RFunk::Option.descendants.find { |c| c.satisfies?(value) }.create(value)
     end
   end
 end

data/lib/rfunk/maybe/some.rb

@@ -1,15 +1,21 @@
 module RFunk
   class Some < Option
-    extend Forwardable
+    class << self
+      def create(value)
+        new(value)
+      end
+
+      def satisfies?(value)
+        !value.nil?
+      end
+    end
+
+    attr_reader :value
 
     def initialize(value)
       @value = value
     end
 
-    def value(_ = RFunk.none)
-      @value
-    end
-
     alias identity value
 
     def or(_)
@@ -18,6 +24,7 @@ module RFunk
 
     def pipe(&block)
       return self if block.nil?
+
       RFunk.option(yield value)
     end
 
@@ -26,8 +33,7 @@ module RFunk
     end
 
     def ==(other)
-      return false unless self.class == other.class
-      value == RFunk.option(other).value
+      value == other.value
     end
 
     def <=>(other)
@@ -38,7 +44,7 @@ module RFunk
       [other, value]
     end
 
-    [:to_str, :to_ary, :to_hash].each { |k| define_method(k) { value } }
+    %i[to_str to_ary to_hash].each { |k| define_method(k) { value } }
 
     def key
       :some

data/lib/rfunk/version.rb

@@ -1,3 +1,3 @@
 module RFunk
-  VERSION = '1.7.0'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,73 +1,79 @@
 --- !ruby/object:Gem::Specification
 name: rfunk
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Alex Falkowski
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2020-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ice_nine
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.7
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: hamster
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby-ext
+  name: ice_nine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.11.2
 - !ruby/object:Gem::Dependency
-  name: hamster
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-given
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-given
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,6 +128,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: See https://github.com/alexfalkowski/rfunk/blob/master/README.md
 email:
 - alexrfalkowski@gmail.com
@@ -149,6 +169,7 @@ files:
 - lib/rfunk/either/success.rb
 - lib/rfunk/lazy.rb
 - lib/rfunk/match.rb
+- lib/rfunk/match/error.rb
 - lib/rfunk/match/pattern.rb
 - lib/rfunk/maybe/none.rb
 - lib/rfunk/maybe/option.rb
@@ -159,7 +180,7 @@ homepage: https://github.com/alexfalkowski/rfunk
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -167,16 +188,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: 2.8.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Functional Programming in Ruby
 test_files: []