ratelimit-ruby 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba840b0a4094c38901cdf325bcc69fdc3f6a864e
-  data.tar.gz: 15d19e332a9ed5bd77ec0edd4daa326e157e2a76
+  metadata.gz: 62a8691b15825c4fda93b482d2cb590ab8e49ceb
+  data.tar.gz: c6023d1fbeb155ae6ec9f5a748c9e8a9be598445
 SHA512:
-  metadata.gz: fa3c25ee0c3ac084e7bc2baf30b896b4cfadf20a0e4e1d35929ada2d4a5c2b0c3f755f9345b953ea162a1d4908a179a209fde19cbb6390186cdcb4fbb3fb40ee
-  data.tar.gz: 262baa3cd4d504c389c2ae6fad3c4c62f6402f1cfd03d471c849d1eb6398c0a4874cf199e4f9c49b6134135840cde011d4046c00d5ef4a44228611d3f93c9829
+  metadata.gz: b93208de32d63e81ee581c3cb90a97b7637d2a9ced00cf75e8be890ef2999637fa850d8de91ba03d7c50e7c36bb2f15451a27ce3c7d4d7662b8e9768b6ad56bd
+  data.tar.gz: d628b0e0994b06935543c69333b714acc1a1dacfe451c4e65231f8656b0dd7da0c1e934ae3da5bfce6b135199e1dbc87ce99d0f7349e51397aaa025fbcbadc05

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/ratelimit-ruby.rb

@@ -27,20 +27,22 @@ module RateLimit
     end
 
 
-    def create_concurrency_limit(group, concurrent, timeout_seconds)
-      upsert_concurrency_limit(group, concurrent, timeout_seconds, method: :post)
+    def create_returnable_limit(group, total_tokens, seconds_to_refill_one_token)
+      upsert_returnable_limit(group, total_tokens, seconds_to_refill_one_token, method: :post)
     end
 
-    def upsert_concurrency_limit(group, concurrent, timeout_seconds, method: :put)
-      recharge_rate = (24*60*60)/timeout_seconds
+    def upsert_returnable_limit(group, total_tokens, seconds_to_refill_one_token, method: :put)
+      recharge_rate = (24*60*60)/seconds_to_refill_one_token
       recharge_policy = DAILY_ROLLING
-      upsert(LimitDefinition.new(group, recharge_rate, recharge_policy, true, concurrent), method)
+      upsert(LimitDefinition.new(group, recharge_rate, recharge_policy, true, total_tokens), method)
     end
 
+    # create only. does not overwrite if it already exists
     def create_limit(group, limit, policy, burst: nil)
       upsert(LimitDefinition.new(group, limit, policy, false, burst || limit), :post)
     end
 
+    # upsert. overwrite whatever is there
     def upsert_limit(group, limit, policy, burst: nil)
       upsert(LimitDefinition.new(group, limit, policy, false, burst || limit), :put)
     end
@@ -78,7 +80,7 @@ module RateLimit
 
 
     def return(limit_result)
-      @conn.post '/api/v1/limitreturn',
+      result = @conn.post '/api/v1/limitreturn',
                  { enforcedGroup: limit_result.enforcedGroup,
                    amount: limit_result.amount }.to_json
       handle_failure(result) unless result.success?
@@ -95,7 +97,13 @@ 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?
+      if !result.success?
+        if method == :put
+          handle_failure(result)
+        elsif result.status != 409 # conflicts routinely expected on create
+          handle_failure(result)
+        end
+      end
     rescue => e
       handle_error(e)
     end

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.2 ruby lib
+# stub: ratelimit-ruby 0.1.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ratelimit-ruby"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   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-16"
+  s.date = "2017-01-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.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-16 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday