rate_limiter 0.0.4 → 0.0.5

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v0.0.5
+
+* Enabling/Disabling for individual controllers actually works now.
+
+## v0.0.4
+
+* Added dummy Rails application for testing.
+* Updated development dependencies.
+
 ## v0.0.3
 
 * Added more if and unless conditions for rate limiting.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rate_limiter (0.0.3)
+    rate_limiter (0.0.5)
       activerecord (~> 3.2)
       railties (~> 3.2)
 

data/lib/rate_limiter/config.rb

@@ -1,3 +1,5 @@
+require 'singleton'
+
 module RateLimiter
   class Config
     include Singleton

data/lib/rate_limiter/controller.rb

@@ -1,9 +1,8 @@
 module RateLimiter
   module Controller
     def self.included(base)
-      base.before_filter :set_rate_limiter_source
-      base.before_filter :set_rate_limiter_controller_info
       base.before_filter :set_rate_limiter_enabled_for_controller
+      base.before_filter :set_rate_limiter_source, :set_rate_limiter_controller_info
     end
 
     protected
@@ -23,11 +22,11 @@ module RateLimiter
     private
 
     def set_rate_limiter_source
-      ::RateLimiter.source = user_for_rate_limiter
+      ::RateLimiter.source = user_for_rate_limiter if rate_limiter_enabled_for_controller
     end
 
     def set_rate_limiter_controller_info
-      ::RateLimiter.controller_info = info_for_rate_limiter
+      ::RateLimiter.controller_info = info_for_rate_limiter if rate_limiter_enabled_for_controller
     end
 
     def set_rate_limiter_enabled_for_controller

data/lib/rate_limiter/model.rb

@@ -5,7 +5,7 @@ module RateLimiter
     end
 
     module ClassMethods
-      def rate_limit options = {}
+      def rate_limit(options = {})
         send :include, InstanceMethods
 
         class_attribute :rate_limit_on
@@ -23,15 +23,15 @@ module RateLimiter
         class_attribute :rate_limit_enabled_for_model
         self.rate_limit_enabled_for_model = true
 
-        def rate_limit_off
-          self.rate_limit_enabled_for_model = false
-        end
+        self.before_create :check_rate_limit
+      end
 
-        def rate_limit_on
-          self.rate_limit_enabled_for_model = true
-        end
+      def rate_limit_off
+        self.rate_limit_enabled_for_model = false
+      end
 
-        self.before_create :check_rate_limit
+      def rate_limit_on
+        self.rate_limit_enabled_for_model = true
       end
     end
 

data/lib/rate_limiter/version.rb

@@ -1,3 +1,3 @@
 module RateLimiter
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/rate_limiter.rb

@@ -1,5 +1,3 @@
-require 'singleton'
-
 require 'rate_limiter/config'
 require 'rate_limiter/controller'
 require 'rate_limiter/model'
@@ -14,11 +12,11 @@ module RateLimiter
   end
 
   def self.enabled_for_controller=(value)
-    RateLimiter.store[:request_enabled_for_controller] = value
+    rate_limiter_store[:request_enabled_for_controller] = value
   end
 
   def self.enabled_for_controller?
-    !!RateLimiter.store[:request_enabled_for_controller]
+    !!rate_limiter_store[:request_enabled_for_controller]
   end
 
   def self.timestamp_field=(field_name)
@@ -30,25 +28,25 @@ module RateLimiter
   end
 
   def self.source=(value)
-    RateLimiter.store[:source] = value
+    rate_limiter_store[:source] = value
   end
 
   def self.source
-    RateLimiter.store[:source]
+    rate_limiter_store[:source]
   end
 
   def self.controller_info=(value)
-    RateLimiter.store[:controller_info] = value
+    rate_limiter_store[:controller_info] = value
   end
 
   def self.controller_info
-    RateLimiter.store[:controller_info]
+    rate_limiter_store[:controller_info]
   end
 
   private
 
-  def self.store
-    Thread.current[:rate_limiter] || { :request_enabled_for_controller => true }
+  def self.rate_limiter_store
+    Thread.current[:rate_limiter] ||= { :request_enabled_for_controller => true }
   end
 
   def self.config

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rate_limiter
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties