Fix rubocop warnings

[rails.git] / app / models / acl.rb

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 94e37734353ec79dd453a75a72cdd06a6f183185..529ccbe3bc26640dfb057674aca5b433ec1582d3 100644 (file)
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -1,13 +1,23 @@
 class Acl < ActiveRecord::Base
-  scope :address, lambda { |address| where("#{inet_aton} & netmask = address", address) }
+  validates :k, :presence => true
 
-private
-
-  def self.inet_aton
-    if self.connection.adapter_name == "MySQL"
-      "inet_aton(?)"
+  def self.match(address, domain = nil)
+    if domain
+      Acl.where("address >>= ? OR domain = ?", address, domain)
     else
-      "?"
+      Acl.where("address >>= ?", address)
     end
   end
+
+  def self.no_account_creation(address, domain = nil)
+    match(address, domain).where(:k => "no_account_creation").exists?
+  end
+
+  def self.no_note_comment(address, domain = nil)
+    match(address, domain).where(:k => "no_note_comment").exists?
+  end
+
+  def self.no_trace_download(address, domain = nil)
+    match(address, domain).where(:k => "no_trace_download").exists?
+  end
 end