promise.rb 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDc3Mjc3N2NjZGNlYzFjOGFkMGNmNTRmZTI3ZDYwZjJkMWYzMTM4YQ==
+    ZDMwMDA0YTBhY2ZkMzE2MzVhNjBkMmQ4ZGRjN2M0MzRiODFkY2Q2OQ==
   data.tar.gz: !binary |-
-    MTE2NTg0ZGZhZDNhNjMwZjgzOWRhODFlMjU0MjhjOTdjOGQ1NzExZg==
+    MDI1ZDlhYzFmM2ViMzkwYzI0YzJhMTM4MDg3YmFhMzhjZjQ2YTcyMg==
 SHA512:
   metadata.gz: !binary |-
-    M2Q4ODVmZGUyZjRkNjhkOTJiMTM2Y2E5YTAzZDkwMjQ1OTQ1ODkyNDYzN2Zj
-    ZjA3ZjI5MzBlNDQ4NjljMDliMjlhMzFiMGVhYWU3NjQwOTgyMGZlYWVkMTYz
-    YTY0MjQxOTk4Y2RmMjJiN2M1YzU3NDEzNGYyYjA4NGZjMzkxMzc=
+    ODExMWZlZjg3YWNmMGM2ZmZhMGI4M2I0OTJlMjJkN2VkOTY4M2E5NjIzZDlj
+    Nzk1Njc0NjQwNTUzMGJjMGJmZmJlOGNmNGI1YTFhZWZkNGMwNzM3ZjIzOGVm
+    ZjBkN2NjMzIxZGFiYTk4OTBmOGUyOWMwYzVkMjRlNzY4OTBmNzc=
   data.tar.gz: !binary |-
-    OGFlMjE0YzRhYTIwYzczODI4YThlNDE3YjQ3MDQ2NWFlOWQ5YjAzNjBkMjY5
-    ZDNlMWU2OGFhNDFjZGQ1MDE5YjY1MmY4NmIwNTI0YzY0MDFmMTI2YzE1Yjg4
-    ZThlOWM2Y2QyMGFhOTg3M2FiMjRiMDk3MmYwMTQyOTBlYzEzNmE=
+    MzBhMGVmODUzZTVmMTg2YjAwMDlmYmY5YTY5MTNlY2FiN2E5OWNiYWFkMzMx
+    YTY2MTU5YzBlYWYyZWI2ZjBhOWM5Y2IzMjI4MTFkMTdlNTEwMzFkNWEzYjg3
+    Zjg3NTAwZTc4NWNjODhiNGMyZjc4ZjJmNGFhMmE0ZmY4ZDZhZDk=

data/.travis.yml

@@ -1,5 +1,13 @@
 language: ruby
 rvm:
   - 1.9.3
-before_script: git checkout master
-script: bundle exec rake ci -t
+  - 2.0.0
+  - jruby-19mode
+  - rbx-19mode
+  - ruby-head
+  - jruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+script: bundle exec rake ci:metrics -t

data/Gemfile

@@ -2,12 +2,9 @@
 
 source 'https://rubygems.org'
 
-ruby '1.9.3'
-
 gemspec
 
-gem 'devtools', git: 'https://github.com/lgierth/devtools.git',
-                ref: 'branch-detection2'
+gem 'devtools', git: 'https://github.com/rom-rb/devtools.git'
 gem 'fuubar',   git: 'https://github.com/lgierth/fuubar.git',
                 ref: 'static-percentage'
 gem 'awesome_print'

data/Gemfile.devtools

@@ -3,6 +3,8 @@
 group :development do
   gem 'rake',  '~> 10.1.0'
   gem 'rspec', '~> 2.14.1'
+  gem 'rspec-core', git: 'https://github.com/rspec/rspec-core.git',
+                    branch: '2-14-maintenance'
   gem 'yard',  '~> 0.8.7'
 end
 

data/lib/promise.rb

@@ -6,7 +6,7 @@ require 'promise/callback'
 require 'promise/progress'
 
 class Promise
-  attr_reader :state, :value, :reason
+  attr_reader :value, :reason
 
   def initialize
     @state = :pending
@@ -26,7 +26,8 @@ class Promise
     @state == :rejected
   end
 
-  def then(on_fulfill = nil, on_reject = nil)
+  def then(on_fulfill = nil, on_reject = nil, &block)
+    on_fulfill = block if block
     next_promise = add_callbacks(on_fulfill, on_reject)
 
     maybe_dispatch(@on_fulfill.last, @on_reject.last)

