pages_core 3.4.3 → 3.5.1

data/app/helpers/pages_core/images_helper.rb

@@ -4,21 +4,21 @@ module PagesCore
   module ImagesHelper
     include DynamicImage::Helper
 
-    def dynamic_image_tag(record_or_array, options={})
+    def dynamic_image_tag(record_or_array, options = {})
       super(
         record_or_array,
         extract_alt_text(record_or_array).merge(options)
       )
     end
 
-    def original_dynamic_image_tag(record_or_array, options={})
+    def original_dynamic_image_tag(record_or_array, options = {})
       super(
         record_or_array,
         extract_alt_text(record_or_array).merge(options)
       )
     end
 
-    def uncropped_dynamic_image_tag(record_or_array, options={})
+    def uncropped_dynamic_image_tag(record_or_array, options = {})
       super(
         record_or_array,
         extract_alt_text(record_or_array).merge(options)

data/app/helpers/pages_core/meta_tags_helper.rb

@@ -0,0 +1,96 @@
+# encoding: utf-8
+
+module PagesCore
+  module MetaTagsHelper
+    # Sets a default image to use for meta tags. Supports
+    # both paths and Image objects.
+    #
+    #  default_meta_image image_path("facebook-share.png")
+    #  default_meta_image root_page.image
+    #
+    def default_meta_image(*args)
+      if args.any?
+        @default_meta_image = args.first
+      else
+        @default_meta_image
+      end
+    end
+
+    # Returns true if default meta image has been set.
+    def default_meta_image?
+      default_meta_image ? true : false
+    end
+
+    # Sets a description for meta tags.
+    #
+    #   meta_description "This is an awesome site"
+    #
+    def meta_description(*args)
+      if args.any?
+        @meta_description = args.first
+      else
+        description = @meta_description
+        description ||= @page.meta_description if @page.try(&:meta_description?)
+        description ||= @page.excerpt if @page && !@page.excerpt.empty?
+        strip_tags(description)
+      end
+    end
+
+    # Returns true if meta description has been set.
+    def meta_description?
+      !meta_description.blank?
+    end
+
+    # Sets an image to use for meta tags. Supports
+    # both paths and Image objects.
+    #
+    #   meta_image image_path("facebook-share.png")
+    #   meta_image @page.image
+    #
+    def meta_image(*args)
+      if args.any?
+        @meta_image = args.first
+      else
+        image = find_meta_image
+        if image.is_a?(Image)
+          dynamic_image_url(image, size: "1200x", only_path: false)
+        else
+          image
+        end
+      end
+    end
+
+    # Returns true if meta image has been set.
+    def meta_image?
+      !meta_image.blank? || default_meta_image?
+    end
+
+    # Sets keywords for meta tags.
+    #
+    #   meta_keywords "cialis viagra"
+    #
+    def meta_keywords(*args)
+      if args.any?
+        @meta_keywords = Array(args.first).join(", ")
+      else
+        keywords = @meta_keywords
+        keywords ||= @page.tag_list if @page && @page.tags.any?
+        strip_tags(keywords)
+      end
+    end
+
+    # Returns true if meta keywords have been set.
+    def meta_keywords?
+      !meta_keywords.blank?
+    end
+
+    private
+
+    def find_meta_image
+      @meta_image ||
+        @page.try(&:meta_image) ||
+        @page.try(&:image) ||
+        default_meta_image
+    end
+  end
+end

data/app/helpers/pages_core/open_graph_tags_helper.rb

@@ -0,0 +1,51 @@
+# encoding: utf-8
+
+module PagesCore
+  module OpenGraphTagsHelper
+    def open_graph_properties
+      @_open_graph_properties ||= {}
+    end
+
+    # Outputs Open Graph tags for Facebook.
+    def open_graph_tags
+      properties = default_open_graph_properties.merge(open_graph_properties)
+      safe_join(
+        properties
+          .delete_if { |_, content| content.nil? }
+          .map do |name, content|
+          tag(:meta, property: "og:#{name}", content: content)
+        end,
+        "\n"
+      )
+    end
+
+    private
+
+    def default_open_graph_title
+      if @page.try(:open_graph_title?)
+        @page.open_graph_title
+      else
+        document_title
+      end
+    end
+
+    def default_open_graph_description
+      if @page.try(:open_graph_description?)
+        @page.open_graph_description
+      elsif meta_description?
+        meta_description
+      end
+    end
+
+    def default_open_graph_properties
+      {
+        type:        "website",
+        site_name:   PagesCore.config(:site_name),
+        title:       default_open_graph_title,
+        image:       (meta_image if meta_image?),
+        description: default_open_graph_description,
+        url:         request.url
+      }
+    end
+  end
+end

data/app/helpers/pages_core/page_path_helper.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+module PagesCore
+  module PagePathHelper
+    def page_path(locale, page, options = {})
+      page.localize(locale) do |p|
+        if p.full_path? && PagesCore.config.localizations?
+          "/#{locale}/" + URI.escape(p.full_path)
+        elsif p.full_path?
+          "/" + URI.escape(p.full_path)
+        else
+          super(locale, p, options)
+        end
+      end
+    end
+
+    def page_url(page_or_locale, page = nil, opts = {})
+      locale, page = page_url_locale_and_page(page_or_locale, page, opts)
+      page.localize(locale) do |p|
+        if p.redirects?
+          p.redirect_path(locale: locale)
+        elsif p.full_path
+          "#{request.protocol}#{request.host_with_port}" + page_path(locale, p)
+        else
+          super(locale, p, opts)
+        end
+      end
+    end
+
+    private
+
+    def page_url_locale_and_page(page_or_locale, page, opts)
+      return [page_or_locale, page] if page
+      ActiveSupport::Deprecation.warn(
+        "Calling page_url without locale is deprecated"
+      )
+      [(opts[:locale] || @locale), page_or_locale]
+    end
+  end
+end

data/app/mailers/admin_mailer.rb

@@ -1,21 +1,23 @@
 # encoding: utf-8
 
 class AdminMailer < ActionMailer::Base
-  before_action :default_headers
-  default from: proc { "\"Pages\" <support@manualdesign.no>" }
+  default from: proc { "\"Pages\" <support@kord.no>" }
 
   def error_report(error_report, from, description)
-    @error_report, @from, @description = error_report, from, description
+    @error_report = error_report
+    @from = from
+    @description = description
     short_message = @error_report[:message].gsub(/[\s\n]+/, " ")[0..80]
     mail(
-      to:      "system+error@manualdesign.no",
-      from:    "\"Error reports\" <system+error@manualdesign.no>",
+      to:      "system+error@kord.no",
+      from:    "\"Error reports\" <system+error@kord.no>",
       subject: "[#{PagesCore.config(:site_name)}] Error: #{short_message}"
     )
   end
 
   def password_reset(user, url)
-    @user, @url = user, url
+    @user = user
+    @url = url
     mail(
       to: @user.email,
       subject: "Reset your password on #{PagesCore.config(:site_name)}"
@@ -23,7 +25,10 @@ class AdminMailer < ActionMailer::Base
   end
 
   def comment_notification(recipient, page, comment, url)
-    @recipient, @page, @comment, @url = recipient, page, comment, url
+    @recipient = recipient
+    @page = page
+    @comment = comment
+    @url = url
     mail(
       to:      recipient,
       subject: "[#{PagesCore.config(:site_name)}] New comment on #{@page.name}"
@@ -31,16 +36,11 @@ class AdminMailer < ActionMailer::Base
   end
 
   def invite(invite, url)
-    @invite, @url = invite, url
+    @invite = invite
+    @url = url
     mail(
       to:      @invite.email,
       subject: "#{PagesCore.config(:site_name)} has invited you to Pages"
     )
   end
-
-  private
-
-  def default_headers
-    headers("X-MC-Subaccount" => "pages")
-  end
 end

data/app/models/autopublisher.rb

@@ -10,7 +10,7 @@ class Autopublisher
           end
         end
       end
-      self.queue!
+      queue!
     end
 
     def queue!
@@ -27,7 +27,7 @@ class Autopublisher
     end
 
     def due_pages
-      queued_pages.where("published_at < ?", (Time.now + 2.minutes))
+      queued_pages.where("published_at < ?", (Time.now.utc + 2.minutes))
     end
   end
 end

data/app/models/category.rb

@@ -1,8 +1,9 @@
 # encoding: utf-8
 
 class Category < ActiveRecord::Base
-  has_and_belongs_to_many :pages, join_table: "pages_categories"
-  validates_presence_of :name
+  has_many :page_categories, dependent: :destroy
+  has_many :pages, through: :page_categories
+  validates :name, presence: true
   acts_as_list
 
   before_save :set_slug
@@ -13,11 +14,10 @@ class Category < ActiveRecord::Base
   private
 
   def set_slug
-    self.slug = name
-      .downcase
-      .gsub(/[^\w\s]/, "")
-      .split(/[^\w\d\-]+/)
-      .compact
-      .join("-")
+    self.slug = name.downcase
+                    .gsub(/[^\w\s]/, "")
+                    .split(/[^\w\d\-]+/)
+                    .compact
+                    .join("-")
   end
 end

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

@@ -5,7 +5,7 @@ module PagesCore
     def role?(role_name)
       role_names.include?(role_name.to_s)
     end
-    alias_method :has_role?, :role?
+    alias has_role? role?
 
     def role_names
       roles.map(&:name)
@@ -14,7 +14,7 @@ module PagesCore
     def role_names=(names)
       new_roles = names.map do |name|
         if role?(name)
-          roles.where(name: name).first
+          roles.find_by(name: name)
         else
           roles.new(name: name)
         end

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

@@ -7,11 +7,11 @@ module PagesCore
     def humanized_param(slug)
       return id.to_s unless slug && !slug.blank?
       "#{id}-" + slug
-        .gsub(/[\[\{]/, "(")
-        .gsub(/[\]\}]/, ")")
-        .gsub(/[^[[:alnum:]]()\-]+/, "-")
-        .gsub(/[\-]{2,}/, "-")
-        .gsub(/(^\-|\-$)/, "")
+                 .gsub(/[\[\{]/, "(")
+                 .gsub(/[\]\}]/, ")")
+                 .gsub(/[^[[:alnum:]]()\-]+/, "-")
+                 .gsub(/[\-]{2,}/, "-")
+                 .gsub(/(^\-|\-$)/, "")
     end
   end
 end

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

@@ -0,0 +1,25 @@
+# encoding: utf-8
+
+module PagesCore
+  module PageModel
+    module Autopublishable
+      extend ActiveSupport::Concern
+
+      included do
+        before_validation :set_autopublish
+        after_save :queue_autopublisher
+      end
+
+      private
+
+      def set_autopublish
+        self.autopublish = published_at? && published_at > Time.now.utc
+        true
+      end
+
+      def queue_autopublisher
+        Autopublisher.queue! if autopublish?
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+# encoding: utf-8
+
+module PagesCore
+  module PageModel
+    module Commentable
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :comments, class_name: "PageComment", dependent: :destroy
+      end
+
+      def comments_closed_after_time?
+        if PagesCore.config.close_comments_after.nil?
+          false
+        else
+          (Time.now.utc - published_at) > PagesCore.config.close_comments_after
+        end
+      end
+
+      def comments_allowed?
+        if comments_closed_after_time?
+          false
+        else
+          self[:comments_allowed]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+# encoding: utf-8
+
+module PagesCore
+  module PageModel
+    module Images
+      extend ActiveSupport::Concern
+
+      included do
+        belongs_to_image :image
+        belongs_to_image :meta_image, class_name: "Image"
+        has_many :page_images, -> { order("position") }
+        has_many(
+          :images,
+          -> { where("`page_images`.`primary` = ?", false).order("position") },
+          through: :page_images
+        )
+
+        after_save :ensure_page_images_contains_primary_image
+      end
+
+      def image?
+        image_id?
+      end
+
+      def image
+        super.try { |i| i.localize(locale) }
+      end
+
+      def images
+        super.in_locale(locale)
+      end
+
+      def page_images
+        super.in_locale(locale)
+      end
+
+      private
+
+      def ensure_page_images_contains_primary_image
+        return if !image_id? || !image_id_changed?
+        page_image = page_images.find_by(image_id: image_id)
+        if page_image
+          page_image.update(primary: true)
+        else
+          page_images.create(image_id: image_id, primary: true)
+        end
+      end
+    end
+  end
+end