Combine the address and netmask for an ACL in one column

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

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 5fb99b9e5bfd7bbfeb0f93a3c64da86ee19846f9..8eeb2310a77674545fa68c2c1d5d8f7deb75e7e0 100644 (file)
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -1,13 +1,3 @@
 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)
-    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
-  end
+  scope :address, lambda { |address| where("address >> ?", address) }
 end