From 23d32ba1d58f96ecb3b92da4b5f371e93cad9dca Mon Sep 17 00:00:00 2001
From: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
Date: Fri, 23 Dec 2011 00:13:35 -0200
Subject: [PATCH] Some fixes

---
 app/controllers/public/profile_controller.rb                                  |  8 ++------
 app/models/action_tracker_notification.rb                                     |  1 -
 app/models/article.rb                                                         |  9 ++++++---
 app/models/comment.rb                                                         |  4 +---
 app/views/profile/_comment.rhtml                                              | 22 +++++++++++-----------
 app/views/profile/_profile.rhtml                                              |  1 -
 app/views/profile/_profile_activities.rhtml                                   | 28 ----------------------------
 app/views/profile/_profile_activities_scraps.rhtml                            |  2 +-
 app/views/profile/_profile_activity.rhtml                                     | 31 ++++++++++++++++++++++++++-----
 app/views/profile/_profile_wall.rhtml                                         | 10 ----------
 config/initializers/action_tracker.rb                                         | 18 ------------------
 test/functional/profile_controller_test.rb                                    | 41 +++++++++++++++++++++++++++++++++++++++--
 test/unit/comment_test.rb                                                     | 10 ++++++++++
 vendor/plugins/active_record_counter_cache_on_polymorphic_association/init.rb | 60 ++++++++++++++++++++++++++++++++----------------------------
 14 files changed, 128 insertions(+), 117 deletions(-)
 delete mode 100644 app/views/profile/_profile_activities.rhtml

diff --git a/app/controllers/public/profile_controller.rb b/app/controllers/public/profile_controller.rb
index b7153d9..ade39ca 100644
--- a/app/controllers/public/profile_controller.rb
+++ b/app/controllers/public/profile_controller.rb
@@ -3,17 +3,14 @@ class ProfileController < PublicController
   needs_profile
   before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index, :add]
   before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse]
-  before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_scraps, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report]
+  before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_scraps, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity]
 
   helper TagsHelper
 
   def index
-    @activities = @profile.tracked_actions.paginate(:per_page => 30, :page => params[:page])
-    @wall_items = []
     @network_activities = !@profile.is_a?(Person) ? @profile.tracked_notifications.paginate(:per_page => 30, :page => params[:page]) : []
     if logged_in? && current_person.follows?(@profile)
       @network_activities = @profile.tracked_notifications.paginate(:per_page => 30, :page => params[:page]) if @network_activities.empty?
-      @wall_items = @profile.scraps_received.not_replies.paginate(:per_page => 30, :page => params[:page])
       @activities = @profile.activities.paginate(:per_page => 30, :page => params[:page])
     end
     @tags = profile.article_tags
@@ -187,7 +184,7 @@ class ProfileController < PublicController
 
   def leave_comment_on_activity
     @comment = Comment.new(params[:comment])
-    @comment.author = user #'if logged_in?
+    @comment.author = user
     @comment.source = ActionTracker::Record.find(params[:comment][:source_id])
     @tab_action = params[:tab_action]
     @message = @comment.save ? _("Comment successfully added.") : _("You can't leave an empty comment.")
@@ -201,7 +198,6 @@ class ProfileController < PublicController
   end
 
   def view_more_activities
-#    @activities = @profile.tracked_actions.paginate(:per_page => 30, :page => params[:page])
     @activities = @profile.activities.paginate(:per_page => 30, :page => params[:page])
     render :partial => 'profile_activities_scraps', :locals => {:activities => @activities}
   end
diff --git a/app/models/action_tracker_notification.rb b/app/models/action_tracker_notification.rb
index 717d0a0..dda665c 100644
--- a/app/models/action_tracker_notification.rb
+++ b/app/models/action_tracker_notification.rb
@@ -11,4 +11,3 @@ class ActionTrackerNotification < ActiveRecord::Base
 end
 
 ActionTracker::Record.has_many :action_tracker_notifications, :class_name => 'ActionTrackerNotification', :foreign_key => 'action_tracker_id', :dependent => :destroy
-ActionTracker::Record.has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
diff --git a/app/models/article.rb b/app/models/article.rb
index 6be91a6..41cc421 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -2,7 +2,7 @@ require 'hpricot'
 
 class Article < ActiveRecord::Base
 
-  track_actions :create_article, :after_create, :keep_params => [:name, :url, :lead], :if => Proc.new { |a| a.is_trackable? && !a.image? }, :custom_target => :action_tracker_target
+  track_actions :create_article, :after_create, :keep_params => [:name, :url, :lead, :id], :if => Proc.new { |a| a.is_trackable? && !a.image? }, :custom_target => :action_tracker_target
 
   # xss_terminate plugin can't sanitize array fields
   before_save :sanitize_tag_list
@@ -15,7 +15,7 @@ class Article < ActiveRecord::Base
 
   belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
 
-  has_many :comments, :dependent => :destroy, :order => 'created_at asc', :as => :source
+  has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
 
   has_many :article_categorizations, :conditions => [ 'articles_categories.virtual = ?', false ]
   has_many :categories, :through => :article_categorizations
@@ -133,7 +133,10 @@ class Article < ActiveRecord::Base
     article.advertise = true
   end
 
-  after_update do |article|
+  after_update :update_creation_activity
+  def update_creation_activity
+    a = ActionTracker::Record.all.select {|a| a.verb == 'create_article' && a.target == article.profile}
+    a.first.touch
     #update article's activity
   end
 
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 91ea076..6686e26 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,10 +1,8 @@
 class Comment < ActiveRecord::Base
 
-#  track_actions :leave_comment, :after_create, :keep_params => ["article.title", "article.url", "title", "url", "body"], :custom_target => :action_tracker_target 
-
   validates_presence_of :body
 
-  belongs_to :source, :foreign_key => :source_id, :counter_cache => true, :polymorphic => true
+  belongs_to :source, :counter_cache => true, :polymorphic => true
   alias :article :source
   alias :article= :source=
 
diff --git a/app/views/profile/_comment.rhtml b/app/views/profile/_comment.rhtml
index 3277900..8eb871b 100644
--- a/app/views/profile/_comment.rhtml
+++ b/app/views/profile/_comment.rhtml
@@ -3,14 +3,14 @@
 
   <div class="comment-content comment-logged-in">
 
-  <%# if comment.author %>
-    <%= link_to image_tag(profile_icon(comment.author, :minor)) +
-                content_tag('span', comment.author_name, :class => 'comment-info'),
-        comment.author.url,
+  <% if Person.find(comment.author_id) %>
+    <%= link_to image_tag(profile_icon(Person.find(comment.author_id), :minor)) +
+                content_tag('span', Person.find(comment.author_id).name, :class => 'comment-info'),
+        Person.find(comment.author_id).url,
         :class => 'comment-picture',
-        :title => comment.author_name
+        :title => Person.find(comment.author_id).name
     %>
-  <%# end %>
+  <% end %>
 
   <div class="comment-details">
     <h4><%= comment.title %></h4>
@@ -23,11 +23,11 @@
     </div>
   </div>
 
-  <%# if logged_in? && (user == profile || user == comment.author || user.has_permission?(:moderate_comments, profile)) %>
+  <% if logged_in? && (user == profile || user == Person.find(comment.author_id) || user.has_permission?(:moderate_comments, profile)) %>
     <% button_bar(:style => 'float: right; margin-top: 0px;') do %>
-      <%= icon_button(:delete, _('Remove this comment and all its replies'), { :profile => params[:profile], :remove_comment => comment.id, :view => params[:view] }, :method => :post, :confirm => _('Are you sure you want to remove this comment and all its replies?')) %>
+      <%= icon_button(:delete, _('Remove'), { :profile => params[:profile], :remove_comment => comment.id, :view => params[:view] }, :method => :post, :confirm => _('Are you sure you want to remove this comment and all its replies?')) %>
     <% end %>
-  <%# end %>
+  <% end %>
 
   <div class="comment_reply post_comment_box closed">
     <% if @comment && @comment.errors.any? && @comment.reply_of_id.to_i == comment.id %>
@@ -39,7 +39,7 @@
         });
       </script>
     <% end %>
-    <%= report_abuse(comment.author, :comment_link, comment) if comment.author %>
+    <%= report_abuse(Person.find(comment.author_id), :comment_link, comment) if Person.find(comment.author_id) %>
     <%= link_to_function _('Reply'),
         "var f = add_comment_reply_form(this, %s); f.find('input[name=comment[title]], textarea').val(''); return false" % comment.id,
         :class => 'comment-footer comment-footer-link comment-footer-hide',
