Remove deprecated push_with_attributes.

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

activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb

@@ -5,7 +5,7 @@ def initialize(owner, reflection)
         super
         construct_sql
       end
- 
+
       def build(attributes = {})
         load_target
         record = @reflection.klass.new(attributes)
@@ -27,7 +27,7 @@ def create(attributes = {})
       def find_first
         load_target.first
       end
-      
+
       def find(*args)
         options = Base.send(:extract_options_from_args!, args)
 
@@ -66,24 +66,7 @@ def find(*args)
           args << options
           @reflection.klass.find(*args)
         end
-      end      
-      
-      # Deprecated as of Rails 1.2.   If your associations require attributes
-      # you should be using has_many :through
-      def push_with_attributes(record, join_attributes = {})
-        raise_on_type_mismatch(record)
-        join_attributes.each { |key, value| record[key.to_s] = value }
-
-        callback(:before_add, record)
-        insert_record(record) unless @owner.new_record?
-        @target << record
-        callback(:after_add, record)
-
-        self
       end
-      deprecate :push_with_attributes => "consider using has_many :through instead"
-
-      alias :concat_with_attributes :push_with_attributes
 
       protected
         def count_records
@@ -121,10 +104,10 @@ def insert_record(record)
 
             @owner.connection.execute(sql)
           end
-          
+
           return true
         end
-        
+
         def delete_records(records)
           if sql = @reflection.options[:delete_sql]
             records.each { |record| @owner.connection.execute(interpolate_sql(sql, record)) }
@@ -134,7 +117,7 @@ def delete_records(records)
             @owner.connection.execute(sql)
           end
         end
-        
+
         def construct_sql
           interpolate_sql_options!(@reflection.options, :finder_sql)
 

activerecord/test/associations/callbacks_test.rb

@@ -15,29 +15,29 @@ def setup
     @authorless = posts(:authorless)
     assert @david.post_log.empty?
   end
-  
+
   def test_adding_macro_callbacks
     @david.posts_with_callbacks << @thinking
     assert_equal ["before_adding#{@thinking.id}", "after_adding#{@thinking.id}"], @david.post_log
     @david.posts_with_callbacks << @thinking
