pages_core 3.6.2 → 3.7.0

data/app/models/tag.rb

@@ -1,4 +1,6 @@
-class Tag < ActiveRecord::Base
+# frozen_string_literal: true
+
+class Tag < ApplicationRecord
   include PagesCore::HumanizableParam
   has_many :taggings, dependent: :destroy
 
@@ -11,6 +13,7 @@ class Tag < ActiveRecord::Base
       tags = (taggable.tags.sorted + pinned.sorted).uniq
 
       return tags unless tags.count < limit
+
       tags + suggestions(taggable, tags, limit)[0...(limit - tags.length)]
     end
 
@@ -26,14 +29,13 @@ class Tag < ActiveRecord::Base
 
     def suggestions(taggable, tags, limit)
       suggestions = taggable_suggestions(taggable, limit).to_a
-      if suggestions.length < limit
-        suggestions += all_suggestions(limit)
-      end
-      suggestions.reject { |t| tags.include?(t) }.uniq[0...(limit)]
+      suggestions += all_suggestions(limit) if suggestions.length < limit
+      suggestions.reject { |t| tags.include?(t) }.uniq[0...limit]
     end
 
     def taggable_suggestions(taggable, limit)
-      all_suggestions(limit).where("taggings.taggable_type = ?", taggable.class)
+      all_suggestions(limit)
+        .where(taggings: { taggable_type: taggable.class.to_s })
     end
 
     def all_suggestions(limit)

data/app/models/tagging.rb

@@ -1,6 +1,8 @@
-class Tagging < ActiveRecord::Base
+# frozen_string_literal: true
+
+class Tagging < ApplicationRecord
   belongs_to :tag
-  belongs_to :taggable, polymorphic: true
+  belongs_to :taggable, polymorphic: true, touch: true
 
   validates :taggable_id, presence: true
   validates :taggable_type, presence: true

data/app/models/user.rb

@@ -1,4 +1,6 @@
-class User < ActiveRecord::Base
+# frozen_string_literal: true
+
+class User < ApplicationRecord
   include PagesCore::HasRoles
 
   attr_accessor :password, :confirm_password
@@ -21,9 +23,7 @@ class User < ActiveRecord::Base
 
   serialize :persistent_data
 
-  validates :username,
-            presence: true,
-            uniqueness: { case_sensitive: false }
+  validates :username, presence: true, uniqueness: { case_sensitive: false }
 
   validates :name, presence: true
 
@@ -63,6 +63,7 @@ class User < ActiveRecord::Base
 
   def authenticate!(password)
     return false unless can_login? && valid_password?(password)
+
     rehash_password!(password) if password_needs_rehash?
     true
   end
@@ -73,6 +74,7 @@ class User < ActiveRecord::Base
 
   def mark_active!
     return if last_login_at && last_login_at > 10.minutes.ago
+
     update(last_login_at: Time.now.utc)
   end
 
@@ -92,6 +94,7 @@ class User < ActiveRecord::Base
 
   def confirm_password_must_match
     return if password.blank? || password == confirm_password
+
     errors.add(:confirm_password, "does not match")
   end
 

data/app/policies/invite_policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class InvitePolicy < Policy
   def index?
     true

data/app/policies/page_file_policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PageFilePolicy < Policy
   def index?
     true

data/app/policies/page_image_policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PageImagePolicy < Policy
   def index?
     true

data/app/policies/page_policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PagePolicy < Policy
   def index?
     true

data/app/policies/policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Policy
   module DefaultPolicy
     def index

data/app/policies/user_policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class UserPolicy < Policy
   def index?
     true

data/app/serializers/admin/attachment_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class AttachmentSerializer < ActiveModel::Serializer
     include Rails.application.routes.url_helpers
@@ -21,8 +23,8 @@ module Admin
     private
 
     def localized_attribute(attr)
-      object.locales.each_with_object({}) do |locale, hash|
-        hash[locale] = object.localize(locale).send(attr)
+      object.locales.index_with do |locale|
+        object.localize(locale).send(attr)
       end
     end
   end

data/app/serializers/admin/image_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class ImageSerializer < ActiveModel::Serializer
     include Rails.application.routes.url_helpers
@@ -49,8 +51,8 @@ module Admin
     private
 
     def localized_attribute(attr)
-      object.locales.each_with_object({}) do |locale, hash|
-        hash[locale] = object.localize(locale).send(attr)
+      object.locales.index_with do |locale|
+        object.localize(locale).send(attr)
       end
     end
   end

data/app/serializers/admin/page_file_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class PageFileSerializer < ActiveModel::Serializer
     attributes :id, :page_id, :attachment_id, :position

data/app/serializers/admin/page_image_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class PageImageSerializer < ActiveModel::Serializer
     attributes :id, :page_id, :image_id, :position, :primary

data/app/serializers/page_export_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PageExportSerializer < ActiveModel::Serializer
   attributes :id, :path, :locale, :author_name, :status
   attributes(*PagesCore::Templates::TemplateConfiguration.all_blocks)

data/app/serializers/page_file_export_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PageFileExportSerializer < ActiveModel::Serializer
   attributes :id, :filename, :name, :description, :content_hash, :content_type,
              :position, :created_at

data/app/serializers/page_image_export_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PageImageExportSerializer < ActiveModel::Serializer
   attributes :id, :primary, :content_hash, :content_type, :filename,
              :alternative, :caption, :created_at

data/app/serializers/page_image_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PageImageSerializer < ActiveModel::Serializer
   include Rails.application.routes.url_helpers
   include DynamicImage::Helper

data/app/serializers/page_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PageSerializer < ActiveModel::Serializer
   attributes :id, :param, :parent_page_id, :locale
   attributes(*PagesCore::Templates::TemplateConfiguration.all_blocks)

data/app/services/pages_core/create_user_service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   class CreateUserService
     attr_reader :attributes, :invite
@@ -8,8 +10,8 @@ module PagesCore
     end
 
     class << self
-      def call(*attrs)
-        new(*attrs).call
+      def call(attrs, invite: nil)
+        new(attrs, invite: invite).call
       end
     end
 
@@ -28,6 +30,7 @@ module PagesCore
 
     def invite_attributes
       return {} unless invite
+
       { role_names: invite.role_names,
         creator: invite.user,
         activated: true }

data/app/services/pages_core/destroy_invite_service.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module PagesCore
+  class DestroyInviteService
+    attr_reader :invite
+
+    def initialize(invite:)
+      @invite = invite
+    end
+
+    class << self
+      def call(*attrs)
+        new(*attrs).call
+      end
+    end
+
+    def call
+      Invite.transaction do
+        invite.destroy
+        PagesCore::PubSub.publish(:destroy_invite, invite: invite)
+        invite
+      end
+    end
+  end
+end

data/app/services/pages_core/invite_service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   class InviteService
     include Rails.application.routes.url_helpers

data/app/views/admin/images/show.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.extract!(
   @image, :id, :filename, :content_type, :content_hash,
   :content_length, :colorspace, :real_width, :real_height, :crop_width,

data/app/views/admin/pages/news.html.erb

@@ -59,7 +59,7 @@
   </div>
 <% end %>
 
-<% if @pages.any? %>
+<% if @pages.length > 0 %>
   <table class="list news-item-list">
     <tr>
       <th>Name</th>

data/app/views/errors/500.html.erb

@@ -1,24 +1,6 @@
 <%
-  @page_title = "Oh dear..."
+  @page_title = "500 Internal Server Error"
 %>
 <p>
-  Something went terribly wrong. Of course, this shouldn't happen, and
-  we'd really appreciate it if you could click the button below to
-  notify us about the problem.
+  We're experiencing an internal server problem. Please try again later.
 </p>
-<p>
-  Please include your email address if you'd like to hear back from us.
-</p>
-
-<%= form_tag report_errors_path, method: 'post' do %>
-  <%= hidden_field_tag :error_report, @report %>
-  <p>
-    <input name="email" type="text" class="text" value="<%= @email %>"
-           placeholder="Your email (optional)" />
-  </p>
-  <p>
-    <button type="submit" class="clean-gray">
-      Report error
-    </button>
-  </p>
-<% end %>

data/app/views/errors/_generic_help.html.erb

@@ -6,7 +6,7 @@
   <li>Try searching this site using <%= link_to "Google", "http://www.google.com/" %> for the information you want:</li>
 </ul>
 
-<form action="http://www.google.com/search" method="get" onSubmit="googleSearch( this );">
+<form action="https://www.google.com/search" method="get" onSubmit="googleSearch( this );">
   <input name="q" type="hidden" />
   <input name="qinput" type="text" class="text with_button" />
   <button type="submit" class="clean-gray">Search</button>

data/app/views/feeds/pages.rss.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
   xml.channel do

data/app/views/sitemaps/show.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml.instruct!
 xml.urlset xmlns: "http://www.sitemaps.org/schemas/sitemap/0.9" do |urlset|
   @entries.each do |entry|

data/config/routes.rb

@@ -1,4 +1,8 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
+  Healthcheck.routes(self)
+
   image_resources :images, path: "dynamic_images/:digest(/:size)"
 
   # Attachment
@@ -97,11 +101,7 @@ Rails.application.routes.draw do
       as: "admin_default")
 
   # Errors