data/lib/promise/callback.rb

@@ -13,6 +13,7 @@ class Promise
       @block.call(value)
     rescue => error
       @next_promise.reject(error)
+      raise
     end
 
     def handle_result(result)

data/lib/promise/progress.rb

@@ -2,12 +2,17 @@
 
 class Promise
   module Progress
-    def on_progress(block)
-      (@on_progress ||= []) << block
+    def initialize
+      super
+      @on_progress = []
+    end
+
+    def on_progress(&block)
+      @on_progress << block
     end
 
     def progress(status)
-      if pending? && @on_progress
+      if pending?
         @on_progress.each { |block| block.call(status) }
       end
     end

data/lib/promise/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 class Promise
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/spec/promise_spec.rb

@@ -10,288 +10,292 @@ describe Promise do
   let(:reason) { double('reason') }
   let(:other_reason) { double('other_reason') }
 
-  describe '#state' do
-    describe '3.1.1 pending' do
-      it 'transitions to fulfilled' do
-        subject.fulfill(value)
-        expect(subject.state).to eq(:fulfilled)
-      end
+  describe '3.1.1 pending' do
+    it 'transitions to fulfilled' do
+      subject.fulfill(value)
+      expect(subject).to be_fulfilled
+    end
 
-      it 'transitions to rejected' do
-        subject.reject(reason)
-        expect(subject.state).to eq(:rejected)
-      end
+    it 'transitions to rejected' do
+      subject.reject(reason)
+      expect(subject).to be_rejected
     end
+  end
 
-    describe '3.1.2 fulfilled' do
-      it 'does not transition to other states' do
-        subject.fulfill(value)
-        subject.reject(reason)
-        expect(subject.state).to eq(:fulfilled)
-      end
+  describe '3.1.2 fulfilled' do
+    it 'does not transition to other states' do
+      subject.fulfill(value)
+      subject.reject(reason)
+      expect(subject).to be_fulfilled
+    end
 
-      it 'has an immutable value' do
-        subject.fulfill(value)
-        expect(subject.value).to eq(value)
+    it 'has an immutable value' do
+      subject.fulfill(value)
+      expect(subject.value).to eq(value)
 
-        subject.fulfill(other_value)
-        expect(subject.value).to eq(value)
+      subject.fulfill(other_value)
+      expect(subject.value).to eq(value)
 
-        expect(subject.value).to be_frozen
-      end
+      expect(subject.value).to be_frozen
     end
+  end
 
-    describe '3.1.3 rejected' do
-      it 'does not transition to other states' do
-        subject.reject(reason)
-        subject.fulfill(value)
-        expect(subject.state).to eq(:rejected)
-      end
+  describe '3.1.3 rejected' do
+    it 'does not transition to other states' do
+      subject.reject(reason)
+      subject.fulfill(value)
+      expect(subject).to be_rejected
+    end
 
-      it 'has an immutable reason' do
-        subject.reject(reason)
-        expect(subject.reason).to eq(reason)
+    it 'has an immutable reason' do
+      subject.reject(reason)
+      expect(subject.reason).to eq(reason)
 
-        subject.reject(other_reason)
-        expect(subject.reason).to eq(reason)
+      subject.reject(other_reason)
+      expect(subject.reason).to eq(reason)
 
-        expect(subject.reason).to be_frozen
-      end
+      expect(subject.reason).to be_frozen
     end
   end
 
-  describe '#then' do
-    describe '3.2.1 on_fulfill' do
-      it 'is optional' do
-        subject.then
-        subject.fulfill(value)
-      end
+  describe '3.2.1 on_fulfill' do
+    it 'is optional' do
+      subject.then
+      subject.fulfill(value)
     end
+  end
 
-    describe '3.2.1 on_reject' do
-      it 'is optional' do
-        subject.then(proc { |_| })
-        subject.reject(reason)
-      end
+  describe '3.2.1 on_reject' do
+    it 'is optional' do
+      subject.then(proc { |_| })
+      subject.reject(reason)
     end
+  end
 
