Merge pull request #1 from Xenapto/develop

Fix non-rate-limit exception exception

.hound.yml

@@ -0,0 +1,4 @@
+---
+ruby:
+  enabled: true
+  config_file: .rubocop.yml

.rubocop.yml

@@ -0,0 +1,46 @@
+---
+AllCops:
+  Exclude:
+    - 'tmp/**/*'
+    - 'coverage/**/*'
+    - 'spec/dummy/**/*'
+
+#-------------------------------------------------------------------------------
+# Project standards
+#-------------------------------------------------------------------------------
+StringLiterals:
+  EnforcedStyle: single_quotes
+  Enabled: true
+
+DotPosition:
+  Description: 'Checks the position of the dot in multi-line method calls.'
+  EnforcedStyle: leading
+  Enabled: true
+
+Documentation:
+  Description: 'Document classes and non-namespace modules.'
+  Enabled: false
+
+FileName:
+  Description: 'Use snake_case for source file names.'
+  Enabled: true
+
+Style/SymbolArray:
+  Description: 'Use %i or %I for arrays of symbols.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-i'
+  Enabled: false # Only available in Ruby 2.0+
+
+Style/ExtraSpacing:
+  Description: 'Do not use unnecessary spacing.'
+  Enabled: true
+
+Lint/LiteralInInterpolation:
+  Description: 'Avoid interpolating literals in strings'
+  AutoCorrect: true
+
+#-------------------------------------------------------------------------------
+# These rules have been relaxed because of existing code
+# We should tighten these up over time
+#-------------------------------------------------------------------------------
+LineLength:
+  Max: 166 # project standard is 120

Guardfile

