rfunk 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19d4d78e7405dd0df4292227a632888722874ea1
-  data.tar.gz: a7c3e340bbc434670d8a524d8c30ff8a7923bab9
+  metadata.gz: 67d0f85734d6898bb2d564a59f4e3ec06e3e32b9
+  data.tar.gz: 5ff36ad9b6ee2c6fae4e9fc8fa10f19eb5135679
 SHA512:
-  metadata.gz: d74968aa0449b85a88e54e5bfc876cefe809937eb38a21c4e5b7038ce669de34aef258509f373bb1f4be2014d5e5fed1ffd71c464c89a42030b096340d58b6c3
-  data.tar.gz: 0ce78139b5124ee24939f52f2e58eea0ab963f642349e21827070d7b5d46d447b3f5dbb46fb5388eef05068e9df9e7cc011da7ef9259bf3913d1add235e942fc
+  metadata.gz: 904998816f7d080cadd75e274e9a4f1321ee396d69b9c4d84e6f2ea96179018260f4a50b8fa2fb9c385b30655f80158edf1295e617a09e925380ec9f1440ff9b
+  data.tar.gz: a7f3a9ba4847578253c7e53357d5f1be431f05ca2073019bf8fc8f3cc23271f7820d00c6e5044de1ed9ecbdcb8a93823687b9766854b9dd32aee63efd5c64c22

data/lib/rfunk/lazy.rb

@@ -6,7 +6,7 @@ module RFunk
     end
 
     def value
-      Option(@value ||= lambda.call.tap { self.created = true  })
+      Option(@value ||= lambda.call.tap { self.created = true })
     end
 
     def created?

data/lib/rfunk/{none.rb → maybe/none.rb}

@@ -1,5 +1,5 @@
 module RFunk
-  class None
+  class None < Option
     include Singleton
 
     def value(default = nil)
@@ -13,6 +13,13 @@ module RFunk
     def method_missing(method, *arguments, &block)
       self
     end
+
+    protected
+
+    def enum
+      []
+    end
+
   end
 
   def None(value = nil)

data/lib/rfunk/maybe/option.rb

@@ -0,0 +1,27 @@
+module RFunk
+  class Option
+    include Enumerable
+
+    def each(&block)
+      return enum_for(:enum) if block.nil?
+
+      enum.each { |v| block.call(v) }
+    end
+  end
+
+  def Option(value)
+    if [Some, None].map { |t| value.is_a?(t) }.any?
+      value
+    elsif nothing?(value)
+      None.instance
+    else
+      Some.new(value)
+    end
+  end
+
+  private
+
+  def nothing?(value)
+    value.nil? || (value.respond_to?(:empty?) && value.empty?) || value.is_a?(None)
+  end
+end

data/lib/rfunk/{some.rb → maybe/some.rb}

@@ -1,5 +1,5 @@
 module RFunk
-  class Some
+  class Some < Option
     attr_reader :value
 
     def initialize(value)
@@ -11,11 +11,23 @@ module RFunk
     end
 
     def method_missing(method, *arguments, &block)
-      Option(value.__send__(method, *arguments, &block))
+      Option(value.send(method, *arguments, &block))
     end
 
     def ==(other)
-      other.value == value
+      return false unless self.class == other.class
+
+      value == other.value
+    end
+
+    def <=>(other)
+      value <=> other.value
+    end
+
+    protected
+
+    def enum
+      [value]
     end
   end
 

data/lib/rfunk/tuple.rb

@@ -0,0 +1,27 @@
+module RFunk
+  class Tuple
+    def initialize(values)
+      @values = values
+    end
+
+    def value(*args)
+      index = args[0]
+
+      if args.length == 1
+        Option(values[index])
+      else
+        self.class.new(values.dup.tap { |v|
+          v[index] = Option(args[1])
+        })
+      end
+    end
+
+    private
+
+    attr_reader :values
+  end
+
+  def Tuple(*values)
+    Tuple.new(values)
+  end
+end

data/lib/rfunk/version.rb

@@ -1,3 +1,3 @@
 module RFunk
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/rfunk.rb

@@ -2,16 +2,17 @@ require 'singleton'
 require 'ice_nine'
 require 'ice_nine/core_ext/object'
 
-require 'rfunk/attribute_type'
-require 'rfunk/attribute'
-require 'rfunk/option'
-require 'rfunk/none'
-require 'rfunk/some'
-require 'rfunk/not_found_error'
+require 'rfunk/attribute/attribute_type'
+require 'rfunk/attribute/attribute'
+require 'rfunk/maybe/option'
+require 'rfunk/maybe/none'
+require 'rfunk/maybe/some'
+require 'rfunk/attribute/not_found_error'
 require 'rfunk/lazy'
-require 'rfunk/value'
-require 'rfunk/failure'
-require 'rfunk/success'
-require 'rfunk/either'
+require 'rfunk/either/value'
+require 'rfunk/either/failure'
+require 'rfunk/either/success'
+require 'rfunk/either/either'
+require 'rfunk/tuple'
 
 include RFunk

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfunk
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Alex Falkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_nine
@@ -60,17 +60,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/rfunk.rb
-- lib/rfunk/attribute.rb
-- lib/rfunk/attribute_type.rb
-- lib/rfunk/either.rb
-- lib/rfunk/failure.rb
+- lib/rfunk/attribute/attribute.rb
+- lib/rfunk/attribute/attribute_type.rb
+- lib/rfunk/attribute/not_found_error.rb
+- lib/rfunk/either/either.rb
+- lib/rfunk/either/failure.rb
+- lib/rfunk/either/success.rb
+- lib/rfunk/either/value.rb
 - lib/rfunk/lazy.rb
-- lib/rfunk/none.rb
-- lib/rfunk/not_found_error.rb
-- lib/rfunk/option.rb
-- lib/rfunk/some.rb
-- lib/rfunk/success.rb
-- lib/rfunk/value.rb
+- lib/rfunk/maybe/none.rb
+- lib/rfunk/maybe/option.rb
+- lib/rfunk/maybe/some.rb
+- lib/rfunk/tuple.rb
 - lib/rfunk/version.rb
 homepage: https://github.com/alexfalkowski/rfunk
 licenses:

data/lib/rfunk/option.rb

@@ -1,15 +0,0 @@
-module RFunk
-  def Option(value)
-    if nothing?(value)
-      None.instance
-    else
-      Some.new(value)
-    end
-  end
-
-  private
-
-  def nothing?(value)
-    value.nil? || (value.respond_to?(:empty?) && value.empty?) || value.is_a?(None)
-  end
-end