proxy_service 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65a3e58131e6f7106bbafbcc3c8805da12ae67b0
-  data.tar.gz: f244fae68a133d6e50ef82241c8619c2374fcaf7
+  metadata.gz: a3a873eeb05db5f539ad28b92d19e2f343a98fd2
+  data.tar.gz: 18356cdbf3b6110a40632160c052a1562caf88fa
 SHA512:
-  metadata.gz: dd696acea6a8979527a6ed5019c41727c507429afa616e43e3b69077e7d2c7a5705e69534fc3e3c2be343d235ea2b7991f760208335d3e8a305c4f37f4f7d12c
-  data.tar.gz: 5c8035c96fcada5cada060df7198169ddd76021802818330d8f53e688d533192d83bbccb76d645039bb072cf877c19137463ec04a8ec1936892ca1f5d5e90d1f
+  metadata.gz: f9cbda9e51af75dc088696d110e55ac0516fc1d45d8b6aa494639b92f4f91d84f4195db2648ecb15d9f04118dc9031f5e59427f1c13394efbc63a3e94f7a549f
+  data.tar.gz: 02fd4b2a19cbcbfe584935d366197c572c2096502cb2036997fe7371067abf61c8fb5fdc2a64e98d797ad81d28e971db2fd0cdc8f79dddaad77c50ade4209c92

data/lib/proxy_service.rb

@@ -2,34 +2,27 @@ require 'json'
 
 class ProxyService
 
-  POLL_PERIOD = 1
-  MAX_FAILURES = 3
-
   class << self
-    attr_accessor :proxies_enabled, :username, :password
+    attr_accessor :proxies_enabled, :username, :password, :failure_limit
 
     def configure
       yield self
     end
   end
 
-  attr_accessor :source
+  attr_accessor :source, :failure_limit
   attr_writer :proxies_enabled
 
   # = Create a new proxy service with for a specific ODS
   #
-  # @example
-  #
-  #   ProxyService.new(:queue_name).with_mechanize do |agent|
-  #     agent.get('...')
-  #   end
-  #
   # @param [String|Symbol] source name of the ODS (e.g. :tripadvisor), will look for a queue with that name "proxy/#{source}"
   # @param [Hash] options
-  # @option options [Boolean] :proxies_enabled override the app configuration
+  # @option options [Boolean] :proxies_enabled override the class configuration
+  # @option options [Integer] :failure_limit before blocking the proxy
   def initialize(source, options = {})
     @source = source
     @proxies_enabled = options.fetch(:proxies_enabled, !!self.class.proxies_enabled)
+    @failure_limit = options.fetch(:failure_limit, self.class.failure_limit || 3)
   end
 
   # @yield [agent] Passes a [proxied] Mechanize agent to the block
@@ -40,7 +33,7 @@ class ProxyService
     yield agent
     proxy.reset_failures
   rescue
-    if proxy.failures >= MAX_FAILURES
+    if proxy.failures >= failure_limit
       proxy.blocked!
     else
       proxy.increment_failures
@@ -53,19 +46,11 @@ class ProxyService
   # Private
   #
 
-  def new_worker
-    if proxies_enabled?
-      Worker.new("proxy/#{source}")
-    else
-      NullWorker.new
-    end
-  end
-
   def proxies_enabled?
     @proxies_enabled
   end
 
-  # = Creates a STOMP connection (consumer)
+  # = Sleeps until the worker receives a proxy (message)
   #
   # @return [Proxy] a new proxy object
   def reserve_proxy
@@ -75,10 +60,18 @@ class ProxyService
       if worker.ready?
         return Proxy.new(worker)
       else
-        sleep(POLL_PERIOD)
+        sleep(1)
       end
     end
   end
+
+  def new_worker
+    if proxies_enabled?
+      Worker.new("proxy/#{source}")
+    else
+      NullWorker.new
+    end
+  end
 end
 
 require 'proxy_service/mechanize_agent'

data/lib/proxy_service/version.rb

@@ -1,3 +1,3 @@
 class ProxyService
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/spec/lib/proxy_service_spec.rb

@@ -51,7 +51,7 @@ describe ProxyService do
 
       context 'when +failures+ exceeds max failures' do
         it 'blocks the proxy' do
-          expect(proxy).to receive(:failures).and_return(ProxyService::MAX_FAILURES + 1)
+          expect(proxy).to receive(:failures).and_return(subject.failure_limit + 1)
           expect(proxy).to receive(:blocked!)
           subject.with_mechanize { |_| raise 'Testing exception' }
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxy_service
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan Buckley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler