disc 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8c13e7e4ec525c4779d4d13e5164e6c0db6b97d
-  data.tar.gz: 8d423e9024f07932f44836ba3d41d5b795c5f7d9
+  metadata.gz: 9e7f970b9a9d1cd2cd784f821cca12490dd4152a
+  data.tar.gz: 4e18b6330789898e33b533229c705ff349500925
 SHA512:
-  metadata.gz: fdbc76ac8cf2678816048219b8e7f962f2b6564c8e43b35af26d371af773720aa12c1a1113e563b982dcf4ab4dd8461926446ebd5c0ab875ebc1dbbac9f57908
-  data.tar.gz: d10b168948292c66d2626c213eef0551d9a0044407641292d59880b4032c4a2da683d18590b680d3a29ffadcc7356d98936cb33ee96963905edeee3e1149d983
+  metadata.gz: 6034dd9276d0c9f9a40d160ab7299f33839cdbfc071a8ed0fd4c2695615acf0e1ba254a8cbd436f95cffee27c3b1ac8f2b3f9e487ae2381347d75ef5be1bc6d2
+  data.tar.gz: f74d5eb2dd9025491ccd19ad0e651bebed8f3b000a2cc46590988083a7411d4b0e503aa3deb368bd8f010f59b51e68155578e166dbe54e061befe10189a2d20d

data/README.md

@@ -118,7 +118,7 @@ the current job as a Hash, that has the following schema.
 ## PowerUps
 
 Disc workers can run just fine on their own, but if you're using
-[Celluloid](https://github.com/celluloid/celluloid) you migth want Disc to take
+[Celluloid](https://github.com/celluloid/celluloid) you might want Disc to take
 advantage of it and spawn multiple worker threads per process, doing this is
 trivial! Just require Celluloid before your init file:
 
@@ -130,6 +130,37 @@ Whenever Disc detects that Celluloid is available it will use it to  spawn a
 number of threads equal to the `DISC_CONCURRENCY` environment variable, or 25 by
 default.
 
+## Rails and ActiveJob integration
+
+Disc has an [ActiveJob](http://edgeguides.rubyonrails.org/active_job_basics.html) adapter, which you can use very easily:
+
+```ruby
+# Gemfile
+gem 'disc'
+
+# config/application.rb
+module YourApp
+  class Application < Rails::Application
+    config.active_job.queue_adapter = :disc
+  end
+end
+
+# app/jobs/clu_job.rb
+
+class CluJob < ActiveJob::Base
+  queue_as :urgent
+
+  def perform(*args)
+    # Try to take over The Grid here...
+  end
+end
+
+# Wherever you want
+CluJob.perform_later(a_bunch_of_arguments)
+```
+
+As always, make sure your `disc_init.rb` file requires the necessary jobs and you'll be good to go!
+
 ## License
 
 The code is released under an MIT license. See the [LICENSE](./LICENSE) file for

data/examples/active_job.rb

@@ -0,0 +1,7 @@
+class IncrediblyActiveJob < ActiveJob::Base
+  queue_as :test_medium
+
+  def perform(something)
+    puts something
+  end
+end

data/lib/active_job/queue_adapters/disc_adapter.rb

@@ -0,0 +1,24 @@
+require 'date'
+require 'msgpack'
+
+module ActiveJob
+  module QueueAdapters
+    class DiscAdapter
+      def enqueue(job)
+        enqueue_at(job, nil)
+      end
+
+      def enqueue_at(job, timestamp)
+        Disc.disque.push(
+          job.queue_name,
+          {
+            class: job.class.name,
+            arguments: job.arguments
+          }.to_msgpack,
+          Disc.disque_timeout,
+          delay: timestamp.nil? ? nil : (timestamp.to_time.to_i - DateTime.now.to_time.to_i)
+        )
+      end
+    end
+  end
+end

data/lib/disc.rb

@@ -68,10 +68,9 @@ class Disc
       loop do
         jobs = disque.fetch(from: queues, timeout: timeout, count: count)
         Array(jobs).each do |queue, msgid, serialized_job|
-          job = MessagePack.unpack(serialized_job)
-          job.update('id' => msgid, 'queue' => queue)
-
           begin
+            job = MessagePack.unpack(serialized_job)
+            job.update('id' => msgid, 'queue' => queue)
             instance = Object.const_get(job['class']).new
             instance.disc_start(job)
             instance.perform(*job['arguments'])

data/lib/disc/version.rb

@@ -1,3 +1,3 @@
 class Disc
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disc
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - pote
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: disque
@@ -69,9 +69,11 @@ files:
 - README.md
 - bin/disc
 - disc.gemspec
+- examples/active_job.rb
 - examples/disc_init.rb
 - examples/fail_job.rb
 - examples/greeter.rb
+- lib/active_job/queue_adapters/disc_adapter.rb
 - lib/disc.rb
 - lib/disc/version.rb
 - test/disc_test.rb