save commenter details in the same comment record

seuros · seuros · commit 47e9a2a43a90 · 2015-05-02T21:03:52.000+01:00
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
@@ -18,17 +18,22 @@ def create
     create_comment_params = params.require(:comment).permit(:comment)
 
     redirect_to_signup_if_unauthenticated(request.referer + "?" + (create_comment_params.try(:to_query) || ""), "You must signin/signup to add a comment") do
-      @comment      = @protip.comments.build(create_comment_params)
+      @comment = @protip.comments.build(create_comment_params)
+
       @comment.user = current_user
-      respond_to do |format|
-        if @comment.save
-          record_event('created comment')
-          format.html { redirect_to protip_path(@comment.commentable.try(:public_id)) }
-          format.json { render json: @comment, status: :created, location: @comment }
-        else
-          format.html { redirect_to protip_path(@comment.commentable.try(:public_id)), error: "could not add your comment. try again" }
-          format.json { render json: @comment.errors, status: :unprocessable_entity }
-        end
+      @comment.user_name = current_user.name
+      @comment.user_email = current_user.email
+      @comment.user_agent = request.user_agent
+      @comment.user_ip = request.remote_ip
+      @comment.request_format = request.format
+
+      if @comment.save
+        record_event('created comment')
+        format.html { redirect_to protip_path(@comment.commentable.try(:public_id)) }
+        format.json { render json: @comment, status: :created, location: @comment }
+      else
+        format.html { redirect_to protip_path(@comment.commentable.try(:public_id)), error: "could not add your comment. try again" }
+        format.json { render json: @comment.errors, status: :unprocessable_entity }
       end
     end
   end
diff --git a/app/models/comment.rb b/app/models/comment.rb
@@ -33,12 +33,12 @@ class Comment < ActiveRecord::Base
   alias_method :author, :user
   alias_attribute :body, :comment
 
-  rakismet_attrs  author: proc { self.user.name },
-    author_email: proc { self.user.email },
+  rakismet_attrs  author: -> { self.user_name },
+    author_email: -> { self.user_email },
     content: :comment,
     blog: ENV['AKISMET_URL'],
-    user_ip: proc { self.user.last_ip },
-    user_agent: proc { self.user.last_ua }
+    user_ip: -> { self.remote_ip },
+    user_agent: -> { self.user_agent }
 
   validates :comment, length: { minimum: 2 }
 
diff --git a/db/migrate/20150428091725_add_userdata_to_comment.rb b/db/migrate/20150428091725_add_userdata_to_comment.rb
@@ -0,0 +1,9 @@
+class AddUserdataToComment < ActiveRecord::Migration
+  def change
+    add_column :comments, :user_name, :string
+    add_column :comments, :user_email, :string
+    add_column :comments, :user_agent, :string
+    add_column :comments, :remote_ip, :inet
+    add_column :comments, :request_format, :string
+  end
+end
