pages_core 3.4.3 → 3.7.0

data/app/helpers/pages_core/images_helper.rb

@@ -1,24 +1,24 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 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)
@@ -30,6 +30,7 @@ module PagesCore
     def extract_alt_text(record_or_array)
       record = extract_dynamic_image_record(record_or_array)
       return {} unless record.alternative?
+
       { alt: record.alternative }
     end
   end

data/app/helpers/pages_core/meta_tags_helper.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+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.present?
+    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.present? || 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&.tags&.any?
+        strip_tags(keywords)
+      end
+    end
+
+    # Returns true if meta keywords have been set.
+    def meta_keywords?
+      meta_keywords.present?
+    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 @@
+# frozen_string_literal: true
+
+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,66 @@
+# frozen_string_literal: true
+
+module PagesCore
+  module PagePathHelper
+    def page_path(locale, page, options = {})
+      page.localize(locale) do |p|
+        return super(locale, p, options) unless p.full_path?
+
+        (PagesCore.config.localizations? ? "/#{locale}/" : "/") +
+          escape_page_path(p.full_path) +
+          (html_format?(options) ? "" : ".#{options[:format]}") +
+          paginated_section(options)
+      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? && html_format?(opts)
+          page_redirect_url(locale, p)
+        elsif p.full_path
+          base_page_url + page_path(locale, p, opts)
+        else
+          super(locale, p, opts)
+        end
+      end
+    end
+
+    private
+
+    def page_redirect_url(locale, page)
+      redirect = page.redirect_path(locale: locale)
+      return redirect if redirect =~ %r{^https?://}
+
+      base_page_url + redirect
+    end
+
+    def base_page_url
+      "#{request.protocol}#{request.host_with_port}"
+    end
+
+    def html_format?(opts)
+      opts[:format].blank? || opts[:format].to_sym == :html
+    end
+
+    def escape_page_path(path)
+      path.split("/").map { |s| CGI.escape(s) }.join("/")
+    end
+
+    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
+
+    def paginated_section(opts)
+      return "" unless opts[:page]
+
+      "/page/#{opts[:page]}"
+    end
+  end
+end

data/app/jobs/pages_core/autopublish_job.rb

@@ -1,7 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module PagesCore
-  class AutopublishJob < ActiveJob::Base
+  class AutopublishJob < ApplicationJob
     queue_as :pages_core
 
     def perform

data/app/jobs/pages_core/sweep_cache_job.rb

@@ -1,11 +1,11 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module PagesCore
-  class SweepCacheJob < ActiveJob::Base
+  class SweepCacheJob < ApplicationJob
     queue_as :pages_core
 
     def perform
-      PagesCore::CacheSweeper.sweep!
+      PagesCore::StaticCache.handler.sweep_now!
     end
   end
 end

data/app/mailers/admin_mailer.rb

@@ -1,46 +1,23 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-class AdminMailer < ActionMailer::Base
-  before_action :default_headers
-  default from: proc { "\"Pages\" <support@manualdesign.no>" }
-
-  def error_report(error_report, from, description)
-    @error_report, @from, @description = error_report, from, description
-    short_message = @error_report[:message].gsub(/[\s\n]+/, " ")[0..80]
-    mail(
-      to:      "system+error@manualdesign.no",
-      from:    "\"Error reports\" <system+error@manualdesign.no>",
-      subject: "[#{PagesCore.config(:site_name)}] Error: #{short_message}"
-    )
-  end
+class AdminMailer < ApplicationMailer
+  default from: proc { "\"Pages\" <support@anyone.no>" }
 
   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)}"
     )
   end
 
-  def comment_notification(recipient, page, comment, url)
-    @recipient, @page, @comment, @url = recipient, page, comment, url
-    mail(
-      to:      recipient,
-      subject: "[#{PagesCore.config(:site_name)}] New comment on #{@page.name}"
-    )
-  end
-
   def invite(invite, url)
-    @invite, @url = invite, url
+    @invite = invite
+    @url = url
     mail(
-      to:      @invite.email,
+      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/attachment.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+class Attachment < ApplicationRecord
+  include Dis::Model
+  include PagesCore::Sweepable
+
+  belongs_to :user, optional: true
+
+  validates_data_presence
+  validates :content_type, presence: true
+  validates :filename, presence: true
+  validates :content_length, presence: true
+
+  localizable do
+    attribute :name
+    attribute :description
+  end
+
+  before_validation :set_name_from_filename
+
+  class << self
+    def verifier
+      @verifier ||= PagesCore::DigestVerifier.new(
+        Rails.application.key_generator.generate_key("attachments")
+      )
+    end
+
+    def formats
+      {
+        "audio/mpeg" => :mp3,
+        "image/gif" => :gif,
+        "image/jpeg" => :jpg,
+        "image/jpg" => :jpg,
+        "image/pjpeg" => :jpg,
+        "image/png" => :png,
+        "application/pdf" => :pdf
+      }
+    end
+  end
+
+  def digest
+    return unless id
+
+    self.class.verifier.generate(id.to_s)
+  end
+
+  def format?
+    content_type && self.class.formats.key?(content_type)
+  end
+
+  def format
+    self.class.formats[content_type]
+  end
+
+  def filename_extension
+    if filename_extension?
+      filename.match(/\.([^.]+)$/)[1]
+    else
+      ""
+    end
+  end
+
+  def filename_extension?
+    filename =~ /\./
+  end
+
+  # Includes a timestamp fingerprint in the URL param, so
+  # that rendered images can be cached indefinitely.
+  def to_param
+    [id, updated_at.utc.to_s(cache_timestamp_format)].join("-")
+  end
+
+  private
+
+  def set_name_from_filename
+    self.name ||= File.basename(filename, ".*") if filename? && locale
+  end
+end

data/app/models/autopublisher.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 class Autopublisher
   class << self
@@ -10,11 +10,12 @@ class Autopublisher
           end
         end
       end
-      self.queue!
+      queue!
     end
 
     def queue!
       return unless queued_pages.any?
+
       PagesCore::AutopublishJob
         .set(wait_until: queued_pages.first.published_at)
         .perform_later
@@ -23,11 +24,13 @@ class Autopublisher
     protected
 
     def queued_pages
-      Page.where(autopublish: true).order("published_at ASC")
+      Page.where(autopublish: true)
+          .order("published_at ASC")
+          .in_locale(I18n.default_locale)
     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