monad-maybe 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 115ca1c42c927a7d5ae489333dce07dbf1090e18
-  data.tar.gz: 881609187366be6aa31e0c2555ccbf92f9fe8cdc
+  metadata.gz: f4ff513fcc26d6a2a1034ca7628d787994f1f4c4
+  data.tar.gz: a44413edb8240cea79f755c6374981424ca97d86
 SHA512:
-  metadata.gz: 75a253437966cda5b6c41ae4f34c85b13fd84d66bc9deba9bd7ca11aaed69a73a72b50761d991efb17ad31719624043ac52152df834b54ea8a25c3decfcc90ba
-  data.tar.gz: 5ea2adcb6c3ee400772cb9feef134bd4693697c99f2a453443eb2caa7257b90649bebe9a19c617ebc2f2de812acf24c8ab9757244a9e01789087f864bbda52b3
+  metadata.gz: c71be1ce7e5f7e6f487cbaefaac244128215218d83a5375954dab890e378e35836a38483dbd37629f624335d2ac803a13a02b1c75fa06d436ae9cffda302118d
+  data.tar.gz: 6efd96a3d2581d1204c6dc0c0dd8268d305ff460515cf75228ad5c2c110c43b27128368fa93bf9e9481717d235e5cb3bb5729db2d172a2b3dd51c6cfab7f0487

data/Rakefile

@@ -3,7 +3,7 @@ Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "monad-maybe"
   gem.summary = %Q{A Ruby implementation of Haskell's Maybe Monad}
-  gem.description = %Q{This is an attempt to implement Haskell's Maybe monad in a Ruby-ish way with as little monkey patching as possible.}
+  gem.description = %Q{This is an attempt to implement Haskell's Maybe monad in a Ruby-ish way.}
   gem.email = "delon.newman@gmail.com"
   gem.homepage = "https://github.com/delonnewman/monad-maybe"
   gem.authors = ["Delon Newman"]

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/lib/monad/maybe.rb

@@ -21,13 +21,17 @@ module Monad
     class ::Range; include Enumerable end
   
     class ::Object
-      def maybe(&blk)
-        if blk
-          Just.new(blk.call(self))
+      def maybe(obj=self, &blk)
+        if obj && blk
+          blk.call(obj).to_maybe
         else
-          Just.new(self)
+          obj.to_maybe
         end
       end
+
+      def to_maybe
+        Just.new(self)
+      end
   
       def maybe?
         false
@@ -47,19 +51,19 @@ module Monad
     end
 
     class ::NilClass
-      def maybe(&blk)
+      def to_maybe
         Nothing.instance.freeze
       end
 
+      def maybe(&blk)
+        to_maybe
+      end
+
       def something?
         false
       end
     end
 
-    def maybe(o, &blk)
-      o.maybe(&blk)
-    end
-
     def just(o)
       Just.new(o)
     end

data/lib/monad/maybe/base.rb

@@ -11,10 +11,13 @@ module Monad
         true
       end
   
-  
       def to_list
         List.new(to_a)
       end
+
+      def to_maybe
+        self
+      end
   
       private
       def initialize; end

data/lib/monad/maybe/just.rb

@@ -11,7 +11,7 @@ module Monad
       end
   
       def method_missing(method, *args)
-        Just.new(value.send(method, *args))
+        value.send(method, *args).maybe
       end
   
       def unwrap(val)
@@ -30,9 +30,10 @@ module Monad
         true
       end
 
+      # NOTE: This being able to return Nothings maybe dangerous
       def maybe(&blk)
         if blk
-          Just.new(blk.call(self.value))
+          blk.call(self.value).to_maybe
         else
           self
         end

data/lib/monad/maybe/list.rb

@@ -25,7 +25,7 @@ module Monad
       end
   
       def to_maybe
-        first.maybe
+        first.to_maybe
       end
   
       def each

data/monad-maybe.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "monad-maybe"
-  s.version = "0.9.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Delon Newman"]
-  s.date = "2013-06-17"
-  s.description = "This is an attempt to implement Haskell's Maybe monad in a Ruby-ish way with as little monkey patching as possible."
+  s.date = "2013-06-18"
+  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 = [
     "README.md"

data/test/maybe.rb

@@ -52,11 +52,15 @@ class MaybeTest < Test::Unit::TestCase
       nil.maybe do
         raise Exception, "This should not be called"
       end
+    end
   
+    assert_nothing_raised do
       nothing.maybe do
         raise Exception, "This should not be called"
       end
+    end
 
+    assert_nothing_raised do
       maybe(nil) do
         raise Exception, "This should not be called"
       end
@@ -75,6 +79,18 @@ class MaybeTest < Test::Unit::TestCase
     end
   end
 
+  def test_maybe_block_return_value_and_type
+    m = 1.maybe { |n| n + 1 }
+    assert_equal 2, m.value
+    assert m.maybe?
+    assert m.just?
+
+    o = 2.maybe { nil }
+    assert_equal nil, o.value
+    assert o.maybe?
+    assert o.nothing?
+  end
+
   def test_something?
     assert_equal false, nil.something?
     assert_equal false, nothing.something?
@@ -82,4 +98,13 @@ class MaybeTest < Test::Unit::TestCase
     assert 1.maybe.something?
     assert (0..10).maybe_map { |n| n }.something?
   end
+
+  def test_to_maybe
+    assert_equal just(1), 1.to_maybe
+    assert_equal just(1), just(1).to_maybe
+    assert_equal nothing, nil.to_maybe
+    assert_equal nothing, nothing.to_maybe
+    assert_equal 1.to_maybe, [1].to_maybe
+    assert_equal 0.to_maybe, (0..10).maybe_map { |n| n }.to_maybe
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monad-maybe
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Delon Newman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
@@ -52,8 +52,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: This is an attempt to implement Haskell's Maybe monad in a Ruby-ish way
-  with as little monkey patching as possible.
+description: This is an attempt to implement Haskell's Maybe monad in a Ruby-ish way.
 email: delon.newman@gmail.com
 executables: []
 extensions: []