pages_core 3.4.3 → 3.5.1

data/config/routes.rb

@@ -4,31 +4,29 @@ Rails.application.routes.draw do
   image_resources :images, path: "dynamic_images/:digest(/:size)"
 
   # Pages
-  scope path: PagesCore.config.pages_path_scope do
-    resources :pages, path: ":locale/pages" do
-      collection do
-        get "search"
-        post "search"
-      end
-      member do
-        post "add_comment"
-        put "preview"
-      end
-      resources :files, controller: "page_files"
+  resources :pages, path: ":locale/pages" do
+    collection do
+      get "search"
+      post "search"
     end
+    member do
+      post "add_comment"
+      put "preview"
+    end
+    resources :files, controller: "page_files"
+  end
 
-    get(
-      "/:locale/pages/:id/:page" => "pages#show",
-      constraints: { page: /\d+/ }, as: :paginated_page
-    )
-
-    # Redirect hack for backwards compatibility
-    get "pages/:locale" => redirect("/%{locale}/pages"), locale: /\w\w\w/
-    get "pages/:locale/*glob" => redirect("/%{locale}/pages/%{glob}"),
-        locale: /\w\w\w/
+  get(
+    "/:locale/pages/:id/:page" => "pages#show",
+    constraints: { page: /\d+/ }, as: :paginated_page
+  )
 
-    get "(/:locale)" => "pages#index" if PagesCore.config.pages_path_scope?
-  end
+  # Redirect hack for backwards compatibility
+  get "pages/:locale" => redirect("/%{locale}/pages"), locale: /\w\w\w/
+  get(
+    "pages/:locale/*glob" => redirect("/%{locale}/pages/%{glob}"),
+    locale: /\w\w\w/
+  )
 
   # Authentication
   resource :session, only: [:create, :destroy]
@@ -76,10 +74,10 @@ Rails.application.routes.draw do
         collection do
           get "news"
           get "new_news" # TODO: Should be refactored
-          get "reorder_pages"
         end
 
         member do
+          put "move"
           delete "delete_meta_image"
         end
 
@@ -122,6 +120,25 @@ Rails.application.routes.draw do
     end
   end
 
+  # Page path routing
+  get(
+    ":locale/*path/page/:page" => "pages#show",
+    constraints: PagesCore::PagePathConstraint.new
+  )
+  get(
+    ":locale/*path" => "pages#show",
+    constraints: PagesCore::PagePathConstraint.new
+  )
+  get(
+    "*path" => "pages#show",
+    constraints: PagesCore::PagePathConstraint.new,
+    defaults: { locale: I18n.default_locale.to_s }
+  )
+
+  get "/404", to: "errors#not_found"
+  get "/422", to: "errors#unacceptable"
+  get "/500", to: "errors#internal_error"
+
   # Legacy routes
   get "/comments/:action/:type/:id", controller: "comments"
 end

data/db/migrate/20111219033112_create_pages_tables.rb

@@ -27,7 +27,7 @@ class CreatePagesTables < ActiveRecord::Migration
       t.datetime "updated_at", null: false
     end
 
-    add_index "categories", ["slug"], name: "index_categories_on_slug"
+    add_index "categories", ["slug"]
 
     create_table "delayed_jobs" do |t|
       t.integer "priority",   default: 0
@@ -52,7 +52,7 @@ class CreatePagesTables < ActiveRecord::Migration
       t.string "author"
     end
 
-    add_index "feed_items", ["feed_id"], name: "index_feed_items_on_feed_id"
+    add_index "feed_items", ["feed_id"]
 
     create_table "feeds" do |t|
       t.string "url"
@@ -62,7 +62,7 @@ class CreatePagesTables < ActiveRecord::Migration
       t.datetime "refreshed_at"
     end
 
-    add_index "feeds", ["url"], name: "index_feeds_on_url"
+    add_index "feeds", ["url"]
 
     create_table "images" do |t|
       t.string "name"
@@ -155,11 +155,11 @@ class CreatePagesTables < ActiveRecord::Migration
       t.integer "page_id"
       t.integer "image_id"
       t.integer "position"
-      t.boolean "primary",  default: false, null: false
+      t.boolean "primary", default: false, null: false
     end
 
-    add_index "page_images", %w(page_id primary), name: "index_page_images_on_page_id_and_primary"
-    add_index "page_images", ["page_id"], name: "index_page_images_on_page_id"
+    add_index "page_images", %w(page_id primary)
+    add_index "page_images", ["page_id"]
 
     create_table "pages" do |t|
       t.integer "parent_page_id"
@@ -169,37 +169,35 @@ class CreatePagesTables < ActiveRecord::Migration
       t.datetime "created_at"
       t.datetime "updated_at"
       t.integer "user_id"
-      t.integer "status", default: 0,     null: false
+      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.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.boolean "delta", default: false, null: false
       t.string "unique_name"
