richer_text 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 823a38cf937e83676b16a06828bf3a3fa461f8b3d38ae628beecd33dfc3927c2
-  data.tar.gz: 4f02bdb13f66fb9b896dee5d52a01806dfab1cf842c4aa33250d1420b49c8fad
+  metadata.gz: a91f47881a33b61d264e59fe2500da26b0ba346f3fe1eda0b2f2a3e8759e6700
+  data.tar.gz: a5a605c07462c979d3b30cce5c9756cb65a7d4a271ca463edb2e75e81192a859
 SHA512:
-  metadata.gz: 1cf13ee1015adee390ccdb1da3a3f2f317f01c70ea2f10364762c526a1619f56aa79085ddae04ab1690ed602bca0ccdedc3f83c0691fca21c9d4f46cc4314ade
-  data.tar.gz: 9f1fffb59f348833c3a7ebdf1b86075bddfb2a4b4b4459bb7bdb211418e6fbf34c2ffe42c3b9c70f9c2610f6bd2874386003a11a0aaa75adbc64cc55149f6aa6
+  metadata.gz: 6d4faf62c78eb8bc372f11c2f0c9209eb14d0c0c622b79cab2c19de14a01da6c9fd4705a7384548bdb810fea8ad7cce4ca87c28fb9e7181974962054af217746
+  data.tar.gz: e462e01e68d7edbb0cea0882e28469fdf8b9aaed92df8f7df7ed405abda49b78e9bb1f7c9dff62df081bbdfff30d0d8dbade9b7c9cc88a71aac77c8cdc6a15f8

data/app/helpers/richer_text/tag_helper.rb

@@ -17,16 +17,40 @@ module ActionView::Helpers
     end
   end
 
+  class Tags::RhinoEditor < Tags::Base
+    include Tags::Placeholderable
+
+    delegate :dom_id, to: ActionView::RecordIdentifier
+
+    def render
+      options = @options.stringify_keys
+      add_default_name_and_id(options)
+      options["input"] ||= dom_id(object, [options["id"], :rhino_text_input].compact.join("_")) if object
+      options["value"] = options.fetch("value") { value&.to_editor_format }
+      options["serializer"] = options.fetch("serializer") { "html"}
+
+      @template_object.rhino_text_area_tag(options.delete("name"), options["value"], options.except("value"))
+    end
+  end
+
   module FormHelper
     def richer_text_area(object_name, method, options = {})
       Tags::Editor.new(object_name, method, self, options).render
     end
+
+    def rhino_text_area(object_name, method, options = {})
+      Tags::RhinoEditor.new(object_name, method, self, options).render
+    end
   end
 
   class FormBuilder
     def richer_text_area(method, options = {})
       @template.richer_text_area(@object_name, method, objectify_options(options))
     end
+
+    def rhino_text_area(method, options = {})
+      @template.rhino_text_area(@object_name, method, objectify_options(options))
+    end
   end
 end
 
@@ -49,5 +73,18 @@ module RicherText
 
       input_tag + editor_tag
     end
+
+    def rhino_text_area_tag(name, value = nil, options = {})
+      options = options.symbolize_keys
+      options[:input] ||= "rhino_text_input_#{RicherText::TagHelper.id += 1}"
+
+      # So we can choose the serializer to use, e.g. "html" or "json"
+      options[:serializer] ||= "html"
+
+      input_tag = hidden_field_tag(name, value, id: options[:input])
+      editor_tag = tag("rhino-editor", { input: options[:input], serializer: "json",  data: { "blob-url-template": rails_service_blob_url(":signed_id", ":filename"), "direct-upload-url": rails_direct_uploads_url }}.merge(options))
+
+      input_tag + editor_tag
+    end
   end
 end

data/app/models/richer_text/json_text.rb

@@ -7,8 +7,9 @@ module RicherText
     serialize :body, JSON, default: DEFAULT_BODY.to_json
 
     has_many_attached :images
+    has_many_attached :rhino_attachments # For handling attachments in the Rhino Editor
 
-    before_save :update_images
+    before_save :update_attachments
 
     def to_editor_format
       body
@@ -20,16 +21,28 @@ module RicherText
 
     private
 
-    def update_images
+    def update_attachments
       self.images = image_nodes.map(&:signed_id)
+      self.rhino_attachments = rhino_attachment_records.map(&:signed_id)
     end
 
     def image_nodes
       find_nodes_of_type(RicherText::Nodes::Image).flatten.compact_blank
     end
 
+    def rhino_attachment_nodes
+      find_nodes_of_type(RicherText::Nodes::AttachmentFigure).flatten.compact_blank
+    end
+
+    def rhino_attachment_records
+      sgids = rhino_attachment_nodes.map(&:sgid).compact_blank
+      GlobalID::Locator.locate_many_signed(sgids, for: "attachable")
+    end
+
     def find_nodes_of_type(type, node = document)
       if node.children.any?
