refinerycms-core 4.0.3 → 4.1.0

data/app/controllers/refinery/admin/dialogs_controller.rb

@@ -1,16 +1,16 @@
-module ::Refinery
+module Refinery
   module Admin
     class DialogsController < ::Refinery::AdminController
-      TYPES = %w[image link]
+      TYPES = %w[image link].freeze
 
-      before_action :find_dialog_type, :find_iframe_src, :only => [:show]
+      before_action :find_dialog_type, :find_iframe_src, only: [:show]
 
       def index
         redirect_to Refinery::Core.backend_path
       end
 
       def show
-        render :layout => false
+        render layout: false
       end
 
       def from_dialog?
@@ -28,7 +28,7 @@ module ::Refinery
       def find_iframe_src
         if @dialog_type == 'image'
           @iframe_src = refinery.insert_admin_images_path(
-            url_params.merge(:modal => true)
+            url_params.merge(modal: true)
           )
         elsif @dialog_type == 'link'
           @iframe_src = refinery.link_to_admin_pages_dialogs_path url_params
@@ -37,7 +37,7 @@ module ::Refinery
 
       def url_params
         params.to_unsafe_h.reject { |key, value| /(action)|(controller)/ === key}.
-               merge :id => nil
+          merge id: nil
       end
 
     end

data/app/helpers/refinery/action_helper.rb

@@ -0,0 +1,75 @@
+module Refinery
+  module ActionHelper
+    def i18n_scope
+      'refinery.index.locale_picker'
+    end
+
+    # returns a link to the requested url, with the requested icon as content
+    def action_icon(action, url, title, options={})
+      action_icon_label(action, url, title, options, false)
+    end
+
+    # returns a link to the requested url, with  icon and label as content
+    def action_label(action, url, title, options={})
+      action_icon_label(action, url, title, options, true)
+    end
+
+    # See icons.scss for defined icons/classes
+    def action_icon_label(action, url, title, options={}, label = true)
+      options[:title] = title
+      action_classes = ["#{action}_icon", action]
+
+      case action
+      when :preview
+        options[:target] = '_blank'
+      when :delete
+        options[:method] = 'delete'
+      when :reorder_done
+        action_classes.push 'hidden'
+      end
+
+      options[:class] = [options[:class], *action_classes].compact.join(' ')
+      link_to(label && title || '', url, **options)
+    end
+
+
+    def edit_in_current_locale(url:, title:, **options)
+      action_icon(:edit, url, title, class: :edit,  **options)
+    end
+
+    def locale_language(locale)
+      Refinery::I18n.locales[locale]
+    end
+
+    def edit_in_locale(locale, url:, title: nil, **options)
+      if options.delete(:label)
+        action_label(
+          :locale, "#{url}?switch_locale=#{locale}",
+          title || locale.to_s.upcase,
+          **options,
+          id: locale,
+          class: :edit, **options
+        )
+      else
+        action_icon(
+          :locale, "#{url}?switch_locale=#{locale}",
+          title || ::I18n.t('.edit_in_language', language: locale_language(locale), scope: 'refinery.admin.locale_picker'),
+          **options,
+          id: locale,
+          class: :edit
+        )
+      end
+    end
+
+    def edit_in_locales(edit_url, locales = [], i18n_scope: %i[refinery admin locale_picker])
+      return if locales.empty?
+
+      edit_links = locales.map do |locale|
+        language = ::Refinery::I18n.config.locales.fetch(locale, locale)
+        edit_in_locale(locale, url: edit_url, title: t('edit_in_language', language: language, scope: i18n_scope))
+      end
+
+      tag.span edit_links.compact.join(' ').html_safe, class: :locales
+    end
+  end
+end

data/app/helpers/refinery/icon_helper.rb

