sidekiq-promise 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d1ad1d63b7ed4f72b139aa1ac53e7a3b96d38d4
-  data.tar.gz: 9f79851dc5d9b034045b33219c189e9de34b8235
+  metadata.gz: 5b8d0356b4487f83cc96590083ef6b2bad2f3447
+  data.tar.gz: a6185ea7a90d54d4a0659b5ef97949b7927a3023
 SHA512:
-  metadata.gz: 0b36eae7845325451d53887e2b9b0b8368a8257db7b85f1079f54848966c3814aa432cb7f84ac78f8ff474583286ea093cb6a11189b7f6c5273bd6528446f074
-  data.tar.gz: 88c8086066a71273f1b03db80c5b883199b168d2132c94c5c4ef3ddf202297e0ab1458e58894936efd53785ed572c477258386952855d4c4a43993de5200e2de
+  metadata.gz: 78c89bcb6e6a36014204bc142f8e9d0c1f635bb4b8797833258952fe7472af3f0db6a2e8c40530b8e53507b537d8b4393e68d17e23a7528515413925c6498146
+  data.tar.gz: 87a6c97f24dd82c85a993dfb776b515dee02e21fa2f0f5d1a83d43ac05800224312dfcf90df3e336a7bd97cda69c7d69e33b153035169b886ff49536ba7f5720

data/.gitignore

@@ -3,10 +3,10 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
+Gemfile.lock
 doc/
 lib/bundler/man
 pkg
@@ -20,3 +20,4 @@ tmp
 *.o
 *.a
 mkmf.log
+spec/sidekiq.log

data/lib/sidekiq/promise.rb

@@ -2,6 +2,8 @@ require "sidekiq/promise/version"
 require 'sidekiq'
 require 'json'
 require 'mr_darcy'
+require 'sidekiq/promise/redis_connection'
+require 'sidekiq/promise/subscription'
 require 'sidekiq/promise/middleware'
 require 'sidekiq/promise/client_middleware'
 require 'sidekiq/promise/server_middleware'
@@ -40,6 +42,10 @@ module Sidekiq
         end
       end
     end
+
+    def redis_pool
+      @redis_pool ||= Sidekiq::Promise::RedisConnection.create
+    end
   end
 end
 

data/lib/sidekiq/promise/middleware.rb

@@ -4,19 +4,19 @@ module Sidekiq
 
       CHANNEL = '/sidekiq_jobs'
 
-      def job_enqueued job, redis_pool=Sidekiq.redis_pool
+      def job_enqueued job, redis_pool=Sidekiq::Promise.redis_pool
         publish_message redis_pool, status: 'enqueued', job: job, jid: job['jid']
       end
 
-      def job_dequeued job, redis_pool=Sidekiq.redis_pool
+      def job_dequeued job, redis_pool=Sidekiq::Promise.redis_pool
         publish_message redis_pool, status: 'dequeued', job: job, jid: job['jid']
       end
 
-      def job_completed job, result=nil, redis_pool=Sidekiq.redis_pool
+      def job_completed job, result=nil, redis_pool=Sidekiq::Promise.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
+      def job_errored job, e, redis_pool=Sidekiq::Promise.redis_pool
         publish_message redis_pool, status: 'error', job: job, exception: {class: e.class.to_s, message: e.message, backtrace: e.backtrace}, jid: job['jid']
       end
 

data/lib/sidekiq/promise/redis_connection.rb

@@ -0,0 +1,7 @@
+module Sidekiq
+  module Promise
+    class RedisConnection < ::Sidekiq::RedisConnection
+      def self.log_info *_; end
+    end
+  end
+end

data/lib/sidekiq/promise/subscription.rb

@@ -0,0 +1,40 @@
+module Sidekiq
+  module Promise
+    class Subscription
+      class << self
+        def subscribe &block
+          subscriptions << block
+          block
+        end
+
+        def unsubscribe id
+          subscriptions.delete id
+        end
+
+        def ready
+          @ready ||= MrDarcy.promise do |promise|
+            Sidekiq::Promise.redis_pool.with do |redis|
+              redis.subscribe Sidekiq::Promise::Middleware::CHANNEL do |on|
+                on.subscribe do
+                  promise.resolve true
+                end
+                on.message do |channel,message|
+                  message = JSON.parse(message)
+                  subscriptions.each do |block|
+                    block.call message
+                  end
+                end
+              end
+            end
+          end
+        end
+
+        private
+
+        def subscriptions
+          @subscriptions ||= []
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq/promise/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Promise
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

data/lib/sidekiq/promise/worker.rb

@@ -14,19 +14,16 @@ module Sidekiq
       private
 
       def subscribe
-        @redis = Sidekiq.redis_pool.checkout
-        @redis.subscribe ::Sidekiq::Promise::Middleware::CHANNEL do |on|
-          on.subscribe { queue_job }
-          on.message do |channel,message|
-            message = JSON.parse(message)
-            process_message message if applicable? message
-          end
+        @subscription_id = Sidekiq::Promise::Subscription.subscribe do |message|
+          process_message message if applicable? message
+        end
+        Sidekiq::Promise::Subscription.ready.then do
+          queue_job
         end
       end
 
       def unsubscribe
-        @redis.unsubscribe
-        Sidekiq.redis_pool.checkin
+        Sidekiq::Promise::Subscription.unsubscribe @subscription_id if @subscription_id
       end
 
       def queue_job

data/sidekiq-promise.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  %w| rake rspec guard guard-rspec guard-bundler terminal-notifier-guard
+  %w| rake rspec rspec-its guard guard-rspec guard-bundler terminal-notifier-guard
       pry |.each do |gem|
     spec.add_development_dependency gem
   end
 
-  spec.add_dependency 'sidekiq', '>= 3.0.1'
+  spec.add_dependency 'sidekiq', '>= 3.4.0'
   spec.add_dependency 'mr_darcy', '>= 0.4.0'
 end

data/spec/acceptance/completing_job_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 describe 'Completing job as promise' do
-  before(:all) { start_worker }
-  after(:all)  { kill_worker }
-  after        { clear_jobs }
+
+  before { start_worker }
+  after  { kill_worker; clear_jobs }
 
   let(:promise) { SleepyWorker.as_promise(0.1) }
   subject { promise }

data/spec/acceptance/promising_job_spec.rb

@@ -1,10 +1,8 @@
 require 'spec_helper'
 
 describe 'Promising job as promise' do
-  before(:all) { start_worker }
-  after(:all)  { kill_worker }
-  before       { clear_jobs }
-  after        { clear_jobs }
+  before { start_worker }
+  after  { kill_worker; clear_jobs }
 
   let(:promise) { PromisingWorker.as_promise }
   subject { promise }

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

@@ -10,8 +10,7 @@ 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, [[]])
-        #         ↓ [[]] is returned by RSpec's block probe.    ↑
+        expect(middleware).to receive(:job_completed).with(job, nil)
         expect { |b| middleware.call(worker, job, queue, &b) }.to yield_control
       end
     end
@@ -23,7 +22,7 @@ describe Sidekiq::Promise::ServerMiddleware do
         expect(middleware).to receive(:job_errored).with(job, exception)
         expect do
           middleware.call(worker,job,queue) { raise exception }
-        end.to raise_error
+        end.to raise_error(RuntimeError)
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
-require 'sidekiq/promise'
+require 'rspec/its'
 require 'mr_darcy'
+MrDarcy.driver = :celluloid
+require 'sidekiq/promise'
 require 'pry'
 
 Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }
@@ -8,7 +10,5 @@ Dir[File.expand_path('../workers/**/*.rb', __FILE__)].each { |f| require f }
 RSpec.configure do |config|
   config.formatter = :documentation
   config.extend ContextHelpers
-  config.include SidekiqHelpers, example_group: {
-    file_path: %r(spec/acceptance)
-  }
+  config.include SidekiqHelpers, file_path: %r(spec/acceptance)
 end

data/spec/support/sidekiq_helpers.rb

@@ -3,8 +3,9 @@ require 'sidekiq/api'
 module SidekiqHelpers
   def start_worker
     return if @worker_pid
+    sidekiq_log = File.expand_path('../../sidekiq.log', __FILE__)
     server_path = File.expand_path('../../spec_server.rb', __FILE__)
-    @worker_pid = Process.spawn("bundle exec sidekiq -t 0 -r #{server_path}")
+    @worker_pid = Process.spawn("bundle exec sidekiq -t 1 -L #{sidekiq_log} -r #{server_path}", out: "/dev/null")
   end
 
   def kill_worker

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-promise
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - James Harton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +142,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: mr_darcy
   requirement: !ruby/object:Gem::Requirement
@@ -167,7 +181,9 @@ files:
 - lib/sidekiq/promise.rb
 - lib/sidekiq/promise/client_middleware.rb
 - lib/sidekiq/promise/middleware.rb
+- lib/sidekiq/promise/redis_connection.rb
 - lib/sidekiq/promise/server_middleware.rb
+- lib/sidekiq/promise/subscription.rb
 - lib/sidekiq/promise/version.rb
 - lib/sidekiq/promise/worker.rb
 - sidekiq-promise.gemspec
@@ -214,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Wrap Sidekiq jobs in promises