diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-01 15:09:56 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-01 15:09:56 -0300 |
| commit | 736bf14d7c15776f17f6e096dba5024a36d15580 (patch) | |
| tree | 0db6556859595f586c2c171599713112b0268d1d /activerecord/lib/active_record | |
| parent | 0c527026308627652c42ed8a6f26a21d3bbc7a5b (diff) | |
| download | rails-736bf14d7c15776f17f6e096dba5024a36d15580.tar.gz rails-736bf14d7c15776f17f6e096dba5024a36d15580.tar.bz2 rails-736bf14d7c15776f17f6e096dba5024a36d15580.zip | |
Revert "Deprecating composed_of in ActiveRecord"
This reverts commit 44b313bc4e3762da64dde7894548f81c595147de.
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/aggregations.rb | 3 |
1 files changed, 0 insertions, 3 deletions
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: # <tt>composed_of :address</tt> adds <tt>address</tt> and <tt>address=(new_address)</tt> 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 |