Merge pull request #1938 from jguthrie100/fix_no_trace_description_error

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

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 3ff19d35f6d8374bba709485641b3080ae62d595..095bad89b942d07e62ee74b18e999100905c456b 100644 (file)
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -1,23 +1,38 @@
+# == Schema Information
+#
+# Table name: acls
+#
+#  id      :integer          not null, primary key
+#  address :inet
+#  k       :string           not null
+#  v       :string
+#  domain  :string
+#
+# Indexes
+#
+#  acls_k_idx  (k)
+#
+
 class Acl < ActiveRecord::Base
-  def self.find_by_address(address, options)
-    self.with_scope(:find => {:conditions => ["#{inet_aton} & netmask = address", address]}) do
-      return self.find(:first, options)
+  validates :k, :presence => true
+
+  def self.match(address, domain = nil)
+    if domain
+      Acl.where("address >>= ? OR domain = ?", address, domain)
+    else
+      Acl.where("address >>= ?", address)
     end
   end
 
-  def self.find_all_by_address(address, options)
-    self.with_scope(:find => {:conditions => ["#{inet_aton} & netmask = address", address]}) do
-      return self.find(:all, options)
-    end
+  def self.no_account_creation(address, domain = nil)
+    match(address, domain).where(:k => "no_account_creation").exists?
   end
 
-private
+  def self.no_note_comment(address, domain = nil)
+    match(address, domain).where(:k => "no_note_comment").exists?
+  end
 
-  def self.inet_aton
-    if self.connection.adapter_name == "MySQL"
-      "inet_aton(?)"
-    else
-      "?"
-    end
+  def self.no_trace_download(address, domain = nil)
+    match(address, domain).where(:k => "no_trace_download").exists?
   end
 end