trek 0.1.13 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55936551def2bb25e098d7f095626b1c65851faced1f73d8421337b660c35dfc
-  data.tar.gz: a55b3f4506ed2cb97258790e8a67194b32a5c409c311625d92aacc7c5bfe78d6
+  metadata.gz: 6b09da98ecaf56b2d61965f064a51258bc84dced5267977541a810f33416ee2f
+  data.tar.gz: ad5b3dfc7aaaeef7c8d996fd7ba89ee3f5057c5b93d9c40bcba859c37035b2d0
 SHA512:
-  metadata.gz: 4eed1f56dace0fc8327f31f86294e2e1a3d394b25bcd662298191d4fd9f1c6a08442088c81cb7889e827ca66e9137c8f4498d6c9d614671daa78da6f4fd2fdc1
-  data.tar.gz: '06689e0c0b07925a1095ac88d17dc0eba1b0f4db8cbb9664162fc259fb58d795b71653c1f1cc3307fa420bd287d7f78983ce5efa73f412e23d5e98c71cbb3964'
+  metadata.gz: ee62982045c3a349abfe75033fe60731cffb498408af1c6375afde95ef4477a7476f8781c4a206f72d4e04565e886165b652c9da488d0f8c3eb97c0a2c9b256b
+  data.tar.gz: dcb6b91baad0d783cefcf01c3afb15b54292d105844c291738e2a5972d96905c3c23e6d83435b35a78d0857eb7c12088d01ed21de3a595e8677002c26e214a29

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trek (0.1.13)
+    trek (0.1.15)
       action_policy (~> 0.6)
       actioncable
       acts_as_list (~> 1.1)
@@ -27,7 +27,6 @@ PATH
       shrine (~> 3.0)
       shrine-blurhash (~> 0.2)
       slim-rails (~> 4.0)
-      sorcery (~> 0.17)
       strip_attributes (~> 2.0)
       view_component (< 5.0)
       view_component-form (~> 0.3)
@@ -138,7 +137,6 @@ GEM
     aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.3.0)
-    bcrypt (3.1.21)
     bigdecimal (3.3.1)
     blurhash (0.1.8)
     brakeman (7.1.2)
@@ -204,19 +202,11 @@ GEM
       zeitwerk (~> 2.6)
     erb (6.0.1)
     erubi (1.13.1)
-    faraday (2.14.1)
-      faraday-net_http (>= 2.0, < 3.5)
-      json
-      logger
-    faraday-net_http (3.4.2)
-      net-http (~> 0.5)
     fastimage (2.4.0)
     ffi (1.17.3-arm64-darwin)
     ffi (1.17.3-x86_64-darwin)
     globalid (1.3.0)
       activesupport (>= 6.1)
-    hashie (5.1.0)
-      logger
     highline (3.1.2)
       reline
     htmlbeautifier (1.4.3)
@@ -245,9 +235,7 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
-    json (2.18.1)
-    jwt (3.1.2)
-      base64
+    json (2.18.0)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -297,10 +285,6 @@ GEM
     mobility (1.3.2)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
-    multi_xml (0.8.0)
-      bigdecimal (>= 3.1, < 5)
-    net-http (0.9.1)
-      uri (>= 0.11.1)
     net-imap (0.6.2)
       date
       net-protocol
@@ -311,25 +295,10 @@ 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)
-    oauth (1.1.3)
-      base64 (~> 0.1)
-      oauth-tty (~> 1.0, >= 1.0.6)
-      snaky_hash (~> 2.0)
-      version_gem (~> 1.1, >= 1.1.9)
-    oauth-tty (1.0.6)
-      version_gem (~> 1.1, >= 1.1.9)
-    oauth2 (2.0.18)
-      faraday (>= 0.17.3, < 4.0)
-      jwt (>= 1.0, < 4.0)
-      logger (~> 1.2)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 4)
-      snaky_hash (~> 2.0, >= 2.0.3)
-      version_gem (~> 1.1, >= 1.1.9)
     parallel (1.27.0)
     parser (3.3.10.0)
       ast (~> 2.4.1)
@@ -344,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
@@ -508,14 +477,6 @@ GEM
       rexml (~> 3.2)
       rubocop (>= 1.0, < 2.0)
       slim (>= 3.0, < 6.0)
-    snaky_hash (2.0.3)
-      hashie (>= 0.1.0, < 6)
-      version_gem (>= 1.1.8, < 3)
-    sorcery (0.18.0)
-      bcrypt (~> 3.1)
-      oauth (>= 0.6)
-      oauth2 (~> 2.0)
-      railties (>= 7.1)
     stringio (3.2.0)
     strip_attributes (2.0.1)
       activemodel (>= 3.0, < 9.0)
@@ -533,7 +494,6 @@ GEM
     unicode-emoji (4.2.0)
     uri (1.1.1)
     useragent (0.16.11)
-    version_gem (1.1.9)
     view_component (4.1.1)
       actionview (>= 7.1.0, < 8.2)
       activesupport (>= 7.1.0, < 8.2)

data/README.md

@@ -21,7 +21,6 @@ Trek uses these gems under the hood:
 - [rails-i18n](https://github.com/svenfuchs/rails-i18n), [mobility](https://github.com/shioyama/mobility) and [i18n-tasks](https://github.com/glebm/i18n-tasks) for internationalization
 - [RSpec](https://github.com/rspec/rspec-rails) for testing
 - [Shrine](https://github.com/shrinerb/shrine) for attachments
-- [Sorcery](https://github.com/Sorcery/sorcery) for authentication
 - [StripAttributes](https://github.com/rmm5t/strip_attributes)
 
 You don't have to set them up yourself, but you can customize their configuration once Trek is installed.

data/lib/generators/trek/install/authentication_generator.rb

@@ -8,24 +8,11 @@ module Trek
       class AuthenticationGenerator < Rails::Generators::Base
         include Trek::Generators::Helpers
 
-        desc "Install Sorcery and its migrations."
+        desc "Setup authentication."
 
         source_root File.expand_path("../templates", __dir__)
 
-        def add_gem
-          gem "sorcery", "~> 0.17" unless in_gemfile?("sorcery")
-          run "bundle install --quiet", abort_on_failure: true
-        end
-
-        def run_install
-          generate "sorcery:install", "remember_me reset_password brute_force_protection activity_logging"
-        end
-
-        def config_user_mailer
-          gsub_file "config/initializers/sorcery.rb",
-            "# user.reset_password_mailer =",
-            "user.reset_password_mailer = UserMailer"
-        end
+        # TODO
       end
     end
   end

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.13"
+  VERSION = "0.1.15"
 end

data/package.json

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

data/trek.gemspec

@@ -52,7 +52,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "shrine", "~> 3.0"
   spec.add_dependency "shrine-blurhash", "~> 0.2"
   spec.add_dependency "slim-rails", "~> 4.0"
-  spec.add_dependency "sorcery", "~> 0.17"
   spec.add_dependency "strip_attributes", "~> 2.0"
   spec.add_dependency "view_component", "< 5.0"
   spec.add_dependency "view_component-form", "~> 0.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trek
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.15
 platform: ruby
 authors:
 - Mohamed Bengrich
@@ -368,20 +368,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: sorcery
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: strip_attributes
   requirement: !ruby/object:Gem::Requirement