pages_core 3.4.3 → 3.5.1

data/app/controllers/pages_core/frontend_controller.rb

@@ -19,16 +19,22 @@ module PagesCore
 
     private
 
-    def set_i18n_locale
-      legacy_locales = {
+    def legacy_locales
+      {
         "nor" => "nb",
         "eng" => "en"
       }
+    end
+
+    def set_i18n_locale
       locale_param = params[:locale] || I18n.default_locale
       if legacy_locales[locale_param]
         locale_param = legacy_locales[locale_param]
       end
       I18n.locale = locale_param
+    rescue I18n::InvalidLocale
+      raise if Rails.application.config.consider_all_requests_local
+      render_error 404
     end
   end
 end

data/app/controllers/pages_core/sitemaps_controller.rb

@@ -2,6 +2,7 @@
 
 module PagesCore
   class SitemapsController < ApplicationController
+    include PagesCore::PagePathHelper
     caches_page :show
 
     def show
@@ -11,7 +12,7 @@ module PagesCore
     private
 
     def format_time(timestamp)
-      if timestamp.kind_of?(Date)
+      if timestamp.is_a?(Date)
         timestamp.strftime("%Y-%m-%d")
       else
         timestamp.strftime("%Y-%m-%dT%H:%M:%S#{timestamp.formatted_offset}")
@@ -38,14 +39,14 @@ module PagesCore
     end
 
     def localized?(record)
-      record.is_a?(PagesCore::Localizable::InstanceMethods)
+      record.is_a?(LocalizableModel::InstanceMethods)
     end
 
     def pages
       ([Page.root.localize(I18n.default_locale)] +
         locales.flat_map do |locale|
-        Page.published.localized(locale)
-      end).uniq
+          Page.published.localized(locale)
+        end).uniq
     end
 
     def page_record_url(record)

data/app/formatters/pages_core/html_formatter.rb

@@ -18,7 +18,7 @@ module PagesCore
     end
 
     def to_html
-      string = parse_images(@string)
+      string = parse_images(parse_files(@string))
       if @options[:shorten] && string.length > @options[:shorten]
         string = string[0..@options[:shorten]] + "..."
       end
@@ -28,6 +28,10 @@ module PagesCore
 
     private
 
