pages_core 3.10.2 → 3.11.1

data/app/models/concerns/pages_core/humanizable_param.rb

@@ -6,15 +6,21 @@ module PagesCore
     extend ActiveSupport::Concern
 
     def humanized_param(slug)
-      return id.to_s unless slug&.present?
+      safe_slug = safe_humanized_param(slug)
+      return id.to_s if safe_slug.blank?
 
-      "#{id}-" + transliterate(slug)
-                 .downcase
-                 .gsub(/[\[{]/, "(")
-                 .gsub(/}\]/, ")")
-                 .gsub(/[^[[:alnum:]]()-]+/, "-")
-                 .gsub(/-{2,}/, "-")
-                 .gsub(/(^-|-$)/, "")
+      "#{id}-#{safe_slug}"
+    end
+
+    private
+
+    def safe_humanized_param(str)
+      transliterate(str.to_s).downcase
+                             .gsub(/[\[{]/, "(")
+                             .gsub(/}\]/, ")")
+                             .gsub(/[^[[:alnum:]]()-]+/, "-")
+                             .gsub(/-{2,}/, "-")
+                             .gsub(/(^-|-$)/, "")
     end
   end
 end

data/app/models/concerns/pages_core/page_model/pathable.rb

@@ -24,7 +24,7 @@ module PagesCore
       end
 
       def ensure_path_segment
-        return if deleted? || path_segment? || !name?
+        return if deleted? || path_segment? || generated_path_segment.blank?
 
         segment = generated_path_segment
         segment = "#{segment}-#{id}" if path_collision?(segment)
@@ -59,11 +59,8 @@ module PagesCore
       end
 
       def generated_path_segment
-        transliterated_name.gsub(/[^[[:alnum:]]-_]+/, "-")
-                           .gsub(/-{2,}/, "-")
-                           .gsub(/(^-|-$)/, "")
-                           .mb_chars
-                           .downcase
+        safe_path_segment(transliterated_name).presence ||
+          safe_path_segment(unique_name)
       end
 
       def page_path_matches_routes?(page_path)
@@ -98,6 +95,15 @@ module PagesCore
         false
       end
 
+      def safe_path_segment(str)
+        str.to_s
+           .gsub(/[^[[:alnum:]]-_]+/, "-")
+           .gsub(/-{2,}/, "-")
+           .gsub(/(^-|-$)/, "")
+           .mb_chars
+           .downcase
+      end
+
       def sibling_path_segments
         siblings = if parent
                      parent.children

data/app/views/admin/pages/_edit_files.html.erb

@@ -1,4 +1,4 @@
 <%= react_component("PageFiles",
                     locale: @locale,
-                    locales: PagesCore.config.locales,
+                    locales: locales_with_dir,
                     records: @page.files.map { |pf| Admin::PageFileResource.new(pf).to_hash }) %>

data/app/views/admin/pages/_edit_images.html.erb

@@ -1,4 +1,4 @@
 <%= react_component("PageImages",
                     locale: @locale,
-                    locales: PagesCore.config.locales,
+                    locales: locales_with_dir,
                     records: @page.page_images.map { |pi| Admin::PageImageResource.new(pi).to_hash }) %>

data/app/views/admin/pages/_edit_metadata.html.erb

@@ -1,6 +1,6 @@
 <div class="field">
   <% if f.object.pathable? %>
-    <%= labelled_field(f.text_field(:path_segment),
+    <%= labelled_field(f.text_field(:path_segment, dir: "ltr", lang: nil),
                        "Path segment",
                        description: "Only alpanumeric characters and dashes " \
                          "are allowed.") %>

data/app/views/admin/pages/index.html.erb

@@ -16,6 +16,7 @@
       "PageTree", {
         pages: @pages.map { |p| page_json(p) },
         locale: @locale,
+        dir: locale_direction(@locale),
         permissions: [(:create if policy(Page).create?)] }
     ) %>
   <% end %>

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: pages_core
 version: !ruby/object:Gem::Version
-  version: 3.10.2
+  version: 3.11.1
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2022-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.32'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.32'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.11.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.11.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: semantic
   requirement: !ruby/object:Gem::Requirement
@@ -602,6 +602,8 @@ files:
 - app/helpers/pages_core/admin/form_builder.rb
 - app/helpers/pages_core/admin/image_uploads_helper.rb
 - app/helpers/pages_core/admin/labelled_field_helper.rb
+- app/helpers/pages_core/admin/locales_helper.rb
+- app/helpers/pages_core/admin/localized_form_builder.rb
 - app/helpers/pages_core/admin/page_blocks_helper.rb
 - app/helpers/pages_core/admin/page_json_helper.rb
 - app/helpers/pages_core/admin/tag_editor_helper.rb
@@ -611,6 +613,7 @@ files:
 - app/helpers/pages_core/frontend_helper.rb
 - app/helpers/pages_core/head_tags_helper.rb
 - app/helpers/pages_core/images_helper.rb
+- app/helpers/pages_core/labelled_form_builder.rb
 - app/helpers/pages_core/meta_tags_helper.rb
 - app/helpers/pages_core/open_graph_tags_helper.rb
 - app/helpers/pages_core/page_path_helper.rb
@@ -860,7 +863,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: Pages Core