sidekiq-promise 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65cb4f994852f81d01a64430041c30bc5b801a61
-  data.tar.gz: d9946fa79e57b00e79147dedb917a4f132e09e06
+  metadata.gz: b8fe996e13d273ffa5bf387826e03ffd70459c18
+  data.tar.gz: 1dfcffb84b77c3f6a87fe8766ed400c2d49f705f
 SHA512:
-  metadata.gz: 95cd8e902837931b931134b0f1ee81e206ec9f79899902b4a4db3263c18979b0d9df079c2431e1d3d2921d30ae977dd7d8fa613fa0e8bed0a0c2c95b12525f29
-  data.tar.gz: c7907bfa3d88b5a8f53aac87841f69bdc624a843b86f79616227040cb9aeed3273669b19d0c8cbe52decf0f9ec78f5bb448596bd028bf82007a8b9dc8ed2a81d
+  metadata.gz: 77f93d1654e06bf548b1fe56d3b10405da12e981db7023717440ff0fa7629c3d3f95e3dcfe1b47177481de637815edad676650a5c1eb7ca015b65f9485428f15
+  data.tar.gz: 6db709578b3a96ecc0872b4ce28e49c9822b136bc7c78e96d4820d6f984c49d21bb45fab06f74b1c1e4ea23219bafdf9ae53ab507273ee4b877160cbdf20c9b4

data/README.md

@@ -10,7 +10,9 @@
 
 Add this line to your application's Gemfile:
 
-    gem 'sidekiq-promise'
+```ruby
+gem 'sidekiq-promise'
+```
 
 And then execute:
 
