work on #2693 Separate API Limits by Writes/Reads

app/logical/api_limiter.rb

@@ -1,15 +1,26 @@
 module ApiLimiter
-  def throttled?(ip_addr)
-    key = "#{ip_addr}:#{Time.now.hour}"
-    MEMCACHE.fetch(key, 1.hour, :raw => true) {0}
-    MEMCACHE.incr(key).to_i > CurrentUser.user.api_hourly_limit
+  def idempotent?(method)
+    case method
+    when "POST", "PUT", "DELETE"
+      false
+
+    else
+      true
+    end
   end
 
-  def remaining_hourly_limit(ip_addr)
-    key = "#{ip_addr}:#{Time.now.hour}"
+  def throttled?(ip_addr, http_method = "GET")
+    idempotent = idempotent?(http_method)
+    key = "api/#{ip_addr}/#{Time.now.hour}/#{idempotent}"
+    MEMCACHE.fetch(key, 1.hour, :raw => true) {0}
+    MEMCACHE.incr(key).to_i > CurrentUser.user.api_hourly_limit(idempotent)
+  end
+
+  def remaining_hourly_limit(ip_addr, idempotent = true)
+    key = "api/#{ip_addr}/#{Time.now.hour}/#{idempotent}"
     requests = MEMCACHE.fetch(key, 1.hour, :raw => true) {0}.to_i
     CurrentUser.user.api_hourly_limit - requests
   end
   
-  module_function :throttled?, :remaining_hourly_limit
+  module_function :throttled?, :idempotent?, :remaining_hourly_limit
 end