pages_core 3.5.1 → 3.6.0

data/app/controllers/pages_core/{application_controller.rb → base_controller.rb}

@@ -1,18 +1,29 @@
-# encoding: utf-8
-
 module PagesCore
-  class ApplicationController < ActionController::Base
+  class BaseController < ActionController::Base
     include PagesCore::Authentication
     include PagesCore::DomainBasedCache
-    include PagesCore::ExceptionHandler
+    include PagesCore::ErrorRenderer
     include PagesCore::ProcessTitler
     include PagesCore::PoliciesHelper
 
-    before_action :set_locale
+    before_action :set_locale, :configure_error_reporting
     after_action :set_content_language_header
 
     protected
 
+    # Configures additional report data if Sentry is installed
+    def configure_error_reporting
+      return unless Object.const_defined?("Raven")
+      if logged_in?
+        Raven.user_context(user_id: current_user.id,
+                           user_email: current_user.email)
+      else
+        Raven.user_context({})
+      end
+      Raven.tags_context(locale: locale)
+      Raven.extra_context(params: params.to_unsafe_h)
+    end
+
     # Sets @locale from params[:locale], with I18n.default_locale as fallback
     def set_locale
       legacy_locales = {

data/app/controllers/pages_core/frontend/page_files_controller.rb

@@ -1,37 +1,18 @@
-# encoding: utf-8
-
 module PagesCore
   module Frontend
     class PageFilesController < ::FrontendController
-      before_action :find_page_file, only: [:show, :edit, :update, :destroy]
+      include PagesCore::AttachmentsHelper
 
-      def show
-        unless modified?(@page_file)
-          render(text: "304 Not Modified", status: 304) && return
-        end
+      before_action :find_page_file, only: %i[show]
 
-        if @page_file.updated_at?
-          response.headers["Last-Modified"] = @page_file.updated_at.httpdate
+      def show
+        if stale?(etag: @page_file, last_modified: @page_file.updated_at)
+          redirect_to attachment_path(@page_file.attachment)
         end
-
-        send_data(@page_file.data,
-                  filename: @page_file.filename,
-                  type: @page_file.content_type,
-                  disposition: "attachment")
       end
 
       private
 
-      def modified?(page_file)
-        return true unless if_modified_since && page_file.updated_at?
-        page_file.updated_at > if_modified_since
-      end
-
-      def if_modified_since
-        return nil if request.env["HTTP_IF_MODIFIED_SINCE"].blank?
-        Time.rfc2822(request.env["HTTP_IF_MODIFIED_SINCE"])
-      end
-
       def find_page_file
         @page_file = PageFile.find(params[:id])
       end

data/app/controllers/pages_core/frontend/pages_controller.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   module Frontend
     class PagesController < ::FrontendController
@@ -7,17 +5,15 @@ module PagesCore
       include PagesCore::Templates::ControllerActions
       include PagesCore::HeadTagsHelper
 
-      include PagesCore::AddCommentsController
       include PagesCore::PreviewPagesController
       include PagesCore::RssController
-      include PagesCore::SearchPagesController
 
       caches_page :index if PagesCore.config(:page_cache)
 
       before_action :load_root_pages
       before_action :find_page_by_path, only: [:show]
-      before_action :find_page, only: [:show, :preview, :add_comment]
-      before_action :require_page, only: [:show, :preview, :add_comment]
+      before_action :find_page, only: %i[show preview]
+      before_action :require_page, only: %i[show preview]
       before_action :canonicalize_url, only: [:show]
       after_action :cache_page_request, only: [:show]
 
@@ -50,7 +46,7 @@ module PagesCore
         return if @page.redirects?
         return if request.path == canonical_path(@page)
         # Don't canonicalize if any unknown params are present
-        return if (params.keys - %w(controller action path locale id)).any?
+        return if (params.keys - %w[controller action path locale id]).any?
         redirect_to(canonical_path(@page), status: :moved_permanently)
       end
 
@@ -99,7 +95,7 @@ module PagesCore
 
       def find_page_by_path
         return unless params[:path]
-        @page ||= PagePath.get(locale, params[:path]).try(&:page)
+        @page = PagePath.get(locale, params[:path]).try(&:page)
       end
 
       def find_page

data/app/controllers/pages_core/frontend_controller.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Abstract controller for all frontend controllers.
 module PagesCore
   class FrontendController < ::ApplicationController

data/app/controllers/pages_core/images_controller.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   class ImagesController < ::ApplicationController
     include DynamicImage::Controller

data/app/controllers/pages_core/sitemaps_controller.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
-
 module PagesCore
-  class SitemapsController < ApplicationController
+  class SitemapsController < ::ApplicationController
     include PagesCore::PagePathHelper
     caches_page :show
 
@@ -43,10 +41,10 @@ module PagesCore
     end
 
     def pages
-      ([Page.root.localize(I18n.default_locale)] +
+      ([Page.root.try(:localize, I18n.default_locale)] +
         locales.flat_map do |locale|
           Page.published.localized(locale)
-        end).uniq
+        end).compact.uniq
     end
 
     def page_record_url(record)

data/app/controllers/sessions_controller.rb

@@ -1,23 +1,21 @@
-# encoding: utf-8
-
 class SessionsController < ::ApplicationController
   def create
     user = find_user(params[:username], params[:password])
     authenticate!(user) if user
 
     if logged_in?
-      redirect_to success_url
+      redirect_to admin_default_url
     else
       flash[:notice] = "The provided email address and password combination " \
         "was not valid"
-      redirect_to login_url
+      redirect_to login_admin_users_url
     end
   end
 
   def destroy
     flash[:notice] = "You have been logged out"
     deauthenticate!
-    redirect_to login_url
+    redirect_to login_admin_users_url
   end
 
   protected
@@ -25,14 +23,4 @@ class SessionsController < ::ApplicationController
   def find_user(username, password)
     User.authenticate(username, password: password) if username && password
   end
-
-  def success_url
-    # TODO: Validate URL
-    params[:success_url] || admin_default_url
-  end
-
-  def login_url
-    # TODO: Validate URL
-    params[:login_url] || login_admin_users_url
-  end
 end

data/app/formatters/pages_core/html_formatter.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   class HtmlFormatter
     include ActionView::Helpers::AssetTagHelper
@@ -18,7 +16,7 @@ module PagesCore
     end
 
     def to_html
-      string = parse_images(parse_files(@string))
+      string = parse_images(parse_files(parse_attachments(@string)))
       if @options[:shorten] && string.length > @options[:shorten]
         string = string[0..@options[:shorten]] + "..."
       end
@@ -28,22 +26,26 @@ module PagesCore
 
     private
 
+    def attachment_expression
+      /\[attachment:([\d,]+)\]/
+    end
+
     def file_expression
       /\[file:([\d,]+)\]/
     end
 
     def image_expression
-      /\[image:(\d+)([\s="\-\w]*)?\]/
+      /\[image:(\d+)([^\]]*)?\]/
     end
 
-    def embed_image(id, size:, class_name:)
+    def embed_image(id, size:, class_name:, link:)
       image = Image.find(id).localize(I18n.locale)
       class_name = ["image", image_class_name(image), class_name].compact
+      image_tag = dynamic_image_tag(image,
+                                    size: size, crop: false, upscale: false)
       content_tag(:figure,
-                  dynamic_image_tag(image,
-                                    size: size,
-                                    crop: false,
-                                    upscale: false) + image_caption(image),
+                  (link ? link_to(image_tag, link) : image_tag) +
+                  image_caption(image),
                   class: class_name)
     rescue ActiveRecord::RecordNotFound
       nil
@@ -57,24 +59,62 @@ module PagesCore
       end
     end
 
+    def find_attachment(id)
+      Attachment.find(id).localize(I18n.locale)
+    rescue ActiveRecord::RecordNotFound
+      nil
+    end
+
+    def find_attachments(str)
+      str.match(attachment_expression)[1]
+         .split(",")
+         .map { |id| find_attachment(id) }
+         .compact
+    end
+
+    def find_file(id)
+      PageFile.find(id).localize(I18n.locale)
+    rescue ActiveRecord::RecordNotFound
+      nil
+    end
+
     def find_files(str)
       str.match(file_expression)[1]
-        .split(",")
-        .map { |id| PageFile.find(id).localize(I18n.locale) }
+         .split(",")
+         .map { |id| find_file(id) }
+         .compact
+    end
+
+    def parse_attachments(string)
+      string.gsub(attachment_expression).each do |str|
+        PagesCore.config.attachment_embedder.new(
+          find_attachments(str)
+        ).to_html
+      end
     end
 
     def parse_files(string)
       string.gsub(file_expression).each do |str|
-        PagesCore.config.file_embedder.new(find_files(str)).to_html
+        PagesCore.config.attachment_embedder.new(
+          find_files(str).map(&:attachment)
+        ).to_html
       end
     end
 
+    def parse_image(str)
+      id = str.match(image_expression)[1]
+      options = str.match(image_expression)[2]
+      class_name = (Regexp.last_match(1) if options =~ /class="([\s\-\w]+)"/)
+      link = (Regexp.last_match(1) if options =~ /link="([^"]+)"/)
+      embed_image(id,
+                  size: embed_image_size(options),
+                  class_name: class_name,
+                  link: link)
+    end
+
     def parse_images(string)
       string.gsub(image_expression).each do |str|
-        id = str.match(image_expression)[1]
-        options = str.match(image_expression)[2]
-        class_name = (Regexp.last_match(1) if options =~ /class="([\s\-\w]+)"/)
-        embed_image(id, size: embed_image_size(options), class_name: class_name)
+        parse_image(str)
       end
     end
 
@@ -92,5 +132,9 @@ module PagesCore
         "portrait"
       end
     end
+
+    def link_to(content, href)
+      content_tag(:a, content, href: href)
+    end
   end
 end

data/app/formatters/pages_core/link_renderer.rb

@@ -0,0 +1,15 @@
+module PagesCore
+  class LinkRenderer < WillPaginate::ActionView::LinkRenderer
+    def previous_page
+      num = @collection.current_page > 1 &&
+            @collection.current_page - 1
+      previous_or_next_page(num, "Previous", "previous")
+    end
+
+    def next_page
+      num = @collection.current_page < total_pages &&
+            @collection.current_page + 1
+      previous_or_next_page(num, "Next", "next")
+    end
+  end
+end

data/app/helpers/admin/admin_helper.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Admin
   module AdminHelper
     include PagesCore::Admin::AdminHelper

data/app/helpers/admin/menu_helper.rb

@@ -1,17 +1,15 @@
-# encoding: utf-8
-
 module Admin
   module MenuHelper
     def header_tabs(group)
       content_tag :ul, class: group.to_s do
-        menu_items_for(group).map do |item|
+        safe_join(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" : ""))
           end
-        end.join.html_safe
+        end)
       end
     end
 

data/app/helpers/admin/pages_helper.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Admin
   module PagesHelper
     def available_templates_for_select
@@ -16,32 +14,60 @@ module Admin
       "[file:#{file.id}]"
     end
 
+    def news_section_name(page, news_pages)
+      if news_pages.select { |p| p.name == page.name }.length > 1
+        page_name(page, include_parents: true)
+      else
+        page_name(page)
+      end
+    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)
-        ),
+        if block_options[:type] == :select
+          page_block_select(form, block_name, block_options)
+        else
+          page_block_text_field(form, block_name, block_options)
+        end,
         block_options[:title],
         errors: form.object.errors[block_name],
         description: block_options[:description]
       )
     end
 
