monad-maybe 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cb424b75bfc95f4cbf310c81e4856c84496466a
-  data.tar.gz: 910d72f9d700f125a7b7f284f4448d6c8dccb4db
+  metadata.gz: 115ca1c42c927a7d5ae489333dce07dbf1090e18
+  data.tar.gz: 881609187366be6aa31e0c2555ccbf92f9fe8cdc
 SHA512:
-  metadata.gz: 7a3f329f7a1e1a1f24a3120673721ddc8fd410549c68abfe306f5b1771753f599c03005f2938407524db7118b02056c01d784bbda0d62e81405650c16b624d1e
-  data.tar.gz: ac4ea776251ffc0528a24c1653f17e3430bf462f02ccf038a57f4f96534aee2fd2d0d4357e182a0d2e37ae1f3f5a90ac0a933bc82e63abffcbb1e28f8278b675
+  metadata.gz: 75a253437966cda5b6c41ae4f34c85b13fd84d66bc9deba9bd7ca11aaed69a73a72b50761d991efb17ad31719624043ac52152df834b54ea8a25c3decfcc90ba
+  data.tar.gz: 5ea2adcb6c3ee400772cb9feef134bd4693697c99f2a453443eb2caa7257b90649bebe9a19c617ebc2f2de812acf24c8ab9757244a9e01789087f864bbda52b3

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/lib/monad/maybe.rb

@@ -21,8 +21,12 @@ module Monad
     class ::Range; include Enumerable end
   
     class ::Object
-      def maybe
-        Just.new(self)
+      def maybe(&blk)
+        if blk
+          Just.new(blk.call(self))
+        else
+          Just.new(self)
+        end
       end
   
       def maybe?
@@ -38,13 +42,12 @@ module Monad
       end
 
       def something?(&blk)
-        blk.call(self) if blk
         true
       end
     end
 
     class ::NilClass
-      def maybe
+      def maybe(&blk)
         Nothing.instance.freeze
       end
 
@@ -53,8 +56,8 @@ module Monad
       end
     end
 
-    def maybe(o)
-      o.maybe
+    def maybe(o, &blk)
+      o.maybe(&blk)
     end
 
     def just(o)

data/lib/monad/maybe/base.rb

@@ -11,9 +11,6 @@ module Monad
         true
       end
   
-      def maybe
-        self
-      end
   
       def to_list
         List.new(to_a)

data/lib/monad/maybe/just.rb

@@ -22,14 +22,21 @@ module Monad
         false
       end
 
-      def something?(&blk)
-        blk.call(value) if blk
+      def something?
         true
       end
   
       def just?
         true
       end
+
+      def maybe(&blk)
+        if blk
+          Just.new(blk.call(self.value))
+        else
+          self
+        end
+      end
   
       def nil?
         false

data/lib/monad/maybe/list.rb

@@ -15,11 +15,6 @@ module Monad
         true
       end
 
-      def something?(&blk)
-        blk.call(select_just.value_map) if blk
-        true
-      end
-  
       def <<(obj)
         @enum << obj if obj.just?
         self

data/lib/monad/maybe/nothing.rb

@@ -28,10 +28,17 @@ module Monad
         true
       end
   
+      def maybe(&blk)
+        self
+      end
+
       def just?
         false
       end
-      alias something? just?
+
+      def something?
+        false
+      end
   
       def unwrap(val)
         val

data/monad-maybe.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "monad-maybe"
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Delon Newman"]

data/test/maybe.rb

@@ -47,36 +47,39 @@ class MaybeTest < Test::Unit::TestCase
     end
   end
 
-  def test_something?
+  def test_maybe_block
     assert_nothing_raised do
-      nil.something? do
+      nil.maybe do
         raise Exception, "This should not be called"
       end
   
-      nothing.something? do
+      nothing.maybe do
         raise Exception, "This should not be called"
       end
-    end
 
-    assert_equal false, nil.something?
-    assert_equal false, nothing.something?
+      maybe(nil) do
+        raise Exception, "This should not be called"
+      end
+    end
 
-    1.something? do |n|
+    1.maybe do |n|
       assert_equal 1, n
     end
 
-    assert 1.something?
-
-    1.maybe.something? do |n|
+    maybe(1) do |n|
       assert_equal 1, n
     end
 
-    assert 1.maybe.something?
-
-    (0..10).maybe_map { |n| n % 2 == 0 ? nil : n }.something? do |xs|
-      assert_equal (0..10).select { |n| n % 2 != 0 }, xs
+    just(1).maybe do |n|
+      assert_equal 1, n
     end
+  end
 
+  def test_something?
+    assert_equal false, nil.something?
+    assert_equal false, nothing.something?
+    assert 1.something?
+    assert 1.maybe.something?
     assert (0..10).maybe_map { |n| n }.something?
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monad-maybe
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Delon Newman