diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-18 16:01:32 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-18 16:01:32 -0300 |
commit | 051747449e7afc817c599e4135bc629d4de064eb (patch) | |
tree | 724cd9c1e5041a90b0362466ff442569f271a748 /activerecord/test/models | |
parent | fda195d34af3cd89cf2f3de3ed653f157c76730b (diff) | |
parent | 14fc8b34521f8354a17e50cd11fa3f809e423592 (diff) | |
download | rails-051747449e7afc817c599e4135bc629d4de064eb.tar.gz rails-051747449e7afc817c599e4135bc629d4de064eb.tar.bz2 rails-051747449e7afc817c599e4135bc629d4de064eb.zip |
Merge pull request #6743 from steveklabnik/remove_composed_of
Removing composed_of
Diffstat (limited to 'activerecord/test/models')
-rw-r--r-- | activerecord/test/models/customer.rb | 7 | ||||
-rw-r--r-- | activerecord/test/models/developer.rb | 5 |
2 files changed, 0 insertions, 12 deletions
diff --git a/activerecord/test/models/customer.rb b/activerecord/test/models/customer.rb index 7e8e82542f..594c484f20 100644 --- a/activerecord/test/models/customer.rb +++ b/activerecord/test/models/customer.rb @@ -1,12 +1,5 @@ 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 { |balance| balance.to_money } - 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)} - composed_of :fullname, :mapping => %w(name to_s), :constructor => Proc.new { |name| Fullname.parse(name) }, :converter => :parse end class Address diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb index 83482f4d07..9fefa9ad3a 100644 --- a/activerecord/test/models/developer.rb +++ b/activerecord/test/models/developer.rb @@ -65,11 +65,6 @@ class AuditLog < ActiveRecord::Base end DeveloperSalary = Struct.new(:amount) -class DeveloperWithAggregate < ActiveRecord::Base - self.table_name = 'developers' - composed_of :salary, :class_name => 'DeveloperSalary', :mapping => [%w(salary amount)] -end - class DeveloperWithBeforeDestroyRaise < ActiveRecord::Base self.table_name = 'developers' has_and_belongs_to_many :projects, :join_table => 'developers_projects', :foreign_key => 'developer_id' |