pages_core 3.5.1 → 3.6.0

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   module PageModel
     module Status
@@ -27,7 +25,7 @@ module PagesCore
       end
 
       def draft?
-        status == 0
+        status.zero?
       end
 
       def reviewed?

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   module PageModel
     module Templateable
@@ -14,7 +12,7 @@ module PagesCore
       end
 
       def template
-        return self[:template] unless self[:template].blank?
+        return self[:template] if self[:template].present?
         inherited_or_default_template
       end
 
@@ -46,7 +44,7 @@ module PagesCore
 
       def base_template
         template.split(/_/)
-                .reject { |w| %w(index list archive liste arkiv).include?(w) }
+                .reject { |w| %w[index list archive liste arkiv].include?(w) }
                 .join(" ")
       end
 

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   module PageModel
     module Tree
@@ -9,7 +7,9 @@ module PagesCore
         belongs_to :parent,
                    class_name:  "Page",
                    foreign_key: :parent_page_id,
-                   inverse_of:  :children
+                   inverse_of:  :children,
+                   optional:    true,
+                   touch:       true
 
         has_many :children,
                  class_name:  "Page",
@@ -23,6 +23,24 @@ module PagesCore
       end
 
       module ClassMethods
+        def admin_list(locale)
+          left_outer_joins(:parent)
+            .where("pages.status < 4")
+            .order(
+              Arel.sql(
+                <<-QUERY
+                pages.parent_page_id,
+                parents_pages.news_page,
+                case when parents_pages.news_page
+                  then pages.pinned end desc,
+                case when parents_pages.news_page
+                  then pages.published_at end desc,
+                position asc
+                QUERY
+              )
+            ).in_locale(locale)
+        end
+
         # Returns all root pages
         def roots
           where(parent_page_id: nil).order("position ASC")
@@ -59,7 +77,8 @@ module PagesCore
         # Finds the page's next sibling. Returns nil if there isn't one.
         def next_sibling
           return unless siblings.any?
-          siblings[(siblings.index(self) + 1)...siblings.length].try(&:first)
+          siblings[(siblings.to_a.index(self) + 1)...siblings.length]
+            .try(&:first)
         end
 
         # Returns the pages parent
@@ -75,7 +94,7 @@ module PagesCore
         # Finds the page's next sibling. Returns nil if there isn't one.
         def previous_sibling
           return unless siblings.any?
-          siblings[0...siblings.index(self)].try(&:last)
+          siblings[0...siblings.to_a.index(self)].try(&:last)
         end
 
         # Returns the root node of the tree.

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   module Sweepable
     extend ActiveSupport::Concern

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

@@ -1,11 +1,12 @@
-# encoding: utf-8
-
 module PagesCore
   module Taggable
     extend ActiveSupport::Concern
 
     included do
-      has_many :taggings, as: :taggable, dependent: :destroy
+      has_many :taggings,
+               as: :taggable,
+               dependent: :destroy,
+               inverse_of: :taggable
       has_many :tags, through: :taggings
     end
 

data/app/models/image.rb

@@ -1,5 +1,6 @@
 class Image < ActiveRecord::Base
   include DynamicImage::Model
+  include PagesCore::Sweepable
 
   localizable do
     attribute :alternative

data/app/models/invite.rb

@@ -15,16 +15,6 @@ class Invite < ActiveRecord::Base
 
   validates :token, presence: true
 
-  def create_user(attributes)
-    user = User.create(attributes.merge(
-                         role_names: role_names,
-                         creator: self.user,
-                         activated: true
-    ))
-    destroy if user.valid?
-    user
-  end
-
   private
 
   def ensure_token

data/app/models/page.rb

@@ -1,32 +1,29 @@
-# encoding: utf-8
-
 class Page < ActiveRecord::Base
   include PagesCore::HumanizableParam
   include PagesCore::Sweepable
   include PagesCore::Taggable
 
+  include PagesCore::PageModel::Attachments
   include PagesCore::PageModel::Autopublishable
-  include PagesCore::PageModel::Commentable
+  include PagesCore::PageModel::DatedPage
   include PagesCore::PageModel::Images
   include PagesCore::PageModel::Localizable
   include PagesCore::PageModel::Pathable
   include PagesCore::PageModel::Redirectable
-  include PagesCore::PageModel::Searchable
   include PagesCore::PageModel::Sortable
   include PagesCore::PageModel::Status
   include PagesCore::PageModel::Tree
   include PagesCore::PageModel::Templateable
 
-  belongs_to :author, class_name: "User", foreign_key: :user_id
+  belongs_to :author,
+             class_name: "User",
+             foreign_key: :user_id,
+             optional: true,
+             inverse_of: :pages
 
   has_many :page_categories, dependent: :destroy
   has_many :categories, through: :page_categories
 
-  has_many :page_files,
-           -> { order("position ASC") },
-           class_name: "PageFile",
-           dependent: :destroy
-
   validates(:unique_name,
             format: { with: /\A[\w\d_\-]+\z/,
                       allow_nil: true,
@@ -38,11 +35,14 @@ class Page < ActiveRecord::Base
 
   before_validation :published_at
 
-  scope :by_date,    -> { order("published_at DESC") }
-  scope :published,  -> { where(status: 2, autopublish: false) }
-  scope :visible,    -> { where("status < 4") }
-  scope :news_pages, -> { visible.where(news_page: true) }
-  scope :pinned,     -> { where(pinned: true) }
+  scope :by_date,       -> { order("published_at DESC") }
+  scope :by_updated_at, -> { order("updated_at DESC") }
+  scope :published,     -> { where(status: 2, autopublish: false) }
+  scope :hidden,        -> { where(status: 3) }
+  scope :deleted,       -> { where(status: 4) }
+  scope :visible,       -> { where("status < 4") }
+  scope :news_pages,    -> { visible.where(news_page: true) }
+  scope :pinned,        -> { where(pinned: true) }
 
   class << self
     def archive_finder
@@ -51,7 +51,7 @@ class Page < ActiveRecord::Base
 
     # Find all published and feed enabled pages
     def enabled_feeds(locale, options = {})
-      conditions = (options[:include_hidden]) ? "status IN (2,3)" : "status = 2"
+      conditions = options[:include_hidden] ? "status IN (2,3)" : "status = 2"
       Page.where(feed_enabled: true).where(conditions).localized(locale)
     end
   end
@@ -69,10 +69,6 @@ class Page < ActiveRecord::Base
     excerpt? && body?
   end
 
-  def files
-    page_files.in_locale(locale)
-  end
-
   def headline_or_name
     headline? ? headline : name
   end
@@ -94,6 +90,6 @@ class Page < ActiveRecord::Base
   end
 
   def to_param
-    humanized_param(name)
+    humanized_param(transliterated_name)
   end
 end

data/app/models/page_builder.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # # PageBuilder
 #
 # PageBuilder is a simple DSL for building pages, for use in ie. seeds.rb

data/app/models/page_category.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class PageCategory < ActiveRecord::Base
   belongs_to :page
   belongs_to :category

data/app/models/page_exporter.rb

@@ -0,0 +1,87 @@
+require "fileutils"
+
+class PageExporter
+  attr_reader :base_dir
+
+  def initialize(base_dir)
+    @base_dir = base_dir
+  end
+
+  def export
+    Page.roots.in_locale(I18n.default_locale).each { |p| export_page(p) }
+    puts
+  end
+
+  private
+
+  def export_page(page)
+    print "."
+    export_page_contents(page)
+    export_images(page)
+    export_files(page)
+    page.subpages.in_locale(I18n.default_locale).each { |p| export_page(p) }
+  end
+
+  def export_files(page)
+    path = page_path(page).join("files")
+    page.attachments.each do |file|
+      write_file(
+        path.join([file.content_hash, file.filename].join("-")),
+        file.data
+      )
+    end
+  end
+
+  def export_images(page)
+    path = page_path(page).join("images")
+    page.page_images.each do |pi|
+      write_file(
+        path.join([pi.image.content_hash, pi.image.filename].join("-")),
+        pi.image.data
+      )
+    end
+  end
+
+  def export_page_contents(page)
+    path = page_path(page)
+    page.locales.map { |l| page.localize(l) }.each do |p|
+      json = PageExportSerializer.new(p).to_json
+      basename = path.join("#{page_file_name(p)}.#{p.locale}")
+      write_file(path.join("page.#{p.locale}.json"), json)
+      write_file(path.join("page.#{p.locale}.yml"), JSON.parse(json).to_yaml)
+      write_file(path.join("page.#{p.locale}.txt"), text_page(p))
+    end
+  end
+
+  def page_path(page)
+    base_dir.join(page.self_and_ancestors
+                      .reverse
+                      .map { |p| page_path_segment(p) }.join("/pages/"))
+  end
+
+  def page_file_name(page)
+    [page.path_segment,
+     page.to_param[0..250]].reject(&:blank?).first
+  end
+
+  def page_path_segment(page)
+    prefix = page.deleted? ? "_deleted/" : ""
+    if page&.parent&.news_page?
+      prefix += "[#{page.published_at.to_date.iso8601}] "
+    end
+    prefix + page_file_name(page)
+  end
+
+  def text_page(page)
+    PagesCore::Templates::TemplateConfiguration
+      .all_blocks
+      .select { |attr| page.send("#{attr}?".to_sym) }
+      .map { |attr| ["-- #{attr}: --", page.send(attr).strip].join("\n\n") }
+      .join("\n\n\n")
+  end
+
+  def write_file(path, data)
+    FileUtils.mkdir_p(File.dirname(path))
+    File.open(path, "wb") { |fh| fh.write(data) }
+  end
+end

data/app/models/page_file.rb

@@ -1,72 +1,48 @@
-# encoding: utf-8
-
 class PageFile < ActiveRecord::Base
-  include Dis::Model
+  include PagesCore::Sweepable
 
   belongs_to :page
-
-  validates_data_presence
-  validates :content_type, presence: true
-  validates :filename, presence: true
-  validates :content_length, presence: true
+  belongs_to :attachment
 
   acts_as_list scope: :page
 
-  localizable do
-    attribute :description
-  end
+  accepts_nested_attributes_for :attachment
 
-  before_validation :set_name_from_filename
+  localizable
 
-  after_save ThinkingSphinx::RealTime.callback_for(:page_file)
+  delegate :published, to: :page
 
-  class << self
-    def formats
-      {
-        "audio/mpeg"      => :mp3,
-        "image/gif"       => :gif,
-        "image/jpeg"      => :jpg,
-        "image/jpg"       => :jpg,
-        "image/pjpeg"     => :jpg,
-        "image/png"       => :png,
-        "application/pdf" => :pdf
-      }
-    end
+  def attachment
+    super&.localize!(locale)
   end
 
-  def format?
-    content_type && self.class.formats.keys.include?(content_type)
+  def name
+    attachment&.name
   end
 
-  def format
-    self.class.formats[content_type]
+  def description
+    attachment&.description
   end
 
-  def filename_extension
-    if filename_extension?
-      filename.match(/\.([^\.]+)$/)[1]
-    else
-      ""
-    end
+  def filename
+    attachment&.filename
   end
 
-  def filename_extension?
-    filename =~ /\./
+  def format?
+    attachment&.format?
   end
 
-  def to_param
-    if filename_extension?
-      "#{id}-#{content_hash}.#{filename_extension}"
-    else
-      "#{id}-#{content_hash}"
-    end
+  def format
+    attachment&.format
   end
 
-  delegate :published, to: :page
-
-  private
+  def to_param
+    return id unless attachment
 
-  def set_name_from_filename
-    self.name = File.basename(filename, ".*") if filename? && !name?
+    if attachment.filename_extension?
+      "#{id}-#{attachment.content_hash}.#{attachment.filename_extension}"
+    else
+      "#{id}-#{attachment.content_hash}"
+    end
   end
 end

data/app/models/page_image.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
-
 class PageImage < ActiveRecord::Base
+  include PagesCore::Sweepable
+
   belongs_to :page
   belongs_to_image :image
 
@@ -9,39 +9,10 @@ class PageImage < ActiveRecord::Base
   accepts_nested_attributes_for :image
   validates_associated :image
 
-  acts_as_list scope: [:page, :primary]
+  acts_as_list scope: %i[page primary]
 
   localizable
 
-  validate do |page_image|
-    if page_image.page && page_image.page.page_images.count < 1
-      page_image.primary = true
-    end
-  end
-
-  after_save do |page_image|
-    if page_image.primary_changed?
-      # Make sure only one PageImage can be the primary,
-      # then update image_id on the page.
-      if page_image.primary?
-        PageImage.where
-        page_image.page
-                  .page_images
-                  .where("id != ?", page_image.id)
-                  .update_all(primary: false)
-        page_image.page.update(image_id: page_image.image_id)
-
-      # Clear image_id on the page if primary is toggled off
-      else
-        page_image.page.update(image_id: nil)
-      end
-    end
-  end
-
-  after_destroy do |page_image|
-    page_image.page.update(image_id: nil) if page_image.primary?
-  end
-
   class << self
     def cleanup!
       all.find_each do |page_image|
@@ -53,9 +24,4 @@ class PageImage < ActiveRecord::Base
   def image
     super.localize!(locale)
   end
-
-  def to_json(options = {})
-    options = { include: [:image] }.merge(options)
-    super(options)
-  end
 end