richer_text 0.8.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a91f47881a33b61d264e59fe2500da26b0ba346f3fe1eda0b2f2a3e8759e6700
-  data.tar.gz: a5a605c07462c979d3b30cce5c9756cb65a7d4a271ca463edb2e75e81192a859
+  metadata.gz: 587dab9004a19d9fdd0d5d1c191f01f2d128e73f20a4c10b38b1b43fc6206a94
+  data.tar.gz: 60ca0263af5e39723bfab6cb3700623aed408bd34e55d4fc6cd81dbebf0f823b
 SHA512:
-  metadata.gz: 6d4faf62c78eb8bc372f11c2f0c9209eb14d0c0c622b79cab2c19de14a01da6c9fd4705a7384548bdb810fea8ad7cce4ca87c28fb9e7181974962054af217746
-  data.tar.gz: e462e01e68d7edbb0cea0882e28469fdf8b9aaed92df8f7df7ed405abda49b78e9bb1f7c9dff62df081bbdfff30d0d8dbade9b7c9cc88a71aac77c8cdc6a15f8
+  metadata.gz: 7d43de3d31186bf8e5c19b1194d817440c10e05e2b4ebfb689882233a4ac7680fb64761476305535c3a1bc5b7f3896116f87419cb824b174dc2e9c7ef5108222
+  data.tar.gz: 41d039dc8fe7b478d7f106562812c1871c9341438f04441cff205ac6f0df35d7b535571c1e3d6dffd1296c61d369828ab1efcd169b82020a18c65a0f1819184b

data/app/models/richer_text/json_text.rb

@@ -19,6 +19,12 @@ module RicherText
       RicherText.default_renderer.visit(document)
     end
 
+    def mentionees
+      gids = mention_nodes.map(&:id).compact_blank
+
+      GlobalID::Locator.locate_many(gids).uniq # Only return unique records
+    end
+
     private
 
     def update_attachments
@@ -30,6 +36,10 @@ module RicherText
       find_nodes_of_type(RicherText::Nodes::Image).flatten.compact_blank
     end
 
+    def mention_nodes
+      find_nodes_of_type(RicherText::Nodes::Mention).flatten.compact_blank
+    end
+
     def rhino_attachment_nodes
       find_nodes_of_type(RicherText::Nodes::AttachmentFigure).flatten.compact_blank
     end

data/app/models/richer_text/rich_text.rb

@@ -19,6 +19,12 @@ module RicherText
       body&.to_html&.to_s
     end
 
+    def mentionees
+      global_ids = body&.mentionees_global_ids
+
+      GlobalID::Locator.locate_many(global_ids)
+    end
+
     private
 
     def update_images

data/lib/richer_text/content.rb

@@ -28,6 +28,12 @@ module RicherText
       end.uniq
     end
 
+    def mentionees_global_ids
+      global_ids = fragment.find_all("span[data-type=mention]").map do |span|
+        span.attributes["data-id"].value
+      end.uniq
+    end
+
     def image_blobs
       image_blob_ids.map { |id| ActiveStorage::Blob.find_signed(id) }
     end

data/lib/richer_text/embed.rb

@@ -0,0 +1,27 @@
+module RicherText
+  class Embed
+    include Rendering
+
+    def self.find(sgid)
+      @embed = GlobalID::Locator.locate_signed(sgid, for: "embeddable")
+      new(@embed) if @embed
+    end
+
+    attr_reader :embed
+
+    def initialize(embed)
+      @embed = embed
+    end
+
+    def object
+      @embed
+    end
+
+    delegate :to_embeddable_partial_path, to: :@embed
+    delegate :model_name, to: :@embed
+
+    def html
+      render partial: to_embeddable_partial_path, object: object, as: model_name.element
+    end
+  end
+end

data/lib/richer_text/embeddable.rb

@@ -0,0 +1,15 @@
+module RicherText
+  module Embeddable
+    extend ActiveSupport::Concern
+
+    included do
+      def embeddable_sgid
+        to_sgid(expires_in: nil, for: "embeddable").to_s
+      end
+
+      def to_embeddable_partial_path
+        to_partial_path
+      end
+    end
+  end
+end

data/lib/richer_text/html_visitor.rb

@@ -42,10 +42,25 @@ module RicherText
       "<div class='richer-text'>#{visit_children(node).join("\n")}</div>".html_safe
     end
 
+    def visit_mention(node, marks)
+      if marks.any?
+        content_tag(marks[0].tag, visit_mention(node, marks[1..]), marks[0].attrs)
+      else
+        tag.span(
+          tag.img(src: node.avatar_url, class: "richer-text--mention-img") +
+          tag.span(node.name, class: "richer-text--mention-label"),
+          class: "richer-text--mention")
+      end
+    end
+
     def visit_paragraph(node)
       "<p style='#{node.style}'>#{visit_children(node).join}</p>"
     end
 
+    def visit_richer_text_embed(node)
+      node.html
+    end
+
     def visit_list_item(node)
       "<li>#{visit_children(node).join}</li>"
     end

data/lib/richer_text/node.rb

@@ -1,6 +1,7 @@
 module RicherText
   class Node
     attr_reader :json, :attrs, :children, :type
+    include RicherText::Rendering
 
     STYLES = {
       "textAlign" => "text-align",

data/lib/richer_text/nodes/mention.rb

@@ -0,0 +1,30 @@
+module RicherText
+  module Nodes
+    class Mention < ::RicherText::Node
+      def initialize(json)
+        @marks = json.fetch("marks", []).map { |mark| RicherText::Mark.new(mark) }
+        super(json)
+      end
+
+      def accept(visitor)
+        visitor.visit_mention(self, @marks)
+      end
+
+      def user
+        @user ||= GlobalID::Locator.locate(@attrs["id"])
+      end
+
+      def id
+        @attrs["id"]
+      end
+
+      def name
+        @user.respond_to?(:name) ? @user.name : @attrs["label"]
+      end
+
+      def avatar_url
+        @user.respond_to?(:avatar_url) ? @user.avatar_url : @attrs["avatarUrl"]
+      end
+    end
+  end
+end

data/lib/richer_text/nodes/richer_text_embed.rb

@@ -0,0 +1,19 @@
+module RicherText
+  module Nodes
+    class RicherTextEmbed < ::RicherText::Node
+      def sgid
+        attrs["sgid"]
+      end
+
+      def html
+        render partial: embeddable.to_embeddable_partial_path, object: embeddable, as: embeddable.model_name.element
+      rescue ActiveRecord::RecordNotFound
+        "" # TODO: handle this better
+      end
+
+      def embeddable
+        @embeddable ||= GlobalID::Locator.locate_signed(sgid, for: "embeddable")
+      end
+    end
+  end
+end

data/lib/richer_text/rendering.rb

@@ -1,13 +1,23 @@
+require "active_support/concern"
+require "active_support/core_ext/module/attribute_accessors_per_thread"
+
 module RicherText
   module Rendering
-    private
+    extend ActiveSupport::Concern
 
-    def render(*args, &block)
-      action_controller_renderer.render(*args, &block)
+    included do
+      thread_cattr_accessor :renderer, instance_accessor: false
+      delegate :render, to: :class
     end
 
-    def action_controller_renderer
-      ActionController::Base.renderer
+    class_methods do
+      def action_controller_renderer
+        @action_controller_renderer ||= Class.new(ActionController::Base).renderer
+      end
+
+      def render(*args, &block)
+        (renderer || action_controller_renderer).render_to_string(*args, &block)
+      end
     end
   end
 end

data/lib/richer_text/version.rb

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

data/lib/richer_text.rb

@@ -14,6 +14,9 @@ module RicherText
   autoload :Serialization
   autoload :TagHelper
 
+  autoload :Embed
+  autoload :Embeddable
+
   autoload :Node
   autoload :Mark
   autoload :HTMLVisitor
@@ -33,8 +36,10 @@ module RicherText
     autoload :HorizontalRule
     autoload :Image
     autoload :ListItem
-    autoload :Paragraph
+    autoload :Mention
     autoload :OrderedList
+    autoload :Paragraph
+    autoload :RicherTextEmbed
     autoload :Text
     autoload :Table
     autoload :TableCell

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: richer_text
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Andrea Fomera
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-20 00:00:00.000000000 Z
+date: 2023-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -54,6 +54,8 @@ files:
 - lib/richer_text.rb
 - lib/richer_text/attribute.rb
 - lib/richer_text/content.rb
+- lib/richer_text/embed.rb
+- lib/richer_text/embeddable.rb
 - lib/richer_text/engine.rb
 - lib/richer_text/fragment.rb
 - lib/richer_text/html_visitor.rb
@@ -71,8 +73,10 @@ files:
 - lib/richer_text/nodes/horizontal_rule.rb
 - lib/richer_text/nodes/image.rb
 - lib/richer_text/nodes/list_item.rb
+- lib/richer_text/nodes/mention.rb
 - lib/richer_text/nodes/ordered_list.rb
 - lib/richer_text/nodes/paragraph.rb
+- lib/richer_text/nodes/richer_text_embed.rb
 - lib/richer_text/nodes/table.rb
 - lib/richer_text/nodes/table_cell.rb
 - lib/richer_text/nodes/table_header.rb