-      t.integer "comments_count", default: 0,     null: false
+      t.integer "comments_count", default: 0, null: false
       t.datetime "last_comment_at"
       t.boolean "pinned", default: false, null: false
     end
 
-    add_index "pages", ["delta"], name: "delta_index"
-    add_index "pages", ["parent_page_id"], name: "index_pages_on_parent_page_id"
-    add_index "pages", ["position"], name: "index_pages_on_position"
-    add_index "pages", %w(status parent_page_id position), name: "for_find_page"
-    add_index "pages", ["status"], name: "index_pages_on_status"
-    add_index "pages", ["user_id"], name: "index_pages_on_user_id"
+    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"], name: "index_pages_categories_on_category_id"
-    add_index "pages_categories", ["page_id"], name: "index_pages_categories_on_page_id"
+    add_index "pages_categories", ["category_id"]
+    add_index "pages_categories", ["page_id"]
 
     create_table "partials" do |t|
       t.string "name"
@@ -213,8 +211,8 @@ class CreatePagesTables < ActiveRecord::Migration
       t.datetime "updated_at"
     end
 
-    add_index "sessions", ["session_id"], name: "index_sessions_on_session_id"
-    add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at"
+    add_index "sessions", ["session_id"]
+    add_index "sessions", ["updated_at"]
 
     create_table "sms_subscribers" do |t|
       t.string "msisdn"
@@ -229,14 +227,14 @@ class CreatePagesTables < ActiveRecord::Migration
       t.string "taggable_type"
     end
 
-    add_index "taggings", ["tag_id"], name: "by_tag_id"
-    add_index "taggings", %w(taggable_type taggable_id), name: "by_taggable"
+    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"], name: "index_tags_on_name"
+    add_index "tags", ["name"]
 
     create_table "textbits" do |t|
       t.integer "textable_id"
@@ -247,11 +245,12 @@ class CreatePagesTables < ActiveRecord::Migration
       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
 
-    add_index "textbits", %w(textable_id textable_type name language), name: "by_foreign_key", unique: true
-    add_index "textbits", %w(textable_id textable_type), name: "by_association"
-
     create_table "users" do |t|
       t.string "username"
       t.string "hashed_password"
@@ -272,10 +271,7 @@ class CreatePagesTables < ActiveRecord::Migration
       t.integer "image_id"
       t.boolean "is_reviewer", default: false, null: false
       t.boolean "is_super_admin", default: false, null: false
-      t.boolean "delta", default: false, null: false
       t.string "openid_url"
     end
-
-    add_index "users", ["delta"], name: "delta_index"
   end
 end

data/db/migrate/20121010055412_drop_removed_tables.rb

@@ -15,7 +15,7 @@ class DropRemovedTables < ActiveRecord::Migration
     create_table :mail_subscribers do |t|
       t.string :email
       t.datetime :created_at
-      t.string :group,      default: "Default"
+      t.string :group, default: "Default"
     end
 
     create_table :mailings do |t|
@@ -24,9 +24,9 @@ class DropRemovedTables < ActiveRecord::Migration
       t.string :subject
       t.text :body
       t.datetime :created_at
-      t.boolean :failed,       default: false
+      t.boolean :failed, default: false
       t.string :content_type
-      t.boolean :in_progress,  default: false, null: false
+      t.boolean :in_progress, default: false, null: false
     end
 
     create_table :mailouts do |t|

data/db/migrate/20130823133208_update_page_redirect_to.rb

@@ -3,19 +3,6 @@
 class UpdatePageRedirectTo < ActiveRecord::Migration
   def self.up
     include Rails.application.routes.url_helpers
-
-    pages = Page.where('redirect_to IS NOT NULL AND redirect_to != ""')
-    pages.each do |page|
-      if page.redirect_to == "0" || page.redirect_to == "--- \"\"\n" || page.redirect_to == "--- ''\n"
-        page.update(redirect_to: nil)
-      elsif page.redirect_to.start_with?("---")
-        options = YAML.load(page.redirect_to)
-        path = url_for(options.merge(locale: ":locale", only_path: true))
-        page.update(redirect_to: path)
-      elsif !(page.redirect_to =~ /\A(\/|https?:\/\/)/)
-        fail "Not a valid Page redirect_to: #{page.redirect_to.inspect}"
-      end
-    end
     change_column :pages, :redirect_to, :string
   end
 

data/db/migrate/20140203183900_create_roles.rb