+    def page_block_select(form, block_name, block_options)
+      opts = localize_page_select_options(form, block_options)
+      opts = opts.call if opts.is_a?(Proc)
+      opts = opts.map { |v| [v, v] } unless nested_array?(opts)
+      opts = ([["", nil]] + opts).uniq
+
+      value = form.object.send(block_name)
+      opts << [value, value] unless opts.map(&:last).include?(value)
+
+      form.send(:select, block_name, opts)
+    end
+
+    def page_block_text_field(form, block_name, block_options)
+      form.send(
+        block_options[:size] == :field ? :text_field : :rich_text_area,
+        block_name,
+        page_block_field_options(block_options)
+      )
+    end
+
     def page_name(page, options = {})
       page_names = if options[:include_parents]
-                     [page.ancestors, page].flatten
+                     page.self_and_ancestors.reverse
                    else
                      [page]
                    end
       safe_join(
         page_names.map { |p| page_name_with_fallback(p) },
-        " &raquo; ".html_safe
+        raw(" &raquo; ")
       )
     end
 
@@ -57,6 +83,18 @@ module Admin
 
     private
 
+    def localize_page_select_options(form, block_options)
+      if block_options[:options].is_a?(Hash)
+        block_options[:options][form.object.locale.to_sym]
+      else
+        block_options[:options]
+      end
+    end
+
+    def nested_array?(array)
+      array.present? && array.first.is_a?(Array)
+    end
+
     def page_block_classes(class_name, block_options = {})
       [class_name, block_options[:class]].join(" ").strip
     end