option 0.3.1 → 0.4.0

data/.travis.yml

@@ -7,6 +7,5 @@ rvm:
   - rbx-18mode
   - rbx-19mode
   - ruby-head
-  - jruby-head
   - 1.8.7
   - ree

data/README.md

@@ -1,7 +1,9 @@
 # Option
 
-A Ruby port os Scala's Option monad. Tries to be faithful
-but also pragmatic in RE: to ducktyping.
+A Ruby port of Scala's Option monad. Tries to be faithful
+but also pragmatic in RE: to duck typing.
+
+Blog post: http://robares.com/2012/09/16/ruby-port-of-scala-option/
 
 ## Installation
 
@@ -54,10 +56,16 @@ None.fold(-> { "missing" }) { |v| v.upcase } #=> missing
 
 # filter values returning an option
 foo.filter { |v| v == "baz" } #=> None
+
+# mutation
+foo.inside { |v| v.upcase! } #=> Some("BAR")
 ```
 
 ## Build Status
-<a href="http://travis-ci.org/rares/option">![http://travis-ci.org/rares/option](https://secure.travis-ci.org/rares/option.png)</a>
+[![Travis CI](https://secure.travis-ci.org/rares/option.png)](http://travis-ci.org/rares/option)
+
+## Code Climate
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/rares/option)
 
 ## Contributing
 

data/lib/option.rb

@@ -9,6 +9,15 @@ class OptionClass
       else or_nil == that
     end
   end
+
+  private
+
+  def assert_option(result)
+    case result
+      when OptionClass then return result
+      else raise TypeError, "Must be an Option"
+    end
+  end
 end
 
 class SomeClass < OptionClass
@@ -52,11 +61,7 @@ class SomeClass < OptionClass
   end
 
   def flat_map(&blk)
-    result = blk.call(get)
-    case result
-      when OptionClass then return result
-      else raise TypeError, "Must be an Option"
-    end
+    assert_option(blk.call(get))
   end
 
   def fold(if_empty, &blk)
@@ -75,6 +80,10 @@ class SomeClass < OptionClass
     blk.call(get)
     self
   end
+
+  def or_else(&blk)
+    self
+  end
 end
 
 class NoneClass < OptionClass
@@ -130,6 +139,10 @@ class NoneClass < OptionClass
   def inside(&blk)
     self
   end
+
+  def or_else(&blk)
+    assert_option(blk.call)
+  end
 end
 
 None = NoneClass.new

data/lib/option/version.rb

@@ -1,3 +1,3 @@
 module Option
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/option_spec.rb

@@ -1,8 +1,23 @@
 require "minitest/autorun"
+require "minitest/pride"
 require "minitest/spec"
 
 require "option"
 
+module MiniTest::Assertions
+
+  def assert_some(value, option, msg = nil)
+    assert (option.is_a?(Some) && option.or_nil == value), "Expected Some(#{value})"
+  end
+
+  def assert_none(value, option, msg = nil)
+    assert option == None, "Expected None"
+  end
+end
+
+OptionClass.infect_an_assertion :assert_some, :must_be_some
+OptionClass.infect_an_assertion :assert_none, :must_be_none
+
 def value
   12
 end
@@ -41,11 +56,11 @@ describe NoneClass do
   end
 
   it "#map should return itself" do
-    None.map {}.must_equal(None)
+    None.map {}.must_be_none
   end
 
   it "#flat_map should return itself" do
-    None.flat_map {}.must_equal(None)
+    None.flat_map {}.must_be_none
   end
 
   it "#exists? should return false" do
@@ -57,11 +72,11 @@ describe NoneClass do
   end
 
   it "#filter with a true predicate returns itself" do
-    Option(value).filter { |i| i == 12 }.must_equal(Option(value))
+    Option(value).filter { |i| i == 12 }.must_be_some(value)
   end
 
   it "#filter with a false predicate returns None" do
-    Option(value).filter { |i| i == 1 }.must_equal(None)
+    Option(value).filter { |i| i == 1 }.must_be_none
   end
 
   it "should be aliased to None" do
@@ -73,6 +88,14 @@ describe NoneClass do
     None.inside { |v| expected = value }
     expected.must_be_nil
   end
+
+  it "#or_else should invoke the block and return an Option" do
+    None.or_else { Some(value) }.must_be_some(value)
+  end
+
+  it "#or_else should raise a TypeError if an Option is not returned" do
+    lambda { None.or_else { value } }.must_raise TypeError
+  end
 end
 
 describe SomeClass do
@@ -116,7 +139,7 @@ describe SomeClass do
   end
 
   it "#map should return the result of the proc over the value in an Option" do
-    Some(value).map { |v| v * 2 }.must_equal(Some(24))
+    Some(value).map { |v| v * 2 }.must_be_some(24)
   end
 
   it "#flat_map should raise TypeError if the returned value is not an Option" do
@@ -124,11 +147,11 @@ describe SomeClass do
   end
 
   it "#flat_map should return an Option value from the block" do
-    Some(value).flat_map { |v| Option(v * 2) }.must_equal(Some(24))
+    Some(value).flat_map { |v| Option(v * 2) }.must_be_some(24)
   end
 
   it "#flat_map can return None from the block" do
-    Some(value).flat_map { |_| None }.must_equal(None)
+    Some(value).flat_map { |_| None }.must_be_none
   end
 
   it "#exists? should return true when the block evaluates true" do
@@ -144,32 +167,36 @@ describe SomeClass do
   end
 
   it "#filter should return itself" do
-    None.filter { |i| i == 0 }.must_equal(None)
+    None.filter { |i| i == 0 }.must_be_none
   end
 
   it "#inside should invoke the proc and return itself" do
     expected = nil
-    Some(value).inside { |v| expected = v }.must_equal(Some(value))
+    Some(value).inside { |v| expected = v }.must_be_some(value)
     expected.must_equal(value)
   end
 
+  it "#or_else should return itself" do
+    Some(value).or_else { None }.must_be_some(value)
+  end
+
   it "should wrap the creation of a Some" do
     Some(value).must_be_instance_of(SomeClass)
   end
 
   it "should be aliased to Some" do
-    Some.new(value).must_equal(Some(value))
+    Some.new(value).must_be_some(value)
   end
 end
 
 describe OptionClass do
 
   it "must return a some if the passed value is not nil" do
-    Option(value).must_equal(Some(value))
+    Option(value).must_be_some(value)
   end
 
   it "must return a None if the passed value is nil" do
-    Option(nil).must_equal(None)
+    Option(nil).must_be_none
   end
 
   it "should do equality checks against the boxed value" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: option
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2012-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70142759119300 !ruby/object:Gem::Requirement
+  requirement: &70193288139160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70142759119300
+  version_requirements: *70193288139160
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70142759118800 !ruby/object:Gem::Requirement
+  requirement: &70193288138600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,7 +32,7 @@ dependencies:
         version: 3.4.0
   type: :development
   prerelease: false
-  version_requirements: *70142759118800
+  version_requirements: *70193288138600
 description: Ruby port of Scala's Option Monad
 email:
 - rob.ares@gmail.com