option 0.4.0 → 0.5.0

data/README.md

@@ -57,8 +57,13 @@ None.fold(-> { "missing" }) { |v| v.upcase } #=> missing
 # filter values returning an option
 foo.filter { |v| v == "baz" } #=> None
 
-# mutation
+# Side-effects
 foo.inside { |v| v.upcase! } #=> Some("BAR")
+
+# use in a for loop
+for value in foo
+  puts value #=> bar
+end
 ```
 
 ## Build Status

data/lib/option.rb

@@ -57,7 +57,7 @@ class SomeClass < OptionClass
   end
 
   def map(&blk)
-    Option(blk.call(get))
+    self.class.new(blk.call(get))
   end
 
   def flat_map(&blk)

data/lib/option/version.rb

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

data/spec/acceptance_spec.rb

@@ -0,0 +1,33 @@
+require "spec_helper"
+
+some = Some("test")
+upcase = lambda { |v| Some(v.upcase) }
+empty  = lambda { |v| None }
+
+describe "Option" do
+
+  describe "when applying the 3 monadic axioms" do
+
+    describe "left identity" do
+
+      it "obeys (return x) >>= f == f x" do
+        some.flat_map(&upcase).must_equal(upcase.call(some.get))
+      end
+    end
+
+    describe "right identity" do
+
+      it "obeys m >>= return == m" do
+        some.flat_map { |v| Some(v) }.must_equal(some)
+      end
+    end
+
+    describe "composition" do
+
+      it "obeys (m >>= f) >>= g == m >>= (\\x -> f x >>= g)" do
+        some.flat_map(&upcase).flat_map(&empty).
+          must_equal(some.flat_map(&empty).flat_map(&upcase))
+      end
+    end
+  end
+end

data/spec/option_spec.rb

@@ -1,26 +1,4 @@
-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
+require "spec_helper"
 
 describe NoneClass do
 
@@ -138,7 +116,7 @@ describe SomeClass do
     Some(value).empty?.must_equal(false)
   end
 
-  it "#map should return the result of the proc over the value in an Option" do
+  it "#map should return the result of the proc over the value in a Some" do
     Some(value).map { |v| v * 2 }.must_be_some(24)
   end
 

data/spec/spec_helper.rb

@@ -0,0 +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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: option
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-07 00:00:00.000000000 Z
+date: 2012-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70193288139160 !ruby/object:Gem::Requirement
+  requirement: &70281246888180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70193288139160
+  version_requirements: *70281246888180
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70193288138600 !ruby/object:Gem::Requirement
+  requirement: &70281246887640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,7 +32,7 @@ dependencies:
         version: 3.4.0
   type: :development
   prerelease: false
-  version_requirements: *70193288138600
+  version_requirements: *70281246887640
 description: Ruby port of Scala's Option Monad
 email:
 - rob.ares@gmail.com
@@ -49,7 +49,9 @@ files:
 - lib/option.rb
 - lib/option/version.rb
 - option.gemspec
+- spec/acceptance_spec.rb
 - spec/option_spec.rb
+- spec/spec_helper.rb
 homepage: http://www.github.com/rares/option
 licenses: []
 post_install_message: 
@@ -76,4 +78,6 @@ specification_version: 3
 summary: Option attempts to be faithful to the useful parts of the scala api. We lose
   the type safety but still is quite useful when dealing with optional values.
 test_files:
+- spec/acceptance_spec.rb
 - spec/option_spec.rb
+- spec/spec_helper.rb