promise.rb 0.6.0 → 0.6.1

data/.travis.yml

@@ -2,13 +2,17 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - jruby
   - rbx
   - ruby-head
   - jruby-head
 matrix:
   allow_failures:
+    - rvm: 2.1.0 # https://github.com/dkubb/adamantium/issues/30
     - rvm: ruby-head
     - rvm: jruby-head
   fast_finish: true
 script: bundle exec rake -t metrics:coverage ci
+before_install:
+  - gem install bundler -v '= 1.5.1'

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # promise.rb changelog
 
+## 0.6.1 (January 14, 2014)
+
+* The rejection reason now defaults to Promise::Error.
+* Promise::Callback got refactored.
+
 ## 0.6.0 (December 21, 2013)
 
 * Most of Promise and Callback have been rewritten. Less code.

data/Gemfile

@@ -11,7 +11,6 @@ gem 'awesome_print'
 
 platform :rbx do
   gem 'rubysl', '~> 2.0'
-  gem 'rubysl-json', '~> 2.0'
   gem 'rubinius', '~> 2.0'
 end
 

data/Gemfile.devtools

@@ -11,17 +11,17 @@ group :development do
 end
 
 group :yard do
-  gem 'kramdown', '~> 1.2.0'
+  gem 'kramdown', '~> 1.3.0'
 end
 
 group :guard do
   gem 'guard',         '~> 2.2.4'
   gem 'guard-bundler', '~> 2.0.0'
-  gem 'guard-rspec',   '~> 4.0.4'
+  gem 'guard-rspec',   '~> 4.2.0'
   gem 'guard-rubocop', '~> 1.0.0'
 
   # file system change event handling
-  gem 'listen',     '~> 2.2.0'
+  gem 'listen',     '~> 2.4.0'
   gem 'rb-fchange', '~> 0.0.6', require: false
   gem 'rb-fsevent', '~> 0.9.3', require: false
   gem 'rb-inotify', '~> 0.9.0', require: false
@@ -37,13 +37,15 @@ group :metrics do
   gem 'flay',      '~> 2.4.0'
   gem 'flog',      '~> 4.2.0'
   gem 'reek',      '~> 1.3.2'
-  gem 'rubocop',   '~> 0.15.0'
+  gem 'rubocop',   '~> 0.16.0'
   gem 'simplecov', '~> 0.8.2'
   gem 'yardstick', '~> 0.9.7', git: 'https://github.com/dkubb/yardstick.git'
 
+  platforms :mri do
+    gem 'mutant', '~> 0.3.4'
+  end
+
   platforms :ruby_19, :ruby_20 do
-    gem 'mutant',          '~> 0.3.0.rc3', git: 'https://github.com/mbj/mutant.git'
-    gem 'unparser',        '~> 0.1.5',     git: 'https://github.com/mbj/unparser.git'
     gem 'yard-spellcheck', '~> 0.1.5'
   end
 

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 10
-total_score: 55
+total_score: 44

data/config/reek.yml

@@ -10,7 +10,8 @@ ClassVariable:
   exclude: []
 ControlParameter:
   enabled: true
-  exclude: []
+  exclude:
+  - "Promise#reject"
 DataClump:
   enabled: true
   exclude: []
@@ -34,7 +35,7 @@ LongParameterList:
   max_params: 2
   overrides:
     initialize:
-      max_params: 3
+      max_params: 4
 LongYieldList:
   enabled: true
   exclude: []

data/config/rubocop.yml

@@ -11,6 +11,7 @@ AllCops:
 ParameterLists:
   Max: 3
   CountKeywordArgs: true
+  Enabled: false
 
 # Avoid more than `Max` levels of nesting.
 BlockNesting:

data/lib/promise.rb

@@ -6,6 +6,8 @@ require 'promise/callback'
 require 'promise/progress'
 
 class Promise
+  Error = Class.new(RuntimeError)
+
   include Promise::Progress
 
   attr_reader :state, :value, :reason, :backtrace
@@ -31,7 +33,7 @@ class Promise
     on_fulfill ||= block
     next_promise = Promise.new
 
-    add_callback { Callback.new(on_fulfill, on_reject, next_promise) }
+    add_callback { Callback.new(self, on_fulfill, on_reject, next_promise) }
     next_promise
   end
 
@@ -56,10 +58,10 @@ class Promise
     end
   end
 
-  def reject(reason = RuntimeError, backtrace = nil)
+  def reject(reason = nil, backtrace = nil)
     dispatch(backtrace) do
       @state = :rejected
-      @reason = reason
+      @reason = reason || Error
     end
   end
 
@@ -73,7 +75,7 @@ class Promise
   end
 
   def dispatch!(callback)
-    defer { callback.dispatch(self) }
+    defer { callback.dispatch }
   end
 
   def defer

data/lib/promise/callback.rb

@@ -2,39 +2,40 @@
 
 class Promise
   class Callback
-    def initialize(on_fulfill, on_reject, next_promise)
+    def initialize(promise, on_fulfill, on_reject, next_promise)
+      @promise = promise
       @on_fulfill, @on_reject = on_fulfill, on_reject
       @next_promise = next_promise
     end
 
-    def block_for(promise)
-      promise.fulfilled? ? @on_fulfill : @on_reject
+    def block
+      @promise.fulfilled? ? @on_fulfill : @on_reject
     end
 
-    def param_for(promise)
-      promise.fulfilled? ? promise.value : promise.reason
+    def param
+      @promise.fulfilled? ? @promise.value : @promise.reason
     end
 
-    def dispatch(promise)
-      if (block = block_for(promise))
-        handle_result(promise) { execute(promise, block) }
+    def dispatch
+      if block
+        handle_result { execute }
       else
-        assume_state(promise, @next_promise)
+        assume_state(@promise, @next_promise)
       end
     end
 
-    def execute(promise, block)
-      block.call(param_for(promise))
+    def execute
+      block.call(param)
     rescue => ex
-      @next_promise.reject(ex, promise.backtrace)
+      @next_promise.reject(ex, @promise.backtrace)
       raise
     end
 
-    def handle_result(promise)
+    def handle_result
       if Promise === (result = yield)
         assume_state(result, @next_promise)
       else
-        @next_promise.fulfill(result, promise.backtrace)
+        @next_promise.fulfill(result, @promise.backtrace)
       end
     end
 

data/lib/promise/version.rb

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

data/spec/promise_spec.rb

@@ -380,7 +380,7 @@ describe Promise do
 
     it 'does not require a reason' do
       subject.reject
-      expect(subject.reason).to be(RuntimeError)
+      expect(subject.reason).to be(Promise::Error)
     end
 
     it 'sets the backtrace' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promise.rb
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-21 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec