qe 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24925d0691189b9630c57dbce7ee24f17107fb6c
-  data.tar.gz: cb621b8762de804d541ae375627c31201127fadc
+  metadata.gz: e6884801104bf918f5ebc6178ff92c2569125e3d
+  data.tar.gz: 99d7e22d878fde30c235f9b60544af0536f2c6b2
 SHA512:
-  metadata.gz: d4ca40ca8191277537bddef4fd7b29c0403d9cec5bdc3d30b2c3b07a8a9cf80b784d880fa7e022452ba28aafe0cda609a1b1fbc7eba9b9d4d71824ef3927df41
-  data.tar.gz: 91de3e84a38b61d045ccd3265a6e34d60a24c298498660e56986a3da0f43dc4cf8337ec2974d80543e7af843584f07a2eb0c3191076f7c78a6974c417ca51f0f
+  metadata.gz: f6dde3ab2aad881d8a1d7116c6a2994d51f0ed3dd2088abbcb4d8f86efc1e800a0b122d79d2e031969297c50da2134b19469e18093b292b6905852009be32e7d
+  data.tar.gz: b4f31aea83cb96b747309c330202314c42fbc64e14ae94fa421f935473bddb07e2af6fc713d499e54d0f8d3d70fd3ae129bc251a6ba82938a6ef88ba8c9fee8a

data/Gemfile.lock

@@ -1,46 +1,52 @@
 PATH
   remote: .
   specs:
-    qe (0.3.0)
+    qe (0.3.1)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    arel (3.0.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.0)
+    atomic (1.1.12)
     awesome_print (1.1.0)
-    backburner (0.3.4)
-      beaneater (~> 0.3.0)
+    backburner (0.4.3)
+      beaneater (~> 0.3.1)
       dante (~> 0.1.5)
-    beaneater (0.3.0)
-    builder (3.0.4)
+    beaneater (0.3.1)
+    builder (3.1.4)
     celluloid (0.14.1)
       timers (>= 1.0.0)
     coderay (1.0.9)
     connection_pool (1.1.0)
     dante (0.1.5)
-    delayed_job (4.0.0.beta2)
+    delayed_job (4.0.0)
       activesupport (>= 3.0, < 4.1)
-    delayed_job_active_record (4.0.0.beta3)
+    delayed_job_active_record (4.0.0)
       activerecord (>= 3.0, < 4.1)
       delayed_job (>= 3.0, < 4.1)
     diff-lcs (1.2.4)
-    i18n (0.6.1)
+    i18n (0.6.4)
     json (1.8.0)
-    method_source (0.8.1)
+    method_source (0.8.2)
+    minitest (4.7.5)
     mono_logger (1.1.0)
-    multi_json (1.7.6)
+    multi_json (1.7.8)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -51,7 +57,7 @@ GEM
     rack-protection (1.5.0)
       rack
     redis (3.0.4)
-    redis-namespace (1.3.0)
+    redis-namespace (1.3.1)
       redis (~> 3.0.0)
     resque (1.24.1)
       mono_logger (~> 1.0)
@@ -63,28 +69,30 @@ GEM
       redis (>= 2.0.1)
       resque (>= 1.20.0)
       rufus-scheduler
-    rspec (2.14.0.rc1)
-      rspec-core (= 2.14.0.rc1)
-      rspec-expectations (= 2.14.0.rc1)
-      rspec-mocks (= 2.14.0.rc1)
-    rspec-core (2.14.0.rc1)
-    rspec-expectations (2.14.0.rc1)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.4)
+    rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.0.rc1)
-    rufus-scheduler (2.0.19)
+    rspec-mocks (2.14.2)
+    rufus-scheduler (2.0.23)
       tzinfo (>= 0.3.23)
-    sidekiq (2.12.1)
+    sidekiq (2.13.0)
       celluloid (>= 0.14.1)
       connection_pool (>= 1.0.0)
       json
       redis (>= 3.0)
       redis-namespace
-    sinatra (1.4.2)
-      rack (~> 1.5, >= 1.5.2)
+    sinatra (1.4.3)
+      rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    slop (3.4.5)
+    slop (3.4.6)
     sqlite3 (1.3.7)
+    thread_safe (0.1.2)
+      atomic
     tilt (1.4.1)
     timers (1.1.0)
     tzinfo (0.3.37)

data/README.md

@@ -75,7 +75,7 @@ MailerWorker.enqueue({
 })
 ```
 
-You can specify when this job must be processed by setting the <tt>:run_at</tt> option.
+You can specify when this job must be processed by setting the `:run_at` option.
 
 ``` ruby
 MailerWorker.enqueue({
@@ -86,6 +86,18 @@ MailerWorker.enqueue({
 })
 ```
 
+### Setting the queue name
+
+Sometimes setting the queue name is important.
+
+```ruby
+class HelloWorker
+  include Qe::Worker
+
+  queue :hello
+end
+```
+
 ### Defining actions
 
 Sometimes you want to create several actions in a single worker, just because is easier. Instead of manually dispatch the action on your perform method, you can

data/lib/qe/immediate.rb

@@ -3,5 +3,9 @@ module Qe
     def self.enqueue(worker, options = {})
       Qe::Worker.perform(worker.name, options)
     end
+
+    def self.schedule(worker, run_at, options = {})
+      enqueue(worker, options)
+    end
   end
 end

data/lib/qe/testing.rb

@@ -5,7 +5,11 @@ module Qe
 
   class Testing
     def self.enqueue(worker, options = {})
-      Qe.jobs << {:worker => worker, :options => options}
+      Qe.jobs << {worker: worker, options: options}
+    end
+
+    def self.schedule(worker, run_at, options = {})
+      Qe.jobs << {worker: worker, options: options, run_at: run_at}
     end
   end
 end

data/lib/qe/testing/rspec.rb

@@ -3,10 +3,12 @@ require "qe/testing"
 module Qe
   module EnqueueMatcher
     class Matcher
-      attr_reader :worker, :options
+      attr_reader :worker, :options, :date, :scheduled
 
-      def initialize(worker)
+      def initialize(worker, scheduled)
         @worker = worker
+        @options = nil
+        @scheduled = scheduled
       end
 
       def with(options)
@@ -14,16 +16,34 @@ module Qe
         self
       end
 
+      def on(date)
+        @date = date
+        self
+      end
+
       def matches?(block)
         block.call
 
-        Qe.jobs.find do |job|
+        jobs.any? do |job|
           condition = job[:worker] == worker
+          condition = condition && datetime? if scheduled
           condition = condition && job[:options] == options if options
+          condition = condition && job[:run_at].to_i == date.to_i if date
           condition
         end != nil
       end
 
+      def does_not_match?(block)
+        block.call
+
+        jobs.none? do |job|
+          condition = job[:worker] != worker
+          condition = condition && job[:options] != options if options
+          condition = condition && job[:run_at].to_i != date.to_i if date
+          condition
+        end
+      end
+
       def description
         "enqueue job for #{worker.inspect} worker"
       end
@@ -37,7 +57,19 @@ module Qe
       end
 
       def build_message(base)
-        base << (options.empty? ? "" : " with #{options.inspect}")
+        base << ((options || {}).empty? ? "" : " with #{options.inspect}")
+        base << " on #{date.inspect}" if date
+        base
+      end
+
+      def jobs
+        Qe.jobs.select do |job|
+          scheduled ? job.key?(:run_at) : true
+        end
+      end
+
+      def datetime?
+        [Date, Time, DateTime].find {|klass| date.kind_of?(klass) }
       end
     end
 
@@ -45,7 +77,14 @@ module Qe
     #   expect {}.to enqueue(MailerWorker).with(options)
     #
     def enqueue(worker)
-      Matcher.new(worker)
+      Matcher.new(worker, true)
+    end
+
+    #
+    #   expect {}.to schedule(MailerWorker).on(Time.now).with(options)
+    #
+    def schedule(worker)
+      Matcher.new(worker, true)
     end
   end
 end

data/lib/qe/version.rb

@@ -1,3 +1,3 @@
 module Qe
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/qe/worker/class_methods.rb

@@ -12,7 +12,7 @@ module Qe
         end
       end
 
-      # Set the queue name when receiving on argument.
+      # Set the queue name when receiving one argument.
       # Return queue name otherwise.
       def queue(*args)
         @queue = args.first unless args.empty?

data/spec/qe/immediate_spec.rb

@@ -18,4 +18,14 @@ describe Qe::Immediate do
 
     Qe::Immediate.enqueue(HelloWorker)
   end
+
+  it "schedules job" do
+    date = Time.now
+
+    Qe::Immediate
+      .should_receive(:enqueue)
+      .with(HelloWorker, :a => 1)
+
+    Qe::Immediate.schedule(HelloWorker, date, :a => 1)
+  end
 end

data/spec/qe/matchers_spec.rb

@@ -0,0 +1,49 @@
+require "spec_helper"
+
+describe Qe::EnqueueMatcher do
+  let(:date) { Time.now }
+
+  before { Qe.jobs.clear }
+
+  it "enqueues job" do
+    expect {
+      HelloWorker.enqueue(a: 1)
+    }.to enqueue(HelloWorker).with(a: 1)
+  end
+
+  it "enqueues job without mentioning options" do
+    expect {
+      HelloWorker.enqueue(a: 1)
+    }.to enqueue(HelloWorker)
+  end
+
+  it "doesn't enqueue job" do
+    expect {
+      # noop
+    }.not_to enqueue(HelloWorker)
+  end
+
+  it "doesn't enqueue job with options" do
+    expect {
+      HelloWorker.enqueue(b: 1)
+    }.not_to enqueue(HelloWorker).with(a: 1)
+  end
+
+  it "schedules job" do
+    expect {
+      HelloWorker.enqueue(a: 1, run_at: date)
+    }.to schedule(HelloWorker).on(date).with(a: 1)
+  end
+
+  it "schedules job without mentioning options" do
+    expect {
+      HelloWorker.enqueue(a: 1, run_at: date)
+    }.to schedule(HelloWorker).on(date)
+  end
+
+  it "requires date on scheduled job" do
+    expect {
+      HelloWorker.enqueue(a: 1, run_at: date)
+    }.not_to schedule(HelloWorker).on(nil)
+  end
+end

data/spec/qe/testing_spec.rb

@@ -0,0 +1,21 @@
+require "spec_helper"
+
+describe Qe::Testing do
+  let(:job) { double("job").as_null_object }
+
+  it "stores enqueued job" do
+    Qe::Testing.enqueue(HelloWorker, a: 1)
+    job = Qe.jobs.first
+
+    expect(job).to include(worker: HelloWorker)
+    expect(job).to include(options: {a: 1})
+  end
+
+  it "schedules job" do
+    date = Time.now
+    Qe::Testing.schedule(HelloWorker, date, a: 1)
+    job = Qe.jobs.first
+
+    expect(job).to include(run_at: date)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qe
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -230,9 +230,11 @@ files:
 - spec/qe/enqueue_matcher_spec.rb
 - spec/qe/immediate_spec.rb
 - spec/qe/locale_spec.rb
+- spec/qe/matchers_spec.rb
 - spec/qe/qu_spec.rb
 - spec/qe/resque_spec.rb
 - spec/qe/sidekiq_spec.rb
+- spec/qe/testing_spec.rb
 - spec/qe/worker_spec.rb
 - spec/spec_helper.rb
 - spec/support/hello_worker.rb