monad-maybe 0.9.5 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afe8c9e77ea5086d445cc8de4ddf4f2e90ae1cd4
-  data.tar.gz: ca392be8c5f236b86d92ec95140128aad505980e
+  metadata.gz: 98844158ce3a0e0e1dfc165e8d984a46cf0d7434
+  data.tar.gz: db1a6787a2e5823e8fae1154467477d38f031fd1
 SHA512:
-  metadata.gz: 2318578beb8bbd41a9582bd3cbde2a63fb0bab2969e84340e50cc8420dfe9a1cd85b53cadd25ce2697d1c20683400d56e556426b4d8c32cd36c7cbba1cf760e1
-  data.tar.gz: f6a5c1169b008858acef80beba3fc5d42bed319151d59256b7051863efd26ea7f0bc35cc808a0d878a0edcab7dd8693e6ab80c3f4be8e3351f38c4acd96569d1
+  metadata.gz: 3039effd1abcd59df0a1e695bfbc3287cc13185a41c361df105e4011a421735536c241795ba09b8f060ce82e78efe08a9a9284b08ed00d974d22ea3e3bd310a9
+  data.tar.gz: b7f35337ccad21f7d47d8022514fbb795e849550065f939ae7a318868070b32c291c2a4d57b8c351693098718d21a65d3f5e471b27e472d0caed58b52dc5ca6a

data/README.md

@@ -1,12 +1,12 @@
-`monad-maybe`
-=============
-
-An Implementation of Haskell's Maybe Mondad
--------------------------------------------
-
-This is an attempt to implement Haskell's Maybe monad in a Ruby-ish way with as little monkey patching as possible. 
-
-SEE ALSO
-========
-[andand](http://)
-[Haskell's Maybe Monad](http://)
+`monad-maybe`
+=============
+
+An Implementation of Haskell's Maybe Mondad
+-------------------------------------------
+
+This is an attempt to implement Haskell's Maybe monad in a Ruby-ish way with as little monkey patching as possible. 
+
+SEE ALSO
+========
+[andand](http://)
+[Haskell's Maybe Monad](http://)

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.9.7

data/lib/monad/maybe.rb

@@ -7,8 +7,8 @@ require_relative 'maybe/list'
 # Some monkey patching and constructor methods.
 #
 module Enumerable
-  def to_maybe
-    first.to_maybe
+  def to_maybe(&blk)
+    first.to_maybe(&blk)
   end
   
   def maybe_map
@@ -17,8 +17,9 @@ module Enumerable
 end
   
 class Object
-  def to_maybe
-    Monad::Maybe::Just.new(self)
+  def to_maybe(&blk)
+    j = Monad::Maybe::Just.new(self)
+    blk ? j.maybe(&blk) : j
   end
   
   def maybe?
@@ -35,7 +36,7 @@ class Object
 end
 
 class NilClass
-  def to_maybe
+  def to_maybe(&blk)
     Monad::Maybe::Nothing.instance
   end
 end
@@ -48,8 +49,9 @@ module Monad
   end
 end
 
-def maybe(obj)
-  Monad::Maybe.return(obj)
+def maybe(obj, &blk)
+  m = Monad::Maybe.return(obj)
+  blk ? m.maybe(&blk) : m
 end
 
 def just(o)

data/lib/monad/maybe/json.rb

@@ -1,26 +1,26 @@
-require 'json'
-
-#
-# Adds JSON conversions to Just, Nothing, and List
-#
-module Monad
-  module Maybe
-    class Just
-      def to_json(*args)
-        value.to_json(*args)
-      end
-    end
-
-    class Nothing
-      def to_json(*args)
-        'null'
-      end
-    end
-
-    class List
-      def to_json(*args)
-        to_a.to_json(*args)
-      end
-    end
-  end
-end
+require 'json'
+
+#
+# Adds JSON conversions to Just, Nothing, and List
+#
+module Monad
+  module Maybe
+    class Just
+      def to_json(*args)
+        value.to_json(*args)
+      end
+    end
+
+    class Nothing
+      def to_json(*args)
+        'null'
+      end
+    end
+
+    class List
+      def to_json(*args)
+        to_a.to_json(*args)
+      end
+    end
+  end
+end

data/lib/monad/maybe/just.rb

@@ -25,10 +25,6 @@ module Monad
         true
       end
 
-      def maybe(&blk)
-        bind(blk)
-      end
-
       def bind(fn)
         fn[@value].to_maybe
       end

data/monad-maybe.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "monad-maybe"
-  s.version = "0.9.5"
+  s.version = "0.9.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Delon Newman"]
-  s.date = "2013-06-20"
+  s.date = "2013-07-16"
   s.description = "This is an attempt to implement Haskell's Maybe monad in a Ruby-ish way."
   s.email = "delon.newman@gmail.com"
   s.extra_rdoc_files = [

data/test/maybe.rb

@@ -79,6 +79,15 @@ class MaybeTest < Test::Unit::TestCase
     end
   end
 
+  def test_to_maybe_blocks
+    1.to_maybe { |v| assert_equal 1, v }
+
+    assert_nothing_raised do
+      nil.to_maybe { raise Exception, "This should not run" }
+    end
+  end
+
+
   def test_maybe_block_return_value_and_type
     m = maybe(1).maybe { |n| n + 1 }
     assert_equal 2, m.value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monad-maybe
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.7
 platform: ruby
 authors:
 - Delon Newman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler