Merge pull request #1 from basecamp/separate-rich-text-record

Separate Rich Text record

4 files changed, 73 insertions, 8 deletions

diff --git a/lib/action_text/attribute.rb b/lib/action_text/attribute.rb
index 32dd1d0e3f..299c26b29f 100644
--- a/lib/action_text/attribute.rb
+++ b/lib/action_text/attribute.rb
@@ -3,15 +3,41 @@ module ActionText
     extend ActiveSupport::Concern
 
     class_methods do
-      def has_rich_text(attribute_name)
-        serialize(attribute_name, ActionText::Content)
+      # Provides access to a dependent RichText model that holds the body and attachments for a single named rich text attribute.
+      # This dependent attribute is lazily instantiated and will be auto-saved when it's been changed. Example:
+      #
+      #   class Message < ActiveRecord::Base
+      #     has_rich_text :content
+      #   end
+      #
+      #   message = Message.create!(content: "<h1>Funny times!</h1>")
+      #   message.content.to_s # => "<h1>Funny times!</h1>"
+      #   message.content.body.to_plain_text # => "Funny times!"
+      #
+      # The dependent RichText model will also automatically process attachments links as sent via the Trix-powered editor.
+      # These attachments are associated with the RichText model using Active Storage.
+      #
+      # If you wish to preload the dependent RichText model, you can use the named scope:
+      #
+      #   Message.all.with_rich_text_content # Avoids N+1 queries when you just want the body, not the attachments.
+      #   Message.all.with_rich_text_content_and_emebds # Avoids N+1 queries when you just want the body and attachments.
+      def has_rich_text(name)
+        class_eval <<-CODE, __FILE__, __LINE__ + 1
+          def #{name}
+            self.rich_text_#{name} ||= ActionText::RichText.new(name: "#{name}", record: self)
+          end
 
-        has_many_attached "#{attribute_name}_attachments"
+          def #{name}=(body)
+            #{name}.body = body
+          end
+        CODE
 
-        after_save do
-          blobs = public_send(attribute_name).attachments.map(&:attachable)
-          public_send("#{attribute_name}_attachments_blobs=", blobs)
-        end
+        has_one :"rich_text_#{name}", -> { where(name: name) }, class_name: "ActionText::RichText", as: :record, inverse_of: :record, dependent: :destroy
+
+        scope :"with_rich_text_#{name}", -> { includes("rich_text_#{name}") }
+        scope :"with_rich_text_#{name}_and_embeds", -> { includes("rich_text_#{name}": { embeds_attachments: :blob }) }
+
+        after_save { public_send(name).save if public_send(name).changed? }
       end
     end
   end
diff --git a/lib/action_text/content.rb b/lib/action_text/content.rb
index c63e0c3525..c296896ac4 100644
--- a/lib/action_text/content.rb
+++ b/lib/action_text/content.rb
@@ -53,8 +53,12 @@ module ActionText
       end.to_html
     end
 
+    def to_html_with_layout
+      ActionText.renderer.render(partial: "action_text/content/layout", locals: { document: to_html })
+    end
+
     def to_s
-      to_html.html_safe
+      to_html_with_layout
     end
 
     def as_json(*)
diff --git a/lib/tasks/actiontext.rake b/lib/tasks/actiontext.rake
new file mode 100644
index 0000000000..817a4c67f0
--- /dev/null
+++ b/lib/tasks/actiontext.rake
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+namespace :action_text do
+  # Prevent migration installation task from showing up twice.
+  Rake::Task["install:migrations"].clear_comments
+
+  desc "Copy over the migration, stylesheet, and JavaScript files"
+  task install: %i( environment copy_migration copy_stylesheet )
+
+  task :copy_migration do
+    if Rake::Task.task_defined?("action_text:install:migrations")
+      Rake::Task["action_text:install:migrations"].invoke
+    else
+      Rake::Task["app:action_text:install:migrations"].invoke
+    end
+  end
+
+  STYLESHEET_TEMPLATE_PATH = File.expand_path("../templates/actiontext.css", __dir__)
+  STYLESHEET_APP_PATH      = Rails.root.join("app/assets/stylesheets/actiontext.css")
+
+  task :copy_stylesheet do
+    if File.exist?(STYLESHEET_APP_PATH)
+      puts "Won't copy Action Text stylesheet as it already exists"
+    else
+      FileUtils.cp STYLESHEET_TEMPLATE_PATH, STYLESHEET_APP_PATH
+    end
+  end
+end
diff --git a/lib/templates/actiontext.css b/lib/templates/actiontext.css
new file mode 100644
index 0000000000..97c083c24b
--- /dev/null
+++ b/lib/templates/actiontext.css
@@ -0,0 +1,7 @@
+/*
+ * Provides a drop-in pointer for the default Trix stylesheet that will format the toolbar and
+ * the trix-editor content (whether displayed or under editing). Feel free to incorporate this
+ * inclusion directly in any other asset bundle and remove this file.
+ *
+ *= require trix/dist/trix 
+*/