ratelimit 0.0.2 → 0.0.3

data/lib/ratelimit.rb

@@ -10,15 +10,16 @@ class Ratelimit
   # @param [Hash] options Options hash
   # @option options [Integer] :bucket_span (600) Time span to track in seconds
   # @option options [Integer] :bucket_interval (5) How many seconds each bucket represents
-  # @option options [Integer] :bucket_expiry (1200) How long we keep data in each bucket before it is auto expired.
+  # @option options [Integer] :bucket_expiry (@bucket_span) How long we keep data in each bucket before it is auto expired. Cannot be larger than the bucket_span.
   #
   # @return [RateLimit] RateLimit instance
   #
-  def initialize(key, redis = nil, options = {}) #bucket_span = 600, bucket_interval = 5, bucket_expiry = 1200, redis = nil)
+  def initialize(key, redis = nil, options = {})
     @key = key
     @bucket_span = options[:bucket_span] || 600
     @bucket_interval = options[:bucket_interval] || 5
-    @bucket_expiry = options[:bucket_expiry] || 1200
+    @bucket_expiry = options[:bucket_expiry] || @bucket_span
+    raise ArgumentError.new("Bucket expiry cannot be larger than the bucket span") if @bucket_expiry > @bucket_span
     @bucket_count = (@bucket_span / @bucket_interval).round
     @redis = redis
   end
@@ -28,7 +29,7 @@ class Ratelimit
   # @param [String] subject A unique key to identify the subject. For example, 'user@foo.com'
   def add(subject)
     bucket = get_bucket
-    subject = @key + ":" + subject
+    subject = "#{@key}:#{subject}"
     redis.multi do
       redis.hincrby(subject, bucket, 1)
       redis.hdel(subject, (bucket + 1) % @bucket_count)
@@ -45,7 +46,7 @@ class Ratelimit
     bucket = get_bucket
     interval = [interval, @bucket_interval].max
     count = (interval / @bucket_interval).floor
-    subject = @key + ":" + subject
+    subject = "#{@key}:#{subject}"
     counts = redis.multi do
       redis.hget(subject, bucket)
       count.downto(1) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ratelimit
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70236973620740 !ruby/object:Gem::Requirement
+  requirement: &13383120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70236973620740
+  version_requirements: *13383120
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70236973620200 !ruby/object:Gem::Requirement
+  requirement: &13382560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70236973620200
+  version_requirements: *13382560
 description: This library uses Redis to track the number of actions for a given subject
   over a flexible time frame.
 email:
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Rate limiting backed by redis