-    describe '3.2.2 on_fulfill' do
-      it 'is called after promise is fulfilled' do
-        state = nil
-        subject.then(proc { |_| state = subject.state })
-
-        subject.fulfill(value)
-        expect(state).to eq(:fulfilled)
-      end
-
-      it 'is called with fulfillment value' do
-        result = nil
-        subject.then(proc { |val| result = val })
+  describe '3.2.2 on_fulfill' do
+    it 'is called after promise is fulfilled' do
+      fulfilled = nil
+      subject.then(proc { |_| fulfilled = subject.fulfilled? })
 
-        subject.fulfill(value)
-        expect(result).to eq(value)
-      end
+      subject.fulfill(value)
+      expect(fulfilled).to eq(true)
+    end
 
-      it 'is called not more than once' do
-        called = 0
-        subject.then(proc { |_| called += 1 })
+    it 'is called with fulfillment value' do
+      result = nil
+      subject.then(proc { |val| result = val })
 
-        subject.fulfill(value)
-        subject.fulfill(value)
-        expect(called).to eq(1)
-      end
+      subject.fulfill(value)
+      expect(result).to eq(value)
+    end
 
-      it 'is not called if on_reject has been called' do
-        called = false
-        subject.then(proc { |_| called = true })
+    it 'is called not more than once' do
+      called = 0
+      subject.then(proc { |_| called += 1 })
 
-        subject.reject(reason)
-        expect(called).to eq(false)
-      end
+      subject.fulfill(value)
+      subject.fulfill(value)
+      expect(called).to eq(1)
     end
 
-    describe '3.2.3 on_reject' do
-      it 'is called after promise is rejected' do
-        state = nil
-        subject.then(nil, proc { |_| state = subject.state })
+    it 'is not called if on_reject has been called' do
+      called = false
+      subject.then(proc { |_| called = true })
 
-        subject.reject(reason)
-        expect(state).to eq(:rejected)
-      end
+      subject.reject(reason)
+      expect(called).to eq(false)
+    end
 
-      it 'is called with rejection reason' do
-        result = nil
-        subject.then(nil, proc { |reas| result = reas })
+    it 'can be passed as a block' do
+      result = nil
+      subject.then { |val| result = val }
 
-        subject.reject(reason)
-        expect(result).to eq(reason)
-      end
+      subject.fulfill(value)
+      expect(result).to eq(value)
+    end
+  end
 
-      it 'is called not more than once' do
-        called = 0
-        subject.then(nil, proc { |_| called += 1 })
+  describe '3.2.3 on_reject' do
+    it 'is called after promise is rejected' do
+      rejected = nil
+      subject.then(nil, proc { |_| rejected = subject.rejected? })
 
-        subject.reject(reason)
-        subject.reject(reason)
-        expect(called).to eq(1)
-      end
+      subject.reject(reason)
+      expect(rejected).to eq(true)
+    end
 
-      it 'is not called if on_fulfill has been called' do
-        called = false
-        subject.then(nil, proc { |_| called = true })
+    it 'is called with rejection reason' do
+      result = nil
+      subject.then(nil, proc { |reas| result = reas })
 
-        subject.fulfill(value)
-        expect(called).to eq(false)
-      end
+      subject.reject(reason)
+      expect(result).to eq(reason)
     end
 
-    describe '3.2.4' do
-      it 'returns before on_fulfill or on_reject is called' do
-        pending
-      end
+    it 'is called not more than once' do
+      called = 0
+      subject.then(nil, proc { |_| called += 1 })
+
+      subject.reject(reason)
+      subject.reject(reason)
+      expect(called).to eq(1)
     end
 
-    describe '3.2.5' do
-      it 'calls multiple on_fulfill callbacks in order of definition' do
-        order = []
-        on_fulfill = proc do |i, val|
-          order << i
-          expect(val).to eq(value)
-        end
+    it 'is not called if on_fulfill has been called' do
+      called = false
+      subject.then(nil, proc { |_| called = true })
 
-        subject.then(on_fulfill.curry[1])
-        subject.then(on_fulfill.curry[2])
+      subject.fulfill(value)
+      expect(called).to eq(false)
+    end
+  end
 
-        subject.fulfill(value)
-        subject.then(on_fulfill.curry[3])
+  describe '3.2.4' do
+    it 'returns before on_fulfill or on_reject is called' do
+      pending
+    end
+  end
 
-        expect(order).to eq([1, 2, 3])
+  describe '3.2.5' do
+    it 'calls multiple on_fulfill callbacks in order of definition' do
+      order = []
+      on_fulfill = proc do |i, val|
+        order << i
+        expect(val).to eq(value)
       end
 
-      it 'calls multiple on_reject callbacks in order of definition' do
-        order = []
-        on_reject = proc do |i, reas|
-          order << i
-          expect(reas).to eq(reason)
-        end
+      subject.then(on_fulfill.curry[1])
+      subject.then(on_fulfill.curry[2])
 
-        subject.then(nil, on_reject.curry[1])
-        subject.then(nil, on_reject.curry[2])
+      subject.fulfill(value)
+      subject.then(on_fulfill.curry[3])
 
-        subject.reject(reason)
-        subject.then(nil, on_reject.curry[3])
+      expect(order).to eq([1, 2, 3])
+    end
 
-        expect(order).to eq([1, 2, 3])
+    it 'calls multiple on_reject callbacks in order of definition' do
+      order = []
+      on_reject = proc do |i, reas|
+        order << i
+        expect(reas).to eq(reason)
       end
+
+      subject.then(nil, on_reject.curry[1])
+      subject.then(nil, on_reject.curry[2])
+
+      subject.reject(reason)
+      subject.then(nil, on_reject.curry[3])
+
+      expect(order).to eq([1, 2, 3])
     end
+  end
 
-    describe '3.2.6' do
-      let(:error) { StandardError.new }
-      let(:returned_promise) { Promise.new }
+  describe '3.2.6' do
+    let(:error) { StandardError.new }
+    let(:returned_promise) { Promise.new }
 
-      it 'returns promise2' do
-        expect(subject.then).to be_a(Promise)
-        expect(subject.then).not_to eq(subject)
-      end
+    it 'returns promise2' do
+      expect(subject.then).to be_a(Promise)
+      expect(subject.then).not_to eq(subject)
+    end
 
-      it 'fulfills promise2 with value returned by on_fulfill' do
-        promise2 = subject.then(proc { |_| other_value })
-        subject.fulfill(value)
+    it 'fulfills promise2 with value returned by on_fulfill' do
+      promise2 = subject.then(proc { |_| other_value })
+      subject.fulfill(value)
 
-        expect(promise2).to be_fulfilled
-        expect(promise2.value).to eq(other_value)
-      end
+      expect(promise2).to be_fulfilled
+      expect(promise2.value).to eq(other_value)
+    end
 
-      it 'fulfills promise2 with value returned by on_reject' do
-        promise2 = subject.then(nil, proc { |_| other_value })
-        subject.reject(reason)
+    it 'fulfills promise2 with value returned by on_reject' do
+      promise2 = subject.then(nil, proc { |_| other_value })
+      subject.reject(reason)
 
-        expect(promise2).to be_fulfilled
-        expect(promise2.value).to eq(other_value)
-      end
+      expect(promise2).to be_fulfilled
+      expect(promise2.value).to eq(other_value)
+    end
 
-      it 'rejects promise2 with error raised by on_fulfill' do
-        promise2 = subject.then(proc { |_| raise error })
-        subject.fulfill(value)
+    it 'rejects promise2 with error raised by on_fulfill' do
+      promise2 = subject.then(proc { |_| raise error })
+      expect { subject.fulfill(value) }.to raise_error(error)
 
-        expect(promise2).to be_rejected
-        expect(promise2.reason).to eq(error)
-      end
+      expect(promise2).to be_rejected
+      expect(promise2.reason).to eq(error)
+    end
 
-      it 'rejects promise2 with error raised by on_reject' do
-        promise2 = subject.then(nil, proc { |_| raise error })
-        subject.reject(reason)
+    it 'rejects promise2 with error raised by on_reject' do
+      promise2 = subject.then(nil, proc { |_| raise error })
+      expect { subject.reject(reason) }.to raise_error(error)
 
-        expect(promise2).to be_rejected
-        expect(promise2.reason).to eq(error)
-      end
+      expect(promise2).to be_rejected
+      expect(promise2.reason).to eq(error)
+    end
 
-      describe 'on_fulfill returns promise' do
-        it 'makes promise2 assume fulfilled state of returned promise' do
-          promise2 = subject.then(proc { |_| returned_promise })
+    describe 'on_fulfill returns promise' do
+      it 'makes promise2 assume fulfilled state of returned promise' do
+        promise2 = subject.then(proc { |_| returned_promise })
 
-          subject.fulfill(value)
-          expect(promise2).to be_pending
+        subject.fulfill(value)
+        expect(promise2).to be_pending
 
