whenner 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a4aa8af9fb47aa98f75a11bb2433eacf417ae87
-  data.tar.gz: 69d6cbba0ed8f7549028e185618321b31be8a1a0
+  metadata.gz: 057edf524df43fcf2575d69704ceb7d3769e6cf9
+  data.tar.gz: 3a953414e1303df0a425969e6c74b82f3dde12c1
 SHA512:
-  metadata.gz: 33fe745591cd305f62158756d6de021c3bdb82b1501c73826a9e6a06010db311c4bfbf1f4234ea09680af99d3cea32391a0cfabf0e8b4f33f229ac65601f40b9
-  data.tar.gz: 97794e75339f30bf8de24b1325d51674fe96ee6a55a0e421ff17a54fdcc1e0b02fd97a21c0e1fa2ac28a0cb0b72dc17712fe55c45a424159043ba35f51708117
+  metadata.gz: 98308e1cc56deaabef70fe14e47144cdc8f25593e90b919d9e265f608eb03bd13c45cade3d38b31cf9d340b330743471c0d1098922b74b0f7dd045fe4ed25bbb
+  data.tar.gz: ed5835d5fdf2e2243b3c27eb22061ae0804cbe76d1ec4cb6f4f5c52c02da2efa9d089cd5933339d6b4eff071a4c89c5fa25d773bed08b5e698321dc4e30cb701

data/.travis.yml

@@ -1,4 +1,3 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    whenner (0.1.1)
+    whenner (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -70,9 +70,8 @@ end.done do |titles|
 end
 ```
 
-As methods in Ruby can only take a single block, Whenner does not support a
-`then` method yet, that would combine the `done` and `fail` methods. This might
-be implementing in the future using something like this:
+As methods in Ruby can only take a single block, Whenner has a special block
+syntax for setting both `done` and `fail` callbacks:
 
 ```ruby
 defer { async_get('http://google.com') }.then do |on|
@@ -81,6 +80,9 @@ defer { async_get('http://google.com') }.then do |on|
 end
 ```
 
+The result of `Deferred#then` is a new promise for the value of the callback
+that will be run.
+
 ### Documentation
 
 See the inline [API

data/lib/whenner.rb

@@ -2,6 +2,7 @@ require 'whenner/version'
 require 'forwardable'
 
 require 'whenner/conversions'
+require 'whenner/deferred_proxy'
 require 'whenner/callback'
 require 'whenner/deferred'
 require 'whenner/promise'

data/lib/whenner/deferred.rb

@@ -105,6 +105,26 @@ module Whenner
       promise
     end
 
+
+    # Register a callback to be run when the deferred is fulfilled.
+    #
+    # @yieldparam [DeferredProxy] proxy
+    # @return [Promise] a new promise representing the return value
+    #   of the deferred, or -- when that return value is a promise itself
+    #   -- a promise mimicking that promise.
+    def then
+      Whenner.defer do |d|
+        proxy = DeferredProxy.new(self)
+        yield proxy
+        pdone = done(&proxy.done)
+        pfail = fail(&proxy.fail)
+        pdone.done { |v| d.fulfill(v) }
+        pdone.fail { |v| d.reject(v) }
+        pfail.done { |v| d.reject(v) }
+        pfail.fail { |v| d.reject(v) }
+      end
+    end
+
     # Register a callback to be run when the deferred is fulfilled.
     #
     # @yieldparam [Object] value

data/lib/whenner/deferred_proxy.rb

@@ -0,0 +1,20 @@
+module Whenner
+
+  # Proxy object yielded by the {Deferred#then} method to set both `fail` and
+  # `done` callbacks.
+  class DeferredProxy
+    def initialize(deferred)
+      @deferred = deferred
+    end
+
+    def done(&block)
+      @done = block if block_given?
+      @done
+    end
+
+    def fail(&block)
+      @fail = block if block_given?
+      @fail
+    end
+  end
+end

data/lib/whenner/promise.rb

@@ -29,8 +29,12 @@ module Whenner
     # @!method always(&block)
     #   Register a callback to fire when the deferred is resolved.
     #   @return [Promise] a new promise for the return value of the block.
+    # @!method then(&block)
+    #   Register both done and fail callbacks
+    #   @return [Promise] a new promise for the return value the deferred
     def_delegators :@deferred, *%i[
-      reason value pending? fulfilled? resolved? rejected? fail done always
+      reason value pending? fulfilled? resolved? rejected?
+      fail done always then
     ]
 
     def initialize(deferred)

data/lib/whenner/version.rb

@@ -1,3 +1,3 @@
 module Whenner
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/spec/whenner/deferred_spec.rb

@@ -114,6 +114,14 @@ module Whenner
         expect(new_promise).to be_fulfilled
       end
 
+      it 'returns a ne promise for a value using #then' do
+        new_promise = subject.then do |on|
+          on.done { 'foo' }
+        end
+        subject.fulfill
+        expect(new_promise.value).to eql('foo')
+      end
+
       it 'returns a new promise that rejects to the reason' do
         new_promise = subject.fail { 'foo' }
         subject.reject
@@ -121,6 +129,14 @@ module Whenner
         expect(new_promise).to be_fulfilled
       end
 
+      it 'returns a new promise that rejects to the reason using #then' do
+        new_promise = subject.then do |on|
+          on.fail { 'foo' }
+        end
+        subject.reject
+        expect(new_promise.reason).to eql('foo')
+      end
+
       it 'returns a new promise that mimics a promise value' do
         d = Deferred.new
         new_promise = subject.done { d.promise }
@@ -129,6 +145,16 @@ module Whenner
         expect(new_promise.value).to eql(:a)
       end
 
+      it 'returns a new promise that mimics a promise value using #then' do
+        d = Deferred.new
+        new_promise = subject.then do |on|
+          on.done { d.promise }
+        end
+        subject.fulfill(:b)
+        d.fulfill(:a)
+        expect(new_promise.value).to eql(:a)
+      end
+
       it 'is rejected on exception' do
         called = false
         promise = subject.done { raise 'arg' }
@@ -136,6 +162,16 @@ module Whenner
         subject.fulfill
         expect(called).to be_a(RuntimeError)
       end
+
+      it 'is rejected on exception using #then' do
+        called = false
+        promise = subject.then do |on|
+          on.done { raise 'arg' }
+        end
+        promise.fail { |e| called = e }
+        subject.fulfill
+        expect(called).to be_a(RuntimeError)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whenner
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Arjan van der Gaag
@@ -89,6 +89,7 @@ files:
 - lib/whenner/callback.rb
 - lib/whenner/conversions.rb
 - lib/whenner/deferred.rb
+- lib/whenner/deferred_proxy.rb
 - lib/whenner/promise.rb
 - lib/whenner/version.rb
 - spec/whenner/conversions_spec.rb