From 27138386ad8dbda2eb44e622515626f352fd3b22 Mon Sep 17 00:00:00 2001 From: Steve Klabnik Date: Thu, 29 Nov 2012 04:35:13 -0800 Subject: ActiveRecord -> Active Record The proper name, as per the documentation guides, is 'Active Record.' I've updated several references to it as 'ActiveRecord'. --- guides/source/active_model_basics.md | 2 +- guides/source/active_record_querying.md | 2 +- guides/source/active_support_instrumentation.md | 2 +- guides/source/testing.md | 4 ++-- guides/source/upgrading_ruby_on_rails.md | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'guides') diff --git a/guides/source/active_model_basics.md b/guides/source/active_model_basics.md index 92b51334a3..0613c14d94 100644 --- a/guides/source/active_model_basics.md +++ b/guides/source/active_model_basics.md @@ -1,7 +1,7 @@ Active Model Basics =================== -This guide should provide you with all you need to get started using model classes. Active Model allows for Action Pack helpers to interact with non-ActiveRecord models. Active Model also helps building custom ORMs for use outside of the Rails framework. +This guide should provide you with all you need to get started using model classes. Active Model allows for Action Pack helpers to interact with non-Active Record models. Active Model also helps building custom ORMs for use outside of the Rails framework. -------------------------------------------------------------------------------- diff --git a/guides/source/active_record_querying.md b/guides/source/active_record_querying.md index 32c139df99..3616257c77 100644 --- a/guides/source/active_record_querying.md +++ b/guides/source/active_record_querying.md @@ -466,7 +466,7 @@ The field name can also be a string: Client.where('locked' => true) ``` -In the case of a belongs_to relationship, an association key can be used to specify the model if an ActiveRecord object is used as the value. This method works with polymorphic relationships as well. +In the case of a belongs_to relationship, an association key can be used to specify the model if an Active Record object is used as the value. This method works with polymorphic relationships as well. ```ruby Post.where(author: author) diff --git a/guides/source/active_support_instrumentation.md b/guides/source/active_support_instrumentation.md index 1163940f10..46fb2f7d6a 100644 --- a/guides/source/active_support_instrumentation.md +++ b/guides/source/active_support_instrumentation.md @@ -216,7 +216,7 @@ ActionView } ``` -ActiveRecord +Active Record ------------ ### sql.active_record diff --git a/guides/source/testing.md b/guides/source/testing.md index f898456d39..f05444ddde 100644 --- a/guides/source/testing.md +++ b/guides/source/testing.md @@ -97,9 +97,9 @@ Rails by default automatically loads all fixtures from the `test/fixtures` folde * Load the fixture data into the table * Dump the fixture data into a variable in case you want to access it directly -#### Fixtures are ActiveRecord objects +#### Fixtures are Active Record objects -Fixtures are instances of ActiveRecord. As mentioned in point #3 above, you can access the object directly because it is automatically setup as a local variable of the test case. For example: +Fixtures are instances of Active Record. As mentioned in point #3 above, you can access the object directly because it is automatically setup as a local variable of the test case. For example: ```ruby # this will return the User object for the fixture named david diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md index 22cda7a8df..9838e02d1a 100644 --- a/guides/source/upgrading_ruby_on_rails.md +++ b/guides/source/upgrading_ruby_on_rails.md @@ -45,7 +45,7 @@ Rails 4.0 has removed the identity map from Active Record, due to [some inconsis The `delete` method in collection associations can now receive `Fixnum` or `String` arguments as record ids, besides records, pretty much like the `destroy` method does. Previously it raised `ActiveRecord::AssociationTypeMismatch` for such arguments. From Rails 4.0 on `delete` automatically tries to find the records matching the given ids before deleting them. -Rails 4.0 has changed how orders get stacked in `ActiveRecord::Relation`. In previous versions of rails new order was applied after previous defined order. But this is no long true. Check [ActiveRecord Query guide](active_record_querying.html#ordering) for more information. +Rails 4.0 has changed how orders get stacked in `ActiveRecord::Relation`. In previous versions of rails new order was applied after previous defined order. But this is no long true. Check [Active Record Query guide](active_record_querying.html#ordering) for more information. Rails 4.0 has changed `serialized_attributes` and `attr_readonly` to class methods only. Now you shouldn't use instance methods, it's deprecated. You must change them, e.g. `self.serialized_attributes` to `self.class.serialized_attributes`. -- cgit v1.2.3