-  resources :errors do
-    collection do
-      post "report"
-    end
-  end
+  resources :errors
 
   # Page path routing
   get ":locale/*path/page/:page" => "pages#show",

data/db/migrate/20111219033112_create_pages_tables.rb

@@ -1,275 +1,196 @@
-class CreatePagesTables < ActiveRecord::Migration[4.2]
-  def change
-    create_table "accounts" do |t|
-      t.string "name"
-      t.string "plan"
-      t.string "key"
-      t.text "billing_address"
-      t.integer "account_holder_id"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.datetime "last_billed_at"
-      t.boolean "is_activated", default: true, null: false
-      t.string "domain"
-    end
-
-    create_table "binaries" do |t|
-      t.string "sha1_hash"
-    end
-
-    create_table "categories" do |t|
-      t.string "name"
-      t.string "slug"
-      t.integer "position"
-      t.datetime "created_at", null: false
-      t.datetime "updated_at", null: false
-    end
-
-    add_index "categories", ["slug"]
-
-    create_table "delayed_jobs" do |t|
-      t.integer "priority",   default: 0
-      t.integer "attempts",   default: 0
-      t.text "handler"
-      t.string "last_error"
-      t.datetime "run_at"
-      t.datetime "locked_at"
-      t.datetime "failed_at"
-      t.string "locked_by"
-      t.datetime "created_at", null: false
-      t.datetime "updated_at", null: false
-    end
-
-    create_table "feed_items" do |t|
-      t.integer "feed_id"
-      t.string "guid"
-      t.string "title"
-      t.string "link"
-      t.text "description"
-      t.datetime "pubdate"
-      t.string "author"
-    end
-
-    add_index "feed_items", ["feed_id"]
-
-    create_table "feeds" do |t|
-      t.string "url"
-      t.string "link"
-      t.string "title"
-      t.text "description"
-      t.datetime "refreshed_at"
-    end
-
-    add_index "feeds", ["url"]
-
-    create_table "images" do |t|
-      t.string "name"
-      t.string "byline"
-      t.text "description"
-      t.string "filename"
-      t.string "content_type"
-      t.integer "folder"
-      t.integer "user_id"
-      t.datetime "created_at"
-      t.text "filters"
-      t.string "original_size"
-      t.string "hotspot"
-      t.integer "binary_id"
-      t.string "url"
-      t.boolean "cropped", default: false, null: false
-      t.string "crop_start"
-      t.string "crop_size"
-      t.integer "original_binary_id"
-      t.datetime "updated_at"
-    end
-
-    create_table "images_imagesets" do |t|
-      t.integer "relation_id"
-      t.integer "imageset_id"
-      t.integer "image_id"
-      t.integer "position"
-    end
-
-    create_table "imagesets" do |t|
-      t.string "name"
-      t.text "description"
-      t.datetime "created_at"
-      t.integer "user_id"
-    end
-
-    create_table "mail_subscribers" do |t|
-      t.string "email"
-      t.datetime "created_at"
-      t.string "group", default: "Default"
-    end
-
-    create_table "mailings" do |t|
-      t.string "recipients"
-      t.string "sender"
-      t.string "subject"
-      t.text "body"
-      t.datetime "created_at"
-      t.boolean "failed", default: false
-      t.string "content_type"
-      t.boolean "in_progress", default: false, null: false
-    end
-
-    create_table "mailouts" do |t|
-      t.string "subject"
-      t.string "sender"
-      t.string "template"
-      t.text "body"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.integer "image_id"
-      t.text "groups"
-      t.string "host"
-    end
-
-    create_table "page_comments" do |t|
-      t.integer "page_id"
-      t.string "remote_ip"
-      t.string "name"
-      t.string "email"
-      t.string "url"
-      t.text "body"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-    end
-
-    create_table "page_files" do |t|
-      t.integer "page_id"
-      t.integer "position"
-      t.string "name"
-      t.string "filename"
-      t.string "content_type"
-      t.integer "filesize"
-      t.integer "binary_id"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-    end
-
-    create_table "page_images" do |t|
-      t.integer "page_id"
-      t.integer "image_id"
-      t.integer "position"
-      t.boolean "primary", default: false, null: false
-    end
-
-    add_index "page_images", %w[page_id primary]
-    add_index "page_images", ["page_id"]
-
-    create_table "pages" do |t|
-      t.integer "parent_page_id"
-      t.integer "position"
-      t.string "byline"
-      t.string "template"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.integer "user_id"
-      t.integer "status", default: 0, null: false
-      t.string "content_order"
-      t.boolean "feed_enabled", default: false, null: false
-      t.datetime "published_at"
-      t.text "redirect_to"
-      t.integer "image_id"
-      t.boolean "comments_allowed", default: true, null: false
-      t.string "image_link"
-      t.boolean "news_page", default: false, null: false
-      t.boolean "autopublish", default: false, null: false
-      t.string "unique_name"
-      t.integer "comments_count", default: 0, null: false
-      t.datetime "last_comment_at"
-      t.boolean "pinned", default: false, null: false
-    end
-
-    add_index "pages", ["parent_page_id"]
-    add_index "pages", ["position"]
-    add_index "pages", %w[status parent_page_id position]
-    add_index "pages", ["status"]
-    add_index "pages", ["user_id"]
-
-    create_table "pages_categories", id: false do |t|
-      t.integer "page_id"
-      t.integer "category_id"
-    end
-
-    add_index "pages_categories", ["category_id"]
-    add_index "pages_categories", ["page_id"]
-
-    create_table "partials" do |t|
-      t.string "name"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-    end
+# frozen_string_literal: true
 
