or_else 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e403ed565733f3d923aee1ec9353e495e95a2536
-  data.tar.gz: f4ffee374ca8a749251e93d9f3e67b7afbba39bf
+  metadata.gz: eecae4c515e30eb7444310ddad11f7decc47d06e
+  data.tar.gz: 8f8c822cdd62cb58b7fceff8b9b5b5734f02fcaf
 SHA512:
-  metadata.gz: 23987290677e25336fedb1c16aaff6e6a38c807c216c16cb82842990c964e6619f61359618e0d792d0370814c743c7fb28173ef4734f4e6fcd800fbb00c40228
-  data.tar.gz: 48821e7cbdb95382f28cf04dc70f2a8a8c632d427809eb83a0dc6f0a3517af8023474dd6ce58606945fa941033ba4f4ef72d87c12616fc30a530f499ab538226
+  metadata.gz: 4add6df6ad601b2290bb7dad6e259031a5d22ddef709cb28726df6b16344cdeae0bb7423d874aed45c98fe261b470657e693426e32c9632aa74bff16a5e5a04a
+  data.tar.gz: 00aad4d57d23adf625c2e804ad33c2e4d11eddc90097af1c9a39cb62a630b9c263b948783fb4153a24331903811b8c11dff4515b729f841da73f9e19882635c1

data/README.md

@@ -19,29 +19,33 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-value = Maybe(nil)              # => Nothing
-value.empty?                    # => true
-value.nil?                      # => true
-value.exists?                   # => false
+# Nothings
+value = Maybe(nil)                  # => Nothing
+Maybe(nil).empty?                   # => true
+Maybe(nil).nil?                     # => true
+Maybe(nil).exists?                  # => false
 # Block is ignored
-value.map { |v| v }             # => Nothing
+Maybe(nil).map { |v| v }            # => Nothing
 # Block is ignored
-value.flat_map { |v| Maybe(v) } # => Nothing
+Maybe(nil).flat_map { |v| v }       # => Nothing
 # Returns the result of the block
-value.or_else { 'foo' }         # => 'foo'
-
-value = Maybe('value')          # => <OrElse::Just>
-value.empty?                    # => false
-value.nil?                      # => false
-value.exists?                   # => true
-# Block is yielded the bare value and the result of the block is wrapped in a Maybe
-value.map { |v| v }             # => <OrElse::Just>
-# Block is yielded the bare value, and the block exists with a Maybe so it is left as is
-value.flat_map { |v| Maybe(v) } # => <OrElse::Just> (Block is yielded the bare value)
-# Block is yielded the bare value, but did not exit with a Maybe so it is wrapped
-value.flat_map { |v| v }        # => <OrElse::Just>
+Maybe(nil).or_else { 'foo' }        # => 'foo'
+
+# Justs
+Maybe('value')                      # => Just('value')
+Maybe('value').empty?               # => false
+Maybe('value').nil?                 # => false
+Maybe('value').exists?              # => true
+Maybe('value').map { |v| v }        # => Just('value')
+Maybe('value').flat_map { |v| v }   # => Maybe('value')
 # Block is ignored
-value.or_else { 'foo' }         # => 'value'
+Maybe('value').or_else { 'foo' }    # => 'value'
+
+#more examples
+Maybe(1).map { |v| nil }            # => Just(nil)
+Maybe(1).map { |v| Maybe(v) }       # => Just(Maybe(1))
+Maybe(1).flat_map { |v| nil }       # => Nothing
+Maybe(1).flat_map { |v| Maybe(v) }  # => Maybe(1)
 ```
 
 Real life example:

data/lib/or_else/just.rb

@@ -8,12 +8,11 @@ module OrElse
     end
 
     def map
-      Maybe(yield value)
+      Just(yield value)
     end
 
     def flat_map
-      t = yield value
-      t.is_a?(Maybe) ? t : Maybe(t)
+      Maybe(yield value)
     end
 
     def empty?

data/lib/or_else/maybe.rb

@@ -3,6 +3,7 @@ require 'or_else/nothing_class'
 
 def Maybe(val)
   return Nothing if val.nil?
+  return val if val.is_a?(OrElse::Maybe)
   OrElse::Just.new(val)
 end
 

data/lib/or_else/version.rb

@@ -1,3 +1,3 @@
 module OrElse
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/spec/or_else/just_spec.rb

@@ -28,12 +28,12 @@ module OrElse
 
         specify { expect { |b| just.map(&b) }.to yield_with_args(val) }
 
-        it 'yields the value 1 and wraps the block in a Maybe' do
+        it 'yields the value 1 and wraps the block in a Just' do
           expect(just.map { |j| j }.value).to eq val
         end
 
-        it 'yields the value 1 and is Nothing when the block evaluates to nil' do
-          expect(just.map { |j| nil }).to eq Nothing
+        it 'yields the value 1 and is Just(nil) when the block evaluates to nil' do
+          expect(just.map { |j| nil }.value).to eq nil
         end
       end
 
@@ -61,6 +61,12 @@ module OrElse
         it 'wraps the result in a Maybe' do
           expect(just.flat_map { |j| j }.value).to eq val
         end
+
+        context 'when the block exists with a nil' do
+          it 'returns Nothing' do
+            expect(just.flat_map { |j| nil }).to eq Nothing
+          end
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: or_else
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - alexpeachey