From 0b9357d401677f289994369e48c2065880978a53 Mon Sep 17 00:00:00 2001 From: Andrew White Date: Wed, 25 Aug 2010 06:31:11 +0100 Subject: Remove rails info route from rake routes output [#5452 state:resolved] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Valim --- railties/lib/rails/tasks/routes.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties') diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake index 65cf79a0a2..306c88c261 100644 --- a/railties/lib/rails/tasks/routes.rake +++ b/railties/lib/rails/tasks/routes.rake @@ -23,7 +23,7 @@ task :routes => :environment do {:name => name, :verb => route.verb.to_s, :path => route.path, :reqs => reqs} end - routes.reject! { |r| r[:path] == "/rails/info/properties" } # Skip the route if it's internal info route + routes.reject! { |r| r[:path] =~ %r{/rails/info/properties} } # Skip the route if it's internal info route name_width = routes.map{ |r| r[:name] }.map(&:length).max verb_width = routes.map{ |r| r[:verb] }.map(&:length).max -- cgit v1.2.3 From d2f55e7eee3f82a9a8cc53a2c48294685d75b15e Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Wed, 25 Aug 2010 20:30:06 +0200 Subject: AS guide: Array.wrap vs splat is only valid for 1.8 --- railties/guides/source/active_support_core_extensions.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties') diff --git a/railties/guides/source/active_support_core_extensions.textile b/railties/guides/source/active_support_core_extensions.textile index 9b3bb1da15..561bae3be8 100644 --- a/railties/guides/source/active_support_core_extensions.textile +++ b/railties/guides/source/active_support_core_extensions.textile @@ -2226,7 +2226,7 @@ There's also a related idiom that uses the splat operator: [*object] -which returns +[nil]+ for +nil+, and calls to Array(object) otherwise +which in Ruby 1.8 returns +[nil]+ for +nil+, and calls to Array(object) otherwise. (Please if you know the exact behavior in 1.9 contact fxn.) Thus, in this case the behavior is different for +nil+, and the differences with Kernel#Array explained above apply to the rest of +object+s. -- cgit v1.2.3 From 5430f5bd06ba71a11479bc83eda38e0d7302ecea Mon Sep 17 00:00:00 2001 From: Jaime Iniesta Date: Thu, 26 Aug 2010 09:55:26 +0200 Subject: lifecycle should be two words, life cycle --- railties/guides/source/association_basics.textile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'railties') diff --git a/railties/guides/source/association_basics.textile b/railties/guides/source/association_basics.textile index 079bb4b6b2..b3735c270e 100644 --- a/railties/guides/source/association_basics.textile +++ b/railties/guides/source/association_basics.textile @@ -1760,9 +1760,9 @@ If you want to assign an object to a +has_and_belongs_to_many+ association witho h4. Association Callbacks -Normal callbacks hook into the lifecycle of Active Record objects, allowing you to work with those objects at various points. For example, you can use a +:before_save+ callback to cause something to happen just before an object is saved. +Normal callbacks hook into the life cycle of Active Record objects, allowing you to work with those objects at various points. For example, you can use a +:before_save+ callback to cause something to happen just before an object is saved. -Association callbacks are similar to normal callbacks, but they are triggered by events in the lifecycle of a collection. There are four available association callbacks: +Association callbacks are similar to normal callbacks, but they are triggered by events in the life cycle of a collection. There are four available association callbacks: * +before_add+ * +after_add+ -- cgit v1.2.3 From e72406e2ba3cd3a5d72fea6219f152640e2e7479 Mon Sep 17 00:00:00 2001 From: Jaime Iniesta Date: Thu, 26 Aug 2010 10:16:08 +0200 Subject: change 'a SQL' to 'an SQL' as suggested by the api documentation guidelines --- .../source/active_record_validations_callbacks.textile | 4 ++-- railties/guides/source/association_basics.textile | 14 +++++++------- railties/guides/source/migrations.textile | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'railties') diff --git a/railties/guides/source/active_record_validations_callbacks.textile b/railties/guides/source/active_record_validations_callbacks.textile index 1e232422e3..9bdeecb684 100644 --- a/railties/guides/source/active_record_validations_callbacks.textile +++ b/railties/guides/source/active_record_validations_callbacks.textile @@ -57,7 +57,7 @@ We can see how it works by looking at some +rails console+ output: => false -Creating and saving a new record will send a SQL +INSERT+ operation to the database. Updating an existing record will send a SQL +UPDATE+ operation instead. Validations are typically run before these commands are sent to the database. If any validations fail, the object will be marked as invalid and Active Record will not perform the +INSERT+ or +UPDATE+ operation. This helps to avoid storing an invalid object in the database. You can choose to have specific validations run when an object is created, saved, or updated. +Creating and saving a new record will send an SQL +INSERT+ operation to the database. Updating an existing record will send an SQL +UPDATE+ operation instead. Validations are typically run before these commands are sent to the database. If any validations fail, the object will be marked as invalid and Active Record will not perform the +INSERT+ or +UPDATE+ operation. This helps to avoid storing an invalid object in the database. You can choose to have specific validations run when an object is created, saved, or updated. CAUTION: There are many ways to change the state of an object in the database. Some methods will trigger validations, but some will not. This means that it's possible to save an object in the database in an invalid state if you aren't careful. @@ -382,7 +382,7 @@ class Account < ActiveRecord::Base end -The validation happens by performing a SQL query into the model's table, searching for an existing record with the same value in that attribute. +The validation happens by performing an SQL query into the model's table, searching for an existing record with the same value in that attribute. There is a +:scope+ option that you can use to specify other attributes that are used to limit the uniqueness check: diff --git a/railties/guides/source/association_basics.textile b/railties/guides/source/association_basics.textile index b3735c270e..17742a8d8c 100644 --- a/railties/guides/source/association_basics.textile +++ b/railties/guides/source/association_basics.textile @@ -629,7 +629,7 @@ end h6(#belongs_to-conditions). +:conditions+ -The +:conditions+ option lets you specify the conditions that the associated object must meet (in the syntax used by a SQL +WHERE+ clause). +The +:conditions+ option lets you specify the conditions that the associated object must meet (in the syntax used by an SQL +WHERE+ clause). class Order < ActiveRecord::Base @@ -899,7 +899,7 @@ end h6(#has_one-conditions). +:conditions+ -The +:conditions+ option lets you specify the conditions that the associated object must meet (in the syntax used by a SQL +WHERE+ clause). +The +:conditions+ option lets you specify the conditions that the associated object must meet (in the syntax used by an SQL +WHERE+ clause). class Supplier < ActiveRecord::Base @@ -961,7 +961,7 @@ end h6(#has_one-order). +:order+ -The +:order+ option dictates the order in which associated objects will be received (in the syntax used by a SQL +ORDER BY+ clause). Because a +has_one+ association will only retrieve a single associated object, this option should not be needed. +The +:order+ option dictates the order in which associated objects will be received (in the syntax used by an SQL +ORDER BY+ clause). Because a +has_one+ association will only retrieve a single associated object, this option should not be needed. h6(#has_one-primary_key). +:primary_key+ @@ -1209,7 +1209,7 @@ end h6(#has_many-conditions). +:conditions+ -The +:conditions+ option lets you specify the conditions that the associated object must meet (in the syntax used by a SQL +WHERE+ clause). +The +:conditions+ option lets you specify the conditions that the associated object must meet (in the syntax used by an SQL +WHERE+ clause). class Customer < ActiveRecord::Base @@ -1335,7 +1335,7 @@ The +:offset+ option lets you specify the starting offset for fetching objects v h6(#has_many-order). +:order+ -The +:order+ option dictates the order in which associated objects will be received (in the syntax used by a SQL +ORDER BY+ clause). +The +:order+ option dictates the order in which associated objects will be received (in the syntax used by an SQL +ORDER BY+ clause). class Customer < ActiveRecord::Base @@ -1635,7 +1635,7 @@ end h6(#has_and_belongs_to_many-conditions). +:conditions+ -The +:conditions+ option lets you specify the conditions that the associated object must meet (in the syntax used by a SQL +WHERE+ clause). +The +:conditions+ option lets you specify the conditions that the associated object must meet (in the syntax used by an SQL +WHERE+ clause). class Parts < ActiveRecord::Base @@ -1724,7 +1724,7 @@ The +:offset+ option lets you specify the starting offset for fetching objects v h6(#has_and_belongs_to_many-order). +:order+ -The +:order+ option dictates the order in which associated objects will be received (in the syntax used by a SQL +ORDER BY+ clause). +The +:order+ option dictates the order in which associated objects will be received (in the syntax used by an SQL +ORDER BY+ clause). class Parts < ActiveRecord::Base diff --git a/railties/guides/source/migrations.textile b/railties/guides/source/migrations.textile index 16f616a5bc..89aa007279 100644 --- a/railties/guides/source/migrations.textile +++ b/railties/guides/source/migrations.textile @@ -250,7 +250,7 @@ create_table :products do |t| end -By default +create_table+ will create a primary key called +id+. You can change the name of the primary key with the +:primary_key+ option (don't forget to update the corresponding model) or if you don't want a primary key at all (for example for a HABTM join table) you can pass +:id => false+. If you need to pass database specific options you can place a SQL fragment in the +:options+ option. For example +By default +create_table+ will create a primary key called +id+. You can change the name of the primary key with the +:primary_key+ option (don't forget to update the corresponding model) or if you don't want a primary key at all (for example for a HABTM join table) you can pass +:id => false+. If you need to pass database specific options you can place an SQL fragment in the +:options+ option. For example create_table :products, :options => "ENGINE=BLACKHOLE" do |t| -- cgit v1.2.3