@@ -0,0 +1,16 @@
+guard :rubocop do
+  watch(/.+\.rb$/)
+  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+end
+
+guard(
+  :rspec,
+  all_after_pass: true,
+  all_on_start: true,
+  cmd: 'NO_SIMPLECOV=true bundle exec rspec --fail-fast --format documentation'
+) do
+  watch(%r{spec/.+_spec\.rb$})
+  watch(%r{lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb') { 'spec' }
+  watch(%r{^spec/support/.+\.rb$}) { 'spec' }
+end

Rakefile

@@ -1,2 +1 @@
-require "bundler/gem_tasks"
-
+require 'bundler/gem_tasks'

lib/resque/plugins/rate_limited_queue/apis/evernote_queue.rb

@@ -9,6 +9,7 @@ class EvernoteQueue < BaseApiQueue
         def self.perform(klass, *params)
           super
         rescue Evernote::EDAM::Error::EDAMSystemException => e
+          raise unless e.errorCode == Evernote::EDAM::Error::EDAMErrorCode::RATE_LIMIT_REACHED
           pause_until(Time.now + 60 * e.rateLimitDuration.seconds)
           rate_limited_requeue(self, klass, *params)
         end

resque-rate_limited_queue.gemspec

@@ -4,36 +4,36 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'resque-rate_limited_queue/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "resque-rate_limited_queue"
+  spec.name          = 'resque-rate_limited_queue'
   spec.version       = RateLimitedQueue::VERSION
-  spec.authors       = ["Greg Dowling"]
-  spec.email         = ["mail@greddowling.com"]
-  spec.summary     = %q{A Resque plugin to help manage jobs that use rate limited apis, pausing when you hit the limits and restarting later.}
-  spec.description = %q{A Resque plugin which allows you to create dedicated queues for jobs that use rate limited apis.
+  spec.authors       = ['Greg Dowling']
+  spec.email         = ['mail@greddowling.com']
+  spec.summary     = 'A Resque plugin to help manage jobs that use rate limited apis, pausing when you hit the limits and restarting later.'
+  spec.description = 'A Resque plugin which allows you to create dedicated queues for jobs that use rate limited apis.
 These queues will pause when one of the jobs hits a rate limit, and unpause after a suitable time period.
 The rate_limited_queue can be used directly, and just requires catching the rate limit exception and pausing the
 queue. There are also additional queues provided that already include the pause/rety logic for twitter, angelist
-and evernote; these allow you to support rate limited apis with minimal changes.}
+and evernote; these allow you to support rate limited apis with minimal changes.'
 
-  spec.homepage      = "http://github.com/pavoni/resque-rate-limited-queue"
-  spec.license       = "MIT"
+  spec.homepage      = 'http://github.com/pavoni/resque-rate-limited-queue'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.add_dependency 'resque', '~> 1.9', '>= 1.9.10'
-  spec.add_dependency 'redis-mutex','~> 4.0', '>= 4.0.0'
+  spec.add_dependency 'redis-mutex', '~> 4.0', '>= 4.0.0'
 
-  spec.add_dependency "angellist_api", '~> 1.0', '>= 1.0.7'
-  spec.add_dependency "evernote-thrift", '~> 1.25', '>= 1.25.1'
-  spec.add_dependency "twitter", '~> 5.11', '>= 5.11.0'
+  spec.add_dependency 'angellist_api', '~> 1.0', '>= 1.0.7'
+  spec.add_dependency 'evernote-thrift', '~> 1.25', '>= 1.25.1'
+  spec.add_dependency 'twitter', '~> 5.11', '>= 5.11.0'
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 2.6"
-  spec.add_development_dependency "simplecov", '~> 0.9.1'
+  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 2.6'
+  spec.add_development_dependency 'simplecov', '~> 0.9.1'
   spec.add_development_dependency 'gem-release', '~> 0.7'
   spec.add_development_dependency 'guard', '~> 2.12'
   spec.add_development_dependency 'guard-rspec', '~> 4.1', '>= 4.1.1'

spec/apis/angellist_queue_spec.rb

@@ -3,7 +3,7 @@
 
 class RateLimitedTestQueueAL
   def self.perform(succeed)
-    raise(AngellistApi::Error::TooManyRequests, 'error') unless succeed
+    fail(AngellistApi::Error::TooManyRequests, 'error') unless succeed
   end
 end
 

spec/apis/evernote_queue_spec.rb

@@ -9,7 +9,17 @@ def self.seconds
 
 class RateLimitedTestQueueEn
   def self.perform(succeed)
-    raise(Evernote::EDAM::Error::EDAMSystemException, rateLimitDuration: RateLimitDuration) unless succeed
+    fail(
+      Evernote::EDAM::Error::EDAMSystemException,
+      errorCode: Evernote::EDAM::Error::EDAMErrorCode::RATE_LIMIT_REACHED,
+      rateLimitDuration: RateLimitDuration
+    ) unless succeed
+  end
+end
+
+class RateLimitedTestQueueOther
+  def self.perform
+    fail(Evernote::EDAM::Error::EDAMSystemException)
   end
 end
 
@@ -51,6 +61,16 @@ def self.perform(succeed)
           .enqueue(RateLimitedTestQueueEn, false)
       end
     end
+
+    context 'with exception that is not rate limit' do
+      before do
+        Resque::Plugins::RateLimitedQueue::EvernoteQueue.stub(:rate_limited_requeue)
+      end
+      it 'raises the exception when request fails' do
+        expect do
+          Resque::Plugins::RateLimitedQueue::EvernoteQueue.enqueue(RateLimitedTestQueueOther)
+        end.to raise_error Evernote::EDAM::Error::EDAMSystemException
+      end
+    end
   end
 end
-

spec/apis/twitter_queue_spec.rb

@@ -3,7 +3,7 @@
 
 class RateLimitedTestQueueTw
   def self.perform(succeed)
-    raise(Twitter::Error::TooManyRequests
+    fail(Twitter::Error::TooManyRequests
       .new('', 'x-rate-limit-reset' => (Time.now + 60).to_i)) unless succeed
   end
 end

spec/rate_limited_un_pause_spec.rb

@@ -45,5 +45,4 @@ class RateLimitedTestQueue
         .to eq(Resque::Plugins::RateLimitedQueue::UnPause)
     end
   end
-
 end

spec/spec_helper.rb

@@ -9,7 +9,7 @@
 
 SimpleCov.start
 
-RSpec.configure do |config|
+RSpec.configure do |_config|
   # Use database 15 for testing so we don't accidentally step on your real data.
   RedisClassy.redis = Redis.new(db: 15)
   unless RedisClassy.keys.empty?