+    def file_expression
+      /\[file:([\d,]+)\]/
+    end
+
     def image_expression
       /\[image:(\d+)([\s="\-\w]*)?\]/
     end
@@ -35,36 +39,42 @@ module PagesCore
     def embed_image(id, size:, class_name:)
       image = Image.find(id).localize(I18n.locale)
       class_name = ["image", image_class_name(image), class_name].compact
-      content_tag(
-        :figure,
-        dynamic_image_tag(
-          image,
-          size: size,
-          crop: false,
-          upscale: false
-        ) + image_caption(image),
-        class: class_name
-      )
+      content_tag(:figure,
+                  dynamic_image_tag(image,
+                                    size: size,
+                                    crop: false,
+                                    upscale: false) + image_caption(image),
+                  class: class_name)
     rescue ActiveRecord::RecordNotFound
       nil
     end
 
+    def embed_image_size(str)
+      if str =~ /size="(\d*x\d*)"/
+        Regexp.last_match(1)
+      else
+        "2000x2000"
+      end
+    end
+
+    def find_files(str)
+      str.match(file_expression)[1]
+        .split(",")
+        .map { |id| PageFile.find(id).localize(I18n.locale) }
+    end
+
+    def parse_files(string)
+      string.gsub(file_expression).each do |str|
+        PagesCore.config.file_embedder.new(find_files(str)).to_html
+      end
+    end
+
     def parse_images(string)
       string.gsub(image_expression).each do |str|
         id = str.match(image_expression)[1]
         options = str.match(image_expression)[2]
-
-        size  =  if options.match(/size="(\d*x\d*)"/)
-                   Regexp.last_match(1)
-                 else
-                   "2000x2000"
-                 end
-
-        class_name = if options.match(/class="([\s\-\w]+)"/)
-                       Regexp.last_match(1)
-                     end
-
-        embed_image(id, size: size, class_name: class_name)
+        class_name = (Regexp.last_match(1) if options =~ /class="([\s\-\w]+)"/)
+        embed_image(id, size: embed_image_size(options), class_name: class_name)
       end
     end
 

data/app/helpers/admin/menu_helper.rb

@@ -7,11 +7,9 @@ module Admin
         menu_items_for(group).map do |item|
           content_tag :li do
             path = instance_eval(&item.path)
-            link_to(
-              item.label,
-              path,
-              class: (current_menu_item?(item) ? "current" : "")
-            )
+            link_to(item.label,
+                    path,
+                    class: (current_menu_item?(item) ? "current" : ""))
           end
         end.join.html_safe
       end
@@ -20,10 +18,8 @@ module Admin
     protected
 
     def menu_item_candidates
-      routes = Rails.application.routes
-      menu_items
-        .map { |item| [item, routes.recognize_path(instance_eval(&item.path))] }
-        .select { |_item, routing| routing[:controller] == params[:controller] }
+      routed_menu_items
+        .select { |_, routing| routing[:controller] == params[:controller] }
     end
 
     def find_menu_candidate
@@ -61,5 +57,12 @@ module Admin
           item.options[:if] && !instance_eval(&item.options[:if])
         end
     end
+
+    def routed_menu_items
+      routes = Rails.application.routes
+      menu_items
+        .select { |item| item.path.is_a?(Proc) }
+        .map { |item| [item, routes.recognize_path(instance_eval(&item.path))] }
+    end
   end
 end

data/app/helpers/admin/pages_helper.rb

@@ -2,31 +2,6 @@
 
 module Admin
   module PagesHelper
-    def page_block_field(form, block_name, block_options)
-      if block_options[:size] == :field
-        labelled_field(
-          form.text_field(
-            block_name,
-            class:       ['text', block_options[:class]].join(" "),
-            placeholder: block_options[:placeholder]
-          ),
-          block_options[:title],
-          errors:      form.object.errors[block_name],
-          description: block_options[:description]
-        )
-      else
-        labelled_field form.text_area(
-          block_name,
-          rows:        (block_options[:size] == :large ? 15 : 5),
-          class:       ['rich', block_options[:class]].join(" "),
-          placeholder: block_options[:placeholder]
-        ),
-          block_options[:title],
-          errors:      form.object.errors[block_name],
-          description: block_options[:description]
-      end
-    end
-
     def available_templates_for_select
       PagesCore::Templates.names.collect do |template|
         if template == "index"
@@ -37,6 +12,27 @@ module Admin
       end
     end
 
+    def file_embed_code(file)
+      "[file:#{file.id}]"
+    end
+
+    def page_authors(page)
+      ([page.author] + User.activated).uniq
+    end
+
+    def page_block_field(form, block_name, block_options)
+      labelled_field(
+        form.send(
+          block_options[:size] == :field ? :text_field : :text_area,
+          block_name,
+          page_block_field_options(block_options)
+        ),
+        block_options[:title],
+        errors: form.object.errors[block_name],
+        description: block_options[:description]
+      )
+    end
+
     def page_name(page, options = {})
       page_names = if options[:include_parents]
                      [page.ancestors, page].flatten
@@ -50,10 +46,10 @@ module Admin
     end
 
     def publish_time(time)
-      if time.year != Time.now.year
+      if time.year != Time.zone.now.year
         time.strftime("on %b %d %Y at %H:%M")
-      elsif time.to_date != Time.now.to_date
-        time.strftime("on %b %Y at %H:%M")
+      elsif time.to_date != Time.zone.now.to_date
+        time.strftime("on %b %d at %H:%M")
       else
         time.strftime("at %H:%M")
       end
@@ -61,6 +57,22 @@ module Admin
 
     private
 
+    def page_block_classes(class_name, block_options = {})
+      [class_name, block_options[:class]].join(" ").strip
+    end
+
+    def page_block_field_options(block_options = {})
+      opts = { placeholder: block_options[:placeholder] }
+      if block_options[:size] == :field
+        opts.merge(class: page_block_classes("rich", block_options))
+      else
+        opts.merge(
+          class: page_block_classes("rich", block_options),
+          rows: (block_options[:size] == :large ? 15 : 5)
+        )
+      end
+    end
+
     def page_name_with_fallback(page)
       if page.name?
         page.name.to_s

data/app/helpers/pages_core/admin/admin_helper.rb

@@ -6,6 +6,24 @@ module PagesCore
       include PagesCore::Admin::LabelledFieldHelper
       include PagesCore::Admin::TagEditorHelper
 
+      attr_accessor :page_title
+      attr_accessor :page_description
+      attr_accessor :page_description_class
+      attr_accessor :page_description_links
+
+      def add_body_class(class_name)
+        @body_classes ||= []
+        @body_classes << class_name
+      end
+
+      def body_classes
+        classes = @body_classes || []
+        classes << controller.class.to_s.underscore
+        classes << "#{controller.action_name}_action" if controller.action_name
+        classes << "with_notice" if flash[:notice]
+        classes
+      end
+
       # Generates tags for an editable dynamic image.
       def editable_dynamic_image_tag(image, options = {})
         preview_url = uncropped_dynamic_image_url(image, size: "800x")
@@ -16,49 +34,40 @@ module PagesCore
         )
       end
 
-      def body_classes
-        classes = @body_classes || []
-        classes << controller.class.underscore
-        classes << "#{controller.action_name}_action"
-        classes << "with_sidebar" if content_for?(:sidebar)
-        classes << "with_notice" if flash[:notice]
-        classes.reverse.join(" ")
+      def content_tab(name, options = {}, &block)
+        @content_tabs ||= []
+        return unless block_given?
+        tab = {
+          name:    name.to_s.humanize,
+          key:     name.to_s.underscore.gsub(/[\s]+/, "_"),
+          options: options,
+          content: capture(&block)
+        }
+        @content_tabs << tab
+        content_tab_tag(tab[:key], tab[:content])
       end
 
-      def add_body_class(class_name)
-        @body_classes ||= []
-        @body_classes << class_name
+      def link_separator
+        ' <span class="separator">|</span> '.html_safe
       end
 
-      attr_accessor :page_title
-      attr_accessor :page_description
-      attr_accessor :page_description_class
-      attr_accessor :page_description_links
-
-      def page_title(title = nil)
-        if title
-          ActiveSupport::Deprecation.warn(
-            "Setting page title with page_title is deprecated, use page_title="
-          )
-          @page_title = title
-        else
-          @page_title
+      def deprecate_page_description_args(string = nil, class_name = nil)
+        if class_name
+          ActiveSupport::Deprecation.warn("Setting class through " \
+                                          "page_description is deprecated, " \
+                                          "use page_description_class=")
+        end
+        if string
+          ActiveSupport::Deprecation.warn("Setting description with " \
+                                          "page_description is deprecated, " \
+                                          "use page_description=")
         end
       end
 
       def page_description(string = nil, class_name = nil)
-        if class_name
-          ActiveSupport::Deprecation.warn(
-            "Setting page description class through page_description " \
-              "is deprecated, use page_description_class="
-          )
-          @page_description_class = class_name
-        end
+        deprecate_page_description_args(string, class_name)
+        @page_description_class = class_name if class_name
         if string
-          ActiveSupport::Deprecation.warn(
-            "Setting description with page_description is deprecated, " \
-              "use page_description="
-          )
           @page_description = string
         else
           @page_description
@@ -77,31 +86,24 @@ module PagesCore
         end
       end
 
-      def sidebar(string = "", &block)
-        @sidebar = string
-        return unless block_given?
-        @sidebar += capture(&block)
+      def page_title(title = nil)
+        if title
+          ActiveSupport::Deprecation.warn(
+            "Setting page title with page_title is deprecated, use page_title="
+          )
+          @page_title = title
+        else
+          @page_title
+        end
       end
 
-      def content_tab(name, options = {}, &block)
-        @content_tabs ||= []
-        return unless block_given?
-        tab = {
-          name:    name.to_s.humanize,
-          key:     name.to_s.underscore.gsub(/[\s]+/, "_"),
-          options: options,
-          content: capture(&block)
-        }
-        @content_tabs << tab
-        tab_output = "<div class=\"content_tab\" " \
-          "id=\"content-tab-#{tab[:key]}\">"
-        tab_output += tab[:content]
-        tab_output += "</div>"
-        tab_output.html_safe
-      end
+      private
 
-      def link_separator
-        ' <span class="separator">|</span> '.html_safe
+      def content_tab_tag(key, content)
+        content_tag(:div,
+                    content,
+                    class: "content_tab",
+                    id: "content-tab-#{key}")
       end
     end
   end

data/app/helpers/pages_core/admin/labelled_field_helper.rb

@@ -25,29 +25,28 @@ module PagesCore
              labelled_field_description(options[:description]) +
              field +
              (options[:check_box_description] || "")
-           ).html_safe
+          ).html_safe
         end
       end
 
       def image_upload_field(form, label, method = :image, options = {})
         output = ""
         if form.object.send(method)
-          output += "<p>" +
-            dynamic_image_tag(form.object.send(method), size: "120x100") +
-            "</p>"
+          output += content_tag(:p,
+                                dynamic_image_tag(form.object.send(method),
+                                                  size: "120x100"))
         end
-        output += labelled_field(
+        output + labelled_field(
           form.file_field(method),
           label, { errors: form.object.errors[method] }.merge(options)
         )
-        output.html_safe
       end
 
       private
 
       def labelled_field_class(options = {})
         if options[:errors] && options[:errors].any?
-          "field field_with_errors"
+          "field field-with-errors"
         else
           "field"
         end