Fix form_for use of datetime_select and date_select as well as a few …

…stylistic upgrades to AR

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3330 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

actionpack/lib/action_view/helpers/date_helper.rb

@@ -76,8 +76,8 @@ def time_ago_in_words(from_time, include_seconds = false)
       #   date_select("user", "birthday",   :order => [:month, :day])
       #
       # The selects are prepared for multi-parameter assignment to an Active Record object.
-      def date_select(object, method, options = {})
-        InstanceTag.new(object, method, self).to_date_select_tag(options)
+      def date_select(object_name, method, options = {})
+        InstanceTag.new(object_name, method, self, nil, options.delete(:object)).to_date_select_tag(options)
       end
 
       # Returns a set of select tags (one for year, month, day, hour, and minute) pre-selected for accessing a specified datetime-based
@@ -87,8 +87,8 @@ def date_select(object, method, options = {})
       #   datetime_select("post", "written_on", :start_year => 1995)
       #
       # The selects are prepared for multi-parameter assignment to an Active Record object.
-      def datetime_select(object, method, options = {})
-        InstanceTag.new(object, method, self).to_datetime_select_tag(options)
+      def datetime_select(object_name, method, options = {})
+        InstanceTag.new(object_name, method, self, nil, options.delete(:object)).to_datetime_select_tag(options)
       end
 
       # Returns a set of html select-tags (one for year, month, and day) pre-selected with the +date+.

activerecord/lib/active_record/base.rb

@@ -851,9 +851,10 @@ def with_scope(method_scoping = {})
           hash
         end
 
-        method_scoping.assert_valid_keys [:find, :create]
+        method_scoping.assert_valid_keys([ :find, :create ])
+
         if f = method_scoping[:find]
-          f.assert_valid_keys [:conditions, :joins, :from, :offset, :limit, :readonly]
+          f.assert_valid_keys([ :conditions, :joins, :from, :offset, :limit, :readonly ])
           f[:readonly] = true if !f[:joins].blank? && !f.has_key?(:readonly)
         end
 
@@ -1448,7 +1449,7 @@ def update
 
       # Creates a new record with values matching those of the instance attributes.
       def create
-        if self.id.nil? and connection.prefetch_primary_key?(self.class.table_name)
+        if self.id.nil? && connection.prefetch_primary_key?(self.class.table_name)
           self.id = connection.next_sequence_value(self.class.sequence_name)
         end