-    create_table "sessions" do |t|
-      t.string "session_id"
-      t.text "data"
-      t.datetime "updated_at"
-    end
-
-    add_index "sessions", ["session_id"]
-    add_index "sessions", ["updated_at"]
-
-    create_table "sms_subscribers" do |t|
-      t.string "msisdn"
-      t.string "group", default: "Default"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-    end
-
-    create_table "taggings" do |t|
-      t.integer "tag_id"
-      t.integer "taggable_id"
-      t.string "taggable_type"
-    end
-
-    add_index "taggings", ["tag_id"]
-    add_index "taggings", %w[taggable_type taggable_id]
-
-    create_table "tags" do |t|
-      t.string "name"
-    end
-
-    add_index "tags", ["name"]
-
-    create_table "textbits" do |t|
-      t.integer "textable_id"
-      t.string "textable_type"
-      t.string "name"
-      t.string "language"
-      t.string "filter"
-      t.text "body"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.index(%w[textable_id textable_type name language],
-              unique: true,
-              name: "index_textbits_on_locale")
-      t.index %w[textable_id textable_type]
-    end
-
-    create_table "users" do |t|
-      t.string "username"
-      t.string "hashed_password"
-      t.string "realname"
-      t.string "email"
-      t.datetime "last_login_at"
-      t.integer "created_by"
-      t.datetime "created_at"
-      t.boolean "is_admin"
-      t.text "persistent_data"
-      t.boolean "sms_sender"
-      t.boolean "is_activated", default: false, null: false
-      t.boolean "is_deleted", default: false, null: false
-      t.string "token"
-      t.date "born_on"
-      t.string "mobile"
-      t.string "web_link"
-      t.integer "image_id"
-      t.boolean "is_reviewer", default: false, null: false
-      t.boolean "is_super_admin", default: false, null: false
-      t.string "openid_url"
+class CreatePagesTables < ActiveRecord::Migration[5.0]
+  def change
+    create_table :attachments do |t|
+      t.string :filename, null: false
+      t.string :content_type, null: false
+      t.integer :content_length, null: false
+      t.datetime :created_at
+      t.datetime :updated_at
+      t.string :content_hash, null: false
+      t.integer :user_id
+    end
+
+    create_table :categories do |t|
+      t.string :name
+      t.string :slug
+      t.integer :position
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.index :slug
+    end
+
+    create_table :delayed_jobs do |t|
+      t.integer :priority, default: 0
+      t.integer :attempts, default: 0
+      t.text :handler
+      t.text :last_error
+      t.datetime :run_at
+      t.datetime :locked_at
+      t.datetime :failed_at
+      t.string :locked_by
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.string :queue
+    end
+
+    create_table :images do |t|
+      t.string :filename, null: false
+      t.string :content_type, null: false
+      t.datetime :created_at
+      t.datetime :updated_at
+      t.string :content_hash, null: false
+      t.integer :content_length, null: false
+      t.string :colorspace, null: false
+      t.integer :real_width, null: false
+      t.integer :real_height, null: false
+      t.integer :crop_width
+      t.integer :crop_height
+      t.integer :crop_start_x
+      t.integer :crop_start_y
+      t.integer :crop_gravity_x
+      t.integer :crop_gravity_y
+    end
+
+    create_table :invite_roles do |t|
+      t.integer :invite_id
+      t.string :name
+      t.datetime :created_at
+      t.datetime :updated_at
+    end
+
+    create_table :invites do |t|
+      t.integer :user_id
+      t.string :email
+      t.string :token
+      t.datetime :sent_at
+      t.datetime :created_at
+      t.datetime :updated_at
+    end
+
+    create_table :localizations do |t|
+      t.integer :localizable_id
+      t.string :localizable_type
+      t.string :name
+      t.string :locale
+      t.text :value
+      t.datetime :created_at
+      t.datetime :updated_at
+      t.index %i[localizable_id localizable_type name locale],
+              name: :index_textbits_on_locale,
+              unique: true
+      t.index %i[localizable_id localizable_type]
+    end
+
+    create_table :page_categories do |t|
+      t.integer :page_id
+      t.integer :category_id
+      t.index :category_id
+      t.index :page_id
+    end
+
+    create_table :page_files, force: :cascade do |t|
+      t.bigint :page_id
+      t.bigint :attachment_id
+      t.integer :position
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.index :attachment_id
+      t.index :page_id
+    end
+
+    create_table :page_images do |t|
+      t.integer :page_id
+      t.integer :image_id
+      t.integer :position
+      t.boolean :primary, default: false, null: false
+      t.index %i[page_id primary]
+      t.index :page_id
+    end
+
+    create_table :page_paths do |t|
+      t.integer :page_id
+      t.string :locale
+      t.string :path
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.index %i[locale path], unique: true
+    end
+
+    create_table :pages do |t|
+      t.integer :parent_page_id
+      t.integer :position
+      t.string :byline
+      t.string :template
+      t.datetime :created_at
+      t.datetime :updated_at
+      t.integer :user_id
+      t.integer :status, default: 0, null: false
+      t.boolean :feed_enabled, default: false, null: false
+      t.datetime :published_at
+      t.string :redirect_to
+      t.integer :image_id
+      t.string :image_link
+      t.boolean :news_page, default: false, null: false
+      t.boolean :autopublish, default: false, null: false
+      t.string :unique_name
+      t.datetime :last_comment_at
+      t.boolean :pinned, default: false, null: false
+      t.integer :meta_image_id
+      t.datetime :starts_at
+      t.datetime :ends_at
+      t.boolean :all_day, default: false, null: false
+      t.index :ends_at
+      t.index :parent_page_id
+      t.index :position
+      t.index :starts_at
+      t.index %i[status parent_page_id position]
+      t.index :status
+      t.index :user_id
+    end
+
+    create_table :password_reset_tokens do |t|
+      t.integer :user_id
+      t.string :token
+      t.datetime :expires_at
+      t.datetime :created_at
+      t.datetime :updated_at
+    end
+
+    create_table :roles do |t|
+      t.integer :user_id
+      t.string :name
+      t.datetime :created_at
+      t.datetime :updated_at
+      t.index :user_id
+    end
+
+    create_table :taggings do |t|
+      t.integer :tag_id
+      t.integer :taggable_id
+      t.string :taggable_type
+      t.index :tag_id
+      t.index %i[taggable_type taggable_id]
+    end
+
+    create_table :tags do |t|
+      t.string :name
+      t.boolean :pinned, default: false, null: false
+      t.index :name
+    end
+
+    create_table :users do |t|
+      t.string :username
+      t.string :hashed_password
+      t.string :name
+      t.string :email
+      t.datetime :last_login_at
+      t.integer :created_by
+      t.datetime :created_at
+      t.text :persistent_data
+      t.boolean :activated, default: false, null: false
+      t.integer :image_id
     end
   end
 end