trek 2.4.0 → 2.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (76) hide show
  1. checksums.yaml +4 -4
  2. data/AGENTS.md +6 -5
  3. data/CHANGELOG.md +25 -0
  4. data/Gemfile.lock +192 -171
  5. data/Makefile +26 -1
  6. data/README.md +2 -2
  7. data/app/components/trek/form/image_field_component.rb +1 -5
  8. data/app/components/trek/list/item_component.rb +1 -1
  9. data/app/components/trek/list/tree/item_component.rb +2 -2
  10. data/app/components/trek/search_component/search_component.html.slim +2 -1
  11. data/app/components/trek/search_component.rb +9 -1
  12. data/app/content/trek/content/bullet_list.rb +10 -0
  13. data/app/content/trek/content/document.rb +33 -0
  14. data/app/content/trek/content/image_block.rb +52 -0
  15. data/app/content/trek/content/link_resolver.rb +33 -0
  16. data/app/content/trek/content/list_item.rb +19 -0
  17. data/app/content/trek/content/ordered_list.rb +10 -0
  18. data/app/content/trek/content/paragraph.rb +10 -0
  19. data/app/content/trek/content/prompts_block.rb +22 -0
  20. data/app/content/trek/content.rb +32 -0
  21. data/app/controllers/concerns/trek/reorderable.rb +14 -3
  22. data/app/controllers/trek/csp_reports_controller.rb +3 -6
  23. data/app/controllers/trek/panels/base_controller.rb +3 -0
  24. data/app/controllers/trek/panels/links_controller.rb +1 -1
  25. data/app/controllers/trek/panels/prompts_controller.rb +1 -1
  26. data/app/helpers/trek/thumbnail_helper.rb +11 -0
  27. data/app/models/concerns/trek/contentable.rb +9 -14
  28. data/app/models/concerns/trek/pageable.rb +10 -1
  29. data/app/views/trek/panels/images/_form.html.slim +1 -1
  30. data/app/views/trek/panels/images/create.turbo_stream.slim +1 -1
  31. data/app/views/trek/panels/links/_form.html.slim +1 -1
  32. data/app/views/trek/panels/prompts/_form.html.slim +1 -1
  33. data/config/locales/trek.en.yml +23 -0
  34. data/config/locales/trek.fr.yml +23 -0
  35. data/docs/getting-started.md +3 -3
  36. data/docs/reference/concerns/contentable.md +2 -1
  37. data/docs/reference/controllers.md +1 -1
  38. data/docs/reference/formatters.md +31 -8
  39. data/docs/reference/models/fragment.md +1 -0
  40. data/docs/what-is-trek.md +4 -4
  41. data/lib/generators/trek/helpers.rb +13 -5
  42. data/lib/generators/trek/install/admin_generator.rb +8 -0
  43. data/lib/generators/trek/install/appsignal_generator.rb +1 -1
  44. data/lib/generators/trek/install/authentication_generator.rb +1 -1
  45. data/lib/generators/trek/install/authorization_generator.rb +1 -1
  46. data/lib/generators/trek/install/postmark_generator.rb +2 -2
  47. data/lib/generators/trek/install/specs_generator.rb +11 -0
  48. data/lib/generators/trek/install/user_generator.rb +1 -1
  49. data/lib/generators/trek/scaffold_generator.rb +13 -5
  50. data/lib/generators/trek/templates/Makefile +1 -1
  51. data/lib/generators/trek/templates/controllers/admin/fragments_controller.rb +7 -0
  52. data/lib/generators/trek/templates/controllers/admin/panels/images_controller.rb +8 -0
  53. data/lib/generators/trek/templates/controllers/admin/panels/links_controller.rb +8 -0
  54. data/lib/generators/trek/templates/controllers/admin/panels/prompts_controller.rb +8 -0
  55. data/lib/generators/trek/templates/models/fragment.rb +14 -0
  56. data/lib/generators/trek/templates/spec/mailers/admin_mailer_spec.rb +2 -1
  57. data/lib/generators/trek/templates/spec/requests/admin/active_sessions_spec.rb +1 -0
  58. data/lib/generators/trek/templates/spec/requests/admin/fragments_spec.rb +26 -2
  59. data/lib/generators/trek/templates/spec/requests/admin/pages_spec.rb +8 -0
  60. data/lib/generators/trek/templates/spec/requests/admin/panels_spec.rb +54 -0
  61. data/lib/generators/trek/templates/spec/requests/admin/sign_in_notices_spec.rb +5 -3
  62. data/lib/generators/trek/templates/views/admin/fragments/index.html.slim +14 -3
  63. data/lib/trek/engine.rb +8 -3
  64. data/lib/trek/saved_attachments_reload.rb +2 -1
  65. data/lib/trek/version.rb +1 -1
  66. data/lib/trek.rb +1 -1
  67. data/package.json +1 -1
  68. data/renovate.json +1 -0
  69. data/trek.gemspec +3 -3
  70. data/yarn.lock +842 -880
  71. metadata +29 -14
  72. data/app/formatters/prosemirror_to_html/global_id_to_links_formatter.rb +0 -19
  73. data/app/formatters/prosemirror_to_html/nodes/image_block.rb +0 -44
  74. data/app/formatters/prosemirror_to_html/nodes/prompts_block.rb +0 -28
  75. data/app/formatters/prosemirror_to_html/remove_empty_paragraphs_formatter.rb +0 -11
  76. data/app/models/prosemirror.rb +0 -23
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trek
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.4.0
4
+ version: 2.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mohamed Bengrich
@@ -293,26 +293,32 @@ dependencies:
293
293
  - !ruby/object:Gem::Version
294
294
  version: '0'
295
295
  - !ruby/object:Gem::Dependency
296
- name: prosemirror_to_html
296
+ name: prosemirror
297
297
  requirement: !ruby/object:Gem::Requirement
298
298
  requirements:
299
- - - "~>"
299
+ - - ">="
300
300
  - !ruby/object:Gem::Version
301
- version: '0.2'
301
+ version: 0.7.1
302
+ - - "<"
303
+ - !ruby/object:Gem::Version
304
+ version: '2'
302
305
  type: :runtime
303
306
  prerelease: false
304
307
  version_requirements: !ruby/object:Gem::Requirement
305
308
  requirements:
306
- - - "~>"
309
+ - - ">="
307
310
  - !ruby/object:Gem::Version
308
- version: '0.2'
311
+ version: 0.7.1
312
+ - - "<"
313
+ - !ruby/object:Gem::Version
314
+ version: '2'
309
315
  - !ruby/object:Gem::Dependency
310
316
  name: rails
311
317
  requirement: !ruby/object:Gem::Requirement
312
318
  requirements:
313
319
  - - ">="
314
320
  - !ruby/object:Gem::Version
315
- version: '6.0'
321
+ version: '8.0'
316
322
  - - "<"
317
323
  - !ruby/object:Gem::Version
318
324
  version: '8.2'
@@ -322,7 +328,7 @@ dependencies:
322
328
  requirements:
323
329
  - - ">="
324
330
  - !ruby/object:Gem::Version
325
- version: '6.0'
331
+ version: '8.0'
326
332
  - - "<"
327
333
  - !ruby/object:Gem::Version
328
334
  version: '8.2'
@@ -743,6 +749,15 @@ files:
743
749
  - app/components/trek/toaster_component/toaster_component.css
744
750
  - app/components/trek/toaster_component/toaster_component.html.slim
745
751
  - app/components/trek/toaster_component/toaster_component.js
752
+ - app/content/trek/content.rb
753
+ - app/content/trek/content/bullet_list.rb
754
+ - app/content/trek/content/document.rb
755
+ - app/content/trek/content/image_block.rb
756
+ - app/content/trek/content/link_resolver.rb
757
+ - app/content/trek/content/list_item.rb
758
+ - app/content/trek/content/ordered_list.rb
759
+ - app/content/trek/content/paragraph.rb
760
+ - app/content/trek/content/prompts_block.rb
746
761
  - app/controllers/concerns/trek/auditable.rb
747
762
  - app/controllers/concerns/trek/authentication.rb
748
763
  - app/controllers/concerns/trek/authorization.rb
@@ -763,10 +778,6 @@ files:
763
778
  - app/controllers/trek/panels/links_controller.rb
764
779
  - app/controllers/trek/panels/prompts_controller.rb
765
780
  - app/controllers/trek/resource_controller.rb
766
- - app/formatters/prosemirror_to_html/global_id_to_links_formatter.rb
767
- - app/formatters/prosemirror_to_html/nodes/image_block.rb
768
- - app/formatters/prosemirror_to_html/nodes/prompts_block.rb
769
- - app/formatters/prosemirror_to_html/remove_empty_paragraphs_formatter.rb
770
781
  - app/forms/trek/form_builder.rb
771
782
  - app/helpers/trek/audit_logs_helper.rb
772
783
  - app/helpers/trek/css_classes_helpers.rb
@@ -775,6 +786,7 @@ files:
775
786
  - app/helpers/trek/page_path_helper.rb
776
787
  - app/helpers/trek/stimulus_helpers.rb
777
788
  - app/helpers/trek/theme_helper.rb
789
+ - app/helpers/trek/thumbnail_helper.rb
778
790
  - app/helpers/trek/user_agents_helper.rb
779
791
  - app/javascript/controllers/application.js
780
792
  - app/javascript/controllers/element_controller.js
@@ -818,7 +830,6 @@ files:
818
830
  - app/models/concerns/trek/users/sign_ins.rb
819
831
  - app/models/concerns/trek/users/themes.rb
820
832
  - app/models/concerns/trek/users/validations.rb
821
- - app/models/prosemirror.rb
822
833
  - app/models/trek/content_editor/image.rb
823
834
  - app/models/trek/content_editor/link.rb
824
835
  - app/models/trek/content_editor/prompt.rb
@@ -995,6 +1006,9 @@ files:
995
1006
  - lib/generators/trek/templates/controllers/admin/fragments_controller.rb
996
1007
  - lib/generators/trek/templates/controllers/admin/menu_nodes_controller.rb
997
1008
  - lib/generators/trek/templates/controllers/admin/pages_controller.rb
1009
+ - lib/generators/trek/templates/controllers/admin/panels/images_controller.rb
1010
+ - lib/generators/trek/templates/controllers/admin/panels/links_controller.rb
1011
+ - lib/generators/trek/templates/controllers/admin/panels/prompts_controller.rb
998
1012
  - lib/generators/trek/templates/controllers/admin/passkey_sessions_controller.rb
999
1013
  - lib/generators/trek/templates/controllers/admin/passkeys_controller.rb
1000
1014
  - lib/generators/trek/templates/controllers/admin/scaffold_controller.rb.tt
@@ -1093,6 +1107,7 @@ files:
1093
1107
  - lib/generators/trek/templates/spec/requests/admin/fragments_spec.rb
1094
1108
  - lib/generators/trek/templates/spec/requests/admin/n_plus_one_spec.rb
1095
1109
  - lib/generators/trek/templates/spec/requests/admin/pages_spec.rb
1110
+ - lib/generators/trek/templates/spec/requests/admin/panels_spec.rb
1096
1111
  - lib/generators/trek/templates/spec/requests/admin/passkey_sessions_spec.rb
1097
1112
  - lib/generators/trek/templates/spec/requests/admin/passkeys_spec.rb
1098
1113
  - lib/generators/trek/templates/spec/requests/admin/password_renewal_spec.rb
@@ -1188,7 +1203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
1188
1203
  requirements:
1189
1204
  - - ">="
1190
1205
  - !ruby/object:Gem::Version
1191
- version: 3.1.0
1206
+ version: 3.3.0
1192
1207
  required_rubygems_version: !ruby/object:Gem::Requirement
1193
1208
  requirements:
1194
1209
  - - ">="