@@ -0,0 +1,51 @@
+module Refinery
+  module IconHelper
+    require 'set'
+
+    # finds icons for documents such as resources and images
+    # split mime_type,
+    # handle special case of 'application',
+    # match type or subtype to icons we support
+    def mime_type_icon(mime_type)
+      default_icon = 'file-o'
+
+      type, sub_type = mime_type.split('/')
+      sub_type = application_type(sub_type) if type == 'application'
+
+      icons = available_icons & Set[type, sub_type]  # intersection
+      icon = icons.empty? ? default_icon : icons.first
+
+      tag.span class: icon_class(icon)
+    end
+
+    # handle mime-types like 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' and
+    #                        'application/vnd.ms-excel'
+    def application_type(type)
+      last_word = type.split('.').last # remove intermediate paths
+                      .gsub('-', '_') # convert dashes to underscore
+                      .to_sym
+      application_icons[last_word]
+    end
+
+    def icon_class(icon) = "#{icon}_icon"
+
+    def application_icons = {
+      document: "word",
+      ms_excel: "excel",
+      ms_powerpoint: "powerpoint",
+      msword: "word",
+      pdf: "pdf",
+      presentation: "powerpoint",
+      x_rar: "archive",
+      sheet: "excel",
+      zip: "zip",
+    }
+
+    # these are the fontawesome-4 icons matching a document type
+    def available_icons = Set[
+      'archive', 'audio', 'code', 'excel', 'image',
+      'movie', 'pdf', 'photo', 'picture', 'plain',
+      'powerpoint', 'sound', 'text', 'video', 'word', 'zip',
+    ]
+  end
+end

data/app/helpers/refinery/image_helper.rb

@@ -29,7 +29,7 @@ module Refinery
       image_tag_args = (image.thumbnail_dimensions(geometry) rescue {})
       image_tag_args[:alt] = image.respond_to?(:title) ? image.title : image.image_name
 
-      image_tag(image.thumbnail(thumbnail_args).url, image_tag_args.merge(options))
+      image_tag image.thumbnail(thumbnail_args).url, **image_tag_args, **options
     end
   end
 end

data/app/helpers/refinery/pagination_helper.rb

@@ -9,6 +9,7 @@ module Refinery
         "frame_center"
       end
     end
+    alias pagination_selector pagination_css_class
 
   end
 end

data/app/helpers/refinery/site_bar_helper.rb

@@ -1,26 +1,29 @@
+# frozen_string_literal: true
+
 module Refinery
   module SiteBarHelper
 
     # Generates the link to determine where the site bar switch button returns to.
     def site_bar_switch_link
-      link_to_if(admin?, t('.switch_to_your_website', site_bar_translate_locale_args),
+      link_to_if(admin?, t('.switch_to_your_website', **site_bar_translate_locale_args),
                          refinery.root_path(site_bar_translate_locale_args),
-                         'data-turbolinks' => false) do
-        link_to t('.switch_to_your_website_editor', site_bar_translate_locale_args),
+                         data: {turbolinks: false}) do
+        link_to t('.switch_to_your_website_editor', **site_bar_translate_locale_args),
                 Refinery::Core.backend_path, 'data-turbolinks' => false
       end
     end
 
     def site_bar_edit_link
       return nil if admin? || @page.nil?
-      link_to t('refinery.admin.pages.edit', site_bar_translate_locale_args),
+
+      link_to t('refinery.admin.pages.page.edit', **site_bar_translate_locale_args),
               refinery.admin_edit_page_path(@page.nested_url,
-              :switch_locale => (@page.translations.first.locale unless @page.translated_to_default_locale?)),
-              'data-turbolinks' => false
+              switch_locale: (@page.translations.first.locale unless @page.translated_to_default_locale?)),
+              data: {turbolinks: false}
     end
 
     def site_bar_translate_locale_args
-      { :locale => Refinery::I18n.current_locale }
+      { locale: Refinery::I18n.current_locale }
     end
 
     def display_site_bar?

data/app/helpers/refinery/tag_helper.rb

@@ -1,5 +1,6 @@
 module Refinery
   module TagHelper
+    include ActionHelper
 
     # Returns <img class='help' tooltip='Your Input' src='refinery/icons/information.png' />
 
@@ -12,44 +13,12 @@ module Refinery
     # This is just a quick wrapper to render an image tag that lives inside refinery/icons.
     # They are all 16x16 so this is the default but is able to be overriden with supplied options.
     def refinery_icon_tag(filename, options = {})
+      Refinery.deprecate('Refinery::TagHelper.refinery_icon_tag', when: '5.1', replacement: 'Refinery::ActionHelper.action_icon')
+
       filename = "#{filename}.png" unless filename.split('.').many?
       path = image_path "refinery/icons/#{filename}", skip_pipeline: true
-      image_tag path, {:width => 16, :height => 16}.merge(options)
-    end
-
-    def action_icon(action, url, title, options={})
-      action_icon_label(action, url, title, options, false)
-    end
-
-    def action_label(action, url, title, options={})
-      action_icon_label(action, url, title, options, true)
-    end
-
-    def action_icon_label(action, url, title, options={}, label = true)
-#   See icons.scss for defined icons/classes
-
-      options[:title] = title
-      options[:class].presence ? options[:class] << " #{action}_icon " : options[:class] = "#{action}_icon"
-      options[:class] << ' icon_label' if label
-
-      case action
-      when :preview
-        options[:target] = '_blank'
-      when :delete
-        options[:method] = :delete
-      when :reorder_done
-        options[:class] << ' hidden'
-      end
-
-      link_to(label && title || '', url, options)
-    end
-
-    # this stacks the text onto the locale icon (actually a comment balloon)
-    def locale_text_icon(text)
-      content_tag(:span, class: 'fa-stack') do
-        content_tag(:i, '', class: 'fa fa-comment') << content_tag(:strong, text)
-      end
+      image_tag path, {width: 16, height: 16}.merge(options)
     end
 
   end
-end
+end

data/app/helpers/refinery/translation_helper.rb

@@ -3,7 +3,7 @@ module Refinery
 
     # Overrides Rails' core I18n.t() function to produce a more helpful error message.
     # The default one wreaks havoc with CSS and makes it hard to understand the problem.
-    def t(key, options = {})
+    def t(key, **options)
       if (val = super) =~ /class.+?translation_missing/
         val = val.to_s.gsub(/<span[^>]*>/, 'i18n: ').gsub('</span>', '').gsub(', ', '.')
       end
@@ -14,5 +14,16 @@ module Refinery
     def translated_field(record, field)
       Refinery::TranslatedFieldPresenter.new(record).call(field)
     end
+
+    def locales_with_translated_field(record, field_name, include_current: true)
+      field_name = field_name.to_sym
+      translations = record.translations.where.not(field_name => [nil, ""])
+      translations = translations.where.not(locale: Refinery::I18n.default_frontend_locale.to_s) unless include_current
+
+      translations.pluck(:locale).map(&:to_sym).sort_by do |locale|
+        index = Refinery::I18n.frontend_locales.index(locale)
+        index ? [0, index] : [1, locale]
+      end
+    end
   end
 end

data/app/views/refinery/_head.html.erb

@@ -10,5 +10,6 @@
 <%= yield :stylesheets %>
 
 <%= render '/refinery/google_analytics' %>
+<%= render '/refinery/matomo_analytics' %>
 
 <%= javascript_include_tag 'modernizr-min' %>

data/app/views/refinery/_matomo_analytics.html.erb

@@ -0,0 +1,18 @@
+<% server = Refinery::Core.matomo_analytics_server.to_s.strip %>
+<% site_id = Refinery::Core.matomo_analytics_site_id.to_s.strip %>
+<% unless local_request? or admin? or server =~ /^(analytics.example.org)?$/ or site_id =~ /^$/ -%>
+<!-- Matomo -->
+<script type="text/javascript">
+  var _paq = _paq || [];
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="//<%= server %>/";
+    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setSiteId', '<%= site_id %>']);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script>
+<!-- End Matomo Code -->
+<% end -%>

