disc 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e7f970b9a9d1cd2cd784f821cca12490dd4152a
-  data.tar.gz: 4e18b6330789898e33b533229c705ff349500925
+  metadata.gz: 3ecc3356891d074ac864ebe024fdab7f8882d1e3
+  data.tar.gz: 48318efa3c5ad39de7cf86e6fe632e73cc1cbcb0
 SHA512:
-  metadata.gz: 6034dd9276d0c9f9a40d160ab7299f33839cdbfc071a8ed0fd4c2695615acf0e1ba254a8cbd436f95cffee27c3b1ac8f2b3f9e487ae2381347d75ef5be1bc6d2
-  data.tar.gz: f74d5eb2dd9025491ccd19ad0e651bebed8f3b000a2cc46590988083a7411d4b0e503aa3deb368bd8f010f59b51e68155578e166dbe54e061befe10189a2d20d
+  metadata.gz: 89f834da2af8da0a89f4a8d2eed744f0739b80c9f7d1ca2ae49c3a803815653affe16589c5708bfaf5314edd841d8327308ab0a7144ab4585f68fceb6228baaf
+  data.tar.gz: 2afe64e1c088273a968db54d41531ca2ad9294f717d48ee743955c67d4f51b14ee3c431ede0e248aadfd5ad444bcd9485170de04a3a2c1faab81fa293e54e2d1

data/.gitignore

@@ -1 +1,2 @@
 *.gem
+nodes.conf

data/Makefile

@@ -1,5 +1,5 @@
-ifndef GS_NAME
-  $(error GS_NAME not set. Have you `gs in` yet?)
+ifndef GEM_HOME
+  $(error GEM_HOME not set.)
 endif
 
 PACKAGES := disc

data/README.md

@@ -141,6 +141,7 @@ gem 'disc'
 # config/application.rb
 module YourApp
   class Application < Rails::Application
+    require 'active_job/queue_adapters/disc_adapter'
     config.active_job.queue_adapter = :disc
   end
 end

data/examples/disc_init.rb

@@ -1 +1,2 @@
-Dir.glob("./**/*.rb") { |f| require f }
+$:.unshift('lib')
+Dir.glob("./examples/**/*.rb") { |f| require f }

data/examples/echoer.rb

@@ -0,0 +1,12 @@
+require 'disc'
+
+class Echoer
+  include Disc::Job
+  disc queue: 'test_medium'
+
+  def perform(first, second, third)
+    puts "First: #{ first }"
+    puts "Second: #{ second }"
+    puts "Third: #{ third }"
+  end
+end

data/lib/disc/version.rb

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

data/lib/disc.rb

@@ -134,7 +134,7 @@ class Disc
           queue,
           {
             class: self.new.class.name,
-            arguments: args
+            arguments: args.first
           }.to_msgpack,
           Disc.disque_timeout,
           delay: datetime.nil? ? nil : (datetime.to_time.to_i - DateTime.now.to_time.to_i)

data/test/disc_test.rb

@@ -1,22 +1,44 @@
 $: << 'lib'
 require 'cutest'
 require 'disc'
+require 'msgpack'
 
 class TestJob
   include Disc::Job
   disc queue: 'test_urgent'
 
-  def perform(argument)
-    puts argument
+  def perform(first, second, third)
+    puts "First: #{ first }"
+    puts "Second: #{ second }"
+    puts "Third: #{ third }"
   end
 end
 
+prepare do
+  Disc.disque.call('DEBUG', 'FLUSHALL')
+end
+
 scope do
-  test 'basic enqueuing works' do
-    original_length = Disc.disque.call('QLEN', 'test_urgent').to_i
+  test 'jobs are enqueued to the correct Disque queue with appropriate parameters and class' do
+    TestJob.enqueue('one argument', { random: 'data' }, 3)
+
+    jobs = Array(Disc.disque.fetch(from: ['test_urgent'], timeout: Disc.disque_timeout, count: 1))
+    assert jobs.any?
+    assert_equal 1, jobs.count
+
+    jobs.first.tap do |queue, _, serialized_job|
+      job = MessagePack.unpack(serialized_job)
+
+      assert job.has_key?('class')
+      assert job.has_key?('arguments')
 
-    TestJob.enqueue(random: 'data')
+      assert_equal 'TestJob', job['class']
 
-    assert Disc.disque.call('QLEN', 'test_urgent').to_i == original_length + 1
+      args = job['arguments']
+      assert_equal 3, args.size
+      assert_equal 'one argument', args[0]
+      assert_equal({ 'random' => 'data' }, args[1])
+      assert_equal(3, args[2])
+    end
   end
 end

metadata

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

data/examples/active_job.rb

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