resque_unit 0.2.7 → 0.2.8

data/lib/resque_unit.rb

@@ -1,11 +1,17 @@
 module ResqueUnit
 end
 
+begin
+  require 'yajl'
+rescue LoadError
+  require 'json'
+end
+
 require 'test/unit'
+require 'resque_unit/helpers'
 require 'resque_unit/resque'
 require 'resque_unit/errors'
 require 'resque_unit/assertions'
 
-
 Test::Unit::TestCase.send(:include, ResqueUnit::Assertions)
 

data/lib/resque_unit/helpers.rb

@@ -0,0 +1,30 @@
+module Resque
+  module Helpers
+    # Given a Ruby object, returns a string suitable for storage in a
+    # queue.
+    def encode(object)
+      if defined? Yajl
+        Yajl::Encoder.encode(object)
+      else
+        object.to_json
+      end
+    end
+
+    # Given a string, returns a Ruby object.
+    def decode(object)
+      return unless object
+
+      if defined? Yajl
+        begin
+          Yajl::Parser.parse(object, :check_utf8 => false)
+        rescue Yajl::ParseError
+        end
+      else
+        begin
+          JSON.parse(object)
+        rescue JSON::ParserError
+        end
+      end
+    end
+  end
+end

data/lib/resque_unit/resque.rb

@@ -1,13 +1,15 @@
 # The fake Resque class. This needs to be loaded after the real Resque
 # for the assertions in +ResqueUnit::Assertions+ to work.
 module Resque
+  include Helpers
+  extend self
 
   # Resets all the queues to the empty state. This should be called in
   # your test's +setup+ method until I can figure out a way for it to
   # automatically be called.
   #
   # If <tt>queue_name</tt> is given, then resets only that queue.
-  def self.reset!(queue_name = nil)
+  def reset!(queue_name = nil)
     if @queue && queue_name
       @queue[queue_name] = []
     else
@@ -19,13 +21,13 @@ module Resque
   # element is of the form +{:klass => klass, :args => args}+ where
   # +klass+ is the job's class and +args+ is an array of the arguments
   # passed to the job.
-  def self.queue(queue_name)
+  def queue(queue_name)
     self.reset! unless @queue
     @queue[queue_name]
   end
 
   # Executes all jobs in all queues in an undefined order.
-  def self.run!
+  def run!
     old_queue = @queue.dup
     self.reset!
 
@@ -37,7 +39,7 @@ module Resque
   end
 
   # Executes all jobs in the given queue in an undefined order.
-  def self.run_for!(queue_name)
+  def run_for!(queue_name)
     jobs = self.queue(queue_name)
     self.reset!(queue_name)
 
@@ -49,7 +51,7 @@ module Resque
   # 1. Execute all jobs in all queues in an undefined order,
   # 2. Check if new jobs were announced, and execute them.
   # 3. Repeat 3
-  def self.full_run!
+  def full_run!
     until empty_queues?
       @queue.each do |k, v|
         while job = v.shift
@@ -60,26 +62,26 @@ module Resque
   end
 
   # Returns the size of the given queue
-  def self.size(queue_name)
+  def size(queue_name)
     self.reset! unless @queue
     @queue[queue_name].length
   end
 
   # :nodoc: 
-  def self.enqueue(klass, *args)
+  def enqueue(klass, *args)
     queue_name = queue_for(klass)
     # Behaves like Resque, raise if no queue was specifed
     raise NoQueueError.new("Jobs must be placed onto a queue.") unless queue_name
-    queue(queue_name) << {:klass => klass, :args => args}
+    queue(queue_name) << {:klass => klass, :args => decode(encode(args))}
   end
 
   # :nodoc: 
-  def self.queue_for(klass)
+  def queue_for(klass)
     klass.instance_variable_get(:@queue) || (klass.respond_to?(:queue) && klass.queue)
   end
 
   # :nodoc:
-  def self.empty_queues?
+  def empty_queues?
     @queue.all? do |k, v|
       v.empty?
     end

data/lib/resque_unit/scheduler.rb

@@ -19,7 +19,7 @@ module ResqueUnit
     end
     
     def enqueue_with_timestamp(timestamp, klass, *args)
-      queue(queue_for(klass)) << {:klass => klass, :args => args, :timestamp => timestamp}
+      queue(queue_for(klass)) << {:klass => klass, :args => decode(encode(args)), :timestamp => timestamp}
     end
 
   end

data/test/resque_unit_test.rb

@@ -75,11 +75,11 @@ class ResqueUnitTest < Test::Unit::TestCase
   
   context "A task that schedules a resque job with arguments" do 
     setup do 
-      Resque.enqueue(JobWithArguments, 1, "test")
+      Resque.enqueue(JobWithArguments, 1, :test, {:symbol => :symbol})
     end
     
-    should "pass the assert_queued(job, *args) assertion if the args match" do
-      assert_queued(JobWithArguments, [1, "test"])
+    should "pass the assert_queued(job, *args) assertion if the args match and sees enqueued symbols as strings" do
+      assert_queued(JobWithArguments, [1, "test", {"symbol"=>"symbol"}])
     end
     
     should "pass the assert_queued(job) assertion with no args passed" do
@@ -98,7 +98,7 @@ class ResqueUnitTest < Test::Unit::TestCase
 
     should "fail the assert_not_queued(job) assertion if the args match" do
       assert_raise Test::Unit::AssertionFailedError do 
-        assert_not_queued(JobWithArguments, [1, "test"])
+        assert_not_queued(JobWithArguments, [1, "test", {"symbol"=>"symbol"}])
       end
     end
   end

data/test/sample_jobs.rb

@@ -30,7 +30,7 @@ end
 class JobWithArguments
   @queue = :medium
 
-  def self.perform(num, text)
+  def self.perform(num, text, hash)
 
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque_unit
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Justin Weiss
@@ -15,13 +15,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 -07:00
+date: 2010-11-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 4
+        - 6
+        version: 1.4.6
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,7 +47,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 description: 
 email: justin@uberweiss.org
 executables: []
@@ -43,6 +59,7 @@ extra_rdoc_files:
 files: 
 - lib/resque_unit/assertions.rb
 - lib/resque_unit/errors.rb
+- lib/resque_unit/helpers.rb
 - lib/resque_unit/resque.rb
 - lib/resque_unit/scheduler.rb
 - lib/resque_unit/scheduler_assertions.rb