data/app/views/refinery/_site_bar.html.erb

@@ -3,26 +3,26 @@
     <% content_for :stylesheets, stylesheet_link_tag('refinery/site_bar') unless !!local_assigns[:exclude_css] %>
     <%= yield(:stylesheets) unless local_assigns[:head] || local_assigns[:exclude_css] %>
   <% end -%>
-  <div id='site_bar'>
-    <div id='site_bar_content' class='clearfix'>
+  <div id="site_bar">
+    <div id="site_bar_content" class="clearfix">
 
-      <%= link_to 'https://www.refinerycms.com', :id => 'site_bar_refinery_cms_logo', :target => '_blank' do %>
-        <%= image_tag 'refinery/refinery-cms-logo.svg', alt: 'Refinery CMS™' %>
+      <%= link_to 'https://github.com/refinery/refinerycms', :id => 'site_bar_refinery_cms_logo', :target => '_blank' do %>
+        <%= image_tag 'refinery/refinery-cms-logo.svg', alt: 'Refinery CMS' %>
       <% end %>
 
-      <div id='editor_switch'>
+      <div id="editor_switch">
         <%= site_bar_switch_link -%>
         <%= site_bar_edit_link -%>
       </div>
 
-      <div id='site_bar_branding'>
-        <span id='site_bar_company_name'>
+      <div id="site_bar_branding">
+        <span id="site_bar_company_name">
           <%= Refinery::Core.site_name %>
         </span>
 
-        <%= link_to t('.log_out', site_bar_translate_locale_args),
+        <%= link_to t('.log_out', **site_bar_translate_locale_args),
                     ::Refinery::Core.refinery_logout_path,
-                    :id => 'logout' if ::Refinery::Core.refinery_logout_path.present? %>
+                    id: 'logout' if ::Refinery::Core.refinery_logout_path.present? %>
       </div>
     </div>
   </div>

data/app/views/refinery/admin/_error_messages.html.erb

@@ -3,12 +3,12 @@
   <p><%= t('.problems_in_following_fields') %>:</p>
   <ul>
   <% if defined?(include_object_name) and include_object_name %>
-    <% object.errors.full_messages.each do |value| %>
-      <li><%= value %></li>
+    <% object.errors.each do |error| %>
+      <li><%= error.message %></li>
     <% end %>
   <% else %>
-    <% object.errors.each do |key, value| %>
-      <li><%= value %></li>
+    <% object.errors.each do |error| %>
+      <li><%= error.message %></li>
     <% end %>
   <% end %>
   </ul>

data/app/views/refinery/admin/_locale_picker.html.erb

@@ -1,18 +1,12 @@
-<input type="hidden" name="switch_locale" id="switch_locale" value="<%= local_assigns[:current_locale] %>" />
+<input type="hidden" name="switch_locale" id="switch_locale" value="<%= local_assigns[:current_locale] %>">
 <% if Refinery::I18n.frontend_locales.many? %>
   <label><%= t('.language') %></label>
-  <ul id="switch_locale_picker" class="clearfix">
-    <% locales = Refinery::I18n.locales.clone %>
-    <% Refinery::I18n.frontend_locales.each do |locale| %>
-      <% locale_name = locales.delete(locale) %>
-      <li<%= %Q{ class=selected} if locale.to_s == local_assigns[:current_locale].to_s %>>
-        <%= link_to refinery.url_for(:switch_locale => locale, :parent_id => params[:parent_id]), id: locale do %>
-          <div class="<%=locale %> locale_marker">
-            <%= locale_text_icon(locale.upcase) %>
-          </div>
-          <%= locale_name %>
-        <% end %>
-      </li>
+  <div id="switch_locale_picker" class="locales">
+    <% Refinery::I18n.frontend_locales.each do |locale, language| %>
+        <% classes = locale.to_s == local_assigns[:current_locale].to_s ? 'selected' : '' %>
+        <%= edit_in_locale(locale,
+                           url: refinery.url_for(parent_id: params[:parent_id]),
+                           title: language, class: classes, label: true ) %>
     <% end %>
