pages_core 3.6.2 → 3.7.0

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module PageModel
     class InvalidRedirectUrl < StandardError; end
@@ -8,7 +10,6 @@ module PagesCore
       included do
         validates(:redirect_to,
                   format: { with: %r{\A(/|https?://).+\z},
-                            allow_nil: true,
                             allow_blank: true })
       end
 
@@ -24,6 +25,7 @@ module PagesCore
             unless value.is_a?(String) || value.is_a?(Symbol)
               raise InvalidRedirectUrl, "must be a string or a symbol"
             end
+
             path.gsub!("/:#{key}", "/#{value}")
           end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module PageModel
     module Sortable
@@ -12,13 +14,12 @@ module PagesCore
         def order_by_tags(tags)
           joins(
             "LEFT JOIN taggings ON taggings.taggable_id = pages.id AND " \
-              "taggable_type = #{ActiveRecord::Base.connection.quote('Page')}",
-            "LEFT JOIN tags ON tags.id = taggings.tag_id AND tags.id IN (" +
-              tags.map(&:id).join(",") +
-              ")"
+            "taggings.tag_id IN (#{tags.map(&:id).join(',')}) AND " \
+            "taggings.taggable_type = " \
+            "#{ActiveRecord::Base.connection.quote('Page')}"
           )
             .group("pages.id, localizations.id")
-            .reorder(Arel.sql("COUNT(tags.id) DESC, position ASC"))
+            .reorder(Arel.sql("COUNT(taggings.id) DESC"))
         end
       end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module PageModel
     module Status

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module PageModel
     module Templateable
@@ -13,6 +15,7 @@ module PagesCore
 
       def template
         return self[:template] if self[:template].present?
+
         inherited_or_default_template
       end
 
@@ -29,15 +32,16 @@ module PagesCore
       def singularized_subtemplate
         singularized = ActiveSupport::Inflector.singularize(base_template)
         return if base_template == singularized
+
         find_template_by_expression(
-          Regexp.new("^" + Regexp.quote(singularized))
+          Regexp.new("^#{Regexp.quote(singularized)}")
         )
       end
 
       def subtemplate_with_postfix
         find_template_by_expression(
           Regexp.new(
-            "^" + Regexp.quote(base_template) + "_?(post|page|subpage|item)"
+            "^#{Regexp.quote(base_template)}_?(post|page|subpage|item)"
           )
         )
       end
@@ -69,6 +73,7 @@ module PagesCore
 
       def inherited_or_default_template
         return parent.default_subtemplate.to_s if parent
+
         (default_template_options[:root] || default_template || :index).to_s
       end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module PageModel
     module Tree
@@ -5,17 +7,17 @@ module PagesCore
 
       included do
         belongs_to :parent,
-                   class_name:  "Page",
+                   class_name: "Page",
                    foreign_key: :parent_page_id,
-                   inverse_of:  :children,
-                   optional:    true,
-                   touch:       true
+                   inverse_of: :children,
+                   optional: true,
+                   touch: true
 
         has_many :children,
-                 class_name:  "Page",
+                 class_name: "Page",
                  foreign_key: :parent_page_id,
-                 inverse_of:  :parent,
-                 dependent:   :destroy
+                 inverse_of: :parent,
+                 dependent: :destroy
 
         # This must be included after the belongs_to call in order
         # to override the .parent method.
@@ -26,19 +28,20 @@ module PagesCore
         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)
+            .order(admin_list_order).in_locale(locale)
+        end
+
+        def admin_list_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
+          )
         end
 
         # Returns all root pages
@@ -66,17 +69,20 @@ module PagesCore
         # Returns all children, recursively
         def all_subpages
           return nil unless subpages.any?
+
           localized_subpages.map { |p| [p, p.all_subpages] }.flatten.compact
         end
 
         def localized_subpages
           return subpages unless locale?
+
           subpages.localized(locale)
         end
 
         # Finds the page's next sibling. Returns nil if there isn't one.
         def next_sibling
           return unless siblings.any?
+
           siblings[(siblings.to_a.index(self) + 1)...siblings.length]
             .try(&:first)
         end
@@ -94,6 +100,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.to_a.index(self)].try(&:last)
         end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module Sweepable
     extend ActiveSupport::Concern
@@ -12,9 +14,9 @@ module PagesCore
     protected
 
     def sweep_cache!
-      return unless PagesCore::CacheSweeper.enabled
       return if cache_swept
-      PagesCore::SweepCacheJob.perform_later
+
+      PagesCore::StaticCache.handler.sweep!
       self.cache_swept = true
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module Taggable
     extend ActiveSupport::Concern
@@ -14,7 +16,7 @@ module PagesCore
       def tagged_with(*tags)
         all
           .includes(:tags)
-          .where("tags.name IN (?)", Tag.parse(tags))
+          .where(tags: { name: Tag.parse(tags) })
           .references(:tags)
       end
     end
@@ -41,7 +43,11 @@ module PagesCore
     end
 
     def tag_list
-      tags.order("name ASC").map(&:name).join(", ")
+      tag_names.join(", ")
+    end
+
+    def tag_names
+      tags.map(&:name).sort
     end
   end
 end

data/app/models/image.rb

@@ -1,7 +1,11 @@
-class Image < ActiveRecord::Base
+# frozen_string_literal: true
+
+class Image < ApplicationRecord
   include DynamicImage::Model
   include PagesCore::Sweepable
 
+  validate :ensure_max_size, on: :create
+
   localizable do
     attribute :alternative
     attribute :caption
@@ -21,4 +25,13 @@ class Image < ActiveRecord::Base
     ActiveSupport::Deprecation.warn "Image#byline= is deprecated, use #caption="
     self.caption = new_caption
   end
+
+  private
+
+  def ensure_max_size
+    return unless real_width? && real_height?
+    return if real_width * real_height <= 48_000_000
+
+    errors.add(:data, "is too large")
+  end
 end

data/app/models/invite.rb

@@ -1,4 +1,6 @@
-class Invite < ActiveRecord::Base
+# frozen_string_literal: true
+
+class Invite < ApplicationRecord
   include PagesCore::HasRoles
 
   belongs_to :user

data/app/models/invite_role.rb

@@ -1,9 +1,11 @@
-class InviteRole < ActiveRecord::Base
+# frozen_string_literal: true
+
+class InviteRole < ApplicationRecord
   belongs_to :invite
   validates :name,
-            presence:   true,
+            presence: true,
             uniqueness: { scope: :invite_id },
-            inclusion:  { in: proc { Role.roles.map(&:name) } }
+            inclusion: { in: proc { Role.roles.map(&:name) } }
 
   def to_s
     name.humanize

data/app/models/page.rb

@@ -1,4 +1,6 @@
-class Page < ActiveRecord::Base
+# frozen_string_literal: true
+
+class Page < ApplicationRecord
   include PagesCore::HumanizableParam
   include PagesCore::Sweepable
   include PagesCore::Taggable
@@ -26,9 +28,8 @@ class Page < ActiveRecord::Base
 
   validates(:unique_name,
             format: { with: /\A[\w\d_\-]+\z/,
-                      allow_nil: true,
                       allow_blank: true },
-            uniqueness: { allow_nil: true, allow_blank: true })
+            uniqueness: { allow_blank: true })
 
   validates :template, presence: true
   validates :published_at, presence: true

data/app/models/page_builder.rb

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

data/app/models/page_category.rb

@@ -1,4 +1,6 @@
-class PageCategory < ActiveRecord::Base
+# frozen_string_literal: true
+
+class PageCategory < ApplicationRecord
   belongs_to :page
   belongs_to :category
   validates :page_id, :category_id, presence: true

data/app/models/page_exporter.rb

@@ -1,21 +1,27 @@
+# frozen_string_literal: true
+
 require "fileutils"
 
 class PageExporter
-  attr_reader :base_dir
+  attr_reader :base_dir, :progress_bar
 
-  def initialize(base_dir)
+  def initialize(base_dir, progress_bar: false)
     @base_dir = base_dir
+    @progress_bar = progress_bar
   end
 
   def export
     Page.roots.in_locale(I18n.default_locale).each { |p| export_page(p) }
-    puts
   end
 
   private
 
+  def bar
+    @bar ||= ProgressBar.new(Page.count)
+  end
+
   def export_page(page)
-    print "."
+    bar.increment! if progress_bar
     export_page_contents(page)
     export_images(page)
     export_files(page)
@@ -44,15 +50,22 @@ class PageExporter
 
   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)
+    localized_pages(page).each do |p|
+      export_page_json(path, page)
       write_file(path.join("page.#{p.locale}.txt"), text_page(p))
     end
   end
 
+  def export_page_json(path, page)
+    json = PageExportSerializer.new(page).to_json
+    write_file(path.join("page.#{page.locale}.json"), json)
+    write_file(path.join("page.#{page.locale}.yml"), JSON.parse(json).to_yaml)
+  end
+
+  def localized_pages(page)
+    page.locales.map { |l| page.localize(l) }
+  end
+
   def page_path(page)
     base_dir.join(page.self_and_ancestors
                       .reverse

data/app/models/page_file.rb

@@ -1,4 +1,6 @@
-class PageFile < ActiveRecord::Base
+# frozen_string_literal: true
+
+class PageFile < ApplicationRecord
   include PagesCore::Sweepable
 
   belongs_to :page

data/app/models/page_image.rb

@@ -1,4 +1,6 @@
-class PageImage < ActiveRecord::Base
+# frozen_string_literal: true
+
+class PageImage < ApplicationRecord
   include PagesCore::Sweepable
 
   belongs_to :page

data/app/models/page_path.rb

@@ -1,6 +1,10 @@
-class PagePath < ActiveRecord::Base
+# frozen_string_literal: true
+
+class PagePath < ApplicationRecord
   class PageNotSavedError < StandardError; end
+
   class NoPathError < StandardError; end
+
   class NoLocaleError < StandardError; end
 
   belongs_to :page
@@ -33,12 +37,16 @@ class PagePath < ActiveRecord::Base
       raise PageNotSavedError unless page.id?
       raise NoLocaleError unless locale
       raise NoPathError unless path
-      existing = get(locale, path)
 
-      return create(locale: locale, path: path, page: page) unless existing
+      page_path = get_or_create(locale, path, page)
+      page_path.update(page: page) unless page_path.page_id == page.id
+      page_path
+    end
+
+    private
 
-      existing.update(page: page) unless existing.page_id == page.id
-      existing
+    def get_or_create(locale, path, page)
+      get(locale, path) || create(locale: locale, path: path, page: page)
     end
   end
 end

data/app/models/password_reset_token.rb

@@ -1,4 +1,6 @@
-class PasswordResetToken < ActiveRecord::Base
+# frozen_string_literal: true
+
+class PasswordResetToken < ApplicationRecord
   belongs_to :user
   before_create :ensure_token
   before_create :ensure_expiration

data/app/models/role.rb

@@ -1,12 +1,14 @@
-class Role < ActiveRecord::Base
+# frozen_string_literal: true
+
+class Role < ApplicationRecord
   belongs_to :user, touch: true
   validates :name,
-            presence:   true,
+            presence: true,
             uniqueness: { scope: :user_id },
-            inclusion:  { in: proc { Role.roles.map(&:name) } }
+            inclusion: { in: proc { Role.roles.map(&:name) } }
 
   class << self
-    def define(name, description, default = false)
+    def define(name, description, default: false)
       if roles.map(&:name).include?(name.to_s)
         raise ArgumentError, "Tried to define role :#{role}, " \
           "but a role by that name already exists"
@@ -30,11 +32,12 @@ class Role < ActiveRecord::Base
     protected
 
     def config_file
-      Rails.root.join("config", "roles.yml")
+      Rails.root.join("config/roles.yml")
     end
 
     def config_roles
       return [] unless File.exist?(config_file)
+
       YAML.load_file(config_file).map do |key, opts|
         OpenStruct.new(name: key.to_s,
                        description: opts["description"],