or_else 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 909970b9f0b817e9663f287b9aa0d80a2c7d4cda
-  data.tar.gz: 5d4e9eba25df54eb18c26a2bd6231ce83222709c
+  metadata.gz: e403ed565733f3d923aee1ec9353e495e95a2536
+  data.tar.gz: f4ffee374ca8a749251e93d9f3e67b7afbba39bf
 SHA512:
-  metadata.gz: 1963215cf7c74943f5d0fbd5a68bc67d20a397dd3a7e1a8f0b5d269d6b407b6c25d2a9f046951ab6078e16d7e2a740381a29cd880d25d292a0fd1c02646ab5ad
-  data.tar.gz: b1799d401e976b8211648390ec42733d4250c531af2cbd9720513faeedb76344701e4425837883406441fc297cf7f13b12542b72b1dda05ed08427c8cc5fdb7b
+  metadata.gz: 23987290677e25336fedb1c16aaff6e6a38c807c216c16cb82842990c964e6619f61359618e0d792d0370814c743c7fb28173ef4734f4e6fcd800fbb00c40228
+  data.tar.gz: 48821e7cbdb95382f28cf04dc70f2a8a8c632d427809eb83a0dc6f0a3517af8023474dd6ce58606945fa941033ba4f4ef72d87c12616fc30a530f499ab538226

data/README.md

@@ -19,21 +19,29 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-value = Maybe(nil)        # => Nothing
-value.empty?              # => true
-value.nil?                # => true
-value.exists?             # => false
-value.map { |v| v }       # => Nothing (Block is ignored)
-value.flat_map { |v| Maybe(v) }  # => Nothing (Block is ignored)
-value.or_else { 'foo' }   # => 'foo'
-
-value = Maybe('value')    # => <OrElse::Just>
-value.empty?              # => false
-value.nil?                # => false
-value.exists?             # => true
-value.map { |v| v }       # => <OrElse::Just> (Block is yielded the bare value and the block is wrapped in a Maybe)
-value.flat_map { |v| Maybe(v) }  # => <OrElse::Just> (Block is yielded the bare value)
-value.or_else { 'foo' }   # => 'value' (Block is ignored)
+value = Maybe(nil)              # => Nothing
+value.empty?                    # => true
+value.nil?                      # => true
+value.exists?                   # => false
+# Block is ignored
+value.map { |v| v }             # => Nothing
+# Block is ignored
+value.flat_map { |v| Maybe(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>
+# Block is ignored
+value.or_else { 'foo' }         # => 'value'
 ```
 
 Real life example:

data/lib/or_else/just.rb

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

data/lib/or_else/version.rb

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

data/spec/or_else/just_spec.rb

@@ -49,16 +49,18 @@ module OrElse
     end
 
     describe '#flat_map' do
-      context 'when initialized with 1' do
-        let(:val) { 1 }
+      context 'when initialized with Maybe(1)' do
+        let(:val) { Maybe(1) }
 
         specify { expect { |b| just.flat_map(&b) }.to yield_with_args(val) }
       end
 
-      context 'when initialized with "foo"' do
-        let(:val) { 'foo' }
+      context 'when the block result is not a Maybe' do
+        let(:val) { 1 }
 
-        specify { expect { |b| just.flat_map(&b) }.to yield_with_args(val) }
+        it 'wraps the result in a Maybe' do
+          expect(just.flat_map { |j| j }.value).to eq val
+        end
       end
     end
 

metadata

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