@@ -75,7 +77,7 @@ notifies the user that the processing is complete.
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/sidekiq-promise/fork )
+1. Fork it ( https://github.com/jamesotron/sidekiq-promise/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/sidekiq/promise/middleware.rb

@@ -12,8 +12,8 @@ module Sidekiq
         publish_message redis_pool, status: 'dequeued', job: job, jid: job['jid']
       end
 
-      def job_completed job, redis_pool=Sidekiq.redis_pool
-        publish_message redis_pool, status: 'complete', job: job, jid: job['jid']
+      def job_completed job, result=nil, redis_pool=Sidekiq.redis_pool
+        publish_message redis_pool, status: 'complete', job: job, jid: job['jid'], result: result
       end
 
       def job_errored job, e, redis_pool=Sidekiq.redis_pool

data/lib/sidekiq/promise/server_middleware.rb

@@ -5,8 +5,12 @@ module Sidekiq
       def call worker, job, queue
         job_dequeued job
         result = yield
-        result.raise if thenable? result
-        job_completed job
+        if thenable? result
+          result.raise
+          job_completed job, result.result
+        else
+          job_completed job, result
+        end
       rescue Exception => e
         job_errored job, e
         raise e

data/lib/sidekiq/promise/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Promise
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/lib/sidekiq/promise/worker.rb

@@ -58,7 +58,7 @@ module Sidekiq
 
       def process_complete_message message
         unsubscribe
-        resolve message['job']
+        resolve message['result']
       end
 
       def process_error_message message

data/spec/acceptance/promise_promise_value_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'Promise promise value' do
+  before(:all) { start_worker }
+  after(:all)  { kill_worker }
+  after        { clear_jobs }
+
+  let(:value)   { rand(99) }
+  let(:result)  { value * value }
+  let(:promise) { PromisingValuableWorker.as_promise(value) }
+  subject { promise }
+
+  its(:final)  { should be_resolved }
+  its(:final)  { should_not be_rejected }
+  its(:result) { should eq result }
+end

data/spec/acceptance/promise_value_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'Promise value' do
+  before(:all) { start_worker }
+  after(:all)  { kill_worker }
+  after        { clear_jobs }
+
+  let(:value)   { rand(99) }
+  let(:result)  { value * value }
+  let(:promise) { ValuableWorker.as_promise(value) }
+  subject { promise }
+
+  its(:final)  { should be_resolved }
+  its(:final)  { should_not be_rejected }
+  its(:result) { should eq result }
+end

data/spec/lib/sidekiq/promise/middleware_spec.rb

@@ -21,8 +21,8 @@ describe Sidekiq::Promise::Middleware do
 
   describe '#job_completed' do
     it 'delegates to #publish_message' do
-      expect(middleware).to receive(:publish_message).with(redis_pool, {status: 'complete', job: {}, jid: nil})
-      middleware.job_completed Hash.new, redis_pool
+      expect(middleware).to receive(:publish_message).with(redis_pool, {status: 'complete', job: {}, jid: nil, result: :result})
+      middleware.job_completed Hash.new, :result, redis_pool
     end
   end
 

data/spec/lib/sidekiq/promise/server_middleware_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Sidekiq::Promise::ServerMiddleware do
   let(:worker)     { double :worker }
-  let(:job)        { double :job }
+  let(:job)        { { jid: '12345' } }
   let(:queue)      { 'default' }
   let(:middleware) { described_class.new }
 
@@ -10,7 +10,8 @@ describe Sidekiq::Promise::ServerMiddleware do
     When 'the job is successful' do
       it 'dequeues the job, then yields, then completes' do
         expect(middleware).to receive(:job_dequeued).with(job)
-        expect(middleware).to receive(:job_completed).with(job)
+        expect(middleware).to receive(:job_completed).with(job, [[]])
+        #         ↓ [[]] is returned by RSpec's block probe.    ↑
         expect { |b| middleware.call(worker, job, queue, &b) }.to yield_control
       end
     end

data/spec/workers/promising_valuable_worker.rb

@@ -0,0 +1,9 @@
+class PromisingValuableWorker
+  include Sidekiq::Promise
+
+  def perform i
+    MrDarcy.promise do
+      resolve i * i
+    end
+  end
+end

data/spec/workers/valuable_worker.rb

@@ -0,0 +1,7 @@
+class ValuableWorker
+  include Sidekiq::Promise
+
+  def perform i
+    i * i
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-promise
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - James Harton
@@ -174,6 +174,8 @@ files:
 - spec/acceptance/completing_job_spec.rb
 - spec/acceptance/crashing_job_spec.rb
 - spec/acceptance/failing_job_spec.rb
+- spec/acceptance/promise_promise_value_spec.rb
+- spec/acceptance/promise_value_spec.rb
 - spec/acceptance/promising_job_spec.rb
 - spec/acceptance/promising_to_fail_worker_spec.rb
 - spec/lib/sidekiq/promise/client_middleware_spec.rb
@@ -187,9 +189,11 @@ files:
 - spec/support/sidekiq_helpers.rb
 - spec/workers/crashy_worker.rb
 - spec/workers/promising_to_fail_worker.rb
+- spec/workers/promising_valuable_worker.rb
 - spec/workers/promising_worker.rb
 - spec/workers/raisey_worker.rb
 - spec/workers/sleepy_worker.rb
+- spec/workers/valuable_worker.rb
 homepage: https://github.com/jamesotron/sidekiq-promise
 licenses:
 - MIT
@@ -218,6 +222,8 @@ test_files:
 - spec/acceptance/completing_job_spec.rb
 - spec/acceptance/crashing_job_spec.rb
 - spec/acceptance/failing_job_spec.rb
+- spec/acceptance/promise_promise_value_spec.rb
+- spec/acceptance/promise_value_spec.rb
 - spec/acceptance/promising_job_spec.rb
 - spec/acceptance/promising_to_fail_worker_spec.rb
 - spec/lib/sidekiq/promise/client_middleware_spec.rb
@@ -231,6 +237,8 @@ test_files:
 - spec/support/sidekiq_helpers.rb
 - spec/workers/crashy_worker.rb
 - spec/workers/promising_to_fail_worker.rb
+- spec/workers/promising_valuable_worker.rb
 - spec/workers/promising_worker.rb
 - spec/workers/raisey_worker.rb
 - spec/workers/sleepy_worker.rb
+- spec/workers/valuable_worker.rb