monad-maybe 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4ff513fcc26d6a2a1034ca7628d787994f1f4c4
-  data.tar.gz: a44413edb8240cea79f755c6374981424ca97d86
+  metadata.gz: 4b83febe6374c7006a9d08b6245aabdeb489b0ba
+  data.tar.gz: a1dcc208247490a63bccfd2664991ccee1616e1b
 SHA512:
-  metadata.gz: c71be1ce7e5f7e6f487cbaefaac244128215218d83a5375954dab890e378e35836a38483dbd37629f624335d2ac803a13a02b1c75fa06d436ae9cffda302118d
-  data.tar.gz: 6efd96a3d2581d1204c6dc0c0dd8268d305ff460515cf75228ad5c2c110c43b27128368fa93bf9e9481717d235e5cb3bb5729db2d172a2b3dd51c6cfab7f0487
+  metadata.gz: a589a26010e6e95de784bff1312d83e38c9b6a433135c36ef20a7cb04a44b2d03c862d1216b95b1e2b442738960e0f187611bd1cc70238802d72b46506e9cb74
+  data.tar.gz: 234a28c4ce91a6f91a2d7e47da0d3b4964c5c7a76d01ea60e3107359a20c8d282d326f31f69d97442b5a4b67e311b02dd3d1030a5eae64a67330e303c20ec0f7

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

data/lib/monad/maybe.rb

@@ -3,75 +3,70 @@ require_relative 'maybe/just'
 require_relative 'maybe/nothing'
 require_relative 'maybe/list'
 
-# Top-level module includes some monkey patching and
-# constructor methods.  Monad::Maybe is included by default.
-module Monad
-  module Maybe
-    module Enumerable
-      def to_maybe
-        first.maybe
-      end
+#
+# Some monkey patching and constructor methods.
+#
+module Enumerable
+  def to_maybe
+    first.maybe
+  end
   
-      def maybe_map
-        List.new(map{ |x| yield(x) })
-      end
-    end
+  def maybe_map
+    Monad::Maybe::List.new(map{ |x| yield(x) })
+  end
+end
   
-    class ::Array; include Enumerable end
-    class ::Range; include Enumerable 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
+class Object
+  def maybe(obj=self, &blk)
+    if obj && blk
+      blk.call(obj).to_maybe
+    else
+      obj.to_maybe
+    end
+  end
 
-      def to_maybe
-        Just.new(self)
-      end
+  def to_maybe
+    Monad::Maybe::Just.new(self)
+  end
   
-      def maybe?
-        false
-      end
+  def maybe?
+    false
+  end
   
-      def just?
-        false
-      end
+  def just?
+    false
+  end
   
-      def nothing?
-        false
-      end
-
-      def something?(&blk)
-        true
-      end
-    end
-
-    class ::NilClass
-      def to_maybe
-        Nothing.instance.freeze
-      end
+  def nothing?
+    false
+  end
 
-      def maybe(&blk)
-        to_maybe
-      end
+  def something?(&blk)
+    true
+  end
+end
 
-      def something?
-        false
-      end
-    end
+class NilClass
+  def to_maybe
+    Monad::Maybe::Nothing.instance.freeze
+  end
 
-    def just(o)
-      Just.new(o)
-    end
+  def maybe(&blk)
+    to_maybe
+  end
 
-    def nothing
-      Nothing.instance
-    end
+  def something?
+    false
   end
 end
 
-include Monad::Maybe
+def just(o)
+  Monad::Maybe::Just.new(o)
+end
+
+def nothing
+  Monad::Maybe::Nothing.instance
+end

data/lib/monad/maybe/json.rb

@@ -0,0 +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

data/lib/monad/maybe/just.rb

@@ -1,10 +1,5 @@
 module Monad
   module Maybe
-    #
-    # Wraps a non-nil object allows us to treat these
-    # objects as a Maybe while distinguishing them from
-    # a Nothing
-    #
     class Just < Base
       def initialize(value)
         @value = value
@@ -30,7 +25,7 @@ module Monad
         true
       end
 
-      # NOTE: This being able to return Nothings maybe dangerous
+      # NOTE: being able to return Nothings maybe dangerous
       def maybe(&blk)
         if blk
           blk.call(self.value).to_maybe
@@ -60,8 +55,9 @@ module Monad
       end
 
       def to_s
-        Just.new(value.to_s)
+        value.to_s
       end
+      alias to_str to_s
   
       def to_a
         [self]

data/lib/monad/maybe/nothing.rb

@@ -2,9 +2,6 @@ require 'singleton'
 
 module Monad
   module Maybe
-    #
-    # A better nil
-    #
     class Nothing < Base
       include ::Singleton
   
@@ -48,10 +45,6 @@ module Monad
         nil
       end
   
-      def to_json(*args)
-        'null'
-      end
-
       def to_s
         ''
       end

data/monad-maybe.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "monad-maybe"
-  s.version = "0.9.2"
+  s.version = "0.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Delon Newman"]
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/monad/maybe.rb",
     "lib/monad/maybe/base.rb",
+    "lib/monad/maybe/json.rb",
     "lib/monad/maybe/just.rb",
     "lib/monad/maybe/list.rb",
     "lib/monad/maybe/nothing.rb",

data/test/maybe.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
 require_relative '../lib/monad/maybe'
+require_relative '../lib/monad/maybe/json'
 
 class MaybeTest < Test::Unit::TestCase
   def test_nothing
@@ -13,6 +14,15 @@ class MaybeTest < Test::Unit::TestCase
     assert 1.maybe.just?
     assert_equal 1, 1.maybe.value
     assert_equal 1, 1.maybe.unwrap('test')
+    assert_equal '1', just(1).to_s
+  end
+
+  def test_json
+    assert_equal 'null', nothing.to_json
+    assert_equal '1', just(1).to_json
+    assert_equal '{}', just({}).to_json
+    assert_equal '[]', just([]).to_json
+    assert_equal (0..10).to_a.to_json, (0..10).maybe_map { |n| n }.to_json
   end
 
   def test_to_a
@@ -29,8 +39,8 @@ class MaybeTest < Test::Unit::TestCase
   end
 
   def test_class
-    assert_equal Nothing, nil.maybe.class
-    assert_equal Just, 1.maybe.class
+    assert_equal Monad::Maybe::Nothing, nil.maybe.class
+    assert_equal Monad::Maybe::Just, 1.maybe.class
   end
 
   def test_list

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monad-maybe
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Delon Newman
@@ -66,6 +66,7 @@ files:
 - VERSION
 - lib/monad/maybe.rb
 - lib/monad/maybe/base.rb
+- lib/monad/maybe/json.rb
 - lib/monad/maybe/just.rb
 - lib/monad/maybe/list.rb
 - lib/monad/maybe/nothing.rb