disquo 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4a5a02702349eb8b6c55ccda7678d0ec5374f9d
-  data.tar.gz: 2793c75864c561a6d96833c7a171c687b0bda854
+  metadata.gz: 478f669678db9f4b49df090cb601c6d2d4fad7f1
+  data.tar.gz: 62c78605fb663c5a4aea50c07911990e3ac1fac9
 SHA512:
-  metadata.gz: bd458037bec4658dd490234ca46ab75f82f3f74e40deb1e6a65d95eea6e3ddf49d3a7f0770885389830be92fed26124e3a66422fad584382fc21ec33ee9f0618
-  data.tar.gz: e0575ada72338c810ee9186104f75b1478d8518f7a91bd5e5ed2218282c1d5c52ea99988b69c8c0550197cbf04d5e2d89919d1a6a7175d21e261f5733572b707
+  metadata.gz: ded5fc8a2aa03764d1c3cafdf6640d88462ed856515ef30a6c2f8e042889a92890c173873ea98dfc921f28f9909e4822a6262fa4bcdc3d8484257d765f678e14
+  data.tar.gz: 72f521a2a23ebcf6fe226e6fb49c8631d05c983ccabbca92e158280274329e8e7698cd80847a567c8d60e975ada140f9f2448d2ff92803c33a0fb0451d42bf32

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 before_install:
-  - wget https://github.com/antirez/disque/archive/master.tar.gz -O disque-master.tar.gz
-  - tar xf disque-master.tar.gz && cd disque-master/src/ && make && PREFIX=../ make install && cd -
+  - test -d disque-master/src || wget -O- https://github.com/antirez/disque/archive/master.tar.gz | tar xz
+  - cd disque-master/src && make && PREFIX=../ make install && cd -
 before_script:
   - ./disque-master/bin/disque-server --daemonize yes
 script:
@@ -9,3 +9,7 @@ script:
 rvm:
   - 2.4
   - 2.3
+cache:
+  bundler: true
+  directories:
+  - disque-master

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    disquo (0.3.1)
+    disquo (0.3.2)
       concurrent-ruby
       connection_pool
       disque
@@ -9,12 +9,25 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activejob (5.1.4)
+      activesupport (= 5.1.4)
+      globalid (>= 0.3.6)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
     diff-lcs (1.3)
     disque (0.0.6)
       redic (~> 1.5.0)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
     hiredis (0.6.1)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    minitest (5.10.3)
     rake (12.3.0)
     redic (1.5.0)
       hiredis
@@ -31,11 +44,15 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activejob
   disquo!
   rake
   rspec

data/disquo.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "disquo"
-  s.version     = "0.3.1"
+  s.version     = "0.3.2"
   s.platform    = Gem::Platform::RUBY
 
   s.licenses    = ["Apache-2.0"]
@@ -25,4 +25,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'activejob'
 end

data/lib/active_job/queue_adapters/disquo_adapter.rb

@@ -0,0 +1,56 @@
+require "disquo"
+
+module ActiveJob
+  module QueueAdapters
+    # == Disquo adapter for Active Job
+    #
+    # Read more about Disquo {here}[https://github.com/bsm/disquo].
+    #
+    # To use queue_adapter config to +:disquo+.
+    #
+    #   require 'active_job/queue_adapters/disquo_adapter'
+    #
+    #   Rails.application.config.active_job.queue_adapter = :disquo
+    #
+    # To pass extra options into the job, you can use custom serialization:
+    #
+    #    class MyJob < ActiveJob::Base
+    #      def serialize
+    #        opts = { 'ttl' => 1.hour, 'async' => true }
+    #        super.merge('disquo' => opts)
+    #      end
+    #    end
+    class DisquoAdapter
+
+      class JobWrapper #:nodoc:
+        include Disquo::Job
+
+        def perform(job_data)
+          ActiveJob::Base.execute job_data
+        end
+      end
+
+      def enqueue(job) #:nodoc:
+        enqueue_with_opts job
+      end
+
+      def enqueue_at(job, timestamp) #:nodoc:
+        delay  = timestamp - Time.current.to_f
+        enqueue_with_opts job, delay: delay.to_i
+      end
+
+      private
+
+        def enqueue_with_opts(job, opts = {})
+          attrs = job.serialize
+          opts.update attrs["disquo"].symbolize_keys if attrs["disquo"].is_a?(Hash)
+          opts[:queue] = job.queue_name
+
+          job_id = JobWrapper.enqueue [attrs], opts
+          job.provider_job_id = job_id
+          job_id
+        end
+
+    end
+  end
+end

