pages_core 3.5.1 → 3.6.0

data/db/migrate/20111219033112_create_pages_tables.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-class CreatePagesTables < ActiveRecord::Migration
+class CreatePagesTables < ActiveRecord::Migration[4.2]
   def change
     create_table "accounts" do |t|
       t.string "name"
@@ -158,7 +156,7 @@ class CreatePagesTables < ActiveRecord::Migration
       t.boolean "primary", default: false, null: false
     end
 
-    add_index "page_images", %w(page_id primary)
+    add_index "page_images", %w[page_id primary]
     add_index "page_images", ["page_id"]
 
     create_table "pages" do |t|
@@ -187,7 +185,7 @@ class CreatePagesTables < ActiveRecord::Migration
 
     add_index "pages", ["parent_page_id"]
     add_index "pages", ["position"]
-    add_index "pages", %w(status parent_page_id position)
+    add_index "pages", %w[status parent_page_id position]
     add_index "pages", ["status"]
     add_index "pages", ["user_id"]
 
@@ -228,7 +226,7 @@ class CreatePagesTables < ActiveRecord::Migration
     end
 
     add_index "taggings", ["tag_id"]
-    add_index "taggings", %w(taggable_type taggable_id)
+    add_index "taggings", %w[taggable_type taggable_id]
 
     create_table "tags" do |t|
       t.string "name"
@@ -245,10 +243,10 @@ class CreatePagesTables < ActiveRecord::Migration
       t.text "body"
       t.datetime "created_at"
       t.datetime "updated_at"