@@ -49,7 +49,7 @@
 
   </div>
 
-  <% unless comment.replies.blank? %>
+  <% unless Comment.find(comment.id).replies.blank? %>
   <ul class="comment-replies">
     <% comment.replies.each do |reply| %>
       <%= render :partial => 'comment', :locals => { :comment => reply } %>
diff --git a/app/views/profile/_profile.rhtml b/app/views/profile/_profile.rhtml
index 1c74fcc..6656761 100644
--- a/app/views/profile/_profile.rhtml
+++ b/app/views/profile/_profile.rhtml
@@ -18,7 +18,6 @@
         <% tabs << {:title => _('Network'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
       <% end %>
 
-      <% tabs << {:title => _('Activity'), :id => 'profile-activity', :content => (render :partial => 'profile_activity')} %>
       <% tabs << {:title => _('Profile'), :id => 'person-profile', :content => (render :partial => 'person_profile')} %>
     <% end %>
 
diff --git a/app/views/profile/_profile_activities.rhtml b/app/views/profile/_profile_activities.rhtml
deleted file mode 100644
index 1d169d1..0000000
--- a/app/views/profile/_profile_activities.rhtml
+++ /dev/null
@@ -1,28 +0,0 @@
-<li class='profile-activity-item <%= activity.verb %>' id='profile-activity-item-<%= activity.id %>'>
-  <%= render :partial => activity.verb, :locals => { :activity => activity }%>
-  <hr />  
-
-  <%# if logged_in? && current_person.follows?(activity.sender) && activity.root.nil? %>
-    <span class='profile-wall-send-reply'><%= link_to_function _('Comment'), "hide_and_show(['#profile-wall-reply-response-#{activity.id}'],['#profile-wall-reply-#{activity.id}', '#profile-wall-reply-form-#{activity.id}']);$('reply_content_#{activity.id}').value='';$('activity_id_#{activity.id}').value='#{activity.id}';return false", :class => "profile-send-reply" %></span>
-  <%# end %>
-
-  <ul class="profile-wall-activities-comments" style='padding-left: 50px;width:auto'>
-    <%= render :partial => 'comment', :collection => activity.comments %>
-  </ul>
-
-  <div id='profile-wall-reply-<%= activity.id%>' style='display:none;width:auto;'>
-    <div id='profile-wall-reply-form-<%= activity.id%>' style='display:none;'>
-      <p class='profile-wall-reply'>
-        <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_comment_on_activity'}, :update => "profile_activities", :success =>"hide_and_show(['#profile-wall-reply-form-#{activity.id}'],['#profile-wall-reply-response-#{activity.id}'])" do %>
-          <%= limited_text_area :comment, :body, 420, "reply_content_#{activity.id}", :cols => 50, :rows => 2 %>
-          <%= hidden_field :comment, :source_id, :id => "activity_id_#{activity.id}" %>
-          <%= hidden_field :comment, :author_id, :value => user.id %>
-          <%= submit_button :add, _('Leave a comment') %>
-          <%= button_to_function :cancel, _('Cancel'), "hide_and_show(['#profile-wall-reply-#{activity.id}'],[]);return false" %>
-        <% end %>
-      </p>
-    </div>
-    <div id='profile-wall-message-response-<%=activity.id%>' class='profile-wall-message-response'></div>
-  </div>
-
-</li>
diff --git a/app/views/profile/_profile_activities_scraps.rhtml b/app/views/profile/_profile_activities_scraps.rhtml
index cbd527a..66601ba 100644
--- a/app/views/profile/_profile_activities_scraps.rhtml
+++ b/app/views/profile/_profile_activities_scraps.rhtml
@@ -1,7 +1,7 @@
 <% activities.each do |a| %>
   <% activity = a.klass.constantize.find(a.id) %>
   <% if activity.kind_of?(ActionTracker::Record) && @profile.person? %>
-    <%= render :partial => 'profile_activities', :locals => {:activity => activity} %>
+    <%= render :partial => 'profile_activity', :locals => {:activity => activity} %>
   <% else %>
     <%= render :partial => 'profile_scrap', :locals => {:scrap => activity } %>
   <% end %>
diff --git a/app/views/profile/_profile_activity.rhtml b/app/views/profile/_profile_activity.rhtml
index c780a4f..0637f50 100644
--- a/app/views/profile/_profile_activity.rhtml
+++ b/app/views/profile/_profile_activity.rhtml
@@ -1,6 +1,27 @@
-<div id='profile-activity'>
-  <h3><%= _("%s's activity") % @profile.name %></h3>
-  <ul>
-    <%= render :partial => 'profile_activities_scraps', :locals => {:activities => @activities} %>
+<li class='profile-activity-item <%= activity.verb %>' id='profile-activity-item-<%= activity.id %>'>
+  <%= render :partial => activity.verb, :locals => { :activity => activity }%>
+  <hr />
+
+  <% if logged_in? && current_person.follows?(activity.user) %>
+    <span class='profile-wall-send-reply'><%= link_to_function _('Comment'), "hide_and_show(['#profile-wall-reply-response-#{activity.id}'],['#profile-wall-reply-#{activity.id}', '#profile-wall-reply-form-#{activity.id}']);$('reply_content_#{activity.id}').value='';$('activity_id_#{activity.id}').value='#{activity.id}';return false", :class => "profile-send-reply" %></span>
+  <% end %>
+
+  <ul class="profile-wall-activities-comments" style='padding-left: 50px;width:auto'>
+    <%= render :partial => 'comment', :collection => activity.comments %>
   </ul>
-</div>
+
+  <div id='profile-wall-reply-<%= activity.id%>' style='display:none;width:auto;'>
+    <div id='profile-wall-reply-form-<%= activity.id%>' style='display:none;'>
+      <p class='profile-wall-reply'>
+        <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_comment_on_activity'}, :update => "profile_activities", :success =>"hide_and_show(['#profile-wall-reply-form-#{activity.id}'],['#profile-wall-reply-response-#{activity.id}'])" do %>
+          <%= limited_text_area :comment, :body, 420, "reply_content_#{activity.id}", :cols => 50, :rows => 2 %>
+          <%= hidden_field :comment, :source_id, :id => "activity_id_#{activity.id}" %>
+          <%= submit_button :add, _('Leave a comment') %>
+          <%= button_to_function :cancel, _('Cancel'), "hide_and_show(['#profile-wall-reply-#{activity.id}'],[]);return false" %>
+        <% end %>
+      </p>
+    </div>
+    <div id='profile-wall-message-response-<%=activity.id%>' class='profile-wall-message-response'></div>
+  </div>
+
+</li>
diff --git a/app/views/profile/_profile_wall.rhtml b/app/views/profile/_profile_wall.rhtml
index ebaa042..ab03654 100644
--- a/app/views/profile/_profile_wall.rhtml
+++ b/app/views/profile/_profile_wall.rhtml
@@ -16,13 +16,3 @@
     <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_activities', :page => (@activities.current_page + 1)}, :update => "profile_activities_page_#{@activities.current_page}" %>
   </div>
 <% end %>
-
-<!--
-<ul id='profile_scraps'>
-  <%#= render :partial => 'profile_scraps', :locals => {:scraps => @wall_items} %>
-</ul>
-
-<% if @profile.person? %>
-  <%#= render :partial => 'profile_activity' %>
-<% end %>
--->
diff --git a/config/initializers/action_tracker.rb b/config/initializers/action_tracker.rb
index 614fc12..cde4180 100644
--- a/config/initializers/action_tracker.rb
+++ b/config/initializers/action_tracker.rb
@@ -8,11 +8,6 @@ ActionTrackerConfig.verbs = {
     :description => lambda { _('published an article: %{title}') % { :title => '{{link_to(truncate(ta.get_name), ta.get_url)}}' } }
   },
 
-  :remove_article => { 
-    :description => lambda { n_('removed 1 article: %{title}', 'removed %{num} articles: %{title}', get_name.size) % { :num => get_name.size, :title => '{{ta.get_name.collect{ |n| truncate(n) }.to_sentence(:connector => "%s")}}' % _("and") } },
-    :type => :groupable
-  },
-
   :new_friendship => { 
     :description => lambda { n_('has made 1 new friend:<br />%{name}', 'has made %{num} new friends:<br />%{name}', get_friend_name.size) % { :num => get_friend_name.size, :name => '{{ta.collect_group_with_index(:friend_name){ |n,i| link_to(image_tag(ta.get_friend_profile_custom_icon[i] || default_or_themed_icon("/images/icons-app/person-icon.png")), ta.get_friend_url[i], :title => n)}.join}}' } },
     :type => :groupable
@@ -27,24 +22,11 @@ ActionTrackerConfig.verbs = {
     :description => lambda { _('has joined the community.') },
   },
 
-  :remove_member_in_community => { 
-    :description => lambda { _('has left the community.') },
-  },
-
-  :leave_community => {
-    :description => lambda { n_('has left 1 community:<br />%{name}', 'has left %{num} communities:<br />%{name}', get_resource_name.size) % { :num => get_resource_name.size, :name => '{{ta.collect_group_with_index(:resource_name){ |n,i| link_to(image_tag(ta.get_resource_profile_custom_icon[i] || default_or_themed_icon("/images/icons-app/community-icon.png")), ta.get_resource_url[i], :title => n)}.join}}' } },
-    :type => :groupable
-  },
-
   :upload_image => { 
     :description => lambda { n_('uploaded 1 image:<br />%{thumbnails}<br />%{details}', 'uploaded %{num} images:<br />%{thumbnails}<br />%{details}', get_view_url.size) % { :num => get_view_url.size, :thumbnails => '{{ta.collect_group_with_index(:thumbnail_path){ |t,i| content_tag(:span, link_to(image_tag(t), ta.get_view_url[i]))}.last(3).join}}', :details => '{{unique_with_count(ta.collect_group_with_index(:parent_name){ |n,i| link_to(n, ta.get_parent_url[i])}, "%s").join("<br />")}}' % _("in the gallery") } },
     :type => :groupable
   },
 
-  :leave_comment => {
-    :description => lambda { _('has left a comment entitled "%{title}" on the article %{article}: <br /> "%{comment}" (%{read})') % { :title => "{{truncate(ta.get_title)}}", :article => "{{link_to(truncate(ta.get_article_title), ta.get_article_url)}}", :comment => "{{truncate(ta.get_body, 50)}}", :read => '{{link_to("%s", ta.get_url)}}' % _("read") } }
-  },
-
   :leave_scrap => {
     :description => lambda { _('sent a message to %{receiver}: <br /> "%{message}"') % { :receiver => "{{link_to(ta.get_receiver_name, ta.get_receiver_url)}}", :message => "{{auto_link_urls(ta.get_content)}}" } }
   },
diff --git a/test/functional/profile_controller_test.rb b/test/functional/profile_controller_test.rb
index e6a51df..579f8e3 100644
--- a/test/functional/profile_controller_test.rb
+++ b/test/functional/profile_controller_test.rb
@@ -1169,7 +1169,7 @@ class ProfileControllerTest < ActionController::TestCase
     assert_equal 40, profile.tracked_actions.count
     get :view_more_activities, :profile => profile.identifier, :page => 2
     assert_response :success
-    assert_template '_profile_bla'
+    assert_template '_profile_activities_scraps'
     assert_equal 10, assigns(:activities).count
   end
 
@@ -1287,5 +1287,42 @@ class ProfileControllerTest < ActionController::TestCase
     get :index, :profile => profile.identifier
 
     assert_equivalent [scrap,activity], assigns(:activities).map {|a| a.klass.constantize.find(a.id)}
-  end  
+  end
+
+  should "be logged in to leave comment on an activity" do
+    article = TinyMceArticle.create!(:profile => profile, :name => 'An article about free software')
+    activity = ActionTracker::Record.last
+    count = activity.comments.count
+
+    post :leave_comment_on_activity, :profile => profile.identifier, :comment => {:body => 'something', :source_id => activity.id}
+    assert_equal count, activity.comments.count
+    assert_redirected_to :controller => 'account', :action => 'login'
+  end
+
+  should "leave a comment in own activity" do
+    login_as(profile.identifier)
+    TinyMceArticle.create!(:profile => profile, :name => 'An article about free software')
+    activity = ActionTracker::Record.last
+    count = activity.comments.count
+
+    assert_equal 0, count
+    post :leave_comment_on_activity, :profile => profile.identifier, :comment => {:body => 'something', :source_id => activity.id}
+    assert_equal count + 1, activity.comments.count
+    assert_response :success
+    assert_equal "Comment successfully added.", assigns(:message)
+  end
+
+  should "leave a comment on another profile's activity" do
+    login_as(profile.identifier)
+    another_person = fast_create(Person)
+    TinyMceArticle.create!(:profile => another_person, :name => 'An article about free software')
+    activity = ActionTracker::Record.last
+    count = activity.comments.count
+
+    assert_equal 0, count
+    post :leave_comment_on_activity, :profile => another_person.identifier, :comment => {:body => 'something', :source_id => activity.id}
+    assert_equal count + 1, activity.comments.count
+    assert_response :success
+    assert_equal "Comment successfully added.", assigns(:message)
+  end
 end
diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb
index a7a378a..349d9e5 100644
--- a/test/unit/comment_test.rb
+++ b/test/unit/comment_test.rb
@@ -74,6 +74,14 @@ class CommentTest < ActiveSupport::TestCase
     assert_equal cc + 1, Article.find(art.id).comments_count
   end
 
+  should 'update counter cache in activity' do
+    action = fast_create(ActionTracker::Record)
+    cc = action.comments_count
+    comment = fast_create(Comment, :source_id => action.id)
+
+    assert_equal cc + 1, ActionTracker::Record.find(action.id).comments_count
+  end
+
   should 'provide author name for authenticated authors' do
     owner = create_user('testuser').person
     assert_equal 'testuser', Comment.new(:author => owner).author_name
@@ -319,4 +327,6 @@ class CommentTest < ActiveSupport::TestCase
     assert c.rejected?
   end
 
+  should 'update article activity when add a comment'
+  should 'update activity when add a comment'
 end
diff --git a/vendor/plugins/active_record_counter_cache_on_polymorphic_association/init.rb b/vendor/plugins/active_record_counter_cache_on_polymorphic_association/init.rb
index 56dd001..92bdc08 100644
--- a/vendor/plugins/active_record_counter_cache_on_polymorphic_association/init.rb
+++ b/vendor/plugins/active_record_counter_cache_on_polymorphic_association/init.rb
@@ -2,31 +2,35 @@
 #
 # https://rails.lighthouseapp.com/projects/8994/tickets/2452-counter_cache-not-updated-when-an-item-updates-its-polymorphic-owner
 
-ActiveRecord::Associations::ClassMethods.module_eval do
-
-  def replace(record)
-    counter_cache_name = @reflection.counter_cache_column
-    if record.nil?
-      if counter_cache_name && !@owner.new_record?
-        record.class.base_class.decrement_counter(counter_cache_name, @owner[@reflection.primary_key_name]) if @owner[@reflection.primary_key_name]
-      end
-      @target = @owner[@reflection.primary_key_name] = @owner[@reflection.options[:foreign_type]] = nil
-    else
-      @target = (AssociationProxy === record ? record.target : record)
-
-      if counter_cache_name && !@owner.new_record?
-        record.class.base_class.increment_counter(counter_cache_name, record.id)
-        record.class.base_class.decrement_counter(counter_cache_name, @owner[@reflection.primary_key_name]) if @owner[@reflection.primary_key_name]
-      end
-
-      @owner[@reflection.primary_key_name] = record.id
-      @owner[@reflection.options[:foreign_type]] = record.class.base_class.name.to_s
-
-      @updated = true
-    end
-
-    loaded
-    record
-  end
-
-end
+#ActiveRecord::Associations.module_eval do
+#
+#  def replace(record)
+#
+#        counter_cache_name = @reflection.counter_cache_column
+#
+#        if record.nil?
+#          if counter_cache_name && !@owner.new_record?
+#            record.class.base_class.decrement_counter(counter_cache_name, @owner[@reflection.primary_key_name]) if @owner[@reflection.primary_key_name]
+#          end
+#
+#          @target = @owner[@reflection.primary_key_name] = @owner[@reflection.options[:foreign_type]] = nil
+#        else
+#          @target = (AssociationProxy === record ? record.target : record)
+#
+#          if counter_cache_name && !@owner.new_record?
+#            record.class.base_class.increment_counter(counter_cache_name, record.id)
+#            record.class.base_class.decrement_counter(counter_cache_name, @owner[@reflection.primary_key_name]) if @owner[@reflection.primary_key_name]
+#          end
+#
+#          @owner[@reflection.primary_key_name] = record.id
+#          @owner[@reflection.options[:foreign_type]] = record.class.base_class.name.to_s
+#
+#
+#      @updated = true
+#    end
+#
+#    loaded
+#    record
+#  end
+#
+#end
--
libgit2 0.21.2