optional 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    optional (0.0.2)
+    optional (0.0.4)
 
 GEM
   remote: https://rubygems.org/

data/lib/optional/none.rb

@@ -32,4 +32,8 @@ module None
   def to_s
     "None"
   end
+
+  def merge other
+    other
+  end
 end

data/lib/optional/option.rb

@@ -14,7 +14,7 @@ module Option
   private
 
   def from_array(values)
-    values.empty? ? None : Some[values.first]
+    values.empty? ? None : Some[*values]
   end
 
   def from_value(value)

data/lib/optional/option/enumerable.rb

@@ -7,13 +7,32 @@ module Option
       self
     end
 
+    def to_ary
+      to_a
+    end
+
+    def flatten
+      from_array to_ary.flatten
+    end
+
+    def juxt(*methods)
+      map { |v| methods.map { |m| v.send(m) } }
+    end
+
+    def map_through(*methods)
+      methods.reduce(self) { |acc, m| acc.map(&m) }
+    end
+
     def map
       from_array super
     end
     alias_method :collect, :map
-    alias_method :flat_map, :map
     alias_method :collect_concat, :map
 
+    def flat_map(&block)
+      map(&block).flatten
+    end
+
     def detect
       from_value super
     end
@@ -28,8 +47,8 @@ module Option
       from_array super
     end
 
-    def reject
-      from_array super
+    def reject(*args, &block)
+      from_array to_a.reject(*args, &block)
     end
 
     def reduce(*args, &block)

data/lib/optional/some.rb

@@ -7,8 +7,8 @@ class Some
     @value = value
   end
 
-  def each
-    yield value
+  def each &block
+    value.is_a?(Array) ? value.each(&block) : block.call(value)
   end
 
   def none?(&block)
@@ -35,8 +35,15 @@ class Some
     self
   end
 
+  def merge(other, &block)
+    other.match do |m|
+      m.some { |v| block.nil? ? Some[*value, v] : Some[block.call(value, v)] }
+      m.none { self }
+    end
+  end
+
   def to_s
-    "Some[#{value}]"
+    "Some[#{value.inspect}]"
   end
 
   def self.[](*values)

data/optional.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'optional'
-  s.version       = '0.0.3'
+  s.version       = '0.0.4'
   s.date          = '2013-04-19'
   s.summary       = "Optional values with pattern matching"
   s.description   = "Make nils go bye bye with Options!"

data/spec/lib/optional/none_spec.rb

@@ -41,4 +41,12 @@ describe None do
   it "prints as None" do
     None.to_s.should eq "None"
   end
+
+  it "can be merged with another none" do
+    None.merge(None).should be_none
+  end
+
+  it "can be merged with a some" do
+    None.merge(Some[cat]).should eq Some[cat]
+  end
 end

data/spec/lib/optional/option/enumerable_spec.rb

@@ -3,6 +3,12 @@ require 'spec_helper'
 describe Option::Enumerable do
 
   let (:cat) { Cat.new("MOGGIE!") }
+  let (:dog) { Dog.new("DOGGIE!") }
+
+  it "makes radek less sad :-(" do
+    Some[4].each { |e| e.should be_a Fixnum }
+    Some[4,5].each { |e| e.should be_a Fixnum }
+  end
 
   describe "#do" do
     it "allows ops with side effects to be performed using the value as part of a method chain" do
@@ -12,10 +18,16 @@ describe Option::Enumerable do
     end
   end
 
+  describe "#map_through" do
+    it "allows mapping through multiple methods" do
+      Some[cat, dog].map_through(:name, :chars, :first).should eq Some["M", "D"]
+    end
+  end
+
   describe "#map" do
 
     it "maps a some to a some" do
-      Some[cat].map(&:name).should eq Some["MOGGIE!"]
+      Some[cat, dog].map(&:name).should eq Some["MOGGIE!", "DOGGIE!"]
     end
 
     it "also works for collect" do
@@ -43,6 +55,32 @@ describe Option::Enumerable do
     end
   end
 
+  describe "#flat_map" do
+    it 'works as expected over an array of options' do
+      [None, Some[3], None, Some[2]].flat_map do |x|
+        x.map(&:succ)
+      end.should eq [4,3]
+    end
+
+    it 'also works for a some that returns a nested some' do
+      x = Some[stub(y: Some[4])]
+      x.flat_map(&:y).should eq Some[4]
+    end
+  end
+
+  describe "#juxt" do
+    it "collects the results of calling the passed methods" do
+
+      Some[cat].juxt(:name, :class).should eq Some["MOGGIE!", Cat]
+
+      Some[1,2,3].juxt(:pred, :succ).should eq Some[[0, 2], [1, 3], [2, 4]]
+    end
+
+    it "also works for nil" do
+      None.juxt(:name, :class).should be_none
+    end
+  end
+
   describe "#detect" do
     it "returns none if called on a none" do
       None.detect{ |pet| pet.name == "MOGGIE!" }.should be_none
@@ -116,6 +154,10 @@ describe Option::Enumerable do
     it "also works as inject" do
       Some[4].inject(:+).should eq 4
     end
+
+    it "also works within the some" do
+      Some[3,4,5].reduce(:+).should eq 12
+    end
   end
 
   describe "#none?" do
@@ -131,4 +173,14 @@ describe Option::Enumerable do
       Some[4].reject(&:odd?).should eq Some[4]
     end
   end
+
+  describe "#flatten" do
+    it "flattens an array of options" do
+      Some[4].flatten.should eq Some[4]
+      [None, Some[4], Some[2], None].flatten.should eq [4,2]
+      Some[None, Some[4], Some[2], Some[1], None].flatten.should eq Some[4,2,1]
+      Some[None, None].flatten.should eq None
+    end
+  end
+
 end

data/spec/lib/optional/some_spec.rb

@@ -45,4 +45,23 @@ describe Some do
   it "prints as Some[value]" do
     Some[4].to_s.should eq "Some[4]"
   end
+
+  describe '#merge' do
+    it 'can be merged with another some' do
+      Some[3].merge(Some[4]).should eq Some[3,4]
+    end
+
+    it 'can be merged with another merged some' do
+      Some[3, 4].merge(Some[5]).should eq Some[3, 4, 5]
+    end
+
+    it 'can be merged with another some using an operation' do
+      Some[3].merge(Some[4], &:+).should eq Some[7]
+    end
+
+    it 'can be merged with a none' do
+      Some[3].merge(None, &:+).should eq Some[3]
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optional
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: