pages_core 3.5.1 → 3.6.0

data/app/jobs/pages_core/autopublish_job.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   class AutopublishJob < ActiveJob::Base
     queue_as :pages_core

data/app/jobs/pages_core/sweep_cache_job.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   class SweepCacheJob < ActiveJob::Base
     queue_as :pages_core

data/app/mailers/admin_mailer.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
-
 class AdminMailer < ActionMailer::Base
-  default from: proc { "\"Pages\" <support@kord.no>" }
+  default from: proc { "\"Pages\" <support@anyone.no>" }
 
   def error_report(error_report, from, description)
     @error_report = error_report
@@ -9,8 +7,8 @@ class AdminMailer < ActionMailer::Base
     @description = description
     short_message = @error_report[:message].gsub(/[\s\n]+/, " ")[0..80]
     mail(
-      to:      "system+error@kord.no",
-      from:    "\"Error reports\" <system+error@kord.no>",
+      to:      "system+error@anyone.no",
+      from:    "\"Error reports\" <system+error@anyone.no>",
       subject: "[#{PagesCore.config(:site_name)}] Error: #{short_message}"
     )
   end
@@ -24,17 +22,6 @@ class AdminMailer < ActionMailer::Base
     )
   end
 
-  def comment_notification(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}"
-    )
-  end
-
   def invite(invite, url)
     @invite = invite
     @url = url

data/app/models/attachment.rb

@@ -0,0 +1,76 @@
+class Attachment < ActiveRecord::Base
+  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,5 +1,3 @@
-# encoding: utf-8
-
 class Autopublisher
   class << self
     def run!(_options = {})
@@ -23,7 +21,9 @@ 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

data/app/models/category.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Category < ActiveRecord::Base
   has_many :page_categories, dependent: :destroy
   has_many :pages, through: :page_categories
@@ -7,7 +5,6 @@ class Category < ActiveRecord::Base
   acts_as_list
 
   before_save :set_slug
-  after_save ThinkingSphinx::RealTime.callback_for(:pages, [:page])
 
   scope :by_name, -> { order("name ASC") }
 

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

@@ -12,14 +12,13 @@ module PagesCore
     end
 
     def role_names=(names)
-      new_roles = names.map do |name|
+      self.roles = names.map do |name|
         if role?(name)
           roles.find_by(name: name)
         else
           roles.new(name: name)
         end
       end
-      self.roles = new_roles
     end
   end
 end

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

@@ -1,12 +1,12 @@
-# encoding: utf-8
-
 module PagesCore
   module HumanizableParam
+    include ActiveSupport::Inflector
     extend ActiveSupport::Concern
 
     def humanized_param(slug)
-      return id.to_s unless slug && !slug.blank?
-      "#{id}-" + slug
+      return id.to_s unless slug && slug.present?
+      "#{id}-" + transliterate(slug)
+                 .downcase
                  .gsub(/[\[\{]/, "(")
                  .gsub(/[\]\}]/, ")")
                  .gsub(/[^[[:alnum:]]()\-]+/, "-")

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

@@ -0,0 +1,39 @@
+module PagesCore
+  module PageModel
+    module Attachments
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :page_files,
+                 -> { order("position ASC") },
+                 class_name: "PageFile",
+                 dependent: :destroy,
+                 inverse_of: :page
+
+        has_many :attachments, through: :page_files
+
+        accepts_nested_attributes_for(
+          :page_files,
+          reject_if: proc { |a| a["attachment_id"].blank? },
+          allow_destroy: true
+        )
+      end
+
+      def attachments
+        super.in_locale(locale)
+      end
+
+      def attachments?
+        attachments.any?
+      end
+
+      def page_files
+        super.in_locale(locale)
+      end
+
+      def files
+        page_files
+      end
+    end
+  end
+end

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   module PageModel
     module Autopublishable

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

@@ -0,0 +1,59 @@
+module PagesCore
+  module PageModel
+    module DatedPage
+      extend ActiveSupport::Concern
+
+      included do
+        before_validation :set_all_day_dates
+        before_validation :ensure_ends_at
+
+        scope :upcoming, -> { where("ends_at > ?", Time.zone.now) }
+        scope :past, -> { where("ends_at <= ?", Time.zone.now) }
+      end
+
+      module ClassMethods
+      end
+
+      # Finds the page's next sibling by date. Returns nil if there isn't one.
+      def next_sibling_by_date
+        siblings = siblings_by_date
+        return unless siblings.any?
+
+        siblings[(siblings.to_a.index(self) + 1)...siblings.length]
+          .try(&:first)
+      end
+
+      # Finds the page's previous sibling by date. Returns nil if there isn't one.
+      def previous_sibling_by_date
+        siblings = siblings_by_date
+        return unless siblings.any?
+
+        siblings[0...siblings.to_a.index(self)].try(&:last)
+      end
+
+      def upcoming?
+        return false unless ends_at?
+        ends_at > Time.zone.now
+      end
+
+      private
+
+      def ensure_ends_at
+        return unless starts_at?
+
+        self.ends_at = starts_at if !ends_at? || ends_at < starts_at
+      end
+
+      def set_all_day_dates
+        return unless all_day?
+
+        self.starts_at = starts_at.beginning_of_day if starts_at?
+        self.ends_at = ends_at.end_of_day if ends_at?
+      end
+
+      def siblings_by_date
+        siblings.reorder("starts_at ASC, pages.id DESC")
+      end
+    end
+  end
+end

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

@@ -1,21 +1,23 @@
-# 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") }
+        belongs_to_image :image, optional: true
+        belongs_to_image :meta_image, class_name: "Image", optional: true
+        has_many :page_images, -> { order("position") }, inverse_of: :page
         has_many(
           :images,
-          -> { where("`page_images`.`primary` = ?", false).order("position") },
+          -> { where(page_images: { primary: false }).order("position") },
           through: :page_images
         )
 
-        after_save :ensure_page_images_contains_primary_image
+        after_save :update_primary_image
+
+        accepts_nested_attributes_for :page_images,
+                                      reject_if: proc { |a| a["image_id"].blank? },
+                                      allow_destroy: true
       end
 
       def image?
@@ -36,14 +38,9 @@ module PagesCore
 
       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
+      def update_primary_image
+        new_id = page_images.find_by(primary: true)&.image_id
+        update(image_id: new_id) if new_id != image_id
       end
     end
   end

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

@@ -1,8 +1,7 @@
-# encoding: utf-8
-
 module PagesCore
   module PageModel
     module Localizable
+      include ActiveSupport::Inflector
       extend ActiveSupport::Concern
 
       included do
@@ -20,10 +19,18 @@ module PagesCore
           attribute :open_graph_description
 
           dictionary(lambda do
-            PagesCore::Templates::TemplateConfiguration.all_blocks
+            PagesCore::Templates::TemplateConfiguration.localized_blocks
           end)
         end
       end
+
+      def transliterated_name
+        prev_locale = I18n.locale
+        I18n.locale = locale.to_sym if locale
+        transliterated = transliterate(name)
+        I18n.locale = prev_locale
+        transliterated
+      end
     end
   end
 end

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   module PageModel
     module Pathable
@@ -28,9 +26,9 @@ module PagesCore
       def full_path?(last_segment = nil)
         last_segment ||= path_segment
         if parent
-          parent.full_path? && !last_segment.blank?
+          parent.full_path? && last_segment.present?
         else
-          !last_segment.blank?
+          last_segment.present?
         end
       end
 
@@ -61,11 +59,11 @@ module PagesCore
       end
 
       def generated_path_segment
-        name.gsub(/[^[[:alnum:]]\-_]+/, "-")
-            .gsub(/[\-]{2,}/, "-")
-            .gsub(/(^\-|\-$)/, "")
-            .mb_chars
-            .downcase
+        transliterated_name.gsub(/[^[[:alnum:]]\-_]+/, "-")
+                           .gsub(/[\-]{2,}/, "-")
+                           .gsub(/(^\-|\-$)/, "")
+                           .mb_chars
+                           .downcase
       end
 
       def page_path_matches_routes?(page_path)
@@ -78,7 +76,7 @@ module PagesCore
       def page_path_route?(route)
         route[:controller] == "pages" &&
           route[:action] == "show" &&
-          !route[:path].blank?
+          route[:path].present?
       end
 
       def path_collision?(path_segment)

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   module PageModel
     class InvalidRedirectUrl < StandardError; end

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   module PageModel
     module Sortable
@@ -20,7 +18,7 @@ module PagesCore
               ")"
           )
             .group("pages.id, localizations.id")
-            .reorder("COUNT(tags.id) DESC, position ASC")
+            .reorder(Arel.sql("COUNT(tags.id) DESC, position ASC"))
         end
       end