@@ -10,8 +10,11 @@ class CreateRoles < ActiveRecord::Migration
        WHERE #{connection.quote_column_name(flag)} = #{connection.quote(true)}"
     ).each do |u|
       connection.execute(
-        "INSERT INTO #{connection.quote_table_name('roles')} (user_id, name, created_at, updated_at)
-         VALUES (#{u[0]}, #{connection.quote(role)}, #{connection.quote(Time.now)}, #{connection.quote(Time.now)})"
+        "INSERT INTO #{connection.quote_table_name('roles')} " \
+          "(user_id, name, created_at, updated_at) " \
+          "VALUES (#{u[0]}, #{connection.quote(role)}, " \
+          "#{connection.quote(Time.now.utc)}, " \
+          "#{connection.quote(Time.now.utc)})"
       )
     end
   end

data/db/migrate/20140920231700_convert_images_to_dis.rb

@@ -36,10 +36,12 @@ class ConvertImagesToDis < ActiveRecord::Migration
 
           image.colorspace = "rgb"
 
-          image.real_width, image.real_height = Vector2d(image.original_size).to_a
+          image.real_width, image.real_height =
+            Vector2d(image.original_size).to_a
 
           if image.cropped?
-            image.crop_start_x, image.crop_start_y = Vector2d(image.crop_start).to_a
+            image.crop_start_x, image.crop_start_y =
+              Vector2d(image.crop_start).to_a
             image.crop_width, image.crop_height = Vector2d(image.crop_size).to_a
           end
 

data/db/migrate/20150401131300_localize_images.rb

@@ -5,14 +5,13 @@ class LocalizeImages < ActiveRecord::Migration
 
   def up
     Image.all.in_locale(locale).each do |image|
-      unless image.attributes["byline"].blank?
-        Localization.create(
-          localizable: image,
-          name: "caption",
-          locale: locale,
-          value: image.attributes["byline"]
-        )
-      end
+      next if image.attributes["byline"].blank?
+      Localization.create(
+        localizable: image,
+        name: "caption",
+        locale: locale,
+        value: image.attributes["byline"]
+      )
     end
     remove_column :images, :name, :string
     remove_column :images, :byline, :string

data/db/migrate/20151002174800_create_page_paths.rb

@@ -0,0 +1,10 @@
+class CreatePagePaths < ActiveRecord::Migration
+  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
+  end
+end

data/db/migrate/20151021103400_drop_binaries_table.rb

@@ -0,0 +1,7 @@
+class DropBinariesTable < ActiveRecord::Migration
+  def change
+    drop_table :binaries do |t|
+      t.string "sha1_hash"
+    end
+  end
+end

data/db/migrate/20151204151000_remove_page_content_order.rb

@@ -0,0 +1,5 @@
+class RemovePageContentOrder < ActiveRecord::Migration
+  def change
+    remove_column :pages, :content_order, :string
+  end
+end

data/db/migrate/20160330220900_rename_pages_categories.rb

@@ -0,0 +1,6 @@
+class RenamePagesCategories < ActiveRecord::Migration
+  def change
+    rename_table :pages_categories, :page_categories
+    add_column :page_categories, :id, :primary_key, first: true
+  end
+end

data/db/migrate/20160405202700_change_localization_limit.rb

@@ -0,0 +1,9 @@
+class ChangeLocalizationLimit < ActiveRecord::Migration
+  def up
+    change_column :localizations, :value, :text, limit: 16_777_215
+  end
+
+  def down
+    change_column :localizations, :value, :text, limit: 65_535
+  end
+end

data/lib/pages_core.rb

@@ -24,6 +24,7 @@ require "coffee-script"
 require "delayed_job"
 require "dis"
 require "dynamic_image"
+require "localizable_model"
 require "json"
 require "rails_i18n"
 require "recaptcha/rails"
@@ -31,37 +32,33 @@ require "RedCloth"
 require "sass"
 require "thinking-sphinx"
 
-# Javascript
+# Assets
+require "font-awesome-rails"
+require "jcrop/rails/v2"
+require "jquery-ui-rails"
 require "jquery/rails/engine"
-require "jquery/ui/rails"
-require "jquery-cookie-rails"
+require "react-rails"
 require "underscore-rails"
-require "jcrop/rails/v2"
+
+# Pages
+require "pages_core/plugin"
+require "pages_core/admin_menu_item"
+require "pages_core/archive_finder"
+require "pages_core/cache_sweeper"
+require "pages_core/file_embedder"
+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/templates"
+require "pages_core/version"
 
 module PagesCore
   class NotAuthorized < StandardError; end
 
   class << self
-    def load_dependencies!
-      load "pages_core/plugin.rb"
-
-      load "pages_core/admin_menu_item.rb"
-      load "pages_core/archive_finder.rb"
-      load "pages_core/cache_sweeper.rb"
-      load "pages_core/configuration.rb"
-      load "pages_core/engine.rb"
-      load "pages_core/extensions.rb"
-      load "pages_core/localizable.rb"
-      load "pages_core/pages_plugin.rb"
-      load "pages_core/paginates.rb"
-      load "pages_core/templates.rb"
-      load "pages_core/version.rb"
-    end
-
-    def init!
-      load_dependencies!
-    end
-
     def version
       VERSION
     end
@@ -82,8 +79,6 @@ module PagesCore
         @configuration
       end
     end
-    alias_method :config, :configuration
+    alias config configuration
   end
 end
-
-PagesCore.init!