-    assert_equal ["before_adding#{@thinking.id}", "after_adding#{@thinking.id}", "before_adding#{@thinking.id}", 
+    assert_equal ["before_adding#{@thinking.id}", "after_adding#{@thinking.id}", "before_adding#{@thinking.id}",
                   "after_adding#{@thinking.id}"], @david.post_log
   end
-  
+
   def test_adding_with_proc_callbacks
     @david.posts_with_proc_callbacks << @thinking
     assert_equal ["before_adding#{@thinking.id}", "after_adding#{@thinking.id}"], @david.post_log
     @david.posts_with_proc_callbacks << @thinking
-    assert_equal ["before_adding#{@thinking.id}", "after_adding#{@thinking.id}", "before_adding#{@thinking.id}", 
+    assert_equal ["before_adding#{@thinking.id}", "after_adding#{@thinking.id}", "before_adding#{@thinking.id}",
                   "after_adding#{@thinking.id}"], @david.post_log
   end
-  
+
   def test_removing_with_macro_callbacks
     first_post, second_post = @david.posts_with_callbacks[0, 2]
     @david.posts_with_callbacks.delete(first_post)
     assert_equal ["before_removing#{first_post.id}", "after_removing#{first_post.id}"], @david.post_log
     @david.posts_with_callbacks.delete(second_post)
-    assert_equal ["before_removing#{first_post.id}", "after_removing#{first_post.id}", "before_removing#{second_post.id}", 
+    assert_equal ["before_removing#{first_post.id}", "after_removing#{first_post.id}", "before_removing#{second_post.id}",
                   "after_removing#{second_post.id}"], @david.post_log
   end
 
@@ -46,20 +46,20 @@ def test_removing_with_proc_callbacks
     @david.posts_with_proc_callbacks.delete(first_post)
     assert_equal ["before_removing#{first_post.id}", "after_removing#{first_post.id}"], @david.post_log
     @david.posts_with_proc_callbacks.delete(second_post)
-    assert_equal ["before_removing#{first_post.id}", "after_removing#{first_post.id}", "before_removing#{second_post.id}", 
+    assert_equal ["before_removing#{first_post.id}", "after_removing#{first_post.id}", "before_removing#{second_post.id}",
                   "after_removing#{second_post.id}"], @david.post_log
   end
-  
+
   def test_multiple_callbacks
     @david.posts_with_multiple_callbacks << @thinking
-    assert_equal ["before_adding#{@thinking.id}", "before_adding_proc#{@thinking.id}", "after_adding#{@thinking.id}", 
+    assert_equal ["before_adding#{@thinking.id}", "before_adding_proc#{@thinking.id}", "after_adding#{@thinking.id}",
                   "after_adding_proc#{@thinking.id}"], @david.post_log
     @david.posts_with_multiple_callbacks << @thinking
-    assert_equal ["before_adding#{@thinking.id}", "before_adding_proc#{@thinking.id}", "after_adding#{@thinking.id}", 
-                  "after_adding_proc#{@thinking.id}", "before_adding#{@thinking.id}", "before_adding_proc#{@thinking.id}", 
+    assert_equal ["before_adding#{@thinking.id}", "before_adding_proc#{@thinking.id}", "after_adding#{@thinking.id}",
+                  "after_adding_proc#{@thinking.id}", "before_adding#{@thinking.id}", "before_adding_proc#{@thinking.id}",
                   "after_adding#{@thinking.id}", "after_adding_proc#{@thinking.id}"], @david.post_log
   end
-  
+
   def test_has_and_belongs_to_many_add_callback
     david = developers(:david)
     ar = projects(:active_record)
@@ -67,10 +67,10 @@ def test_has_and_belongs_to_many_add_callback
     ar.developers_with_callbacks << david
     assert_equal ["before_adding#{david.id}", "after_adding#{david.id}"], ar.developers_log
     ar.developers_with_callbacks << david
-    assert_equal ["before_adding#{david.id}", "after_adding#{david.id}", "before_adding#{david.id}", 
+    assert_equal ["before_adding#{david.id}", "after_adding#{david.id}", "before_adding#{david.id}",
                   "after_adding#{david.id}"], ar.developers_log
   end
-  
+
   def test_has_and_belongs_to_many_remove_callback
     david = developers(:david)
     jamis = developers(:jamis)
@@ -78,9 +78,9 @@ def test_has_and_belongs_to_many_remove_callback
     assert activerecord.developers_log.empty?
     activerecord.developers_with_callbacks.delete(david)
     assert_equal ["before_removing#{david.id}", "after_removing#{david.id}"], activerecord.developers_log
-    
+
     activerecord.developers_with_callbacks.delete(jamis)
-    assert_equal ["before_removing#{david.id}", "after_removing#{david.id}", "before_removing#{jamis.id}", 
+    assert_equal ["before_removing#{david.id}", "after_removing#{david.id}", "before_removing#{jamis.id}",
                   "after_removing#{jamis.id}"], activerecord.developers_log
   end
 
@@ -97,7 +97,7 @@ def test_has_and_belongs_to_many_remove_callback_on_clear
     assert activerecord.developers_with_callbacks.clear
     assert_equal log_array, activerecord.developers_log.sort
   end
-  
+
   def test_dont_add_if_before_callback_raises_exception
     assert !@david.unchangable_posts.include?(@authorless)
     begin
@@ -109,18 +109,5 @@ def test_dont_add_if_before_callback_raises_exception
     @david.reload
     assert !@david.unchangable_posts.include?(@authorless)
   end
-  
-  def test_push_with_attributes
-    assert_deprecated 'push_with_attributes' do
-      david = developers(:david)
-      activerecord = projects(:active_record)
-      assert activerecord.developers_log.empty?
-      activerecord.developers_with_callbacks.push_with_attributes(david, {})
-      assert_equal ["before_adding#{david.id}", "after_adding#{david.id}"], activerecord.developers_log
-      activerecord.developers_with_callbacks.push_with_attributes(david, {})
-      assert_equal ["before_adding#{david.id}", "after_adding#{david.id}", "before_adding#{david.id}", 
-                    "after_adding#{david.id}"], activerecord.developers_log
-    end
-  end
 end