Refactor composed_of into AddressUtilities. [#41]

marnen · Oct 20, 2009 · f82d0ee · f82d0ee
1 parent 8f77957
commit f82d0ee
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/app/models/event.rb b/app/models/event.rb
@@ -6,7 +6,6 @@ class Event < ActiveRecord::Base
   belongs_to :calendar
   has_many :commitments
   has_many :users, :through => :commitments
-  composed_of :address, :mapping => %w(street street2 city state_id zip coords).collect{|x| [x, x.gsub(/_id$/, '')]}
   # validates_presence_of :city
   validates_presence_of :calendar_id
   validates_presence_of :name

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -13,7 +13,6 @@ class User < ActiveRecord::Base
   has_many :permissions
   has_many :calendars, :through => :permissions
   # validates_presence_of :permissions
-  composed_of :address, :mapping => %w(street street2 city state_id zip coords).collect{|x| [x, x.gsub(/_id$/, '')]}
 
   validates_presence_of :email
   validates_presence_of     :password,                   :if => :password_required?

diff --git a/lib/address_utilities.rb b/lib/address_utilities.rb
@@ -1,4 +1,8 @@
 module AddressUtilities
+  def self.included(klass)
+    klass.composed_of :address, :mapping => %w(street street2 city state_id zip coords).collect{|x| [x, x.gsub(/_id$/, '')]}
+  end
+
   # Nil-safe country accessor.
   def country
     address.country