trek 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cb0d4043c637f6146abea51141e76c51b0ebd6cc4dac523445d902473b95177
-  data.tar.gz: b0fc30e95b128e3cd3728c81d24a6e35ee2300ed56b14f18027248e2c15a3030
+  metadata.gz: 6b09da98ecaf56b2d61965f064a51258bc84dced5267977541a810f33416ee2f
+  data.tar.gz: ad5b3dfc7aaaeef7c8d996fd7ba89ee3f5057c5b93d9c40bcba859c37035b2d0
 SHA512:
-  metadata.gz: 174c1802c47d012db7287e22dd3f67873d5542f271d8d4caf539e7519cea9344feb1eb6c2bc6ba7b015e94fdc63fa2b992a6c3ca8207a97b76f7cd819a05dae4
-  data.tar.gz: e7b8ddced93643490fb19c423c71c0996e6ed2782ac2e7e26a522b3d0a4026cc0bf84c8a5b0072e8f3e88d4a64461e218b723631a266a9a3a6214b53721fb04c
+  metadata.gz: ee62982045c3a349abfe75033fe60731cffb498408af1c6375afde95ef4477a7476f8781c4a206f72d4e04565e886165b652c9da488d0f8c3eb97c0a2c9b256b
+  data.tar.gz: dcb6b91baad0d783cefcf01c3afb15b54292d105844c291738e2a5972d96905c3c23e6d83435b35a78d0857eb7c12088d01ed21de3a595e8677002c26e214a29

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trek (0.1.14)
+    trek (0.1.15)
       action_policy (~> 0.6)
       actioncable
       acts_as_list (~> 1.1)
@@ -295,9 +295,9 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.5)
-    nokogiri (1.19.0-arm64-darwin)
+    nokogiri (1.19.1-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.0-x86_64-darwin)
+    nokogiri (1.19.1-x86_64-darwin)
       racc (~> 1.4)
     parallel (1.27.0)
     parser (3.3.10.0)
@@ -313,7 +313,7 @@ GEM
       prettyprint
     prettyprint (0.2.0)
     prism (1.7.0)
-    prosemirror_to_html (0.2.1)
+    prosemirror_to_html (0.3.0)
       nokogiri
     psych (5.3.1)
       date

data/lib/generators/trek/templates/migrations/taggings.rb.erb

@@ -7,6 +7,6 @@ class TrekTaggings < <%= migration_class_name %>
       t.timestamps
     end
 
-    add_index :taggings, [:taggable_id, :tag_id], unique: true
+    add_index :taggings, %i[taggable_type taggable_id tag_id], unique: true
   end
 end

data/lib/trek/typography_formatter.rb

@@ -2,28 +2,60 @@ module Trek
   # `TypographyFormatter` formats strings to enforce typography rules.
   # For now, only French typography rules about non-breaking spaces
   # and ellipsis are implemented.
+  #
+  # Supports both plain strings and ProseMirror JSONB hashes. When given
+  # a Hash, it walks the node tree and formats only `text` node values
+  # in place, leaving the structure intact.
   class TypographyFormatter
     NBSP = [160].pack("U*").freeze
     NBSP_BEFORE_CHARS = %w[: ; % € \$ °C °F » ! \? –].freeze
     NBSP_AFTER_CHARS = %w[«].freeze
     NBSP_BEFORE_UNITS = %w[g h ha kg km Ko ko kW L l m min ml Mo mo s].freeze
 
-    def initialize(str)
-      @source = str
-      @output = str.dup
+    def initialize(input)
+      @source = input
+      @prosemirror = input.is_a?(Hash)
+      @output = @prosemirror ? deep_dup_hash(input) : input.dup
     end
 
     def formatted
       return @output if @output.nil?
 
+      if @prosemirror
+        format_prosemirror_node(@output)
+      else
+        format_string!
+      end
+
+      @output
+    end
+
+    private
+
+    def format_string!
       remove_double_spaces
       add_nbsp
       replace_ellipsis
+    end
 
-      @output
+    def format_prosemirror_node(node)
+      return unless node.is_a?(Hash)
+
+      if node["type"] == "text" && node["text"].is_a?(String)
+        formatter = self.class.new(node["text"])
+        node["text"] = formatter.formatted
+      end
+
+      Array(node["content"]).each { |child| format_prosemirror_node(child) }
     end
 
-    private
+    def deep_dup_hash(obj)
+      case obj
+      when Hash then obj.transform_values { |v| deep_dup_hash(v) }
+      when Array then obj.map { |v| deep_dup_hash(v) }
+      else obj.dup rescue obj
+      end
+    end
 
     def remove_double_spaces
       @output.gsub!(/(\p{Zs}{2,})/, " ")

data/lib/trek/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Trek
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etaminstudio/trek",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "A modern CMS for Ruby on Rails",
   "main": "app/javascript/trek.js",
   "repository": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trek
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Mohamed Bengrich