ratelimit-ruby 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f3b746eec2993e0825020e4c703de39a6a3458a
-  data.tar.gz: e49e70c0153e2a0c5aa5d8f8a87382e4664ed412
+  metadata.gz: ba840b0a4094c38901cdf325bcc69fdc3f6a864e
+  data.tar.gz: 15d19e332a9ed5bd77ec0edd4daa326e157e2a76
 SHA512:
-  metadata.gz: 9f18859ffe8e2805dce9597d79c6ee3b9f50a8a642b520e4bd22ef95a10750b5ed3324404ec377a6e72a16506bc20a31fcf50abfb0abc64a9e1a566eccba0354
-  data.tar.gz: 7435ee478458b536a662854e9f99c15eee732b739ce1cfebba7330911bab8b2613fc6627e43cc601d442d58ddba1b68cf257a3f50c8d7d5cb3025fe812c7376a
+  metadata.gz: fa3c25ee0c3ac084e7bc2baf30b896b4cfadf20a0e4e1d35929ada2d4a5c2b0c3f755f9345b953ea162a1d4908a179a209fde19cbb6390186cdcb4fbb3fb40ee
+  data.tar.gz: 262baa3cd4d504c389c2ae6fad3c4c62f6402f1cfd03d471c849d1eb6398c0a4874cf199e4f9c49b6134135840cde011d4046c00d5ef4a44228611d3f93c9829

data/README.md

@@ -15,6 +15,7 @@ end
 ```
 See full documentation http://www.ratelim.it/documentation
 
+
 ## Supports
 
 * RateLimits
@@ -24,6 +25,17 @@ See full documentation http://www.ratelim.it/documentation
 * Semaphores
 * Infinite retention fo deduplication workflows
 
+## Options and Defaults
+```ruby
+limiter =  RateLimit::Limiter.new(apikey: "ACCT_ID|APIKEY",
+  on_error: :log_and_pass, # :log_and_pass, :log_and_hit, :throw
+  logger: nil, # pass in your own logger here
+  debug: false  #Faraday debugging
+)
+
+
+```
+
 
 ## Contributing to ratelimit-ruby
  
@@ -37,6 +49,6 @@ See full documentation http://www.ratelim.it/documentation
 
 ## Copyright
 
-Copyright (c) 2016 Jeff Dwyer. See LICENSE.txt for
+Copyright (c) 2017 Jeff Dwyer. See LICENSE.txt for
 further details.
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/ratelimit-ruby.rb

@@ -1,5 +1,6 @@
 module RateLimit
   WAIT_INCR_MAX = 0.5
+  ON_ERROR = [:log_and_pass, :log_and_hit, :throw]
 
   class WaitExceeded < StandardError
   end
@@ -9,10 +10,16 @@ module RateLimit
       local ? 'http://localhost:8080' : 'http://www.ratelim.it'
     end
 
-    def initialize(apikey:, local: false, debug: false)
+    def initialize(apikey:, on_error: :log_and_pass, logger: nil, debug: false, local: false)
+      @logger = (logger || Logger.new($stdout)).tap do |log|
+        log.progname = "RateLimit"
+      end
+      @on_error = on_error
       @conn = Faraday.new(:url => self.base_url(local)) do |faraday|
         faraday.request :json # form-encode POST params
         faraday.response :logger if debug
+        faraday.options[:open_timeout] = 2
+        faraday.options[:timeout] = 5
         faraday.adapter Faraday.default_adapter # make requests with Net::HTTP
       end
       (username, pass) = apikey.split("|")
@@ -47,9 +54,12 @@ module RateLimit
       result = @conn.post '/api/v1/limitcheck', { acquireAmount: acquire_amount,
                                                   groups: [group],
                                                   allowPartialResponse: allow_partial_response }.to_json
+      handle_failure(result) unless result.success?
       res =JSON.parse(result.body, object_class: OpenStruct)
       res.amount ||= 0
       res
+    rescue => e
+      handle_error(e)
     end
 
     def acquire_or_wait(key:, acquire_amount:, max_wait_secs:, init_backoff: 0)
@@ -71,7 +81,9 @@ module RateLimit
       @conn.post '/api/v1/limitreturn',
                  { enforcedGroup: limit_result.enforcedGroup,
                    amount: limit_result.amount }.to_json
-      puts "RETURN #{result.body} #{result.status}"
+      handle_failure(result) unless result.success?
+    rescue => e
+      handle_error(e)
     end
 
     private
@@ -83,6 +95,35 @@ module RateLimit
                   policyName: limit_definition.policy,
                   returnable: limit_definition.returnable }.to_json
       result= @conn.send(method, '/api/v1/limits', to_send)
+      handle_failure(result) unless result.success?
+    rescue => e
+      handle_error(e)
+    end
+
+    def handle_failure(result)
+      case @on_error
+      when :log_and_pass
+        @logger.warn("returned #{result.status}")
+        OpenStruct.new(passed: true)
+      when :log_and_hit
+        @logger.warn("returned #{result.status}")
+        OpenStruct.new(passed: false)
+      when :throw
+        raise "#{result.status} calling RateLim.it"
+      end
+    end
+
+    def handle_error(e)
+      case @on_error
+      when :log_and_pass
+        @logger.warn(e)
+        OpenStruct.new(passed: true)
+      when :log_and_hit
+        @logger.warn(e)
+        OpenStruct.new(passed: false)
+      when :throw
+        raise e
+      end
     end
   end
 
@@ -90,4 +131,5 @@ end
 
 require 'faraday'
 require 'faraday_middleware'
+require 'logger'
 require 'ratelimit/limit_definition'

data/ratelimit-ruby.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: ratelimit-ruby 0.1.1 ruby lib
+# stub: ratelimit-ruby 0.1.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ratelimit-ruby"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jeff Dwyer"]
-  s.date = "2016-12-13"
+  s.date = "2016-12-16"
   s.description = "rate limit your ruby"
   s.email = "jdwyah@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ratelimit-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday