monad-maybe 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b83febe6374c7006a9d08b6245aabdeb489b0ba
-  data.tar.gz: a1dcc208247490a63bccfd2664991ccee1616e1b
+  metadata.gz: e61e65884a865a598567f36add94bbba7907ab3f
+  data.tar.gz: b2d2f6ec6625ccf1c61fbf8a888bd6cbd76342be
 SHA512:
-  metadata.gz: a589a26010e6e95de784bff1312d83e38c9b6a433135c36ef20a7cb04a44b2d03c862d1216b95b1e2b442738960e0f187611bd1cc70238802d72b46506e9cb74
-  data.tar.gz: 234a28c4ce91a6f91a2d7e47da0d3b4964c5c7a76d01ea60e3107359a20c8d282d326f31f69d97442b5a4b67e311b02dd3d1030a5eae64a67330e303c20ec0f7
+  metadata.gz: cc6b56d0da004ab51a7d042cf7e8a8797de1716bd993a3eab98e42c1bb7d1dc8360119155802772f5f51ce53c87353cd060c19a4b1b3a79ade4df5d24fab2595
+  data.tar.gz: ad3ab76350f0d63b6a879d45e80b2e063aac9ad802092ae3530e1e4c3dbdde666949733de7c2a8f3fc07f99586aa4c6ae834f055de1a5716c1a3b549fe6ee548

data/Rakefile

@@ -1,3 +1,4 @@
+require 'rake/testtask'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
@@ -21,3 +22,7 @@ desc "Setup for development"
 task :setup do
   sh "bundle"
 end
+
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+end

data/VERSION

@@ -1 +1 @@
-0.9.3
+0.9.4

data/lib/monad/maybe.rb

@@ -8,7 +8,7 @@ require_relative 'maybe/list'
 #
 module Enumerable
   def to_maybe
-    first.maybe
+    first.to_maybe
   end
   
   def maybe_map
@@ -16,18 +16,7 @@ module Enumerable
   end
 end
   
-class Array; include Enumerable end
-class Range; include Enumerable end
-  
 class Object
-  def maybe(obj=self, &blk)
-    if obj && blk
-      blk.call(obj).to_maybe
-    else
-      obj.to_maybe
-    end
-  end
-
   def to_maybe
     Monad::Maybe::Just.new(self)
   end
@@ -43,24 +32,24 @@ class Object
   def nothing?
     false
   end
-
-  def something?(&blk)
-    true
-  end
 end
 
 class NilClass
   def to_maybe
-    Monad::Maybe::Nothing.instance.freeze
+    Monad::Maybe::Nothing.instance
   end
+end
 
-  def maybe(&blk)
-    to_maybe
+module Monad
+  module Maybe
+    def self.return(obj)
+      obj.to_maybe
+    end
   end
+end
 
-  def something?
-    false
-  end
+def maybe(obj)
+  Monad::Maybe.return(obj)
 end
 
 def just(o)

data/lib/monad/maybe/base.rb

@@ -18,6 +18,19 @@ module Monad
       def to_maybe
         self
       end
+
+      def maybe(&blk)
+        bind(blk)
+      end
+
+      def then(fn)
+        bind(->(x){ fn && fn.call })
+        self
+      end
+
+      def and(&blk)
+        self.then(blk)
+      end
   
       private
       def initialize; end

data/lib/monad/maybe/just.rb

@@ -27,11 +27,11 @@ module Monad
 
       # NOTE: being able to return Nothings maybe dangerous
       def maybe(&blk)
-        if blk
-          blk.call(self.value).to_maybe
-        else
-          self
-        end
+        bind(blk)
+      end
+
+      def bind(fn)
+        fn[@value].to_maybe
       end
   
       def nil?

data/lib/monad/maybe/list.rb

@@ -4,7 +4,7 @@ module Monad
       include Enumerable
   
       def initialize(enum)
-        @enum = enum.map { |v| v.maybe? ? v : v.maybe }
+        @enum = enum.map { |v| v.maybe? ? v : v.to_maybe }
       end
   
       def inspect

data/lib/monad/maybe/nothing.rb

@@ -25,7 +25,7 @@ module Monad
         true
       end
   
-      def maybe(&blk)
+      def bind(fn)
         self
       end
 

data/monad-maybe.gemspec

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

data/test/maybe.rb

@@ -4,16 +4,16 @@ require_relative '../lib/monad/maybe/json'
 
 class MaybeTest < Test::Unit::TestCase
   def test_nothing
-    assert nil.maybe.nothing?
-    assert nil.maybe.value.nil?
-    assert_equal 'test', nil.maybe.unwrap('test')
+    assert nil.to_maybe.nothing?
+    assert nil.to_maybe.value.nil?
+    assert_equal 'test', nil.to_maybe.unwrap('test')
     assert_equal '', nothing.to_s
   end
 
   def test_just
-    assert 1.maybe.just?
-    assert_equal 1, 1.maybe.value
-    assert_equal 1, 1.maybe.unwrap('test')
+    assert maybe(1).just?
+    assert_equal 1, 1.to_maybe.value
+    assert_equal 1, 1.to_maybe.unwrap('test')
     assert_equal '1', just(1).to_s
   end
 
@@ -26,25 +26,25 @@ class MaybeTest < Test::Unit::TestCase
   end
 
   def test_to_a
-    assert_equal [1.maybe], 1.maybe.to_a
-    assert_equal [], nil.maybe.to_a
+    assert_equal [1.to_maybe], 1.to_maybe.to_a
+    assert_equal [], nil.to_maybe.to_a
   end
 
   def test_false
-    assert_equal false, false.maybe.value
+    assert_equal false, false.to_maybe.value
   end
 
   def test_nil_conversions
-    assert_equal nil.nil?, nil.maybe.nil?
+    assert_equal nil.nil?, nil.to_maybe.nil?
   end
 
   def test_class
-    assert_equal Monad::Maybe::Nothing, nil.maybe.class
-    assert_equal Monad::Maybe::Just, 1.maybe.class
+    assert_equal Monad::Maybe::Nothing, maybe(nil).class
+    assert_equal Monad::Maybe::Just, maybe(1).class
   end
 
   def test_list
-    xs = true.maybe << nil.maybe << 1.maybe << 3.maybe
+    xs = true.to_maybe << nil.to_maybe << 1.to_maybe << 3.to_maybe
     assert_equal 3, xs.count
     xs.each { |x| assert x.just? }
   end
@@ -58,12 +58,6 @@ class MaybeTest < Test::Unit::TestCase
   end
 
   def test_maybe_block
-    assert_nothing_raised do
-      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"
@@ -76,10 +70,6 @@ class MaybeTest < Test::Unit::TestCase
       end
     end
 
-    1.maybe do |n|
-      assert_equal 1, n
-    end
-
     maybe(1) do |n|
       assert_equal 1, n
     end
@@ -90,25 +80,17 @@ class MaybeTest < Test::Unit::TestCase
   end
 
   def test_maybe_block_return_value_and_type
-    m = 1.maybe { |n| n + 1 }
+    m = maybe(1).maybe { |n| n + 1 }
     assert_equal 2, m.value
     assert m.maybe?
     assert m.just?
 
-    o = 2.maybe { nil }
+    o = maybe(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?
-    assert 1.something?
-    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
@@ -117,4 +99,51 @@ class MaybeTest < Test::Unit::TestCase
     assert_equal 1.to_maybe, [1].to_maybe
     assert_equal 0.to_maybe, (0..10).maybe_map { |n| n }.to_maybe
   end
+
+  def test_then_and_and
+    just(1).and do
+      assert true
+    end
+
+    nothing.and do
+      assert true
+    end
+
+    just(1).and{ assert true }.and{ assert true }
+    maybe(1).then(->(){ assert true }).then(->(){ assert true })
+  end
+
+  #
+  # Monad laws
+  #
+
+  #
+  # Right Unit:
+  #   m >>= return = m
+  #
+  def test_right_unit
+    m = just(1)
+    assert_equal m, m.bind(->(x){ Monad::Maybe.return(x) })
+  end
+
+  #
+  # Left Unit:
+  #   return x >>= f = f x
+  #
+  def test_left_unit
+    x = 2
+    f = ->(x) { x + 1 }
+    assert_equal Monad::Maybe.return(x).bind(f), f[x]
+  end
+
+  #
+  # Associativity:
+  #   (m >>= f) >>= g = m >>= (\x -> f x >>= g)
+  #
+  def test_associativity
+    m = just(3.1459)
+    f = ->(x) { x ** 2 }
+    g = ->(x) { 2 *  x }
+    assert_equal m.bind(f).bind(g), m.bind(->(x) { f[x] }).bind(g)
+  end
 end

metadata

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