lib/rate_limiter.rb in rate_limiter-0.0.4 vs lib/rate_limiter.rb in rate_limiter-0.0.5

@@ -1,7 +1,5 @@
-require 'singleton'
-
 require 'rate_limiter/config'
 require 'rate_limiter/controller'
 require 'rate_limiter/model'
 
 module RateLimiter
@@ -12,15 +10,15 @@
   def self.enabled?
     !!RateLimiter.config.enabled
   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)
     RateLimiter.config.timestamp_field = field_name
   end
@@ -28,28 +26,28 @@
   def self.timestamp_field
     RateLimiter.config.timestamp_field
   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
     @@config ||= RateLimiter::Config.instance
   end