@@ -1,19 +0,0 @@
1
- module ProsemirrorToHtml
2
- class GlobalIdToLinksFormatter
3
- include Rails.application.routes.url_helpers
4
-
5
- # The app segment allows hyphens and dots: GlobalID derives it from the
6
- # Rails application name (e.g. "au-poste").
7
- GLOBAL_ID_REGEX = %r{(gid://[\w.-]+/[\w:]+/[\w-]+)}
8
-
9
- def initialize(str)
10
- @str = str
11
- end
12
-
13
- def to_s
14
- gids = @str.scan(GLOBAL_ID_REGEX).flatten
15
- objects = GlobalID::Locator.locate_many(gids).index_by { |o| o.to_global_id.to_s }
16
- @str.gsub(GLOBAL_ID_REGEX) { |gid| url_for(objects[gid]) }
17
- end
18
- end
19
- end
@@ -1,44 +0,0 @@
1
- module ProsemirrorToHtml
2
- module Nodes
3
- class ImageBlock < Node
4
- @node_type = "image_block"
5
-
6
- def tag
7
- [
8
- {
9
- tag: "div"
10
- }
11
- ]
12
- end
13
-
14
- def text
15
- ApplicationController.render(
16
- Blocks::FigureComponent.new(**component_params),
17
- layout: false
18
- )
19
- end
20
-
21
- private
22
-
23
- def node_attrs
24
- @node.attrs.to_h.compact
25
- end
26
-
27
- def component_params
28
- {
29
- image:,
30
- alt: node_attrs[:alt],
31
- caption: node_attrs[:text],
32
- size: node_attrs[:size]
33
- }
34
- end
35
-
36
- def image
37
- object = Admin::ContentEditor::Image.new(node_attrs.except(:file_url))
38
- attacher = ModelImageUploader::Attacher.from_model(object, :file)
39
- attacher.load_model(object, :file)
40
- object.file
41
- end
42
- end
43
- end
44
- end
@@ -1,28 +0,0 @@
1
- module ProsemirrorToHtml
2
- module Nodes
3
- class PromptsBlock < Node
4
- @node_type = "prompts_block"
5
-
6
- def tag
7
- [
8
- {
9
- tag: "div"
10
- }
11
- ]
12
- end
13
-
14
- def text
15
- ApplicationController.render(
16
- ButtonComponent.new(**node_attrs),
17
- layout: false
18
- )
19
- end
20
-
21
- private
22
-
23
- def node_attrs
24
- @node.attrs.to_h.compact
25
- end
26
- end
27
- end
28
- end
@@ -1,11 +0,0 @@
1
- module ProsemirrorToHtml
2
- class RemoveEmptyParagraphsFormatter
3
- def initialize(str)
4
- @str = str
5
- end
6
-
7
- def to_s
8
- @str.gsub("<p></p>", "")
9
- end
10
- end
11
- end
@@ -1,23 +0,0 @@
1
- class Prosemirror
2
- def renderer
3
- return @renderer if @renderer
4
-
5
- @renderer = ProsemirrorToHtml::Renderer.new
6
- @renderer.add_node(ProsemirrorToHtml::Nodes::ImageBlock)
7
- @renderer.add_node(ProsemirrorToHtml::Nodes::PromptsBlock)
8
- end
9
-
10
- def format_content(parsed_content)
11
- return if parsed_content.blank?
12
-
13
- # GlobalIDs must be resolved to URLs before rendering: the renderer's
14
- # sanitizer strips href attributes with unknown protocols, so a gid://
15
- # link would lose its href entirely.
16
- content = ProsemirrorToHtml::GlobalIdToLinksFormatter.new(parsed_content.to_json).to_s
17
- content = renderer.render(JSON.parse(content))
18
- content = ProsemirrorToHtml::RemoveEmptyParagraphsFormatter.new(content).to_s
19
- # rubocop:disable Rails/OutputSafety
20
- content.html_safe
21
- # rubocop:enable Rails/OutputSafety
22
- end
23
- end