Override accessors for #attributes and #changed_attributes in a non-d…

…estructive manner

test/dummy/app/models/song.rb

@@ -13,15 +13,19 @@ def length
 
   # override attributes hashes like some libraries do
   def attributes_with_name
-    attributes_without_name.tap do |_hash|
-      _hash.merge!(:name => name) if name
+    if name
+      attributes_without_name.merge(:name => name)
+    else
+      attributes_without_name
     end
   end
   alias_method_chain :attributes, :name
 
   def changed_attributes_with_name
-    changed_attributes_without_name.tap do |_hash|
-      _hash.merge!(:name => name) if name
+    if name
+      changed_attributes_without_name.merge(:name => name)
+    else
+      changed_attributes_without_name
     end
   end
   alias_method_chain :changed_attributes, :name

test/unit/model_test.rb

@@ -1131,11 +1131,11 @@ def without(&block)
       setup do
         @song.name = 'Good Vibrations'
         @song.save
-        @song.name = nil
+        @song.name = 'Yellow Submarine'
       end
 
       should 'return persist the changes on the live instance properly' do
-        assert_equal nil, @song.name
+        assert_equal 'Yellow Submarine', @song.name
       end
       should 'return "overwritten" virtual attribute on the reified instance' do
         assert_equal 'Good Vibrations', @song.versions.last.reify.name