From 736bf14d7c15776f17f6e096dba5024a36d15580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 1 Aug 2012 15:09:56 -0300 Subject: Revert "Deprecating composed_of in ActiveRecord" This reverts commit 44b313bc4e3762da64dde7894548f81c595147de. --- activerecord/lib/active_record/aggregations.rb | 3 --- 1 file changed, 3 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/aggregations.rb b/activerecord/lib/active_record/aggregations.rb index e7ed2644ca..c39284539c 100644 --- a/activerecord/lib/active_record/aggregations.rb +++ b/activerecord/lib/active_record/aggregations.rb @@ -161,8 +161,6 @@ module ActiveRecord # # Customer.where(:balance => Money.new(20, "USD")).all # - # Note: +composed_of+ has been deprecated, and will be removed (with no - # replacement) in Rails 4. module ClassMethods # Adds reader and writer methods for manipulating a value object: # composed_of :address adds address and address=(new_address) methods. @@ -205,7 +203,6 @@ module ActiveRecord # :converter => Proc.new { |ip| ip.is_a?(Integer) ? IPAddr.new(ip, Socket::AF_INET) : IPAddr.new(ip.to_s) } # def composed_of(part_id, options = {}) - ActiveSupport::Deprecation.warn("composed_of is deprecated, and will be removed in Rails 4. There is no replacement.") options.assert_valid_keys(:class_name, :mapping, :allow_nil, :constructor, :converter) name = part_id.id2name -- cgit v1.2.3