aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/models/customer.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-08-01 15:09:56 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-08-01 15:09:56 -0300
commit736bf14d7c15776f17f6e096dba5024a36d15580 (patch)
tree0db6556859595f586c2c171599713112b0268d1d /activerecord/test/models/customer.rb
parent0c527026308627652c42ed8a6f26a21d3bbc7a5b (diff)
downloadrails-736bf14d7c15776f17f6e096dba5024a36d15580.tar.gz
rails-736bf14d7c15776f17f6e096dba5024a36d15580.tar.bz2
rails-736bf14d7c15776f17f6e096dba5024a36d15580.zip
Revert "Deprecating composed_of in ActiveRecord"
This reverts commit 44b313bc4e3762da64dde7894548f81c595147de.
Diffstat (limited to 'activerecord/test/models/customer.rb')
-rw-r--r--activerecord/test/models/customer.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/activerecord/test/models/customer.rb b/activerecord/test/models/customer.rb
index 7f1687be5e..777f6b5ba0 100644
--- a/activerecord/test/models/customer.rb
+++ b/activerecord/test/models/customer.rb
@@ -1,10 +1,8 @@
class Customer < ActiveRecord::Base
- ActiveSupport::Deprecation.silence do
- composed_of :address, :mapping => [ %w(address_street street), %w(address_city city), %w(address_country country) ], :allow_nil => true
- composed_of :balance, :class_name => "Money", :mapping => %w(balance amount), :converter => Proc.new { |balance| balance.to_money }
- composed_of :gps_location, :allow_nil => true
- composed_of :fullname, :mapping => %w(name to_s), :constructor => Proc.new { |name| Fullname.parse(name) }, :converter => :parse
- end
+ composed_of :address, :mapping => [ %w(address_street street), %w(address_city city), %w(address_country country) ], :allow_nil => true
+ composed_of :balance, :class_name => "Money", :mapping => %w(balance amount), :converter => Proc.new { |balance| balance.to_money }
+ composed_of :gps_location, :allow_nil => true
+ composed_of :fullname, :mapping => %w(name to_s), :constructor => Proc.new { |name| Fullname.parse(name) }, :converter => :parse
end
class Address