diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-01-29 16:42:12 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2018-01-29 16:45:29 +0900 |
| commit | a9c6c3a23ef71fb2bd26a1fdce1d8a1bca492c89 (patch) | |
| tree | ee5e8c8c50eebeb553d58b3eed9265a9118306c5 | |
| parent | 3cf0973bc7aab24e2245dce66282e8be94c9d362 (diff) | |
| download | rails-a9c6c3a23ef71fb2bd26a1fdce1d8a1bca492c89.tar.gz rails-a9c6c3a23ef71fb2bd26a1fdce1d8a1bca492c89.tar.bz2 rails-a9c6c3a23ef71fb2bd26a1fdce1d8a1bca492c89.zip | |
Remove unused/missing `to_money` converter in the test/doc
| -rw-r--r-- | activerecord/lib/active_record/aggregations.rb | 3 | ||||
| -rw-r--r-- | activerecord/test/models/customer.rb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/aggregations.rb b/activerecord/lib/active_record/aggregations.rb index e5e89734d2..30826c9ffa 100644 --- a/activerecord/lib/active_record/aggregations.rb +++ b/activerecord/lib/active_record/aggregations.rb @@ -212,8 +212,7 @@ module ActiveRecord # # Option examples: # composed_of :temperature, mapping: %w(reading celsius) - # composed_of :balance, class_name: "Money", mapping: %w(balance amount), - # converter: Proc.new { |balance| balance.to_money } + # composed_of :balance, class_name: "Money", mapping: %w(balance amount) # composed_of :address, mapping: [ %w(address_street street), %w(address_city city) ] # composed_of :gps_location # composed_of :gps_location, allow_nil: true diff --git a/activerecord/test/models/customer.rb b/activerecord/test/models/customer.rb index 524a9d7bd9..bc501a5ce0 100644 --- a/activerecord/test/models/customer.rb +++ b/activerecord/test/models/customer.rb @@ -4,7 +4,7 @@ class Customer < ActiveRecord::Base cattr_accessor :gps_conversion_was_run 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(&:to_money) + composed_of :balance, class_name: "Money", mapping: %w(balance amount) composed_of :gps_location, allow_nil: true composed_of :non_blank_gps_location, class_name: "GpsLocation", allow_nil: true, mapping: %w(gps_location gps_location), converter: lambda { |gps| self.gps_conversion_was_run = true; gps.blank? ? nil : GpsLocation.new(gps) } |