ratelimit-ruby 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cf58e13eb3d3e2371dc2dd10833cf597d2ab108
-  data.tar.gz: 24eb31d4a576763298d489bfe6d11454f7c5eb8e
+  metadata.gz: 2f3b746eec2993e0825020e4c703de39a6a3458a
+  data.tar.gz: e49e70c0153e2a0c5aa5d8f8a87382e4664ed412
 SHA512:
-  metadata.gz: df86c38c7dd3b1c57f7ed345e245aac1b9962df2f831e2daab790b3c34bae842e9e75bd0e85d08c435e61c516a3f7ff94aba56283d5370cf380c8b464ae83e50
-  data.tar.gz: fcd2f9261d6c38bfc779055baac475b26e3a8fa5fe9d88f7a68aa7e28690f850286137ef0cd28c96fd32e9ad08c1ab711727971aec5ba5377ee115fe41fb5a0a
+  metadata.gz: 9f18859ffe8e2805dce9597d79c6ee3b9f50a8a642b520e4bd22ef95a10750b5ed3324404ec377a6e72a16506bc20a31fcf50abfb0abc64a9e1a566eccba0354
+  data.tar.gz: 7435ee478458b536a662854e9f99c15eee732b739ce1cfebba7330911bab8b2613fc6627e43cc601d442d58ddba1b68cf257a3f50c8d7d5cb3025fe812c7376a

data/README.md

@@ -3,13 +3,13 @@
 Rate Limit your Ruby app using http://www.ratelim.it
 
 ```ruby
-limiter =  RateLimit::Limiter.new(apikey: "APIKEY", account_id: ACCT_ID)
+limiter =  RateLimit::Limiter.new(apikey: "ACCT_ID|APIKEY")
 
 # only need to do this on startup
 # limit to 1 per hour
-limiter.upsert_limit(Limit.new("pageload", 1, RateLimIt::HOURLY_ROLLING))
+limiter.upsert_limit("pageload", 1, RateLimIt::HOURLY_ROLLING)
 
-if limiter.check?("pageload")
+if limiter.pass?("pageload")
   do_hourly_thing()
 end
 ```

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/ratelimit-ruby.rb

@@ -1,4 +1,6 @@
 module RateLimit
+  WAIT_INCR_MAX = 0.5
+
   class WaitExceeded < StandardError
   end
 
@@ -7,24 +9,36 @@ module RateLimit
       local ? 'http://localhost:8080' : 'http://www.ratelim.it'
     end
 
-    def initialize(apikey:, account_id:, local: false, debug: false)
+    def initialize(apikey:, local: false, debug: false)
       @conn = Faraday.new(:url => self.base_url(local)) do |faraday|
         faraday.request :json # form-encode POST params
         faraday.response :logger if debug
         faraday.adapter Faraday.default_adapter # make requests with Net::HTTP
       end
-      @conn.basic_auth(account_id, apikey)
+      (username, pass) = apikey.split("|")
+      @conn.basic_auth(username, pass)
+    end
+
+
+    def create_concurrency_limit(group, concurrent, timeout_seconds)
+      upsert_concurrency_limit(group, concurrent, timeout_seconds, method: :post)
+    end
+
+    def upsert_concurrency_limit(group, concurrent, timeout_seconds, method: :put)
+      recharge_rate = (24*60*60)/timeout_seconds
+      recharge_policy = DAILY_ROLLING
+      upsert(LimitDefinition.new(group, recharge_rate, recharge_policy, true, concurrent), method)
     end
 
-    def upsert_semaphore(group, limit, policy)
-      upsert(LimitDefinition.new(group, limit, policy, true))
+    def create_limit(group, limit, policy, burst: nil)
+      upsert(LimitDefinition.new(group, limit, policy, false, burst || limit), :post)
     end
 
-    def upsert_limit(group, limit, policy)
-      upsert(LimitDefinition.new(group, limit, policy, false))
+    def upsert_limit(group, limit, policy, burst: nil)
+      upsert(LimitDefinition.new(group, limit, policy, false, burst || limit), :put)
     end
 
-    def check?(group)
+    def pass?(group)
       result = acquire(group, 1)
       return result.passed
     end
@@ -47,7 +61,7 @@ module RateLimit
         if res.passed
           return res
         end
-        sleep += rand
+        sleep += rand * WAIT_INCR_MAX
       end
       raise RateLimit::WaitExceeded
     end
@@ -57,17 +71,18 @@ module RateLimit
       @conn.post '/api/v1/limitreturn',
                  { enforcedGroup: limit_result.enforcedGroup,
                    amount: limit_result.amount }.to_json
-      puts result.body
+      puts "RETURN #{result.body} #{result.status}"
     end
 
     private
 
-    def upsert(limit_definition)
+    def upsert(limit_definition, method)
       to_send = { limit: limit_definition.limit,
                   group: limit_definition.group,
+                  burst: limit_definition.burst,
                   policyName: limit_definition.policy,
                   returnable: limit_definition.returnable }.to_json
-      result= @conn.post '/api/v1/limits', to_send
+      result= @conn.send(method, '/api/v1/limits', to_send)
     end
   end
 

data/lib/ratelimit/limit_definition.rb

@@ -11,14 +11,15 @@ module RateLimit
   POLICIES = [SECONDLY, MINUTELY, MINUTELY_ROLLING, HOURLY, HOURLY_ROLLING, DAILY, DAILY_ROLLING, MINUTELY, INFINITE]
 
   class LimitDefinition
-    attr_reader :limit, :group, :policy, :returnable
+    attr_reader :limit, :group, :policy, :returnable, :burst
 
-    def initialize(group, limit, policy, returnable)
+    def initialize(group, limit, policy, returnable, burst)
       raise "Invalid Policy" unless POLICIES.include? policy
       @limit = limit
       @group = group
       @policy = policy
-      @returnable= returnable
+      @returnable = returnable
+      @burst = burst
     end
   end
 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.0 ruby lib
+# stub: ratelimit-ruby 0.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ratelimit-ruby"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   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-11-18"
+  s.date = "2016-12-13"
   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.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday