rfunk 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b903a5e57ad02cb3ce4aad68527844a54e41c296
-  data.tar.gz: 52a6223d519be58a35360407524a16391d8a0bae
+  metadata.gz: '019b13193329aab02ae682f74d7c7b8adee21edd'
+  data.tar.gz: e6a1de1d5538b610a21bced73081f9113d29340e
 SHA512:
-  metadata.gz: d3518017a522c77111be0461cb8b13b72e73cafed66628f0187f83d46699bfb41c03a5851a0240bf006c9eb2e21b1bd955df58982946189ff723f880ca571388
-  data.tar.gz: 7f0a210a7177c8748a99c9d770b6139589712b31c59d34f2592b947e5974d03298a6724b103577ae2c2af147b477c95e52d191edcdd25f5b38a714893dac7760
+  metadata.gz: 298044ffbc4d407854f85a12b213869fe7417720e66076ce48bf7a29f521418d834f5b3076471ba1e8357d7e4d0c9ae27f81a3d52c1b1378c75b9c72a7d42a2e
+  data.tar.gz: b5b035e47f6212b87e1d13a086ba7477bb78f1dbc4b1af8f0f4b38a2b542994ab9f49e4bd0e4efb188e7252b53a986783d17cd1bae23fa3e2f240799bb018c92

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/match/error.rb

@@ -0,0 +1,6 @@
+module RFunk
+  module Match
+    class Error < StandardError
+    end
+  end
+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/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

@@ -2,6 +2,15 @@ module RFunk
   class Option
     include Enumerable
 
+    class << self
+      def inherited(subclass)
+        @descendants ||= []
+        @descendants << subclass
+      end
+
+      attr_reader :descendants
+    end
+
     def each(&block)
       return enum_for(:enum) if block.nil?
 
@@ -11,23 +20,8 @@ module RFunk
 
   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
-
-    def empty?(value)
-      value.respond_to?(:empty?) && value.empty?
+      return value if RFunk::Option.descendants.map { |t| value.is_a?(t) }.any?
+      RFunk::Option.descendants.find { |c| c.satisfies?(value) }.create(value)
     end
   end
 end

data/lib/rfunk/maybe/some.rb

@@ -2,12 +2,20 @@ module RFunk
   class Some < Option
     extend Forwardable
 
-    def initialize(value)
-      @value = value
+    class << self
+      def create(value)
+        new(value)
+      end
+
+      def satisfies?(value)
+        !value.nil?
+      end
     end
 
-    def value(_ = RFunk.none)
-      @value
+    attr_reader :value
+
+    def initialize(value)
+      @value = value
     end
 
     alias identity value
@@ -38,7 +46,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 = '1.8.0'.freeze
 end

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'

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: rfunk
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Alex Falkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-04-21 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.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: concurrent-ruby-ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby-ext
+  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: hamster
+  name: ice_nine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.11.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  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'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,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 +177,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
@@ -175,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Functional Programming in Ruby