2 files changed, 10 insertions(+), 0 deletions(-)

M app/models/entity_report.rb
M test/models/entity_report_test.rb

@@ 35,6 35,7 @@ class EntityReport < ApplicationRecord
 
   scope :approved, -> { where(:approved => true) }
 
+  before_validation :content_strip_cr
   after_save :update_entity_status
 
   def approve!


@@ 55,6 56,10 @@ class EntityReport < ApplicationRecord
   end
 
   private
+  def content_strip_cr
+    content.tr! ?\r, '' if content.present?
+  end
+
   def update_entity_status
     if approved? and entity.reports.approved.order(:created_at => :desc).first == self
       entity.update :status_cached => status, :updated_at => created_at

@@ 20,6 20,11 @@ class EntityReportTest < ActiveSupport::TestCase
     assert_equal [ er2, er4 ], EntityReport.approved.to_a
   end
 
+  test 'automatically strip \r characters from content' do
+    er = FactoryGirl.create :entity_report, :content => "hello\r\nbye\r\n"
+    assert_equal "hello\nbye\n", er.content
+  end
+
   test '#approve! sets approved to true' do
     er = FactoryGirl.create :entity_report, :approved => false
     assert_changes 'er.reload.approved', :from => false, :to => true do