refinerycms-pages 4.0.2 → 4.1.0

data/app/views/refinery/admin/pages_dialogs/link_to.html.erb

@@ -13,7 +13,7 @@
       <input type="radio" name="link_to" value="email_address" id="link_to_email_address" <%= 'checked="true"'.html_safe if @email_address_area_selected %> />
       <label for="link_to_email_address" class="stripped"><%= t('tab_name', :scope => 'refinery.admin.pages_dialogs.link_to.email_address') %></label>
     </span>
-    <% if ::Refinery::Plugins.registered.names.include?("refinery_files") and @resources.any? %>
+    <% if ::Refinery::Plugins.registered.names.include?("refinery_files") && (@resources.any? || searching?) %>
       <span id="resource_file_radio" class="radio<%= ' selected_radio' if @resource_area_selected %>">
         <input type="radio" name="link_to" value="resource_file" id="link_to_resource_file" <%= 'checked="true"'.html_safe if @resource_area_selected %> />
         <label for="link_to_resource_file" class="stripped"><%= t('tab_name', :scope => 'refinery.admin.pages_dialogs.link_to.your_resource') %></label>
@@ -27,10 +27,10 @@
       <div id="your_page_content" class="clearfix">
         <div id="pages_list" class="pages_list">
           <ul class="link_list">
