fat_free_crm 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9ca7af735f0354a0fea14c54f2c91d86a3aacd3
-  data.tar.gz: c06e91603c18ee7f5d38e6ce525382d83e9ad68b
+  metadata.gz: a4610b38a0c1f9e0ec425f23e3f3995bdc06e7d8
+  data.tar.gz: 74743c1df54cdd4b4c995e7ec25b1c91f9991c44
 SHA512:
-  metadata.gz: c9eba700182f9b5044621e1acf9e75730c0dcfd7b3354f301580ae4038087b0ead46623eecafbff75dbf9d17ef1ba7e8f1f744545c45e9dbbb726c508131f233
-  data.tar.gz: 0ef94a125840208ae7df9fc88d8bf485b259dd7a897b8ac84e714c32181bc7a8a6273422a9caa6353cbcabab2f365a85d39a0ff58ae676b3da4b79ad7848e3fa
+  metadata.gz: 9c1a920b3272bc9295700f7045399a5aa2466e1793f109ad8fea89c6315e4f289cf8a9175794f7420072abc3ff9b99c14f5c90805d4d1bb71db3efce8f02aa38
+  data.tar.gz: 96fca95e2972efd06c4f5b7193e116b41da01d490376db4577875ccaee0c69f1760dde032859958357e851042342472c85b2f6b20cb3cbb27eb8a5853bc264fa

data/CHANGELOG.md

@@ -4,6 +4,10 @@ It does not matter how slowly you go as long as you do not stop.
 First they ignore you, then they laugh at you, then they fight you,
 then you win. –- Mahatma Gandhi
 
+Sat Jan 6, 2018 (0.16.1)
+---------------------------------------------------------------------
+- #653 Fix regression with emails
+
 Fri Jan 5, 2018 (0.16.0)
 ---------------------------------------------------------------------
 - #633 Upgrade to rails 5.1.0

data/app/models/polymorphic/email.rb

@@ -42,16 +42,13 @@ class Email < ActiveRecord::Base
     state == "Collapsed"
   end
 
-  module BodyWithTextile
-    def body
-      if defined?(RedCloth)
-        RedCloth.new(super).to_html
-      else
-        super.to_s.gsub("\n", "<br/>")
-      end
-    end
+  def body_html
+    body.to_s.gsub("\n", "<br>")
+  end
+
+  def body_inline
+    body.to_s.tr("\n", " ")
   end
-  prepend BodyWithTextile
 
   ActiveSupport.run_load_hooks(:fat_free_crm_email, self)
 end

data/app/views/emails/_email.html.haml

@@ -1,5 +1,5 @@
-- truncated = truncate(email.body_without_textile.to_s.gsub("\n", " "), :length => 125 - email.subject.to_s.size)
-- formatted = email.body
+- truncated = truncate(email.body_inline, :length => 125 - email.subject.to_s.size)
+- formatted = email.body_html
 - mediator = email.mediator
 
 %li.mail.highlight[email]

data/lib/fat_free_crm/version.rb

@@ -7,7 +7,7 @@ module FatFreeCRM
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 16
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/spec/models/polymorphic/email_spec.rb

@@ -37,4 +37,15 @@ describe Email do
   it "should be valid" do
     expect(@email).to be_valid
   end
+
+  describe "body formatting" do
+    before(:each) do
+      @email.body = "this\n\nhas\nline breaks"
+    end
+
+    it "should render" do
+      expect(@email.body_html).to eq "this<br><br>has<br>line breaks"
+      expect(@email.body_inline).to eq "this  has line breaks"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fat_free_crm
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Michael Dvorkin
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-05 00:00:00.000000000 Z
+date: 2018-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails