maybe 0.0.1 → 1.0.0

data/LICENSE

@@ -1,20 +1,22 @@
-Copyright (c) 2009 Ben Brinckerhoff
+Copyright (c) 2009, 2010 Ben Brinckerhoff
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
 
 The above copyright notice and this permission notice shall be
 included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,86 @@
+maybe
+=====
+
+A library for treating nil and non-nil objects in a similar manner. Technically speaking, Maybe is an implemenation of the maybe monad.
+
+Synopsis
+--------
+
+The Maybe class wraps any value (nil or non-nil) and lets you treat it as non-nil.
+
+     "hello".upcase                         #=> "HELLO"
+     nil.upcase                             #=> NoMethodError: undefined method `upcase' for nil:NilClass
+     Maybe.new("hello").upcase.__value__    #=> "HELLO"
+     Maybe.new(nil).upcase.__value__        #=> nil
+
+You can also use the method `Maybe` for convenience. The following are equivalent:
+
+     Maybe.new("hello").__value__          #=> "hello"
+     Maybe("hello").__value__              #=> "hello"
+   
+When you call `Maybe.new` with a value, that value is wrapped in a Maybe object. Whenever you call methods on that object, it does a simple check: if the wrapped value is nil, then it returns another Maybe object that wraps nil. If the wrapped object is not nil, it calls the method on that object, then wraps it back up in a Maybe object. 
+
+This is especially handy for long chains of method calls, any of which could return nil.
+
+     # foo, bar, and/or baz could return nil, but this will still work
+     Maybe.new(foo).bar(1).baz(:x)
+
+Here's a real world example. Instead of writing this:
+
+    if(customer && customer.order && customer.order.id==newest_customer_id)
+      # ... do something with customer
+    end
+
+just write this:
+
+    if(Maybe.new(customer).order.id.__value__==newest_customer_id)
+      # ... do something with customer
+    end
+
+If your wrapped object does not have a `#value` method, you can call
+
+    Maybe.new(obj).value
+
+instead of
+
+    Maybe.new(obj).__value__
+
+Examples
+--------
+
+    Maybe.new("10")                    #=> A Maybe object, wrapping "10"
+  
+    Maybe.new("10").to_i               #=> A Maybe object, wrapping 10
+  
+    Maybe.new("10").to_i.__value__     #=> 10
+  
+    Maybe.new(nil)                     #=> A Maybe object, wrapping nil 
+  
+    Maybe.new(nil).to_i                #=> A Maybe object, still wrapping nil
+  
+    Maybe.new(nil).to_i.__value__      #=> nil
+
+Related Reading
+---------------
+
+* [MenTaLguY has a great tutorial on Monads in Ruby over at Moonbase](http://moonbase.rydia.net/mental/writings/programming/monads-in-ruby/00introduction.html)
+* [Oliver Steele explores the problem in depth and looks at a number of different solutions](http://osteele.com/archives/2007/12/cheap-monads)
+* [Reg Braithwaite explores this same problem and comes up with a different, but very cool solution in Ruby](http://weblog.raganwald.com/2008/01/objectandand-objectme-in-ruby.html)
+* [Weave Jester has another solution, inspired by the Maybe monad](http://weavejester.com/node/10)
+
+Note on Patches/Pull Requests
+------
+ 
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but
+  bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+Copyright
+----
+
+Copyright (c) 2009, 2010 Ben Brinckerhoff. See LICENSE for details.

data/README.rdoc

@@ -1,20 +1,22 @@
-= maybe
+maybe
+=====
 
 A library for treating nil and non-nil objects in a similar manner. Technically speaking, Maybe is an implemenation of the maybe monad.
 
-== Synopsis
+Synopsis
+--------
 
 The Maybe class wraps any value (nil or non-nil) and lets you treat it as non-nil.
 
-   "hello".upcase                     #=> "HELLO"
-   nil.upcase                         #=> NoMethodError: undefined method `upcase' for nil:NilClass
-   Maybe.new("hello").upcase.value    #=> "HELLO"
-   Maybe.new(nil).upcase.value        #=> nil
+   "hello".upcase                         #=> "HELLO"
+   nil.upcase                             #=> NoMethodError: undefined method `upcase' for nil:NilClass
+   Maybe.new("hello").upcase.__value__    #=> "HELLO"
+   Maybe.new(nil).upcase.__value__        #=> nil
 
 You can also use the method Maybe for convenience. The following are equivalent:
 
-   Maybe.new("hello").value          #=> "hello"
-   Maybe("hello").value              #=> "hello"
+   Maybe.new("hello").__value__          #=> "hello"
+   Maybe("hello").__value__              #=> "hello"
    
 When you call Maybe.new with a value, that value is wrapped in a Maybe object. Whenever you call methods on that object, it does a simple check: if the wrapped value is nil, then it returns another Maybe object that wraps nil. If the wrapped object is not nil, it calls the method on that object, then wraps it back up in a Maybe object. 
 
@@ -31,23 +33,32 @@ Here's a real world example. Instead of writing this:
 
 just write this:
 
-  if(Maybe.new(customer).order.id.value==newest_customer_id)
+  if(Maybe.new(customer).order.id.__value__==newest_customer_id)
     # ... do something with customer
   end
 
-== Examples
+If your wrapped object does not have a `#value` method, you can call
 
-  Maybe.new("10")            #=> A Maybe object, wrapping "10"
+  Maybe.new(obj).value
 
-  Maybe.new("10").to_i       #=> A Maybe object, wrapping 10
+instead of
 
-  Maybe.new("10").to_i.value #=> 10
+  Maybe.new(obj).__value__
 
-  Maybe.new(nil)             #=> A Maybe object, wrapping nil 
+Examples
+--------
 
-  Maybe.new(nil).to_i        #=> A Maybe object, still wrapping nil
+  Maybe.new("10")                    #=> A Maybe object, wrapping "10"
 
-  Maybe.new(nil).to_i.value  #=> nil
+  Maybe.new("10").to_i               #=> A Maybe object, wrapping 10
+
+  Maybe.new("10").to_i.__value__     #=> 10
+
+  Maybe.new(nil)                     #=> A Maybe object, wrapping nil 
+
+  Maybe.new(nil).to_i                #=> A Maybe object, still wrapping nil
+
+  Maybe.new(nil).to_i.__value__      #=> nil
 
 == Related Reading
 
@@ -64,7 +75,7 @@ just write this:
   future version unintentionally.
 * Commit, do not mess with rakefile, version, or history.
   (if you want to have your own version, that is fine but
-   bump version in a commit by itself I can ignore when I pull)
+  bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
 == Copyright

data/VERSION

@@ -1 +1 @@
-0.0.1
+1.0.0

data/lib/maybe.rb

@@ -4,61 +4,94 @@ end
 
 class Maybe
 
-  instance_methods.reject { |method_name| method_name =~ /^__/ }.each { |method_name| undef_method method_name }
+  LEGACY_METHODS = %w{value pass fmap join}
 
+  instance_methods.reject { |method_name| method_name.to_s =~ /^__/ || ['object_id','respond_to?', 'methods'].include?(method_name.to_s) }.each { |method_name| undef_method method_name }
+
+  # Initializes a new Maybe object
+  # @param value Any Ruby object (nil or non-nil)
   def initialize(value)
     @value = value
-    self.join
+    __join__
+  end
+  
+  def respond_to?(method_name)
+    return true if LEGACY_METHODS.include?(method_name.to_s)
+    super || @value.respond_to?(method_name)
+  end
+
+  def methods
+    super + @value.methods + LEGACY_METHODS
+  end
+
+  def respond_to_missing?(method_name, *args, &block)
+    # For Ruby 1.9 support
+    super
   end
 
-  def method_missing(method_name, *args)
-    self.fmap do |value|
-      value.send(method_name,*args) do |*block_args|
-        yield(*block_args) if block_given?
+  def method_missing(method_name, *args, &block)
+    if LEGACY_METHODS.include?(method_name.to_s)
+      if @value.respond_to?(method_name)
+        @value.send(method_name, *args, &block)
+      else
+        __send__("__#{method_name}__", *args, &block)
+      end
+    else
+      __fmap__ do |value|
+        value.send(method_name,*args) do |*block_args|
+          yield(*block_args) if block_given?
+        end
       end
     end
   end
-  
-  def value(value_if_nil=nil)
-    if(value_if_nil!=nil && @value==nil)
+
+  # Unwraps the Maybe object. If the wrapped object does not define #value
+  # you may call #value instead of \_\_value\_\_
+  # @param value_if_nil A value to return if the wrapped value is nil.
+  # @return the wrapped object
+  def __value__(value_if_nil=nil)
+    if(@value==nil)
       value_if_nil
     else
       @value
     end
   end
-  
-  # Given that the value is of type A
+
+  def nil?
+    @value==nil
+  end
+
+  # Only included to provide a complete Monad interface. Not recommended
+  # for general use. 
+  # (Technically: Given that the value is of type A
   # takes a function from A->M[B] and returns
-  # M[B] (a monad with a value of type B)
-  def pass
-    fmap {|*block_args| yield(*block_args)}.join
+  # M[B] (a monad with a value of type B))
+  def __pass__
+    __fmap__ {|*block_args| yield(*block_args)}.__join__
   end
 
-  # Given that the value is of type A
+  # Only included to provide a complete Monad interface. Not recommended
+  # for general use. 
+  # (Technically: Given that the value is of type A
   # takes a function from A->B and returns
-  # M[B] (a monad with a value of type B)
-  def fmap
+  # M[B] (a monad with a value of type B))
+  def __fmap__
     if(@value==nil)
       self
     else
       Maybe.new(yield(@value))
     end
   end
-  
-  def nil?
-    @value==nil
-  end
 
-  def join
+  # Only included to provide a complete Monad interface. Not recommended
+  # for general use. 
+  # (Technically: M[M[A]] is equivalent to M[A], that is, monads should be flat
+  # rather than nested)
+  def __join__
     if(@value.is_a?(Maybe))
-      @value = value.value
+      @value = @value.__value__
     end
     self
   end
 
-  # for testing purposes
-  def value=(value)
-    @value = value
-  end
-
 end

data/test/maybe_test.rb

@@ -1,122 +1,305 @@
 require File.expand_path("test_helper", File.dirname(__FILE__))
 require 'cgi'
+require 'shoulda'
 
 class MaybeTest < Test::Unit::TestCase
 
-  def test_initialize__performs_join
-    assert_equal 1, Maybe.new(Maybe.new(1)).value
-  end
+  context "#initialize" do
 
-   def test_initialize__never_calls_pass_on_nested_maybe
-     Maybe.any_instance.expects(:pass).never
-     Maybe.new(Maybe.new(1)).value
-   end
+    should "perform join" do
+      assert_equal 1, Maybe.new(Maybe.new(1)).__value__
+    end
 
-  def test_call_match_operator
-    assert_equal nil, (Maybe.new(nil)=~/b/).value
-    assert_equal 1, (Maybe.new('abc')=~/b/).value
+    should "never call pass on nested maybe" do
+      Maybe.any_instance.expects(:__pass__).never
+      Maybe.new(Maybe.new(1)).__value__
+    end
+    
   end
 
-  def test_call_method_defined_on_object
-    assert_equal nil, (Maybe.new(nil).to_s).value
-    assert_equal "1", (Maybe.new(1).to_s).value
-  end
+  context "when calling methods" do
+
+    should "return correct value for match operator" do
+      assert_equal nil, (Maybe.new(nil)=~/b/).__value__
+      assert_equal 1, (Maybe.new('abc')=~/b/).__value__    
+    end
+
+    should "return correct value for to_s" do
+      assert_equal nil, (Maybe.new(nil).to_s).__value__
+      assert_equal "1", (Maybe.new(1).to_s).__value__
+    end
+
+    should "return correct value for to_int" do
+      assert_equal nil, Maybe.new(nil).to_int.__value__
+      assert_equal 2, Maybe.new(2.3).to_int.__value__
+    end
+    
+    should "work if method call takes a block" do
+      assert_equal nil, Maybe.new(nil).map{|x|x*2}.__value__
+      assert_equal [2,4,6], Maybe.new([1,2,3]).map{|x|x*2}.__value__
+    end
+
+    should "work if methods takes args and a block" do
+      assert_equal nil, Maybe.new(nil).gsub(/x/) {|m| m.upcase}.__value__
+      str = Maybe.new('x').gsub(/x/) do |m| 
+        m.upcase
+      end
+      assert_equal 'X', str.__value__
+    end
+
+    should "not change the value" do
+      x = Maybe.new(1)
+      x.to_s
+      assert_equal 1, x.__value__
+    end
 
-  def test_method
-    assert_equal nil, Maybe.new(nil).to_int.value
-    assert_equal 2, Maybe.new(2.3).to_int.value
   end
-  
-  def test_method_with_block
-    assert_equal nil, Maybe.new(nil).map{|x|x*2}.value
-    assert_equal [2,4,6], Maybe.new([1,2,3]).map{|x|x*2}.value
+
+  context "when calling object_id" do
+    
+    should "have different object id than wrapped object" do
+      wrapped = "hello"
+      maybe = Maybe.new(wrapped)
+      assert_kind_of Fixnum, maybe.object_id
+      assert_not_equal wrapped.object_id, maybe.object_id
+      assert_equal wrapped.object_id, maybe.__value__.object_id
+    end
+
   end
 
-  def test_method__calling_method_doesnt_change_value
-    x = Maybe.new(1)
-    x.to_s
-    assert_equal 1, x.value
+  context "#join" do
+    
+    should "not call #pass" do
+      Maybe.any_instance.expects(:__pass__).never
+      m = Maybe.new(nil)
+      m.instance_variable_set(:@value, Maybe.new(1))
+      m.join
+      m.__join__
+    end
+
+    should "call the wrapped object's #join if defined" do
+      wrapped = %w{a b c}
+      assert_equal "a b c", Maybe.new(wrapped).join(' ')
+      assert_equal "a b c", Maybe.new(Maybe.new(wrapped)).join(' ')
+    end
+
   end
 
-  def test_method_with_arg_and_block
-    assert_equal nil, Maybe.new(nil).gsub(/x/) {|m| m.upcase}.value
-    str = Maybe.new('x').gsub(/x/) do |m| 
-      m.upcase
+  context "respond_to?" do
+    
+    should "respond correctly" do
+      klass = Class.new do
+        def fmap
+        end
+
+        def foo
+        end
+      end
+      
+      wrapped = klass.new
+      maybe = Maybe.new(wrapped)
+
+      assert_equal false, wrapped.respond_to?(:bar)
+      assert_equal true, wrapped.respond_to?(:foo)
+      assert_equal true, wrapped.respond_to?(:fmap)
+      assert_equal false, wrapped.respond_to?(:join)
+      assert_equal false, wrapped.respond_to?(:value)
+      assert_equal false, wrapped.respond_to?(:pass)
+      assert_equal false, wrapped.respond_to?(:__fmap__)
+      assert_equal false, wrapped.respond_to?(:__join__)
+      assert_equal false, wrapped.respond_to?(:__value__)
+      assert_equal false, wrapped.respond_to?(:__pass__)
+
+      assert_equal false, maybe.respond_to?(:bar)
+      assert_equal true, maybe.respond_to?(:foo)
+      assert_equal true, maybe.respond_to?(:fmap)
+      assert_equal true, maybe.respond_to?(:join)
+      assert_equal true, maybe.respond_to?(:value)
+      assert_equal true, maybe.respond_to?(:pass)
+      assert_equal true, maybe.respond_to?(:__fmap__)
+      assert_equal true, maybe.respond_to?(:__join__)
+      assert_equal true, maybe.respond_to?(:__value__)
+      assert_equal true, maybe.respond_to?(:__pass__)
     end
-    assert_equal 'X', str.value
+    
   end
 
-  def test_join__doesnt_call_pass
-    Maybe.any_instance.expects(:pass).never
-    m = Maybe.new(nil)
-    m.value = Maybe.new(1)
-    m.join
+  context "#methods" do
+
+    should "contain methods from wrapped method and wrapper" do
+      klass = Class.new do
+        def fmap
+        end
+
+        def foo
+        end
+      end
+      
+      wrapped = klass.new
+      maybe = Maybe.new(wrapped)
+      
+      methods = maybe.methods.map{|x| x.to_sym}
+
+      assert_equal false, methods.include?(:far)
+      assert_equal true, methods.include?(:foo)
+
+      assert_equal true, methods.include?(:fmap)
+      assert_equal true, methods.include?(:value)
+      assert_equal true, methods.include?(:pass)
+      assert_equal true, methods.include?(:join)
+
+      assert_equal true, methods.include?(:__fmap__)
+      assert_equal true, methods.include?(:__value__)
+      assert_equal true, methods.include?(:__pass__)
+      assert_equal true, methods.include?(:__join__)
+    end
+
   end
 
-  def test_pass__with_cgi_unescape
-    # using CGI::unescape because that's the first function I had problems with 
-    # when implementing Maybe
-    assert_equal nil, Maybe.new(nil).pass {|v|CGI.unescapeHTML(v)}.value
-    assert_equal '&', Maybe.new('&amp;').pass {|v|CGI.unescapeHTML(v)}.value
+  context "#pass" do
+
+    should "not conflict with wrapped object's #pass method" do
+      ball = Object.new
+      def ball.pass
+        "success"
+      end
+      assert_equal "success", Maybe.new(ball).pass
+    end
+
+    should "work with CGI.unescape" do
+      # using CGI::unescape because that's the first function I had problems with 
+      # when implementing Maybe
+      assert_equal nil, Maybe.new(nil).pass {|v|CGI.unescapeHTML(v)}.value
+      assert_equal '&', Maybe.new('&amp;').pass {|v|CGI.unescapeHTML(v)}.value
+
+      assert_equal nil, Maybe.new(nil).__pass__ {|v|CGI.unescapeHTML(v)}.__value__
+      assert_equal '&', Maybe.new('&amp;').__pass__ {|v|CGI.unescapeHTML(v)}.__value__
+    end
+    
   end
 
-  def test_nil
-    assert_equal true, Maybe.new(nil).nil?
-    assert_equal false, Maybe.new(1).nil?
+  context "#nil?" do
+    
+    should "be true for nil value" do
+      assert_equal true, Maybe.new(nil).nil?
+    end
+
+    should "be false for non-nil value" do
+      assert_equal false, Maybe.new(1).nil?
+    end
+
   end
 
-  def test_value__returns_value_with_no_params
-    assert_equal nil, Maybe.new(nil).value
-    assert_equal 1, Maybe.new(1).value
+  context "#value" do
+
+    should "return value if wrapped object does not define #value" do
+      assert_equal nil, Maybe.new(nil).value
+      assert_equal 1, Maybe.new(1).value
+    end
+
+    should "call wrapped object's #value if defined" do
+      wrapped = Object.new
+      def wrapped.value
+        "foo"
+      end
+      assert_equal "foo", Maybe.new(wrapped).value
+      assert_equal "foo", Maybe.new(Maybe.new(wrapped)).value
+    end
+
+    should "call wrapped object's #value if defined (with params and block)" do
+      wrapped = Object.new
+      def wrapped.value(value)
+        value * yield 
+      end
+      assert_equal 4, Maybe.new(wrapped).value(2) { 2 }
+      assert_equal 4, Maybe.new(Maybe.new(wrapped)).value(2) { 2 }
+    end
+
   end
 
-  def test_value__with_default
-    assert_equal "", Maybe.new(nil).value("")
-    assert_equal 1, Maybe.new(1).value("1")
-    assert_equal nil, Maybe.new(nil).value(nil)
-    assert_equal true, Maybe.new(true).value(nil)
-    assert_equal false, Maybe.new(nil).value(false)
-    assert_equal 1, Maybe.new(1).value(false)
+  context "#__value__" do
+
+    should "return value with no params" do
+      assert_equal nil, Maybe.new(nil).__value__
+      assert_equal 1, Maybe.new(1).__value__
+    end
+
+    context "when default is provided" do
+
+      should "return default is value is nil" do
+        assert_equal "", Maybe.new(nil).__value__("")
+        assert_equal nil, Maybe.new(nil).__value__(nil)
+        assert_equal false, Maybe.new(nil).__value__(false)
+      end
+
+      should "return value if value is non-nil" do
+        assert_equal 1, Maybe.new(1).__value__("1")
+        assert_equal true, Maybe.new(true).__value__(nil)
+        assert_equal 1, Maybe.new(1).__value__(false)
+      end
+
+    end
+
   end
 
-  # the connection between fmap and pass (translated from)
-  # http://james-iry.blogspot.com/2007/10/monads-are-elephants-part-3.html
-  # scala version: m map f ≡ m flatMap {x => unit(f(x))}
-  # note that in my code map == fmap && unit==Maybe.new && flatMap==pass
-  def test_monad_rule_0
-    f = lambda {|x| x*2}
-    m = Maybe.new(5)
-    assert_equal m.fmap(&f), m.pass {|x| Maybe.new(f[x])}
+  context "#fmap" do
+
+    should "call wrapped object's #fmap if defined" do
+      wrapped = Object.new
+      def wrapped.fmap
+        "x"
+      end
+      assert_equal "x", Maybe.new(wrapped).fmap
+      assert_equal "x", Maybe.new(Maybe.new(wrapped)).fmap
+    end
+
   end
 
-  # monad rules taken from http://moonbase.rydia.net/mental/writings/programming/monads-in-ruby/01identity
-  # and http://james-iry.blogspot.com/2007_10_01_archive.html
+  context "when testing monad rules" do
+
+    # the connection between fmap and pass (translated from)
+    # http://james-iry.blogspot.com/2007/10/monads-are-elephants-part-3.html
+    # scala version: m map f ≡ m flatMap {x => unit(f(x))}
+    # note that in my code map == fmap && unit==Maybe.new && flatMap==pass
+    should "satisfy monad rule #0" do
+      f = lambda {|x| x*2}
+      m = Maybe.new(5)
+      assert_equal m.fmap(&f), m.pass {|x| Maybe.new(f[x])}
+      assert_equal m.__fmap__(&f), m.__pass__ {|x| Maybe.new(f[x])}
+    end
+
+    # monad rules taken from http://moonbase.rydia.net/mental/writings/programming/monads-in-ruby/01identity
+    # and http://james-iry.blogspot.com/2007_10_01_archive.html
   
-  #1. Calling pass on a newly-wrapped value should have the same effect as giving that value directly to the block.
-  # (this is actually the second law at http://james-iry.blogspot.com/2007/10/monads-are-elephants-part-3.html)
-  # scala version: unit(x) flatMap f ≡ f(x)
-  def test_monad_rule_1
-    f = lambda {|y| Maybe.new(y.to_s)}
-    x = 1
-    assert_equal f[x], Maybe.new(x).pass {|y| f[y]}.value
-  end
+    #1. Calling pass on a newly-wrapped value should have the same effect as giving that value directly to the block.
+    # (this is actually the second law at http://james-iry.blogspot.com/2007/10/monads-are-elephants-part-3.html)
+    # scala version: unit(x) flatMap f ≡ f(x)
+    should "satisfy monad rule #1" do
+      f = lambda {|y| Maybe.new(y.to_s)}
+      x = 1
+      assert_equal f[x], Maybe.new(x).pass {|y| f[y]}.value
+      assert_equal f[x], Maybe.new(x).__pass__ {|y| f[y]}.__value__
+    end
   
-  #2. pass with a block that simply calls wrap on its value should produce the exact same values, wrapped up again.
-  # (this is actually the first law at http://james-iry.blogspot.com/2007/10/monads-are-elephants-part-3.html)
-  # scala version: m flatMap unit ≡ m
-  def test_monad_rule_2
-    x = Maybe.new(1)
-    assert_equal x.value, x.pass {|y| Maybe.new(y)}.value
-  end
+    #2. pass with a block that simply calls wrap on its value should produce the exact same values, wrapped up again.
+    # (this is actually the first law at http://james-iry.blogspot.com/2007/10/monads-are-elephants-part-3.html)
+    # scala version: m flatMap unit ≡ m
+    should "satisfy monad rule #2" do
+      x = Maybe.new(1)
+      assert_equal x.value, x.pass {|y| Maybe.new(y)}.value
+      assert_equal x.__value__, x.pass {|y| Maybe.new(y)}.__value__
+    end
 
-  #3. nesting pass blocks should be equivalent to calling them sequentially
-  def test_monad_rule_3
-    f = lambda {|x| Maybe.new(x*2)}
-    g = lambda {|x| Maybe.new(x+1)}
-    m = Maybe.new(3)
-    n = Maybe.new(3)
-    assert_equal m.pass{|x| f[x]}.pass{|x|g[x]}.value, n.pass{|x| f[x].pass{|y|g[y]}}.value
-  end
+    #3. nesting pass blocks should be equivalent to calling them sequentially
+    should "satisfy monad rule #3" do
+      f = lambda {|x| Maybe.new(x*2)}
+      g = lambda {|x| Maybe.new(x+1)}
+      m = Maybe.new(3)
+      n = Maybe.new(3)
+      assert_equal m.pass{|x| f[x]}.pass{|x|g[x]}.value, n.pass{|x| f[x].pass{|y|g[y]}}.value
+      assert_equal m.__pass__{|x| f[x]}.__pass__{|x|g[x]}.__value__, n.__pass__{|x| f[x].__pass__{|y|g[y]}}.__value__
+    end
 
+  end
 
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: maybe
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Ben Brinckerhoff
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-30 00:00:00 -07:00
+date: 2010-12-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 8
         version: 0.9.8
-    version: 
+  type: :development
+  version_requirements: *id001
 description: A library for treating nil and non-nil objects in a similar manner. Technically speaking, Maybe is an implemenation of the maybe monad. The Maybe class wraps any value (nil or non-nil) and lets you treat it as non-nil.
 email: ben@devver.net
 executables: []
@@ -30,17 +39,19 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
+- README.md
 - README.rdoc
 files: 
 - .document
 - .gitignore
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - lib/maybe.rb
 - test/maybe_test.rb
 - test/test_helper.rb
+- README.rdoc
 has_rdoc: true
 homepage: http://github.com/bhb/maybe
 licenses: []
@@ -54,18 +65,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A library for treating nil and non-nil objects in a similar manner.