-            <%= render :partial => 'page_link', :collection => @pages,
-                       :locals => {
-                         :child => 0,
-                         :link_to_arguments => {}
+            <%= render partial: '/refinery/admin/pages_dialogs/page_link', collection: @pages, cached: true,
+                       locals: {
+                         child: 0,
+                         link_to_arguments: {}
                        } %>
           </ul>
           <%= will_paginate @pages, :id => 'pages_paginate' %>
@@ -86,24 +86,31 @@
         </ol>
       </div>
     </div>
-    <% if ::Refinery::Plugins.registered.names.include?("refinery_files") and @resources.any? %>
+    <% if ::Refinery::Plugins.registered.names.include?("refinery_files") && (@resources.any? || searching?) %>
       <div id="resource_file_area"<%= ' style="display:none"'.html_safe unless @resource_area_selected %> class="dialog_area">
+        <%= render '/refinery/admin/search', url: refinery.insert_admin_resources_path(params.to_unsafe_h.dup.except('resource')) %>
+
         <div id="resources_list" class="pages_list">
-          <ul class="link_list">
-            <% @resources.each do |resource| -%>
-              <% resource_linked = (resource.url == params[:current_link]) unless params[:current_link].blank? %>
-              <li<%= ' class="linked"'.html_safe if resource_linked %>>
-                <%= link_to "#{resource.title}.#{resource.ext}", path_to_asset(resource.url),
-                            :title => t('link_to_this_resource', :scope => 'refinery.admin.pages_dialogs.link_to.your_resource'),
-                            :rel => resource.title,
-                            :class => "page_link #{resource.ext}" %>
-              </li>
-            <% end %>
-          </ul>
-          <%= will_paginate @resources,
-                           :param_name => :resource_page,
-                           :params => {:paginating => "resource_file"},
-                           :id => 'resouces_paginate' %>
+          <% if @resources.any? %>
+            <ul class="link_list">
+              <% @resources.each do |resource| -%>
+                <% resource_linked = (resource.url == params[:current_link]) unless params[:current_link].blank? %>
+                <li<%= ' class="linked"'.html_safe if resource_linked %>>
+                  <%= link_to "#{resource.title}.#{resource.ext}", path_to_asset(resource.url),
+                              :title => t('link_to_this_resource', :scope => 'refinery.admin.pages_dialogs.link_to.your_resource'),
+                              :rel => resource.title,
+                              :class => "page_link #{resource.ext}" %>
+                </li>
+              <% end %>
+            </ul>
+
+            <%= will_paginate @resources,
+                              :param_name => :resource_page,
+                              :params => {:paginating => "resource_file"},
+                              :id => 'resouces_paginate' %>
+          <% elsif searching? %>
+            <%= t('no_results', :scope => 'refinery.admin.search') %>
+          <% end %>
         </div>
       </div>
     <% end %>

data/config/locales/en.yml

@@ -32,15 +32,15 @@ en:
             tab_name: Your file
             link_to_this_resource: Link to this file
       pages:
-        delete: Remove this page forever
-        edit: Edit this page
-        new: Add a new child page
         expand_collapse: Expand or collapse sub pages
         page:
           draft: draft
           hidden: hidden
           redirected: Redirected
           skip_to_first_child: Skip to first child
+          delete: Remove this page forever
+          edit: Edit this page
+          new: Add a new child page
           view_live_html: View this page live <br/><em>(opens in a new window)</em>
         form:
           preview: Preview

data/config/locales/sk.yml

@@ -37,9 +37,11 @@ sk:
         new: Pridať novú podstránku
         expand_collapse: Rozbaliť alebo zbaliť podstránky
         page:
-          view_live_html: Zobraziť stránku <br/><em>(otvorí sa v novom okne)</em>
-          hidden: skrytá
           draft: pracovná verzia
+          hidden: skrytá
+          redirected: Presmerovanie
+          skip_to_first_child: Presmerovať na prvú substránku
+          view_live_html: Zobraziť stránku <br/><em>(otvorí sa v novom okne)</em>
         form:
           preview: Náhľad
           preview_changes: Zobraziť náhľad s vykonanými zmenami

data/db/migrate/20100913234708_create_refinerycms_pages_schema.rb

@@ -1,5 +1,5 @@
 class CreateRefinerycmsPagesSchema < ActiveRecord::Migration[4.2]
-  def up
+  def change
     create_table :refinery_page_parts do |t|
       t.integer  :refinery_page_id
       t.string   :title
@@ -38,38 +38,35 @@ class CreateRefinerycmsPagesSchema < ActiveRecord::Migration[4.2]
     add_index :refinery_pages, :parent_id
     add_index :refinery_pages, :rgt
 
-    begin
-      ::Refinery::PagePart.create_translation_table!({
-        :body => :text
-      })
-    rescue NameError
-      warn "Refinery::PagePart was not defined!"
-    end
+    create_table :refinery_page_part_translations do |t|
 
-    begin
-      ::Refinery::Page.create_translation_table!({
-        :title => :string,
-        :custom_slug => :string,
-        :menu_title => :string,
-        :slug => :string
-      })
-    rescue NameError
-      warn "Refinery::Page was not defined!"
-    end
-  end
+      # Translated attribute(s)
+      t.text :body
 
-  def down
-    drop_table :refinery_page_parts
-    drop_table :refinery_pages
-    begin
-      ::Refinery::PagePart.drop_translation_table!
-    rescue NameError
-      warn "Refinery::PagePart was not defined!"
+      t.string  :locale, null: false
+      t.integer :refinery_page_part_id, null: false
+
+      t.timestamps null: false
     end
-    begin
-      ::Refinery::Page.drop_translation_table! if defined?(::Refinery::Page)
-    rescue NameError
-      warn "Refinery::Page was not defined!"
+
+    add_index :refinery_page_part_translations, :locale, name: :index_refinery_page_part_translations_on_locale
+    add_index :refinery_page_part_translations, [:refinery_page_part_id, :locale], name: :index_93b7363baf444ecab114aab0bbdedc79d0ec4f4b, unique: true
+
+    create_table :refinery_page_translations do |t|
+
+      # Translated attribute(s)
+      t.string :title
+      t.string :custom_slug
+      t.string :menu_title
+      t.string :slug
+
+      t.string  :locale, null: false
+      t.integer :refinery_page_id, null: false
+
+      t.timestamps null: false
     end
+
+    add_index :refinery_page_translations, :locale, name: :index_refinery_page_translations_on_locale
+    add_index :refinery_page_translations, [:refinery_page_id, :locale], name: :index_refinery_page_t10s_on_refinery_page_id_and_locale, unique: true
   end
 end

data/db/seeds.rb

@@ -51,7 +51,7 @@ Refinery::I18n.frontend_locales.each do |lang|
    'about' => 'About'
   }.each do |slug, title|
     Refinery::Page.by_title(title).each do |page|
-      page.update_attributes slug: slug
+      page.update slug: slug
     end
   end
 end

data/lib/generators/refinery/pages/pages_generator.rb

@@ -15,7 +15,7 @@ module Refinery
     end
 
     def append_load_seed_data
-      create_file "db/seeds.rb" unless File.exists?(File.join(destination_root, 'db', 'seeds.rb'))
+      create_file "db/seeds.rb" unless File.exist?(File.join(destination_root, 'db', 'seeds.rb'))
       append_file 'db/seeds.rb', :verbose => true do
         <<-EOH
 

data/lib/generators/refinery/pages/templates/config/initializers/refinery/pages.rb.erb

@@ -18,6 +18,9 @@ Refinery::Pages.configure do |config|
   # This only applies when marketable_urls is enabled.
   # config.friendly_id_reserved_words = <%= Refinery::Pages.friendly_id_reserved_words.inspect %>
 
+  # You can specify reserved paths that won't interfere with others routes like ActiveStorage route
+  # config.reserved_paths = <%= Refinery::Pages.reserved_paths.inspect %>
+
   # Configure how many pages per page should be displayed when a dialog is presented that contains a links to pages
   # config.pages_per_dialog = <%= Refinery::Pages.pages_per_dialog.inspect %>
 
@@ -67,12 +70,16 @@ Refinery::Pages.configure do |config|
   # config.show_title_in_body = <%= Refinery::Pages.show_title_in_body.inspect %>
 
   # You can add new HTML elements not already supported by Loofah::HTML5::WhiteList::ALLOWED_ELEMENTS
-  # For more information on whitelist see ALLOWED_ELEMENTS 
+  # For more information on whitelist see ALLOWED_ELEMENTS
   # (https://github.com/flavorjones/loofah/blob/v2.0.3/lib/loofah/html5/whitelist.rb#L151)
   # config.add_whitelist_elements = <%= Refinery::Pages.add_whitelist_elements.inspect %>
-  
+
   # You can add new HTML attributes not already supported by Loofah::HTML5::WhiteList::ALLOWED_ATTRIBUTES
-  # For more information on whitelist see ALLOWED_ATTRIBUTES 
+  # For more information on whitelist see ALLOWED_ATTRIBUTES
   # (https://github.com/flavorjones/loofah/blob/v2.0.3/lib/loofah/html5/whitelist.rb#L152)
   # config.add_whitelist_attributes = <%= Refinery::Pages.add_whitelist_attributes.inspect %>
+
+  # You can configure the site so that the home page is a model-index page
+  # config.home_page_path = <%= Refinery::Pages.home_page_path.inspect %>
+
 end

data/lib/refinery/pages/configuration.rb

@@ -8,8 +8,9 @@ module Refinery
                     :cache_pages_full, :layout_template_whitelist,
                     :use_layout_templates, :page_title, :absolute_page_links, :types,
                     :auto_expand_admin_tree, :show_title_in_body,
-                    :friendly_id_reserved_words, :layout_templates_pattern, :view_templates_pattern,
-                    :add_whitelist_elements, :add_whitelist_attributes, :whitelist_elements, :whitelist_attributes
+                    :friendly_id_reserved_words, :reserved_paths, :layout_templates_pattern, :view_templates_pattern,
+                    :add_whitelist_elements, :add_whitelist_attributes, :whitelist_elements, :whitelist_attributes,
+                    :home_page_path
 
     self.pages_per_dialog = 14
     self.pages_per_admin_index = 20
@@ -25,15 +26,16 @@ module Refinery
     self.add_whitelist_elements = %w[ source track ]
     # Note: "data-" attributes are whitelisted by default. See https://github.com/refinery/refinerycms/pull/3187
     self.add_whitelist_attributes = %w[ kind srclang placeholder controls required ]
+    self.home_page_path = "/"
 
 
     class << self
       def whitelist_elements
-        Loofah::HTML5::WhiteList::ALLOWED_ELEMENTS.merge(config.add_whitelist_elements)
+        Loofah::HTML5::SafeList::ALLOWED_ELEMENTS.merge(config.add_whitelist_elements)
       end
 
       def whitelist_attributes
-        Loofah::HTML5::WhiteList::ALLOWED_ATTRIBUTES.merge(config.add_whitelist_attributes)
+        Loofah::HTML5::SafeList::ALLOWED_ATTRIBUTES.merge(config.add_whitelist_attributes)
       end
 
       def layout_template_whitelist
@@ -59,9 +61,10 @@ module Refinery
     self.absolute_page_links = false
     self.types = Types.registered
     self.auto_expand_admin_tree = true
+    self.reserved_paths = %w(/rails/active_storage)
     self.friendly_id_reserved_words = %w(
       index new session login logout users refinery admin images
-    )
+    ) | self.reserved_paths.map { |path| path.split('/').reject(&:blank?).first}.flatten.uniq
     self.layout_templates_pattern = 'app', 'views', '{layouts,refinery/layouts}', '*html*'
     self.view_templates_pattern = 'app', 'views', '{pages,refinery/pages}', '*html*'
   end

data/lib/refinery/pages/engine.rb

@@ -48,7 +48,8 @@ module Refinery
 
       def append_marketable_routes
         Refinery::Core::Engine.routes.append do
-          get '*path', :to => 'pages#show', :as => :marketable_page
+          get '*path', :to => 'pages#show', :as => :marketable_page,
+            constraints: lambda { |request| !Refinery::Pages.config.reserved_paths.any? { |path| request.path.start_with?(path) } }
         end
       end
 

data/lib/refinery/pages/finder.rb

@@ -17,7 +17,7 @@ module Refinery
         FinderBySlug.new(slug, conditions).find
       end
 
-      def self.with_globalize(conditions = {})
+      def self.with_mobility(conditions = {})
         Finder.new(conditions).find
       end
 
@@ -26,15 +26,15 @@ module Refinery
       end
 
       def find
-        with_globalize
+        with_mobility
       end
 
-      def with_globalize
-        globalized_conditions = {:locale => ::Globalize.locale.to_s}.merge(conditions)
-        translations_conditions = translations_conditions(globalized_conditions)
+      def with_mobility
+        mobility_conditions = {:locale => ::Mobility.locale.to_s}.merge(conditions)
+        translations_conditions = translations_conditions(mobility_conditions)
 
         # A join implies readonly which we don't really want.
-        Page.where(globalized_conditions).
+        Page.i18n.where(mobility_conditions).
              joins(:translations).
              where(translations_conditions).
              readonly(false)
@@ -44,136 +44,135 @@ module Refinery
       attr_accessor :conditions
 
       def translated_attributes
-        Page.translated_attribute_names.map(&:to_s) | %w(locale)
+        [*Page.mobility_attributes, 'locale']
       end
 
       def translations_conditions(original_conditions)
         translations_conditions = {}
         original_conditions.keys.each do |key|
           if translated_attributes.include? key.to_s
-            translations_conditions["#{Page.translation_class.table_name}.#{key}"] = original_conditions.delete(key)
+            translations_conditions["#{Page::Translation.table_name}.#{key}"] = original_conditions.delete(key)
           end
         end
         translations_conditions
       end
 
-    end
+      class FinderByTitle < Finder
+        def initialize(title)
+          @title = title
+          @conditions = default_conditions
+        end
 
-    class FinderByTitle < Finder
-      def initialize(title)
-        @title = title
-        @conditions = default_conditions
-      end
+        def default_conditions
+          { :title => title }
+        end
 
-      def default_conditions
-        { :title => title }
+        private
+        attr_accessor :title
       end
 
-      private
-      attr_accessor :title
-    end
+      class FinderBySlug < Finder
+        def initialize(slug, conditions)
+          @slug = slug
+          @conditions = default_conditions.merge(conditions)
+        end
 
-    class FinderBySlug < Finder
-      def initialize(slug, conditions)
-        @slug = slug
-        @conditions = default_conditions.merge(conditions)
-      end
+        def default_conditions
+          {
+            :locale => Refinery::I18n.frontend_locales.map(&:to_s),
+            :slug => slug
+          }
+        end
 
-      def default_conditions
-        {
-          :locale => Refinery::I18n.frontend_locales.map(&:to_s),
-          :slug => slug
-        }
+        private
+        attr_accessor :slug
       end
 