data/spec/active_job/queue_adapters/disquo_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+RSpec.describe ActiveJob::QueueAdapters::DisquoAdapter do
+
+  subject do
+    TestActiveJob.set(wait: 60).perform_later("foo", 1)
+  end
+
+  let(:job_data) { show(subject.provider_job_id) }
+
+  it "should enqueue" do
+    expect(job_data).to include(
+      "additional-deliveries" => 0,
+      "id"    => subject.provider_job_id,
+      "nacks" => 0,
+      "queue" => "__disquo_test__",
+      "state" => "active",
+    )
+    expect(job_data["delay"]).to be_within(5).of(60)
+    expect(job_data["retry"]).to be_within(5).of(360)
+    expect(job_data["ttl"]).to be_within(5).of(3600)
+    expect(Disquo.load_job(job_data["body"])).to eq([
+      "ActiveJob::QueueAdapters::DisquoAdapter::JobWrapper",
+      [{
+        "job_class"  => "TestActiveJob",
+        "job_id"     => subject.job_id,
+        "provider_job_id" => nil,
+        "queue_name" => "__disquo_test__",
+        "priority"   => nil,
+        "arguments"  => ["foo", 1],
+        "executions" => 0,
+        "locale"     => "en",
+        "disquo"     => {"ttl" => 3600},
+      }],
+    ])
+  end
+
+  it 'should perform' do
+    klass, args = Disquo.load_job(job_data["body"])
+    Object.const_get(klass).new.perform(*args)
+
+    expect(Disquo::TEST::PERFORMED.size).to eq(1)
+    expect(Disquo::TEST::PERFORMED.last).to include(
+      klass:  "TestActiveJob",
+      args:   ["foo", 1],
+    )
+  end
+
+end

data/spec/disquo/job_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe Disquo::Job do
   it "should enqueue jobs" do
     jid1 = TestJob.enqueue ["foo", 1]
     expect(qlen).to eq(1)
-    expect(jid1).to match(/^D\w+/)
+    expect(jid1).to match(/^D[\w\-]+/)
     expect(show(jid1)).to include(
       "id"    => jid1,
       "queue" => "__disquo_test__",
@@ -18,7 +18,7 @@ RSpec.describe Disquo::Job do
 
     jid2 = TestJob.enqueue ["bar"], delay: 600
     expect(qlen).to eq(1)
-    expect(jid2).to match(/^D\w+/)
+    expect(jid2).to match(/^D[\w\-]+/)
     expect(show(jid2)).to include(
       "id"    => jid2,
       "queue" => "__disquo_test__",

data/spec/disquo/worker_spec.rb

@@ -33,7 +33,7 @@ RSpec.describe Disquo::Worker do
       klass: "TestJob",
       queue: "__disquo_test__",
     )
-    expect(Disquo::TEST::PERFORMED.last[:job_id]).to match(/^D\w+/)
+    expect(Disquo::TEST::PERFORMED.last[:job_id]).to match(/^D[\w\-]+/)
     expect(Disquo::TEST::PERFORMED.map {|e| e[:args].first }).to match_array(0..199)
   end
 

data/spec/spec_helper.rb

@@ -2,6 +2,11 @@ require 'rspec'
 require 'disquo'
 require 'disquo/worker'
 
+require 'active_job'
+require 'active_job/queue_adapters/disquo_adapter'
+ActiveJob::Base.queue_adapter = :disquo
+ActiveJob::Base.logger = Logger.new(nil)
+
 module Disquo::TEST
   QUEUE = "__disquo_test__"
   PERFORMED = []
@@ -17,6 +22,18 @@ class TestJob
   end
 end
 
+class TestActiveJob < ActiveJob::Base
+  queue_as Disquo::TEST::QUEUE
+
+  def perform(*args)
+    Disquo::TEST::PERFORMED.push(klass: self.class.name, args: args)
+  end
+
+  def serialize
+    super.merge('disquo' => {'ttl' => 3600})
+  end
+end
+
 helpers = Module.new do
 
   def qlen

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disquo
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2017-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: disque
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activejob
+  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'
 description: Concurrent background workers on top of Disque
 email: dimitrij@blacksquaremedia.com
 executables:
@@ -96,10 +110,12 @@ files:
 - Rakefile
 - bin/disquo
 - disquo.gemspec
+- lib/active_job/queue_adapters/disquo_adapter.rb
 - lib/disquo.rb
 - lib/disquo/cli.rb
 - lib/disquo/job.rb
 - lib/disquo/worker.rb
+- spec/active_job/queue_adapters/disquo_spec.rb
 - spec/disquo/job_spec.rb
 - spec/disquo/worker_spec.rb
 - spec/spec_helper.rb
@@ -128,6 +144,7 @@ signing_key:
 specification_version: 4
 summary: Concurrent background workers on top of Disque
 test_files:
+- spec/active_job/queue_adapters/disquo_spec.rb
 - spec/disquo/job_spec.rb
 - spec/disquo/worker_spec.rb
 - spec/spec_helper.rb