-      t.index(%w(textable_id textable_type name language),
+      t.index(%w[textable_id textable_type name language],
               unique: true,
               name: "index_textbits_on_locale")
-      t.index %w(textable_id textable_type)
+      t.index %w[textable_id textable_type]
     end
 
     create_table "users" do |t|

data/db/migrate/20120627033112_rename_textbits.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-class RenameTextbits < ActiveRecord::Migration
+class RenameTextbits < ActiveRecord::Migration[4.2]
   def self.up
     rename_table :textbits, :localizations
     rename_column :localizations, :language, :locale

data/db/migrate/20121010055412_drop_removed_tables.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-class DropRemovedTables < ActiveRecord::Migration
+class DropRemovedTables < ActiveRecord::Migration[4.2]
   def self.up
     drop_table :mail_subscribers
     drop_table :mailouts

data/db/migrate/20130130053932_add_queue_to_delayed_jobs.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-class AddQueueToDelayedJobs < ActiveRecord::Migration
+class AddQueueToDelayedJobs < ActiveRecord::Migration[4.2]
   def self.up
     add_column :delayed_jobs, :queue, :string
   end

data/db/migrate/20130303053932_remove_filter_from_localizations.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-class RemoveFilterFromLocalizations < ActiveRecord::Migration
+class RemoveFilterFromLocalizations < ActiveRecord::Migration[4.2]
   def self.up
     remove_column :localizations, :filter
   end

data/db/migrate/20130303160632_remove_imagesets.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-class RemoveImagesets < ActiveRecord::Migration
+class RemoveImagesets < ActiveRecord::Migration[4.2]
   def self.up
     drop_table :imagesets
     drop_table :images_imagesets

data/db/migrate/20130303161732_remove_sms_subscribers.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-class RemoveSmsSubscribers < ActiveRecord::Migration
+class RemoveSmsSubscribers < ActiveRecord::Migration[4.2]
   def self.up
     drop_table :sms_subscribers
   end

data/db/migrate/20130823133208_update_page_redirect_to.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-class UpdatePageRedirectTo < ActiveRecord::Migration
+class UpdatePageRedirectTo < ActiveRecord::Migration[4.2]
   def self.up
     include Rails.application.routes.url_helpers
     change_column :pages, :redirect_to, :string

data/db/migrate/20140203183900_create_roles.rb

@@ -1,4 +1,4 @@
-class CreateRoles < ActiveRecord::Migration
+class CreateRoles < ActiveRecord::Migration[4.2]
   def connection
     @connection ||= ActiveRecord::Base.connection
   end

data/db/migrate/20140414150500_change_locale_names.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-class ChangeLocaleNames < ActiveRecord::Migration
+class ChangeLocaleNames < ActiveRecord::Migration[4.2]
   def self.up
     Localization.where(locale: "nor").update_all(locale: "nb")
     Localization.where(locale: "eng").update_all(locale: "en")

data/db/migrate/20140604142100_remove_openid_url.rb

@@ -1,4 +1,4 @@
-class RemoveOpenidUrl < ActiveRecord::Migration
+class RemoveOpenidUrl < ActiveRecord::Migration[4.2]
   def self.up
     remove_column :users, :openid_url
   end

data/db/migrate/20140920231700_convert_images_to_dis.rb

@@ -1,4 +1,4 @@
-class ConvertImagesToDis < ActiveRecord::Migration
+class ConvertImagesToDis < ActiveRecord::Migration[4.2]
   class Image < ActiveRecord::Base; end
   class Binary < ActiveRecord::Base; end
 

data/db/migrate/20140922124600_convert_page_files_to_dis.rb

@@ -1,4 +1,4 @@
-class ConvertPageFilesToDis < ActiveRecord::Migration
+class ConvertPageFilesToDis < ActiveRecord::Migration[4.2]
   class PageFile < ActiveRecord::Base; end
   class Binary < ActiveRecord::Base; end
 

data/db/migrate/20141004003100_create_password_reset_tokens.rb

@@ -1,4 +1,4 @@
-class CreatePasswordResetTokens < ActiveRecord::Migration
+class CreatePasswordResetTokens < ActiveRecord::Migration[4.2]
   def change
     create_table :password_reset_tokens do |t|
       t.belongs_to :user

data/db/migrate/20141006181300_remove_user_cruft.rb

@@ -1,4 +1,4 @@
-class RemoveUserCruft < ActiveRecord::Migration
+class RemoveUserCruft < ActiveRecord::Migration[4.2]
   def change
     remove_column :users, :token, :string
     remove_column :users, :is_deleted, :boolean, default: false, null: false

data/db/migrate/20141007173000_create_invites.rb

@@ -1,4 +1,4 @@
-class CreateInvites < ActiveRecord::Migration
+class CreateInvites < ActiveRecord::Migration[4.2]
   def change
     create_table :invites do |t|
       t.belongs_to :user

data/db/migrate/20150204130800_update_delayed_job_table.rb

@@ -1,4 +1,4 @@
-class UpdateDelayedJobTable < ActiveRecord::Migration
+class UpdateDelayedJobTable < ActiveRecord::Migration[4.2]
   def up
     change_column :delayed_jobs, :last_error, :text
   end

data/db/migrate/20150401131300_localize_images.rb

@@ -1,4 +1,4 @@
-class LocalizeImages < ActiveRecord::Migration
+class LocalizeImages < ActiveRecord::Migration[4.2]
   def locale
     I18n.default_locale
   end

data/db/migrate/20150520174300_add_meta_image_to_page.rb

@@ -1,4 +1,4 @@
-class AddMetaImageToPage < ActiveRecord::Migration
+class AddMetaImageToPage < ActiveRecord::Migration[4.2]
   def change
     add_column :pages, :meta_image_id, :integer
   end

data/db/migrate/20150904164200_add_pinned_to_tags.rb

@@ -1,4 +1,4 @@
-class AddPinnedToTags < ActiveRecord::Migration
+class AddPinnedToTags < ActiveRecord::Migration[4.2]
   def change
     add_column :tags, :pinned, :boolean, default: false, null: false
   end

data/db/migrate/20151002174800_create_page_paths.rb

@@ -1,10 +1,10 @@
-class CreatePagePaths < ActiveRecord::Migration
+class CreatePagePaths < ActiveRecord::Migration[4.2]
   def change
     create_table :page_paths do |t|
       t.belongs_to :page
       t.string :locale, :path
       t.timestamps null: false
     end
-    add_index :page_paths, [:locale, :path], unique: true
+    add_index :page_paths, %i[locale path], unique: true
   end
 end

data/db/migrate/20151021103400_drop_binaries_table.rb

@@ -1,4 +1,4 @@
-class DropBinariesTable < ActiveRecord::Migration
+class DropBinariesTable < ActiveRecord::Migration[4.2]
   def change
     drop_table :binaries do |t|
       t.string "sha1_hash"

data/db/migrate/20151204151000_remove_page_content_order.rb

@@ -1,4 +1,4 @@
-class RemovePageContentOrder < ActiveRecord::Migration
+class RemovePageContentOrder < ActiveRecord::Migration[4.2]
   def change
     remove_column :pages, :content_order, :string
   end

data/db/migrate/20160330220900_rename_pages_categories.rb

@@ -1,4 +1,4 @@
-class RenamePagesCategories < ActiveRecord::Migration
+class RenamePagesCategories < ActiveRecord::Migration[4.2]
   def change
     rename_table :pages_categories, :page_categories
     add_column :page_categories, :id, :primary_key, first: true

data/db/migrate/20160405202700_change_localization_limit.rb

@@ -1,4 +1,4 @@
-class ChangeLocalizationLimit < ActiveRecord::Migration
+class ChangeLocalizationLimit < ActiveRecord::Migration[4.2]
   def up
     change_column :localizations, :value, :text, limit: 16_777_215
   end

data/db/migrate/20170716040500_remove_page_comments.rb

@@ -0,0 +1,23 @@
+class RemovePageComments < ActiveRecord::Migration[5.0]
+  def up
+    drop_table :page_comments
+    remove_column :pages, :comments_allowed
+    remove_column :pages, :comments_count
+  end
+
+  def down
+    add_column :pages, :comments_allowed, :boolean, default: true, null: false
+    add_column :pages, :comments_count, :integer,
+               limit: 4, default: 0, null: false
+    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
+  end
+end

data/db/migrate/20170716213400_remove_sessions.rb

@@ -0,0 +1,15 @@
+class RemoveSessions < ActiveRecord::Migration[5.0]
+  def up
+    drop_table :sessions
+  end
+
+  def down
+    create_table :sessions do |t|
+      t.string :session_id
+      t.text :data
+      t.datetime :updated_at
+      t.index :session_id
+      t.index :updated_at
+    end
+  end
+end

data/db/migrate/20180207134000_add_dates_to_pages.rb

@@ -0,0 +1,11 @@
+class AddDatesToPages < ActiveRecord::Migration[5.0]
+  def change
+    change_table :pages do |t|
+      t.datetime :starts_at
+      t.datetime :ends_at
+      t.boolean :all_day, null: false, default: false
+      t.index :starts_at
+      t.index :ends_at
+    end
+  end
+end

data/db/migrate/20190211154800_create_attachments.rb

@@ -0,0 +1,73 @@
+class CreateAttachments < ActiveRecord::Migration[5.2]
+  def up
+    rename_table :page_files, :attachments
+    add_column :attachments, :user_id, :integer
+
+    create_table :page_files do |t|
+      t.references :page
+      t.references :attachment
+      t.integer :position
+      t.timestamps
+    end
+
+    Attachment.reset_column_information
+    PageFile.reset_column_information
+
+    locales = [I18n.default_locale,
+               PagesCore.config.locales&.keys].compact.map(&:to_sym).uniq
+
+    Attachment.all.each do |a|
+      begin
+        Dis::Storage.change_type("page_files", "attachments", a.content_hash)
+      rescue
+        puts "Missing attachment: #{a.content_hash}"
+      end
+      locales.each do |l|
+        Localization.create(localizable: a,
+                            locale: l,
+                            name: "name",
+                            value: a.attributes["name"])
+      end
+      PageFile.create(attachment_id: a.id,
+                      page_id: a.page_id,
+                      position: a.position,
+                      created_at: a.created_at,
+                      updated_at: a.updated_at)
+    end
+
+    Localization.where(localizable_type: "PageFile")
+                .update_all(localizable_type: "Attachment")
+
+    remove_column :attachments, :page_id
+    remove_column :attachments, :position
+    remove_column :attachments, :name
+  end
+
+  def down
+    add_column :attachments, :name, :string
+    add_column :attachments, :position, :integer
+    add_column :attachments, :page_id, :integer
+
+    Attachment.reset_column_information
+    Attachment.all.in_locale(I18n.default_locale).each do |a|
+      begin
+        Dis::Storage.change_type("attachments", "page_files", a.content_hash)
+      rescue
+        puts "Missing attachment: #{a.content_hash}"
+      end
+
+      pf = PageFile.find_by(attachment_id: a.id)
+      Attachment.where(id: a.id).update_all(name: a.name,
+                                            page_id: pf.page_id,
+                                            position: pf.position)
+    end
+
+    Localization.where(localizable_type: "Attachment")
+                .update_all(localizable_type: "PageFile")
+    Localization.where(localizable_type: "PageFile", name: "name").destroy_all
+
+    drop_table :page_files
+    remove_column :attachments, :user_id
+    rename_table :attachments, :page_files
+  end
+end

data/lib/pages_core.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Ruby Standard Library
 require "digest/sha1"
 require "fileutils"
@@ -21,37 +19,36 @@ require "active_model_serializers"
 require "acts_as_list"
 require "bcrypt"
 require "coffee-script"
+require "country_select"
 require "delayed_job"
 require "dis"
 require "dynamic_image"
 require "localizable_model"
 require "json"
 require "rails_i18n"
-require "recaptcha/rails"
 require "RedCloth"
-require "sass"
-require "thinking-sphinx"
+require "sass-rails"
+require "will_paginate"
 
 # Assets
 require "font-awesome-rails"
-require "jcrop/rails/v2"
 require "jquery-ui-rails"
 require "jquery/rails/engine"
 require "react-rails"
-require "underscore-rails"
 
 # Pages
 require "pages_core/plugin"
 require "pages_core/admin_menu_item"
 require "pages_core/archive_finder"
+require "pages_core/attachment_embedder"
 require "pages_core/cache_sweeper"
-require "pages_core/file_embedder"
+require "pages_core/digest_verifier"
 require "pages_core/configuration"
 require "pages_core/engine"
 require "pages_core/extensions"
 require "pages_core/page_path_constraint"
 require "pages_core/pages_plugin"
-require "pages_core/paginates"
+require "pages_core/pub_sub"
 require "pages_core/templates"
 require "pages_core/version"
 

data/lib/pages_core/admin_menu_item.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   class AdminMenuItem
     attr_reader :label, :path, :group, :options

data/lib/pages_core/archive_finder.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   class ArchiveFinder
     def initialize(relation, options = {})
@@ -15,12 +13,14 @@ module PagesCore
       filter_by_time(range_for_year_and_month(year, month))
     end
 
+    def latest_year
+      latest_year_and_month&.first
+    end
+
     def latest_year_and_month
       ordered_relation.first.try do |record|
-        [
-          record[timestamp_attribute].year,
-          record[timestamp_attribute].month
-        ]
+        [record[timestamp_attribute].year,
+         record[timestamp_attribute].month]
       end
     end
 
@@ -32,7 +32,7 @@ module PagesCore
       group_by_month(by_year(year))
         .count
         .to_a
-        .sort { |a, b| a.first <=> b.first }
+        .sort_by(&:first)
     end
 
     def timestamp_attribute
@@ -43,10 +43,14 @@ module PagesCore
       select_years(@relation).map(&:to_i).sort
     end
 
+    def years_with_count
+      years.map { |year| [year, by_year(year).count] }
+    end
+
     private
 
     def group_by_month(relation)
-      relation.reorder("").group(month_part)
+      relation.reorder("").group(Arel.sql(month_part))
     end
 
     def filter_by_time(range)
@@ -61,7 +65,7 @@ module PagesCore
       if mysql?
         "MONTH(#{timestamp_attribute})"
       else
-        "date_part('month', #{timestamp_attribute})"
+        "date_part('month', #{timestamp_attribute})::integer"
       end
     end
 
@@ -70,21 +74,23 @@ module PagesCore
     end
 
     def range_for_year(year)
-      date_time = DateTime.new(year.to_i, 1, 1).utc
-      date_time..date_time.end_of_year
+      start_time = Time.new(year.to_i, 1, 1)
+      end_time = start_time.end_of_year
+      (start_time.in_time_zone)..(end_time.in_time_zone)
     end
 
     def range_for_year_and_month(year, month)
-      date_time = DateTime.new(year.to_i, month.to_i, 1).utc
-      date_time..date_time.end_of_month
+      start_time = Time.new(year.to_i, month, 1)
+      end_time = start_time.end_of_month
+      (start_time.in_time_zone)..(end_time.in_time_zone)
     end
 
     def select_months(relation)
-      relation.reorder("").pluck("DISTINCT #{month_part}")
+      relation.reorder("").pluck(Arel.sql("DISTINCT #{month_part}"))
     end
 
     def select_years(relation)
-      relation.reorder("").pluck("DISTINCT #{year_part}")
+      relation.reorder("").pluck(Arel.sql("DISTINCT #{year_part}"))
     end
 
     def ordered_relation