-      private
-      attr_accessor :slug
-    end
-
-    class FinderByPath
-      def initialize(path)
-        @path = path
-      end
+      class FinderByPath
+        def initialize(path)
+          @path = path
+        end
 
-      def find
-        if slugs_scoped_by_parent?
-          FinderByScopedPath.new(path).find
-        else
-          FinderByUnscopedPath.new(path).find
+        def find
+          if slugs_scoped_by_parent?
+            FinderByScopedPath.new(path).find
+          else
+            FinderByUnscopedPath.new(path).find
+          end
         end
-      end
 
-      private
-      attr_accessor :path
+        private
+        attr_accessor :path
 
-      def slugs_scoped_by_parent?
-        ::Refinery::Pages.scope_slug_by_parent
-      end
+        def slugs_scoped_by_parent?
+          ::Refinery::Pages.scope_slug_by_parent
+        end
 
-      def by_slug(slug_path, conditions = {})
-        Finder.by_slug(slug_path, conditions)
+        def by_slug(slug_path, conditions = {})
+          Finder.by_slug(slug_path, conditions)
+        end
       end
-    end
 
-    class FinderByScopedPath < FinderByPath
-      def find
-        # With slugs scoped to the parent page we need to find a page by its full path.
-        # For example with about/example we would need to find 'about' and then its child
-        # called 'example' otherwise it may clash with another page called /example.
-        page = parent_page
-        while page && path_segments.any? do
-          page = next_page(page)
+      class FinderByScopedPath < FinderByPath
+        def find
+          # With slugs scoped to the parent page we need to find a page by its full path.
+          # For example with about/example we would need to find 'about' and then its child
+          # called 'example' otherwise it may clash with another page called /example.
+          page = parent_page
+          while page && path_segments.any? do
+            page = next_page(page)
+          end
+          page
         end
-        page
-      end
 
-      private
+        private
 
-      def path_segments
-        @path_segments ||= path.split('/').select(&:present?)
-      end
+        def path_segments
+          @path_segments ||= path.split('/').select(&:present?)
+        end
 
-      def parent_page
-        parent_page_segment = path_segments.shift
-        if parent_page_segment.friendly_id?
-          by_slug(parent_page_segment, :parent_id => nil).first
-        else
-          Page.find(parent_page_segment)
+        def parent_page
+          parent_page_segment = path_segments.shift
+          if parent_page_segment.friendly_id?
+            by_slug(parent_page_segment, :parent_id => nil).first
+          else
+            Page.find(parent_page_segment)
+          end
         end
-      end
 
-      def next_page(page)
-        slug_or_id = path_segments.shift
-        page.children.by_slug(slug_or_id).first || page.children.find(slug_or_id)
+        def next_page(page)
+          slug_or_id = path_segments.shift
+          page.children.by_slug(slug_or_id).first || page.children.find(slug_or_id)
+        end
       end
-    end
 
-    class FinderByUnscopedPath < FinderByPath
-      def find
-        by_slug(path).first
+      class FinderByUnscopedPath < FinderByPath
+        def find
+          by_slug(path).first
+        end
       end
-    end
 
-    class FinderByPathOrId
-      def initialize(path, id)
-        @path = path
-        @id = id
-      end
+      class FinderByPathOrId
+        def initialize(path, id)
+          @path = path
+          @id = id
+        end
 
-      def find
-        if path.present?
-          if path.friendly_id?
-            FinderByPath.new(path).find
-          else
-            Page.friendly.find(path)
+        def find
+          if path.present?
+            if path.friendly_id?
+              FinderByPath.new(path).find
+            else
+              Page.friendly.find(path)
+            end
+          elsif id.present?
+            Page.friendly.find(id)
           end
-        elsif id.present?
-          Page.friendly.find(id)
         end
-      end
 
-      private
-      attr_accessor :id, :path
+        private
+        attr_accessor :id, :path
+      end
     end
   end
 end

data/lib/refinery/pages/instance_methods.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 module Refinery
   module Pages
     module InstanceMethods
 
       def error_404(exception = nil)
-        if (@page = ::Refinery::Page.where(:menu_match => "^/404$").includes(:parts).first).present?
+        if (@page = ::Refinery::Page.where(menu_match: "^/404$").includes(:parts).first).present?
           # render the application's custom 404 page with layout and meta.
           if self.respond_to? :render_with_templates?, true
-            render_with_templates? @page, :status => 404
+            render_with_templates? @page, status: 404
           else
-            render :template => '/refinery/pages/show', :formats => [:html], :status => 404
+            render template: '/refinery/pages/show', format: :html, status: 404
           end
           return false
         else
@@ -16,7 +18,7 @@ module Refinery
         end
       end
 
-      def render(*args)
+      def render(*args, &block)
         present @page unless admin? || @meta
         super
       end

data/lib/refinery/pages.rb

@@ -1,5 +1,5 @@
-require 'refinerycms-core'
-require 'globalize'
+require 'refinerycms/core'
+require 'mobility'
 
 module Refinery
   autoload :PagesGenerator, 'generators/refinery/pages/pages_generator'
@@ -51,4 +51,4 @@ end
 require 'friendly_id'
 require 'seo_meta'
 require 'babosa'
-require 'speakingurl-rails'
+require 'speakingurl-rails'

data/lib/refinerycms/pages.rb

@@ -0,0 +1 @@
+require_relative '../refinery/pages'

data/refinerycms-pages.gemspec

@@ -1,38 +1,32 @@
-# Encoding: UTF-8
-require File.expand_path('../../core/lib/refinery/version', __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('../core/lib/refinery/version', __dir__)
 
 version = Refinery::Version.to_s
 
 Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
-  s.name              = %q{refinerycms-pages}
+  s.name              = 'refinerycms-pages'
   s.version           = version
-  s.summary           = %q{Pages extension for Refinery CMS}
-  s.description       = %q{The default content extension of Refinery CMS. This extension handles the administration and display of user-editable pages.}
-  s.email             = %q{refinerycms@p.arndt.io}
-  s.homepage          = %q{https://www.refinerycms.com}
-  s.rubyforge_project = %q{refinerycms}
-  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski']
-  s.license           = %q{MIT}
-  s.require_paths     = %w(lib)
+  s.summary           = 'Pages extension for Refinery CMS'
+  s.description       = 'The default content extension of Refinery CMS. This extension handles the administration and display of user-editable pages.'
+  s.email             = 'gems@p.arndt.io'
+  s.homepage          = 'https://www.refinerycms.com'
+  s.authors           = ['Philip Arndt', 'David Jones', 'Uģis Ozols', 'Brice Sanchez']
+  s.license           = 'MIT'
+  s.require_paths     = %w[lib]
 
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
-  s.add_dependency 'friendly_id',                 ['>= 5.1.0', '< 5.3']
-  s.add_dependency 'globalize',                   ['>= 5.1.0.beta1', '< 5.2']
-  s.add_dependency 'activemodel-serializers-xml', '~> 1.0', '>= 1.0.1'
   s.add_dependency 'awesome_nested_set',          '~> 3.1', '>= 3.1.0'
-  s.add_dependency 'seo_meta',                    '~> 3.0', '>= 3.0.0'
+  s.add_dependency 'babosa',                      '~> 1.0'
+  s.add_dependency 'diffy',                       '~> 3.1', '>= 3.1.0'
+  s.add_dependency 'friendly_id',                 '>= 5.4.0'
+  s.add_dependency 'friendly_id-mobility',        '~> 1.0.4'
   s.add_dependency 'refinerycms-core',            version
-  s.add_dependency 'babosa',                      '!= 0.3.6'
+  s.add_dependency 'seo_meta',                    '~> 3.0', '>= 3.0.0'
   s.add_dependency 'speakingurl-rails',           '~> 8.0', '>= 8.0.0'
-  s.add_dependency 'diffy',                       '~> 3.1', '>= 3.1.0'
 
   s.required_ruby_version = Refinery::Version.required_ruby_version
-
-  s.cert_chain  = [File.expand_path("../../certs/parndt.pem", __FILE__)]
-  if $0 =~ /gem\z/ && ARGV.include?("build") && ARGV.include?(__FILE__)
-    s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem")
-  end
 end