Merge branch 'master' into next

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

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 8bb4ae4b9dd8ebf294419aa141ebeaea5f4d7994..095bad89b942d07e62ee74b18e999100905c456b 100644 (file)
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -1,4 +1,21 @@
+# == 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
 class Acl < ActiveRecord::Base

+  validates :k, :presence => true
+

   def self.match(address, domain = nil)
     if domain
       Acl.where("address >>= ? OR domain = ?", address, domain)
   def self.match(address, domain = nil)
     if domain
       Acl.where("address >>= ? OR domain = ?", address, domain)