throttling 0.1.0 → 0.2.0

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+## 0.2.0 (April 12, 2012)
+
+Bugfixes:
+
+  - Fixed bug when occurrences where increased for larger periods, when smaller ones did not pass
+
+## 0.1.0 (April 12, 2012)
+
+Features:
+
+  - Allows to throttle actions occurred in period of time
+  - Allows to specify limits inline or in external configuration file
+  - 100% test coverage

data/lib/throttling/base.rb

@@ -12,7 +12,9 @@ module Throttling
 
       # Convert simple limits to a hash
       if @limits[:limit] && @limits[:period]
-        @limits = { 'global' => @limits }
+        @limits = [[ 'global', @limits ]]
+      else
+        @limits = @limits.sort_by { |name, params| params && params[:period] }
       end
     end
 

data/lib/throttling/version.rb

@@ -1,3 +1,3 @@
 module Throttling
-  VERSION = "0.1.0"
+  VERSION = '0.2.0'
 end

data/spec/base_spec.rb

@@ -71,18 +71,30 @@ describe Throttling do
 
   describe 'with multi-level limits' do
     before do
-      Throttling.limits = { 'foo' => { 'one' => { 'limit' => 5, 'period' => 2 }, 'two' => { 'limit' => 10, 'period' => 20 } } }
+      Throttling.limits = { 'foo' => { 'two' => { 'limit' => 10, 'period' => 20 }, 'one' => { 'limit' => 5, 'period' => 2 } } }
     end
 
-    it "should return false if at least one limit is reached" do
+    it 'should return false if at least one limit is reached' do
       @storage.should_receive(:fetch).and_return(1, 100)
       Throttling.for('foo').check_ip('127.0.0.1').should be_false
     end
 
-    it "should return true if none limits reached" do
+    it 'should return true if none limits reached' do
       @storage.should_receive(:fetch).and_return(1, 2)
       Throttling.for('foo').check_ip('127.0.0.1').should be_true
     end
+
+    it 'should sort limits by period' do
+      @storage.should_receive(:fetch).ordered.with(/\:one\:/, anything).and_return(0)
+      @storage.should_receive(:fetch).ordered.with(/\:two\:/, anything).and_return(0)
+      Throttling.for('foo').check_ip('127.0.0.1').should be_true
+    end
+
+    it 'should return as soon as limit reached' do
+      @storage.should_receive(:fetch).ordered.with(/\:one\:/, anything).and_return(10)
+      @storage.should_not_receive(:fetch).with(/\:two\:/)
+      Throttling.for('foo').check_ip('127.0.0.1').should be_false
+    end
   end
 
   context do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: throttling
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70193684278040 !ruby/object:Gem::Requirement
+  requirement: &70166425496360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193684278040
+  version_requirements: *70166425496360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70193684277620 !ruby/object:Gem::Requirement
+  requirement: &70166425495940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193684277620
+  version_requirements: *70166425495940
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70193684277200 !ruby/object:Gem::Requirement
+  requirement: &70166425495520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193684277200
+  version_requirements: *70166425495520
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70193684276780 !ruby/object:Gem::Requirement
+  requirement: &70166425495100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193684276780
+  version_requirements: *70166425495100
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70193684276360 !ruby/object:Gem::Requirement
+  requirement: &70166425494680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193684276360
+  version_requirements: *70166425494680
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70193684275940 !ruby/object:Gem::Requirement
+  requirement: &70166425494260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193684275940
+  version_requirements: *70166425494260
 description: Throttling gem provides basic, but very powerful way to throttle various
   user actions in your application
 email:
@@ -88,6 +88,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE