resque-restriction 0.2.2 → 0.3.0

data/.gitignore

@@ -1,4 +1,5 @@
 spec/dump.rdb
 pkg/**
 .idea
+.rvmrc
 

data/.rvmrc.example

@@ -0,0 +1,2 @@
+rvm_gemset_create_on_use_flag=1
+rvm gemset use resque-restriction

data/README.markdown

@@ -9,6 +9,11 @@ Resque Restriction is a plugin for the [Resque][0] queueing system (http://githu
 
 Resque Restriction requires Resque 1.7.0.
 
+Attention
+---------
+
+The <code>identifier</code> method is renamed to <code>restriction_identifier</code> to solve the confliction with resque-retry from version 0.3.0.
+
 Install
 -------
 
@@ -37,14 +42,14 @@ You can also add customized restriction as you like. For example, we have a job
 	class GenerateFacebookShares < Resque::Plugins::RestrictionJob
 	  restrict :per_day => 40
     
-	  def self.identifier(options)
+	  def self.restriction_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.
+options["user_id"] returns the user's facebook uid, the key point is that the different restriction_identifiers can restrict different job execution numbers.
 
 Contributing
 ------------

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/lib/resque-restriction/restriction_job.rb

@@ -66,10 +66,10 @@ module Resque
                      when :per_month then Date.today.strftime("%Y-%m")
                      when :per_year then Date.today.year.to_s
                      else period.to_s =~ /^per_(\d+)$/ and (Time.now.to_i / $1.to_i).to_s end
-        [self.identifier(*args), period_str].compact.join(":")
+        [self.restriction_identifier(*args), period_str].compact.join(":")
       end
 
-      def identifier(*args)
+      def restriction_identifier(*args)
         self.to_s
       end
 

data/resque-restriction.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{resque-restriction}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2010-09-09}
+  s.date = %q{2010-11-04}
   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 = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     ".rvmrc.example",
      "LICENSE",
      "README.markdown",
      "Rakefile",
@@ -37,7 +38,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/flyerhzm/resque-restriction}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{resque-restriction is an extension to resque queue system that restricts the execution number of certain jobs in a period time.}
   s.test_files = [
     "spec/resque-restriction/job_spec.rb",
@@ -49,7 +50,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<resque>, [">= 1.7.0"])
     else
       s.add_dependency(%q<resque>, [">= 1.7.0"])

data/spec/resque-restriction/restriction_job_spec.rb

@@ -42,7 +42,7 @@ describe Resque::Plugins::RestrictionJob do
       Resque.redis.get(OneHourRestrictionJob.redis_key(:per_hour)).should == "9"
     end
 
-    it "should use identifier to set exclusive execution counts" do
+    it "should use restriction_identifier to set exclusive execution counts" do
       result = perform_job(IdentifiedRestrictionJob, 1)
       result.should be_true
       result = perform_job(IdentifiedRestrictionJob, 1)

data/spec/spec_helper.rb

@@ -71,7 +71,7 @@ class IdentifiedRestrictionJob < Resque::Plugins::RestrictionJob
 
   @queue = 'normal'
 
-  def self.identifier(*args)
+  def self.restriction_identifier(*args)
     [self.to_s, args.first].join(":")
   end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-restriction
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Richard Huang
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 +08:00
+date: 2010-11-04 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: resque
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 7
@@ -42,6 +45,7 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - .gitignore
+- .rvmrc.example
 - LICENSE
 - README.markdown
 - Rakefile
@@ -67,23 +71,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: resque-restriction is an extension to resque queue system that restricts the execution number of certain jobs in a period time.