-  </ul>
+  </div>
 <% end %>

data/config/initializers/assets.rb

@@ -1 +1,5 @@
-Rails.application.config.assets.precompile << 'refinery_core_manifest.js'
+# frozen_string_literal: true
+
+if Rails.application.config.respond_to?(:assets)
+  Rails.application.config.assets.precompile << 'refinery_core_manifest.js'
+end

data/config/initializers/zeitwerk.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class RefineryInflector < Zeitwerk::Inflector
+  def camelize(basename, abspath)
+    return 'Refinery' if basename.start_with?('refinerycms-')
+    super
+  end
+end
+
+Rails.autoloaders.each do |autoloader|
+  autoloader.inflector = RefineryInflector.new
+end

data/config/locales/en.yml

@@ -43,7 +43,9 @@ en:
         change: Click here to pick an image
         show: Show
       locale_picker:
-        language: Language
+        language: Language,
+        edit_in_locale: Edit in '%{locale_code}'
+        edit_in_language: Edit in %{language}
       resource_picker:
         download_current: Download current file
         opens_in_new_window: Opens in a new window

data/config/locales/sk.yml

@@ -52,6 +52,11 @@ sk:
         button_text: Hľadať 
         results_for_html: "Výsledky hľadania pre &#8216;<em>%{query}</em>&#8217;"
         no_results: Žiadne záznamy sa nenašli
+        cancel_search: 'Zrušiť vyhľadávanie'
+        search_input_notice: ''
+        input:
+          placeholder: "Hľadať &#8230;"
+          help: 'Napíšte slovo alebo frázu, ktorú chcete vyhľadať'
       delete:
         message: Naozaj chcete zmazať '%{title}'?
       error_messages:
@@ -66,6 +71,8 @@ sk:
       close_this_message: Zavrieť správu
     draft_page_message:
       not_live: Táto stránka NIE JE viditeľná pre bežných návštevníkov webu.
+    skip_to_first_child_page_message:
+      skip_to_first_child: "Táto stránka má nastavenie \"Presmeruj na prvú substránku\" a nikdy nebude zobrazená návštevníkom"
     footer:
       copyright: Copyright © %{year} %{site_name}
     no_script:

data/lib/generators/refinery/cms/cms_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'mkmf'
 
@@ -5,18 +7,18 @@ module Refinery
   class CmsGenerator < Rails::Generators::Base
     source_root Pathname.new(File.expand_path('../templates', __FILE__))
 
-    class_option :update,  :type => :boolean, :aliases => nil, :group => :runtime,
-                           :desc => "Update an existing Refinery CMS based application"
-    class_option :fresh_installation, :type => :boolean, :aliases => nil, :group => :runtime, :default => false,
-                           :desc => "Allow Refinery to remove default Rails files in a fresh installation"
-    class_option :heroku,  :type => :string, :default => nil, :group => :runtime, :banner => 'APP_NAME',
-                           :desc => "Deploy to Heroku after the generator has run."
-    class_option :stack,   :type => :string, :default => 'cedar-14', :group => :runtime,
-                           :desc => "Specify which Heroku stack you want to use. Requires --heroku option to function."
-    class_option :skip_db, :type => :boolean, :default => false, :aliases => nil, :group => :runtime,
-                           :desc => "Skip over any database creation, migration or seeding."
-    class_option :skip_migrations, :type => :boolean, :default => false, :aliases => nil, :group => :runtime,
-                           :desc => "Skip over installing or running migrations."
+    class_option :update,  type: :boolean, aliases: nil, group: :runtime,
+                           desc: "Update an existing Refinery CMS based application"
+    class_option :fresh_installation, type: :boolean, aliases: nil, group: :runtime, default: false,
+                           desc: "Allow Refinery to remove default Rails files in a fresh installation"
+    class_option :heroku,  type: :string, default: nil, group: :runtime, banner: 'APP_NAME',
+                           desc: "Deploy to Heroku after the generator has run."
+    class_option :stack,   type: :string, default: 'cedar-14', group: :runtime,
+                           desc: "Specify which Heroku stack you want to use. Requires --heroku option to function."
+    class_option :skip_db, type: :boolean, default: false, aliases: nil, group: :runtime,
+                           desc: "Skip over any database creation, migration or seeding."
+    class_option :skip_migrations, type: :boolean, default: false, aliases: nil, group: :runtime,
+                           desc: "Skip over installing or running migrations."
 
     def generate
       start_pretending?
