resque-restriction 0.2.0 → 0.2.1

data/README.markdown

@@ -25,9 +25,26 @@ It is especially useful when a system has an email invitation resque job, becaus
 	  #rest of your class here
 	end
 
-That means the InvitationJob can not be executed more than 1000 times per day, 100 times per hour and 30 times per 300 seconds.
+That means the InvitationJob can not be executed more than 1000 times per day, 100 times per hour and 30 times per 300 seconds.  All restrictions have to be met for the job to execute.
 
-The argument of restrict method is a hash, the key of the hash is a period time, including :per_minute, :per_hour, :per_day, :per_week, :per_month, :per_year, and you can also define any period like :per_300 means per 300 seconds. the value of the hash is the job execution limit number in a period.
+The argument of restrict method is a hash, the key of the hash is a period time, including :concurrent, :per_minute, :per_hour, :per_day, :per_week, :per_month, :per_year, and you can also define any period like :per_300 means per 300 seconds. The value of the hash is the job execution limit number in a period.  The :concurrent option restricts the number of jobs that run simultaneously.
+
+Advance
+-------
+
+You can also add customized restriction as you like. For example, we have a job to restrict the facebook post numbers 40 times per user per day, we can define as:
+
+	class GenerateFacebookShares < Resque::Plugins::RestrictionJob
+	  restrict :per_day => 40
+    
+	  def self.identifier(options)
+	    [self.to_s, options["user_id"]].join(":")
+	  end
+    
+	  #rest of your class here
+	end
+
+options["user_id"] returns the user's facebook uid, the key point is that the different identifiers can restrict different job execution numbers.
 
 Contributing
 ------------
@@ -44,6 +61,10 @@ Author
 ------
 Richard Huang :: flyerhzm@gmail.com :: @flyerhzm
 
+Contributors
+------------
+Matt Conway :: matt@conwaysplace.com :: @mattconway
+
 Copyright
 ---------
 Copyright (c) 2010 Richard Huang. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/resque-restriction/restriction_job.rb

@@ -54,6 +54,10 @@ module Resque
         end
       end
 
+      def on_failure_restriction(ex, *args)
+        after_perform_restriction(*args)
+      end
+
       def redis_key(period, *args)
         period_str = case period
                      when :concurrent then "*"

data/resque-restriction.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{resque-restriction}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2010-06-29}
+  s.date = %q{2010-07-10}
   s.description = %q{resque-restriction is an extension to resque queue system that restricts the execution number of certain jobs in a period time, the exceeded jobs will be executed at the next period.}
   s.email = %q{flyerhzm@gmail.com}
   s.extra_rdoc_files = [

data/spec/resque-restriction/restriction_job_spec.rb

@@ -71,6 +71,12 @@ describe Resque::Plugins::RestrictionJob do
       Resque.redis.get(ConcurrentRestrictionJob.redis_key(:concurrent)).should == "1"
     end
 
+    it "should increment execution number when concurrent job fails" do
+      ConcurrentRestrictionJob.should_receive(:perform).and_raise("bad")
+      perform_job(ConcurrentRestrictionJob, "any args") rescue nil
+      Resque.redis.get(ConcurrentRestrictionJob.redis_key(:concurrent)).should == "1"
+    end
+
     it "should put the job into restriction queue when execution count < 0" do
       Resque.redis.set(OneHourRestrictionJob.redis_key(:per_hour), 0)
       result = perform_job(OneHourRestrictionJob, "any args")

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Richard Huang
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 +08:00
+date: 2010-07-10 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency