activerecord 3.0.0.rc2 → 3.0.0

data/CHANGELOG

@@ -1,9 +1,4 @@
-*Rails 3.0.0 [release candidate 2] (August 23rd, 2010)*
-
-* No material changes (see http://github.com/rails/rails/compare/v3.0.0_RC...v3.0.0_RC2 for gory details)
-
-
-*Rails 3.0.0 [release candidate] (July 26th, 2010)*
+*Rails 3.0.0 (August 29, 2010)*
 
 * Changed update_attribute to not run callbacks and update the record directly in the database [Neeraj Singh]
 
@@ -15,9 +10,6 @@
 
 * PostgreSQL: ensure the database time zone matches Ruby's time zone #4895 [Aaron Patterson]
 
-
-*Rails 3.0.0 [beta 4] (June 8th, 2010)*
-
 * Fixed that ActiveRecord::Base.compute_type would swallow NoMethodError #4751 [Andrew Bloomgarden, Andrew White]
 
 * Add index length support for MySQL. #1852 [Emili Parreno, Pratik Naik]
@@ -42,9 +34,6 @@
 
 * Observers can prevent records from saving by returning false, just like before_save and friends.  #4087 [Mislav Marohnić]
 
-
-*Rails 3.0.0 [beta 3] (April 13th, 2010)*
-
 * Add Relation extensions. [Pratik Naik]
 
   users = User.where(:admin => true).extending(User::AdminPowers)
@@ -59,9 +48,6 @@
 
 * Silenced "SHOW FIELDS" and "SET SQL_AUTO_IS_NULL=0" statements from the MySQL driver to improve log signal to noise ration in development [DHH]
 
-
-*Rails 3.0.0 [Beta 1] (February 4th, 2010)*
-
 * PostgreSQLAdapter: set time_zone to UTC when Base.default_timezone == :utc so that Postgres doesn't incorrectly offset-adjust values inserted into TIMESTAMP WITH TIME ZONE columns. #3777 [Jack Christensen]
 
 * Allow relations to be used as scope.
@@ -2044,7 +2030,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
       end
     end
 
-* Fixed that schema changes while the database was open would break any connections to a SQLite database (now we reconnect if that error is throw) [David Heinemeier Hansson]
+* Fixed that schema changes while the database was open would break any connections to an SQLite database (now we reconnect if that error is throw) [David Heinemeier Hansson]
 
 * Don't classify the has_one class when eager loading, it is already singular. Add tests. (closes #4117) [Jonathan Viney]
 
@@ -3559,7 +3545,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
       end
     end
 
-* Fixed that schema changes while the database was open would break any connections to a SQLite database (now we reconnect if that error is throw) [David Heinemeier Hansson]
+* Fixed that schema changes while the database was open would break any connections to an SQLite database (now we reconnect if that error is throw) [David Heinemeier Hansson]
 
 * Don't classify the has_one class when eager loading, it is already singular. Add tests. (closes #4117) [Jonathan Viney]
 
@@ -5223,7 +5209,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
   NOTE: The agreement is considered valid if it's set to the string "1". This makes it easy to relate it to an HTML checkbox.
 
 
-* Added validation macros to make the stackable just like the lifecycle callbacks. Examples:
+* Added validation macros to make the stackable just like the life cycle callbacks. Examples:
 
     class Person < ActiveRecord::Base
       validate { |record| record.errors.add("name", "too short") unless name.size > 10 }

data/README.rdoc

@@ -70,7 +70,7 @@ A short rundown of some of the major features:
   {Learn more}[link:classes/ActiveRecord/Validations.html]
 
 
-* Callbacks available for the entire lifecycle (instantiation, saving, destroying, validating, etc.)
+* Callbacks available for the entire life cycle (instantiation, saving, destroying, validating, etc.)
 
    class Person < ActiveRecord::Base
      before_destroy :invalidate_payment_plan

data/lib/active_record/associations.rb

@@ -340,7 +340,7 @@ module ActiveRecord
     #
     # === Association callbacks
     #
-    # Similar to the normal callbacks that hook into the lifecycle of an Active Record object,
+    # Similar to the normal callbacks that hook into the life cycle of an Active Record object,
     # you can also define callbacks that get triggered when you add an object to or remove an
     # object from an association collection.
     #

data/lib/active_record/associations/has_and_belongs_to_many_association.rb

@@ -26,7 +26,7 @@ module ActiveRecord
         def construct_find_options!(options)
           options[:joins]      = Arel::SqlLiteral.new @join_sql
           options[:readonly]   = finding_with_ambiguous_select?(options[:select] || @reflection.options[:select])
-          options[:select]   ||= (@reflection.options[:select] || '*')
+          options[:select]   ||= (@reflection.options[:select] || Arel::SqlLiteral.new('*'))
         end
 
         def count_records

data/lib/active_record/base.rb

@@ -32,7 +32,7 @@ module ActiveRecord #:nodoc:
   # Active Record objects. The mapping that binds a given Active Record class to a certain
   # database table will happen automatically in most common cases, but can be overwritten for the uncommon ones.
   #
-  # See the mapping rules in table_name and the full example in link:files/README.html for more insight.
+  # See the mapping rules in table_name and the full example in link:files/activerecord/README_rdoc.html for more insight.
   #
   # == Creation
   #
@@ -876,7 +876,12 @@ module ActiveRecord #:nodoc:
       #     limit(10) # Fires "SELECT * FROM posts LIMIT 10"
       #   }
       #
-      def unscoped
+      # It is recommended to use block form of unscoped because chaining unscoped with <tt>named_scope</tt>
+      # does not work. Assuming that <tt>published</tt> is a <tt>named_scope</tt> following two statements are same.
+      #
+      # Post.unscoped.published 
+      # Post.published 
+      def unscoped #:nodoc:
         block_given? ? relation.scoping { yield } : relation
       end
 

data/lib/active_record/callbacks.rb

@@ -3,7 +3,7 @@ require 'active_support/core_ext/array/wrap'
 module ActiveRecord
   # = Active Record Callbacks
   #
-  # Callbacks are hooks into the lifecycle of an Active Record object that allow you to trigger logic
+  # Callbacks are hooks into the life cycle of an Active Record object that allow you to trigger logic
   # before or after an alteration of the object state. This can be used to make sure that associated and
   # dependent objects are deleted when +destroy+ is called (by overwriting +before_destroy+) or to massage attributes
   # before they're validated (by overwriting +before_validation+). As an example of the callbacks initiated, consider
@@ -26,7 +26,7 @@ module ActiveRecord
   # <tt>after_rollback</tt>.
   #
   # That's a total of ten callbacks, which gives you immense power to react and prepare for each state in the
-  # Active Record lifecycle. The sequence for calling <tt>Base#save</tt> for an existing record is similar,
+  # Active Record life cycle. The sequence for calling <tt>Base#save</tt> for an existing record is similar,
   # except that each <tt>_on_create</tt> callback is replaced by the corresponding <tt>_on_update</tt> callback.
   #
   # Examples:

data/lib/active_record/observer.rb

@@ -3,7 +3,7 @@ require 'active_support/core_ext/class/attribute'
 module ActiveRecord
   # = Active Record Observer
   #
-  # Observer classes respond to lifecycle callbacks to implement trigger-like
+  # Observer classes respond to life cycle callbacks to implement trigger-like
   # behavior outside the original class. This is a great way to reduce the
   # clutter that normally comes when the model class is burdened with
   # functionality that doesn't pertain to the core responsibility of the

data/lib/active_record/persistence.rb

@@ -208,24 +208,37 @@ module ActiveRecord
     # If an attribute name is passed, that attribute is updated along with
     # updated_at/on attributes.
     #
-    # Examples:
-    #
     #   product.touch               # updates updated_at/on
     #   product.touch(:designed_at) # updates the designed_at attribute and updated_at/on
+    #
+    # If used along with +belongs_to+ then +touch+ will invoke +touch+ method on associated object.
+    #
+    #   class Brake < ActiveRecord::Base
+    #     belongs_to :car, :touch => true
+    #   end
+    #
+    #   class Car < ActiveRecord::Base
+    #     belongs_to :corporation, :touch => true
+    #   end
+    #
+    #   # triggers @brake.car.touch and @brake.car.corporation.touch
+    #   @brake.touch
     def touch(name = nil)
       attributes = timestamp_attributes_for_update_in_model
-      attributes << name if name
+      unless attributes.blank?
+        attributes << name if name
 
-      current_time = current_time_from_proper_timezone
-      changes = {}
+        current_time = current_time_from_proper_timezone
+        changes = {}
 
-      attributes.each do |column|
-        changes[column.to_s] = write_attribute(column.to_s, current_time)
-      end
+        attributes.each do |column|
+          changes[column.to_s] = write_attribute(column.to_s, current_time)
+        end
 
-      @changed_attributes.except!(*changes.keys)
-      primary_key = self.class.primary_key
-      self.class.update_all(changes, { primary_key => self[primary_key] }) == 1
+        @changed_attributes.except!(*changes.keys)
+        primary_key = self.class.primary_key
+        self.class.update_all(changes, { primary_key => self[primary_key] }) == 1
+      end
     end
 
   private

data/lib/active_record/railties/databases.rake

@@ -61,12 +61,14 @@ namespace :db do
         @charset   = ENV['CHARSET']   || 'utf8'
         @collation = ENV['COLLATION'] || 'utf8_unicode_ci'
         creation_options = {:charset => (config['charset'] || @charset), :collation => (config['collation'] || @collation)}
+        error_class = config['adapter'] =~ /mysql2/ ? Mysql2::Error : Mysql::Error
+        access_denied_error = 1045
         begin
           ActiveRecord::Base.establish_connection(config.merge('database' => nil))
           ActiveRecord::Base.connection.create_database(config['database'], creation_options)
           ActiveRecord::Base.establish_connection(config)
-        rescue Mysql::Error => sqlerr
-          if sqlerr.errno == Mysql::Error::ER_ACCESS_DENIED_ERROR
+        rescue error_class => sqlerr
+          if sqlerr.errno == access_denied_error
             print "#{sqlerr.error}. \nPlease provide the root password for your mysql installation\n>"
             root_password = $stdin.gets.strip
             grant_statement = "GRANT ALL PRIVILEGES ON #{config['database']}.* " \

data/lib/active_record/relation/calculations.rb

@@ -7,18 +7,17 @@ module ActiveRecord
     #
     # * Count all: By not passing any parameters to count, it will return a count of all the rows for the model.
     # * Count using column: By passing a column name to count, it will return a count of all the
-    #   rows for the model with supplied column present
+    #   rows for the model with supplied column present.
     # * Count using options will find the row count matched by the options used.
     #
     # The third approach, count using options, accepts an option hash as the only parameter. The options are:
     #
     # * <tt>:conditions</tt>: An SQL fragment like "administrator = 1" or [ "user_name = ?", username ].
     #   See conditions in the intro to ActiveRecord::Base.
-    # * <tt>:joins</tt>: Either an SQL fragment for additional joins like "LEFT JOIN comments ON comments.post_id = id" (rarely needed)
-    #   or named associations in the same form used for the <tt>:include</tt> option, which will
-    #   perform an INNER JOIN on the associated table(s).
-    #   If the value is a string, then the records will be returned read-only since they will have
-    #   attributes that do not correspond to the table's columns.
+    # * <tt>:joins</tt>: Either an SQL fragment for additional joins like "LEFT JOIN comments ON comments.post_id = id" 
+    #   (rarely needed) or named associations in the same form used for the <tt>:include</tt> option, which will
+    #   perform an INNER JOIN on the associated table(s). If the value is a string, then the records 
+    #   will be returned read-only since they will have attributes that do not correspond to the table's columns.
     #   Pass <tt>:readonly => false</tt> to override.
     # * <tt>:include</tt>: Named associations that should be loaded alongside using LEFT OUTER JOINs.
     #   The symbols named refer to already defined associations. When using named associations, count
@@ -27,8 +26,7 @@ module ActiveRecord
     # * <tt>:order</tt>: An SQL fragment like "created_at DESC, name" (really only used with GROUP BY calculations).
     # * <tt>:group</tt>: An attribute name by which the result should be grouped. Uses the GROUP BY SQL-clause.
     # * <tt>:select</tt>: By default, this is * as in SELECT * FROM, but can be changed if you, for example,
-    #   want to do a join but not
-    #   include the joined columns.
+    #   want to do a join but not include the joined columns.
     # * <tt>:distinct</tt>: Set this to true to make this a distinct calculation, such as
     #   SELECT COUNT(DISTINCT posts.id) ...
     # * <tt>:from</tt> - By default, this is the table name of the class, but can be changed to an

data/lib/active_record/relation/query_methods.rb

@@ -96,14 +96,14 @@ module ActiveRecord
     end
 
     def reverse_order
-      order_clause = arel.send(:order_clauses).join(', ')
+      order_clause = arel.order_clauses.join(', ')
       relation = except(:order)
 
-      if order_clause.present?
-        relation.order(reverse_sql_order(order_clause))
-      else
-        relation.order("#{@klass.table_name}.#{@klass.primary_key} DESC")
-      end
+      order = order_clause.blank? ?
+        "#{@klass.table_name}.#{@klass.primary_key} DESC" :
+        reverse_sql_order(order_clause)
+
+      relation.order Arel::SqlLiteral.new order
     end
 
     def arel
@@ -188,7 +188,7 @@ module ActiveRecord
         association_joins << join if [Hash, Array, Symbol].include?(join.class) && !array_of_strings?(join)
       end
 
-      stashed_association_joins = joins.select {|j| j.is_a?(ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation)}
+      stashed_association_joins = joins.grep(ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation)
 
       non_association_joins = (joins - association_joins - stashed_association_joins)
       custom_joins = custom_join_sql(*non_association_joins)

data/lib/active_record/relation/spawn_methods.rb

@@ -8,7 +8,7 @@ module ActiveRecord
 
       ((Relation::ASSOCIATION_METHODS + Relation::MULTI_VALUE_METHODS) - [:joins, :where]).each do |method|
         value = r.send(:"#{method}_values")
-        if value.present?
+        unless value.empty?
           if method == :includes
             merged_relation = merged_relation.includes(value)
           else

data/lib/active_record/timestamp.rb

@@ -61,7 +61,7 @@ module ActiveRecord
     end
 
     def should_record_timestamps?
-      record_timestamps && !partial_updates? || changed?
+      record_timestamps && (!partial_updates? || changed?)
     end
 
     def timestamp_attributes_for_update_in_model

data/lib/active_record/version.rb

@@ -3,8 +3,7 @@ module ActiveRecord
     MAJOR = 3
     MINOR = 0
     TINY  = 0
-    BUILD = "rc2"
 
-    STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
+    STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord
 version: !ruby/object:Gem::Version 
-  hash: 977940607
-  prerelease: true
+  hash: 7
+  prerelease: false
   segments: 
   - 3
   - 0
   - 0
-  - rc2
-  version: 3.0.0.rc2
+  version: 3.0.0
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 -05:00
+date: 2010-08-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,13 +26,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 977940607
+        hash: 7
         segments: 
         - 3
         - 0
         - 0
-        - rc2
-        version: 3.0.0.rc2
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,13 +42,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 977940607
+        hash: 7
         segments: 
         - 3
         - 0
         - 0
-        - rc2
-        version: 3.0.0.rc2
+        version: 3.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -61,13 +58,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940574
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
-        - rc1
-        version: 1.0.0.rc1
+        version: 1.0.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -211,14 +207,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: activerecord