@@ -55,15 +57,15 @@ module Refinery
       if destination_path.join(application_css).file?
         insert_into_file application_css, %q{*= require refinery/formatting
  *= require refinery/theme
- },      :before => "*= require_self"
+ },      before: "*= require_self"
       end
     end
 
     def append_gemfile!
       if destination_path.join('Gemfile').file? &&
          destination_path.join('Gemfile').read !~ %r{group :development, :test do\n.+?gem 'sqlite3'\nend}m
-        gsub_file 'Gemfile', %q{gem 'sqlite3'}, %q{group :development, :test do
-  gem 'sqlite3'
+        gsub_file 'Gemfile', /(gem\ ['|"]sqlite3['|"].*)$/, %q{group :development, :test do
+  \1
 end}  end
     end
 
@@ -215,10 +217,10 @@ end
             "  end"
           ].join("\n")
 
-          gsub_file env, current_mailer_config, new_mailer_config, :verbose => false
+          gsub_file env, current_mailer_config, new_mailer_config, verbose: false
         end
 
-        gsub_file env, "config.assets.compile = false", "config.assets.compile = true", :verbose => false
+        gsub_file env, "config.assets.compile = false", "config.assets.compile = true", verbose: false
       end
     end
 
@@ -253,7 +255,7 @@ end
       %w(public/index.html app/views/layouts/application.html.erb).each do |roadblock|
         if (roadblock_path = destination_path.join(roadblock)).file?
           if self.options[:fresh_installation]
-            remove_file roadblock_path, :verbose => true
+            remove_file roadblock_path, verbose: true
           else
             say_status :"-- You may need to remove '#{roadblock}' for Refinery to function properly --", nil, :yellow
           end
@@ -329,7 +331,7 @@ end
       # Only pretend to do the next actions if this is Refinery to stay DRY
       if destination_path == Refinery.root
         say_status :'-- pretending to make changes that happen in an actual installation --', nil, :yellow
-        old_pretend = self.options[:pretend]
+        self.old_pretend = self.options[:pretend]
         new_options = self.options.dup
         new_options[:pretend] = true
         self.options = new_options
@@ -340,10 +342,12 @@ end
       # Stop pretending
       if destination_path == Refinery.root
         say_status :'-- finished pretending --', nil, :yellow
-        new_options = self.options.dup
+        new_options = options.dup.merge(pretend: old_pretend)
         new_options[:pretend] = old_pretend
         self.options = new_options
       end
     end
+
+    private attr_accessor :old_pretend
   end
 end

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

@@ -20,6 +20,11 @@ Refinery::Core.configure do |config|
   # Google Analytics are made.
   # config.google_analytics_page_code = <%= Refinery::Core.google_analytics_page_code.inspect %>
 
+  # This activates Matomo open web analytics tracking within your website. If the server config is
+  # left blank or set to analytics.example.org then the javascript tracking code will not be loaded.
+  # config.matomo_analytics_server = <%= Refinery::Core.matomo_analytics_server.inspect %>
+  # config.matomo_analytics_site_id = <%= Refinery::Core.matomo_analytics_site_id.inspect %>
+
   # Enable/disable authenticity token on frontend
   # config.authenticity_token_on_frontend = <%= Refinery::Core.authenticity_token_on_frontend.inspect %>