-          returned_promise.fulfill(other_value)
-          expect(promise2).to be_fulfilled
-          expect(promise2.value).to eq(other_value)
-        end
+        returned_promise.fulfill(other_value)
+        expect(promise2).to be_fulfilled
+        expect(promise2.value).to eq(other_value)
+      end
 
-        it 'makes promise2 assume rejected state of returned promise' do
-          promise2 = subject.then(proc { |_| returned_promise })
+      it 'makes promise2 assume rejected state of returned promise' do
+        promise2 = subject.then(proc { |_| returned_promise })
 
-          subject.fulfill(value)
-          expect(promise2).to be_pending
+        subject.fulfill(value)
+        expect(promise2).to be_pending
 
-          returned_promise.reject(other_reason)
-          expect(promise2).to be_rejected
-          expect(promise2.reason).to eq(other_reason)
-        end
+        returned_promise.reject(other_reason)
+        expect(promise2).to be_rejected
+        expect(promise2.reason).to eq(other_reason)
       end
+    end
 
-      describe 'on_reject returns promise' do
-        it 'makes promise2 assume fulfilled state of returned promise' do
-          promise2 = subject.then(nil, proc { |_| returned_promise })
+    describe 'on_reject returns promise' do
+      it 'makes promise2 assume fulfilled state of returned promise' do
+        promise2 = subject.then(nil, proc { |_| returned_promise })
 
-          subject.reject(reason)
-          expect(promise2).to be_pending
+        subject.reject(reason)
+        expect(promise2).to be_pending
 
-          returned_promise.fulfill(other_value)
-          expect(promise2).to be_fulfilled
-          expect(promise2.value).to eq(other_value)
-        end
+        returned_promise.fulfill(other_value)
+        expect(promise2).to be_fulfilled
+        expect(promise2.value).to eq(other_value)
+      end
 
-        it 'makes promise2 assume rejected state of returned promise' do
-          promise2 = subject.then(nil, proc { |_| returned_promise })
+      it 'makes promise2 assume rejected state of returned promise' do
+        promise2 = subject.then(nil, proc { |_| returned_promise })
 
-          subject.reject(reason)
-          expect(promise2).to be_pending
+        subject.reject(reason)
+        expect(promise2).to be_pending
 
-          returned_promise.reject(other_reason)
-          expect(promise2).to be_rejected
-          expect(promise2.reason).to eq(other_reason)
-        end
+        returned_promise.reject(other_reason)
+        expect(promise2).to be_rejected
+        expect(promise2.reason).to eq(other_reason)
       end
+    end
 
-      describe 'without on_fulfill' do
-        it 'fulfill promise2 with fulfillment value' do
-          promise2 = subject.then
-          subject.fulfill(value)
+    describe 'without on_fulfill' do
+      it 'fulfill promise2 with fulfillment value' do
+        promise2 = subject.then
+        subject.fulfill(value)
 
-          expect(promise2).to be_fulfilled
-          expect(promise2.value).to eq(value)
-        end
+        expect(promise2).to be_fulfilled
+        expect(promise2.value).to eq(value)
       end
+    end
 
-      describe 'without on_reject' do
-        it 'rejects promise2 with rejection reason' do
-          promise2 = subject.then
-          subject.reject(reason)
+    describe 'without on_reject' do
+      it 'rejects promise2 with rejection reason' do
+        promise2 = subject.then
+        subject.reject(reason)
 
-          expect(promise2).to be_rejected
-          expect(promise2.reason).to eq(reason)
-        end
+        expect(promise2).to be_rejected
+        expect(promise2.reason).to eq(reason)
       end
     end
   end
@@ -311,9 +315,9 @@ describe Promise do
         expect(stat).to eq(status)
       end
 
-      subject.on_progress(block.curry[1])
-      subject.on_progress(block.curry[2])
-      subject.on_progress(block.curry[3])
+      subject.on_progress(&block.curry[1])
+      subject.on_progress(&block.curry[2])
+      subject.on_progress(&block.curry[3])
       subject.progress(status)
 
       expect(order).to eq([1, 2, 3])
@@ -321,7 +325,7 @@ describe Promise do
 
     it 'does not call back unless pending' do
       called = false
-      subject.on_progress(proc { |_| called = true })
+      subject.on_progress { |_| called = true }
       subject.fulfill(value)
 
       subject.progress(status)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: promise.rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Lars Gierth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.1
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Promises/A+ for Ruby