+        return node if node.is_a?(type)
+
         node.children.map { |child| find_nodes_of_type(type, child) }
       else
         node.is_a?(type) ? node : nil

data/lib/richer_text/attribute.rb

@@ -3,10 +3,10 @@ module RicherText
     extend ActiveSupport::Concern
 
     class_methods do
-      def has_richer_text(name, json: false)
+      def has_richer_text(name, store_as: :html)
         # Store if the attribute is using JSON or not.
         class_attribute :"richer_text_#{name}_json", instance_writer: false
-        self.send(:"richer_text_#{name}_json=", json)
+        self.send(:"richer_text_#{name}_json=", store_as == :json)
 
         class_eval <<-CODE, __FILE__, __LINE__ + 1
           def #{name}
@@ -23,7 +23,7 @@ module RicherText
         CODE
 
         has_one :"richer_text_#{name}", -> { where(name: name) },
-          class_name: json ? "RicherText::JsonText" : "RicherText::RichText", as: :record, inverse_of: :record, autosave: true, dependent: :destroy
+          class_name: store_as == :json ? "RicherText::JsonText" : "RicherText::RichText", as: :record, inverse_of: :record, autosave: true, dependent: :destroy
 
         scope :"with_richer_text_#{name}", -> { includes("richer_text_#{name}") }
       end

data/lib/richer_text/html_visitor.rb

@@ -6,6 +6,18 @@ module RicherText
       node.accept(self)
     end
 
+    def visit_attachment_figure(node)
+      "<figure sgid=#{node.attrs["sgid"]}>
+        #{node_previewable?(node) ? "<img src=#{node.url} />" : "<a href=#{node.url} target='_blank'>"}
+        <figcaption class='attachment__caption'>#{visit_children(node).join}</figcaption>
+        #{node_previewable?(node) ? "" : "</a>"}
+      </figure>"
+    end
+
+    def visit_attachment_gallery(node)
+      "<div class='attachment-gallery'>#{visit_children(node).join}</div>"
+    end
+
     def visit_blockquote(node)
       "<blockquote>#{visit_children(node).join}</blockquote>"
     end
@@ -81,5 +93,15 @@ module RicherText
     def visit_table_header(node)
       "<th>#{visit_children(node).join}</th>"
     end
+
+    private
+
+    def previewable_regex
+      /^image(\/(gif|png|jpe?g)|$)/
+    end
+
+    def node_previewable?(node)
+      node.attrs["contentType"].match(previewable_regex)
+    end
   end
 end

data/lib/richer_text/node.rb

@@ -8,8 +8,8 @@ module RicherText
 
     def self.build(json)
       node = json.is_a?(String) ? JSON.parse(json) : json
-      klass = "RicherText::Nodes::#{node["type"].underscore.classify}".safe_constantize
-      klass.new(node)
+      klass = "RicherText::Nodes::#{node["type"].underscore.classify}".constantize
+      klass.new(node) if klass
     end
 
     def initialize(json)

data/lib/richer_text/nodes/attachment_figure.rb

@@ -0,0 +1,17 @@
+module RicherText
+  module Nodes
+    class AttachmentFigure < ::RicherText::Node
+      def previewable?
+        @attrs["previewable"]
+      end
+
+      def url
+        @attrs["url"].presence || @attrs["src"]
+      end
+
+      def sgid
+        @attrs["sgid"]
+      end
+    end
+  end
+end

data/lib/richer_text/nodes/attachment_gallery.rb

@@ -0,0 +1,6 @@
+module RicherText
+  module Nodes
+    class AttachmentGallery < ::RicherText::Node
+    end
+  end
+end

data/lib/richer_text/version.rb

@@ -1,3 +1,3 @@
 module RicherText
-  VERSION = "0.6.0"
+  VERSION = "0.8.0"
 end

data/lib/richer_text.rb

@@ -21,6 +21,8 @@ module RicherText
   module Nodes
     extend ActiveSupport::Autoload
 
+    autoload :AttachmentFigure # For Rhino Editor support
+    autoload :AttachmentGallery # For Rhino Editor support
     autoload :Blockquote
     autoload :BulletList
     autoload :Callout

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: richer_text
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Andrea Fomera
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2023-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,6 +59,8 @@ files:
 - lib/richer_text/html_visitor.rb
 - lib/richer_text/mark.rb
 - lib/richer_text/node.rb
+- lib/richer_text/nodes/attachment_figure.rb
+- lib/richer_text/nodes/attachment_gallery.rb
 - lib/richer_text/nodes/blockquote.rb
 - lib/richer_text/nodes/bullet_list.rb
 - lib/richer_text/nodes/callout.rb