monad-maybe 0.9.9 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4b9973bafaf3d9e728106f0ca22fcd9e1c6cc25
-  data.tar.gz: 30d80d184fe6500b0a428a00ebd1766cf59e7824
+  metadata.gz: 1e2cf6c871f826aa0729c79f78d1edc9465f0fe0
+  data.tar.gz: bb2c9d46f3f2a4f06cb7a8b1ef23cc6949e8fb05
 SHA512:
-  metadata.gz: 3a217e29d79862e5a2966c60ff653e12aafee6d6b96ac508b92f7eeec2cb6d617a5843f998f21b45966e9dee70d412ca0616591f7cc5eaf5ec028230e02797b2
-  data.tar.gz: 0976f7d7acb1d70d91a98034422d99fd00a6abb5159de54733e2cd1a5a58094c7721cd9f15114a464e7b7f66cbf7e2f92a98317c507d1564071a32b9b397a841
+  metadata.gz: d3648bb2d0b72766700ed3630ed247c390528391ce6462cfc5b34c7997fa47cd489ce6b950b5b63be1763cefb765cc9b597372616ac5d85d51dc41e496dbdd48
+  data.tar.gz: 894847248795c75271ddb62781000bcc840670997ee152891e3f71fb35e0bf212190837a8bfbaf4405d2ef05dff81c9749c12cbd114a353a519f5e33da3d1fad

data/.ruby-version

@@ -0,0 +1 @@
+2.4.1

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 group :development do
-  gem 'jeweler'
-  gem 'yard'
+  gem 'jeweler', '~> 2.3.9'
+  gem 'yard', ">= 0.9.11"
   gem 'test-unit'
 end

data/Gemfile.lock

@@ -1,24 +1,67 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    git (1.2.5)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
+    addressable (2.4.0)
+    builder (3.2.3)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.5.0)
+    github_api (0.16.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashie (3.6.0)
+    highline (2.0.0)
+    jeweler (2.3.9)
+      builder
+      bundler
       git (>= 1.2.5)
+      github_api (~> 0.16.0)
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      psych
       rake
       rdoc
-    json (1.8.0)
-    rake (10.0.4)
-    rdoc (4.0.1)
-      json (~> 1.4)
+      semver2
+    jwt (2.1.0)
+    mime-types (2.99.3)
+    mini_portile2 (2.3.0)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nokogiri (1.8.5)
+      mini_portile2 (~> 2.3.0)
+    nokogiri (1.8.5-x86-mingw32)
+      mini_portile2 (~> 2.3.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    psych (3.0.3)
+    psych (3.0.3-x86-mingw32)
+    rack (2.0.6)
+    rake (12.3.1)
+    rdoc (6.0.4)
+    semver2 (3.4.2)
     test-unit (2.5.5)
-    yard (0.8.6.1)
+    thread_safe (0.3.6)
+    yard (0.9.16)
 
 PLATFORMS
   ruby
   x86-mingw32
 
 DEPENDENCIES
-  jeweler
+  jeweler (~> 2.3.9)
   test-unit
-  yard
+  yard (>= 0.9.11)
+
+BUNDLED WITH
+   1.17.1

data/VERSION

@@ -1 +1 @@
-0.9.9
+0.9.11

data/lib/monad/maybe.rb

@@ -14,21 +14,9 @@ end
   
 class Object
   def to_maybe(&blk)
-    j = Monad::Maybe::Just.new(self)
+    j = Monad::Maybe.return(self)
     blk ? j.maybe(&blk) : j
   end
-  
-  def maybe?
-    false
-  end
-  
-  def just?
-    false
-  end
-  
-  def nothing?
-    false
-  end
 end
 
 class NilClass
@@ -40,11 +28,17 @@ end
 module Monad
   module Maybe
     def self.return(obj)
-      obj.to_maybe
+      if obj.nil? or nothing? obj
+        Monad::Maybe::Nothing.instance
+      else
+        Monad::Maybe::Just.new(obj)
+      end
     end
   end
 end
 
+# some toplevel methods
+
 def maybe(obj, &blk)
   m = Monad::Maybe.return(obj)
   blk ? m.maybe(&blk) : m
@@ -57,3 +51,32 @@ end
 def nothing
   Monad::Maybe::Nothing.instance
 end
+
+module Kernel
+  def maybe?(x=nil)
+    return false if x.nil? # we assume it's being called as a method on an object like 0.maybe?
+    if not x.is_a? Monad::Maybe::Base
+      false
+    else
+      true
+    end
+  end
+  
+  def just?(x=nil)
+    return false if x.nil? # we assume it's being called as a method on an object like 0.maybe?
+    if not x.is_a? Monad::Maybe::Just
+      false
+    else
+      true
+    end
+  end
+  
+  def nothing?(x)
+    return false if x.nil? # we assume it's being called as a method on an object like 0.maybe?
+    if x == Monad::Maybe::Nothing.instance
+      true
+    else
+      false
+    end
+  end
+end

data/lib/monad/maybe/base.rb

@@ -31,9 +31,6 @@ module Monad
       def and(&blk)
         self.then(blk)
       end
-  
-      private
-      def initialize; end
     end
   end
 end

data/lib/monad/maybe/just.rb

@@ -9,7 +9,7 @@ module Monad
         value.send(method, *args).to_maybe
       end
   
-      def unwrap(val)
+      def unwrap(val=nil, &blk)
         value
       end
   

data/lib/monad/maybe/list.rb

@@ -3,12 +3,14 @@ module Monad
     class List
       include Enumerable
   
+      # TODO: add support for lazy evaluation
+
       def initialize(enum)
         @enum = enum.map { |v| v.maybe? ? v : v.to_maybe }
       end
   
       def inspect
-        "#{to_a}"
+        "maybe_list(#{@enum.map(&:inspect).join(', ')})"
       end
   
       def maybe?

data/lib/monad/maybe/nothing.rb

@@ -37,8 +37,8 @@ module Monad
         false
       end
   
-      def unwrap(val)
-        val
+      def unwrap(val=nil, &blk)
+        val || blk.call
       end
   
       def value

data/monad-maybe.gemspec

@@ -2,20 +2,23 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: monad-maybe 0.9.11 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "monad-maybe"
-  s.version = "0.9.9"
+  s.name = "monad-maybe".freeze
+  s.version = "0.9.11"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Delon Newman"]
-  s.date = "2013-08-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.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Delon Newman".freeze]
+  s.date = "2018-11-06"
+  s.description = "This is an attempt to implement Haskell's Maybe monad in a Ruby-ish way.".freeze
+  s.email = "delon.newman@gmail.com".freeze
   s.extra_rdoc_files = [
     "README.md"
   ]
   s.files = [
+    ".ruby-version",
     "Gemfile",
     "Gemfile.lock",
     "README.md",
@@ -30,28 +33,27 @@ Gem::Specification.new do |s|
     "monad-maybe.gemspec",
     "test/maybe.rb"
   ]
-  s.homepage = "https://github.com/delonnewman/monad-maybe"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.0.rc.2"
-  s.summary = "A Ruby implementation of Haskell's Maybe Monad"
+  s.homepage = "https://github.com/delonnewman/monad-maybe".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.6.11".freeze
+  s.summary = "A Ruby implementation of Haskell's Maybe Monad".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<test-unit>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3.9"])
+      s.add_development_dependency(%q<yard>.freeze, [">= 0.9.11"])
+      s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<test-unit>, [">= 0"])
+      s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.9"])
+      s.add_dependency(%q<yard>.freeze, [">= 0.9.11"])
+      s.add_dependency(%q<test-unit>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<test-unit>, [">= 0"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.9"])
+    s.add_dependency(%q<yard>.freeze, [">= 0.9.11"])
+    s.add_dependency(%q<test-unit>.freeze, [">= 0"])
   end
 end
 

data/test/maybe.rb

@@ -105,7 +105,7 @@ class MaybeTest < Test::Unit::TestCase
     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 1.to_maybe, [1].to_maybe this shouldn't be the case, why's this here?
     assert_equal 0.to_maybe, (0..10).maybe_map { |n| n }.to_maybe
   end
 
@@ -122,6 +122,11 @@ class MaybeTest < Test::Unit::TestCase
     maybe(1).then(->(){ assert true }).then(->(){ assert true })
   end
 
+  def test_unwrap
+    assert_equal maybe(1).unwrap(nil), maybe(nil).unwrap(1)
+    assert_equal maybe(1).unwrap { 3 }, nothing.unwrap { 1 }
+  end
+
   #
   # Monad laws
   #

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: monad-maybe
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.11
 platform: ruby
 authors:
 - Delon Newman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-18 00:00:00.000000000 Z
+date: 2018-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.9
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.11
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This is an attempt to implement Haskell's Maybe monad in a Ruby-ish way.
@@ -59,6 +59,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -82,17 +83,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A Ruby implementation of Haskell's Maybe Monad