ratelimit-ruby 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2ff9d738826e547d7d64b087858282fe5b9a4d3
-  data.tar.gz: 39bbd78258a2805bec76eb852077f36e6ad3081b
+  metadata.gz: ca815aecc034e3b21b4806cb72d97ec12d042398
+  data.tar.gz: 2adb83319878f5d4d146b4c1e2e3b9b9d8eb10ef
 SHA512:
-  metadata.gz: 6e2a19885fcd3952411fc44a80efbef3ffb888d013530c7dfd23e245a69f8a1dcfeb27d8259dfe8f4a0fd48e965594b49efc0a403d3d9530c8497607a872de5c
-  data.tar.gz: 4da6feb04c65f31a6ae53fb3f14ebc8f12c7bf0ea57b7b15fe972c39c4afaa0184b429c2df7264909d75525dc0feec9d634ecfe14a4c4a52ad2f0fd2ec8cb46c
+  metadata.gz: a31b7235915a193b3a6de6cf3b3d3bedc3976692ccae926a5944e7bbafc21bfa71ec9910836f32ac7d0714deec5c8b3e759af8991c6a8fa05fe7e86277485851
+  data.tar.gz: 39cff153c06dba23d6569471a5b6a87d75924ddd5366d5336ad15d7563e2d9bebaf44d9424f587f3076300e749a0b566c3a15ff0b4f80e3beea5888072f559b4

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/ratelimit/limit_definition.rb

@@ -10,8 +10,13 @@ module RateLimit
   INFINITE="INFINITE".freeze
   POLICIES = [SECONDLY, MINUTELY, MINUTELY_ROLLING, HOURLY, HOURLY_ROLLING, DAILY, DAILY_ROLLING, MINUTELY, INFINITE]
 
+  L4_BEST_EFFORT = "L4_BEST_EFFORT"
+  L5_BOMBPROOF = "L5_BOMBPROOF"
+  SAFETY_LEVELS = [L4_BEST_EFFORT, L5_BOMBPROOF]
+
   class LimitDefinition
     attr_reader :limit, :group, :policy, :returnable, :burst
+    attr_accessor :safety_level
 
     def initialize(group, limit, policy, returnable, burst)
       raise "Invalid Policy" unless POLICIES.include? policy

data/lib/ratelimit-ruby.rb

@@ -57,6 +57,25 @@ module RateLimit
       upsert(LimitDefinition.new(group, limit, policy, false, burst || limit), :put)
     end
 
+    def upsert(limit_definition, method)
+      to_send = { limit: limit_definition.limit,
+                  group: limit_definition.group,
+                  burst: limit_definition.burst,
+                  policyName: limit_definition.policy,
+                  safetyLevel: limit_definition.safety_level,
+                  returnable: limit_definition.returnable }.to_json
+      result= @conn.send(method, '/api/v1/limits', to_send)
+      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
+
     def pass?(group)
       result = acquire(group, 1)
       return result.passed
@@ -107,6 +126,7 @@ module RateLimit
     def return(limit_result)
       result = @conn.post '/api/v1/limitreturn',
                           { enforcedGroup: limit_result.enforcedGroup,
+                            expiresAt: limit_result.expiresAt,
                             amount: limit_result.amount }.to_json
       handle_failure(result) unless result.success?
     rescue => e
@@ -184,24 +204,6 @@ module RateLimit
       int_value / 4294967294.0
     end
 
-    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.send(method, '/api/v1/limits', to_send)
-      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
-
     def handle_failure(result)
       case @on_error
       when :log_and_pass

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