resque-progress 1.0.0 → 1.0.1

data/lib/resque/plugins/progress.rb

@@ -8,10 +8,15 @@ module Resque
         Resque::Plugins::Meta::Metadata.send(:include, Resque::Plugins::Progress::Metadata)
       end
 
-      def at(num, total, message)
-        meta = get_meta(meta_id)
-        meta.progress = [num, total, message]
-        meta.save
+      def at(num, total, message = nil)
+        if meta = get_meta(@meta_id)
+          meta.progress = [num, total, message]
+          meta.save
+        end
+      end
+
+      def before_perform_progress(meta_id, *args)
+        @meta_id = meta_id
       end
 
       module Metadata

data/lib/resque/plugins/progress/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module Progress
-      Version = '1.0.0'
+      Version = '1.0.1'
     end
   end
 end

data/test/progress_test.rb

@@ -1,3 +1,4 @@
+require 'digest/sha1'
 require 'resque'
 require 'resque/plugins/progress'
 require 'resque/plugins/progress/version'
@@ -10,6 +11,31 @@ class ProgressJob
     10
   end
 
+  def self.meta_id(*args)
+    Digest::SHA1.hexdigest([rand.to_s, self, args].join)
+  end
+
+  def self.perform(meta_id)
+    (0..4).each do |i|
+      at(i, 5, 'working')
+    end
+    at(5, 5, 'complete')
+  end
+end
+
+class IncludeBothJob
+  extend Resque::Plugins::Meta
+  extend Resque::Plugins::Progress
+  @queue = :test
+
+  def self.expire_meta_in
+    10
+  end
+
+  def self.meta_id(*args)
+    Digest::SHA1.hexdigest([rand.to_s, self, args].join)
+  end
+
   def self.perform(meta_id)
     (0..4).each do |i|
       at(i, 5, 'working')
@@ -17,6 +43,8 @@ class ProgressJob
     at(5, 5, 'complete')
   end
 end
+
+
 class ProgressTest < Test::Unit::TestCase
   def setup
     Resque.redis.flushall
@@ -67,4 +95,26 @@ class ProgressTest < Test::Unit::TestCase
     assert_equal(100, meta.progress[:percent])
     assert_equal('complete', meta.progress[:message])
   end
+
+  def test_include_both
+    meta = IncludeBothJob.enqueue
+    assert_not_nil(meta)
+    assert_not_nil(meta.progress)
+    assert_equal(0, meta.progress[:num])
+    assert_equal(1, meta.progress[:total])
+    assert_equal(0, meta.progress[:percent])
+    assert_nil(meta.progress[:message])
+
+    worker = Resque::Worker.new(:test)
+    worker.work(0)
+
+    meta = IncludeBothJob.get_meta(meta.meta_id)
+    assert_not_nil(meta)
+    assert(meta.finished?)
+    assert_not_nil(meta.progress)
+    assert_equal(5, meta.progress[:num])
+    assert_equal(5, meta.progress[:total])
+    assert_equal(100, meta.progress[:percent])
+    assert_equal('complete', meta.progress[:message])
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-progress
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Idris Mokhtarzada
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 -04:00
+date: 2010-08-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency