publify_core 9.0.0.pre5 → 9.2.0

data/config/routes.rb

@@ -1,123 +1,111 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
   devise_for :users
   # TODO: use only in archive sidebar. See how made other system
-  get ':year/:month', to: 'articles#index', year: /\d{4}/, month: /\d{1,2}/, as: 'articles_by_month', format: false
-  get ':year/:month/page/:page', to: 'articles#index', year: /\d{4}/, month: /\d{1,2}/, as: 'articles_by_month_page', format: false
-  get ':year', to: 'articles#index', year: /\d{4}/, as: 'articles_by_year', format: false
-  get ':year/page/:page', to: 'articles#index', year: /\d{4}/, as: 'articles_by_year_page', format: false
-
-  get 'articles.:format', to: 'articles#index', constraints: {format: 'rss'}, as: 'rss'
-  get 'articles.:format', to: 'articles#index', constraints: {format: 'atom'}, as: 'atom'
-
-  scope controller: 'xml', path: 'xml' do
-    get 'articlerss/:id/feed.xml', action: 'articlerss', format: false
-    get 'commentrss/feed.xml', action: 'commentrss', format: false
-    get 'trackbackrss/feed.xml', action: 'trackbackrss', format: false
-  end
+  get ":year/:month", to: "articles#index", year: /\d{4}/, month: /\d{1,2}/,
+                      as: "articles_by_month", format: false
+  get ":year/:month/page/:page", to: "articles#index", year: /\d{4}/, month: /\d{1,2}/,
+                                 as: "articles_by_month_page", format: false
+  get ":year", to: "articles#index", year: /\d{4}/, as: "articles_by_year", format: false
+  get ":year/page/:page", to: "articles#index", year: /\d{4}/,
+                          as: "articles_by_year_page", format: false
 
-  get 'xml/:format', to: 'xml#feed', type: 'feed', constraints: {format: 'rss'}, as: 'xml'
-  get 'sitemap.xml', to: 'xml#feed', format: 'googlesitemap', type: 'sitemap', as: 'sitemap_xml'
+  get "articles.:format", to: "articles#index", format: /rss|atom/, as: "articles_feed"
 
-  scope controller: 'xml', path: 'xml', as: 'xml' do
-    scope action: 'feed' do
-      get ':format/feed.xml', type: 'feed'
-      get ':format/:type/:id/feed.xml'
-      get ':format/:type/feed.xml'
-    end
-  end
-
-  get 'xml/rsd', to: 'xml#rsd', format: false
-  get 'xml/feed', to: 'xml#feed'
+  get "sitemap.xml", to: "xml#sitemap", format: "googlesitemap"
 
   # CommentsController
-  resources :comments, as: 'admin_comments', only: [:index, :create] do
+  resources :comments, only: [:create] do
     collection do
       post :preview
     end
   end
 
-  resources :trackbacks
-
-  # I thinks it's useless. More investigating
-  post "trackbacks/:id/:day/:month/:year", to: 'trackbacks#create', format: false
+  resources :feedback, only: :index
 
   # ArticlesController
-  get '/live_search/', to: 'articles#live_search', as: :live_search_articles, format: false
-  get '/search/:q(.:format)/page/:page', to: 'articles#search', as: 'search', defaults: {page: 1}
-  get '/search(/:q(.:format))', to: 'articles#search'
-  get '/search/', to: 'articles#search', as: 'search_base', format: false
-  get '/archives/', to: 'articles#archives', format: false
-  get '/page/:page', to: 'articles#index', page: /\d+/, format: false
-  get '/pages/*name', to: 'articles#view_page', format: false
-  get 'previews(/:id)', to: 'articles#preview', format: false
-  get 'previews_pages(/:id)', to: 'articles#preview_page', format: false
-  get 'check_password', to: 'articles#check_password', format: false
-  get 'articles/markup_help/:id', to: 'articles#markup_help', format: false
-  get 'articles/tag', to: 'articles#tag', format: false
+  get "/live_search/", to: "articles#live_search", as: :live_search_articles, format: false
+  get "/search/:q(.:format)/page/:page", to: "articles#search",
+                                         as: "search", defaults: { page: 1 }
+  get "/search(/:q(.:format))", to: "articles#search"
+  get "/search/", to: "articles#search", as: "search_base", format: false
+  get "/archives/", to: "articles#archives", format: false
+  get "/page/:page", to: "articles#index", page: /\d+/, format: false
+  get "/pages/*name", to: "articles#view_page", format: false
+  get "previews(/:id)", to: "articles#preview", format: false
+  get "previews_pages(/:id)", to: "articles#preview_page", format: false
+  get "check_password", to: "articles#check_password", format: false
+  get "articles/markup_help/:id", to: "articles#markup_help", format: false
+  get "articles/tag", to: "articles#tag", format: false
 
   # SetupController
-  match '/setup', to: 'setup#index', via: [:get, :post], format: false
+  get "/setup", to: "setup#index", format: false
+  post "/setup", to: "setup#create", format: false
 
   # TagsController (imitate inflected_resource)
   resources :tags, only: [:index, :create, :new]
-  resources :tags, path: 'tag', only: [:show, :edit, :update, :destroy]
-  get '/tag/:id/page/:page', to: 'tags#show', format: false
-  get '/tags/page/:page', to: 'tags#index', format: false
+  resources :tags, path: "tag", only: [:show, :edit, :update, :destroy]
+  get "/tag/:id/page/:page", to: "tags#show", format: false
+  get "/tags/page/:page", to: "tags#index", format: false
 
-  resources :authors, path: 'author', only: :show
+  resources :authors, path: "author", only: :show
 
   # ThemeController
-  scope controller: 'theme', filename: /.*/ do
-    get 'stylesheets/theme/:filename', action: 'stylesheets', format: false
-    get 'javascripts/theme/:filename', action: 'javascript', format: false
-    get 'images/theme/:filename', action: 'images', format: false
-    get 'fonts/theme/:filename', action: 'fonts', format: false
+  scope controller: "theme", filename: /.*/ do
+    get "stylesheets/theme/:filename", action: "stylesheets", format: false
+    get "javascripts/theme/:filename", action: "javascripts", format: false
+    get "images/theme/:filename", action: "images", format: false
+    get "fonts/theme/:filename", action: "fonts", format: false
   end
 
   # For the tests
-  get 'theme/static_view_test', format: false
+  get "theme/static_view_test", format: false
 
   # For the statuses
-  get '/notes', to: 'notes#index', format: false
-  get '/notes/page/:page', to: 'notes#index', format: false
-  get '/note/:permalink', to: 'notes#show', format: false
+  get "/notes", to: "notes#index", format: false
+  get "/notes/page/:page", to: "notes#index", format: false
+  get "/note/:permalink", to: "notes#show", format: false
 
-  get '/humans', to: 'text#humans', format: 'txt'
-  get '/robots', to: 'text#robots', format: 'txt'
+  get "/robots", to: "text#robots", format: "txt"
 
   # TODO: Remove if possible
   resources :accounts, only: [], format: false do
     collection do
-      get 'confirm'
+      get "confirm"
     end
   end
 
   namespace :admin do
-    root 'dashboard#index', as: 'dashboard'
+    root "dashboard#index", as: "dashboard"
 
-    resources :content, only: [:index, :new, :edit, :create, :update, :destroy], format: false do
+    resources :content, only: [:index, :new, :edit, :create, :update, :destroy],
+                        format: false do
       collection do
-        get 'auto_complete_for_article_keywords'
-        post 'autosave'
-        put 'autosave'
+        get "auto_complete_for_article_keywords"
+        post "autosave"
+        put "autosave"
       end
     end
 
     resources :feedback, only: [:index, :edit, :create, :update, :destroy], format: false do
       collection do
-        post 'bulkops'
+        post "bulkops"
       end
       member do
-        get 'article'
-        post 'change_state'
+        get "article"
+        post "change_state"
       end
     end
 
-    resources :notes, only: [:index, :show, :edit, :create, :update, :destroy], format: false
+    resources :notes, only: [:index, :show, :edit, :create, :update, :destroy],
+                      format: false
 
-    resources :pages, only: [:index, :new, :edit, :create, :update, :destroy], format: false
+    resources :pages, only: [:index, :new, :edit, :create, :update, :destroy],
+                      format: false
 
-    resources :post_types, only: [:index, :edit, :create, :update, :destroy], format: false
+    resources :post_types, only: [:index, :edit, :create, :update, :destroy],
+                           format: false
 
     resources :profiles, only: [:index, :update], format: false
 
@@ -125,22 +113,21 @@ Rails.application.routes.draw do
 
     resources :resources, only: [:index, :destroy], format: false do
       collection do
-        post 'upload'
+        post "upload"
       end
     end
 
-    resource :seo, controller: 'seo', only: [:show, :update], format: false
-    resource :migrations, only: [:show, :update]
+    resource :seo, controller: "seo", only: [:show, :update], format: false
 
     # TODO: This should be a singular resource
     resource :settings, only: [], format: false do
       collection do
-        get 'index'
-        get 'display'
-        get 'feedback'
-        get 'write'
-        post 'migrate'
-        post 'update'
+        get "index"
+        get "display"
+        get "feedback"
+        get "write"
+        post "migrate"
+        post "update"
       end
     end
 
@@ -154,21 +141,17 @@ Rails.application.routes.draw do
 
     resources :tags, only: [:index, :edit, :create, :update, :destroy], format: false
 
-    # TODO: Work out if post is actually used or not.
-    get 'textfilters/macro_help(/:id)', to: 'textfilters#macro_help', id: nil, format: false
-    post 'textfilters/macro_help(/:id)', to: 'textfilters#macro_help', id: nil, format: false
-
     resources :themes, only: [:index], format: false do
       collection do
-        get 'preview'
-        get 'switchto'
+        get "preview"
+        get "switchto"
       end
     end
 
     resources :users, only: [:index, :new, :edit, :create, :update, :destroy], format: false
   end
 
-  root 'articles#index'
+  root "articles#index"
 
-  get '*from', to: 'articles#redirect', format: false
+  get "*from", to: "articles#redirect", format: false
 end

data/db/migrate/113_initial_schema.rb

@@ -1,6 +1,6 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
-class InitialSchema < ActiveRecord::Migration
+class InitialSchema < ActiveRecord::Migration[4.2]
   def change
     create_table "articles_tags", id: false, force: true do |t|
       t.integer "article_id"
@@ -44,14 +44,14 @@ class InitialSchema < ActiveRecord::Migration
       t.integer  "text_filter_id"
       t.text     "whiteboard"
       t.string   "name"
-      t.boolean  "published",      default: false
+      t.boolean  "published", default: false
       t.boolean  "allow_pings"
       t.boolean  "allow_comments"
       t.datetime "published_at"
       t.string   "state"
       t.integer  "parent_id"
       t.text     "settings"
-      t.string   "post_type",      default: "read"
+      t.string   "post_type", default: "read"
     end
 
     add_index "contents", ["published"]
@@ -72,9 +72,9 @@ class InitialSchema < ActiveRecord::Migration
       t.integer  "article_id"
       t.string   "email"
       t.string   "url"
-      t.string   "ip",               limit: 40
+      t.string   "ip", limit: 40
       t.string   "blog_name"
-      t.boolean  "published",                      default: false
+      t.boolean  "published", default: false
       t.datetime "published_at"
       t.string   "state"
       t.boolean  "status_confirmed"

data/db/migrate/114_fixes_buggy_articles_and_notes.rb

@@ -1,11 +1,13 @@
-class FixesBuggyArticlesAndNotes < ActiveRecord::Migration
-  class Content < ActiveRecord::Base
+# frozen_string_literal: true
 
+class FixesBuggyArticlesAndNotes < ActiveRecord::Migration[4.2]
+  class Content < ActiveRecord::Base
   end
 
   class Article < Content
     def set_permalink
-      return if state == 'draft' || permalink.present?
+      return if state == "draft" || permalink.present?
+
       self.permalink = title.to_permalink
     end
   end
@@ -17,7 +19,7 @@ class FixesBuggyArticlesAndNotes < ActiveRecord::Migration
     end
 
     def create_guid
-      return true unless guid.blank?
+      return true if guid.present?
 
       self.guid = UUIDTools::UUID.random_create.to_s
     end
@@ -32,14 +34,14 @@ class FixesBuggyArticlesAndNotes < ActiveRecord::Migration
   def self.up
     say "Fixing contents permalinks, this may take some time"
 
-    contents = Content.where("permalink is ? or permalink = ?", nil, '')
+    contents = Content.where("permalink is ? or permalink = ?", nil, "")
     contents.each do |c|
       c.set_permalink
       c.save
     end
 
     say "Fixes empty notes GUID"
-    notes = Note.where("guid is ? or guid = ?", nil, '')
+    notes = Note.where("guid is ? or guid = ?", nil, "")
     notes.each do |n|
       n.create_guid
       n.save

data/db/migrate/115_drops_categories_for_tags.rb

@@ -1,4 +1,6 @@
-class DropsCategoriesForTags < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class DropsCategoriesForTags < ActiveRecord::Migration[4.2]
   class Categorization < ActiveRecord::Base
     belongs_to :article
     belongs_to :category
@@ -6,7 +8,7 @@ class DropsCategoriesForTags < ActiveRecord::Migration
 
   class Category < ActiveRecord::Base
     has_many :categorizations
-    has_many :articles, :through => :categorizations
+    has_many :articles, through: :categorizations
   end
 
   def up
@@ -17,8 +19,8 @@ class DropsCategoriesForTags < ActiveRecord::Migration
         tg.display_name = cat.name
       end
 
-      redirect = Redirect.create(from_path: "category/#{cat.permalink}",
-                                 to_path: File.join(Blog.first.base_url, "tag", tag.name))
+      Redirect.create(from_path: "category/#{cat.permalink}",
+                      to_path: File.join(Blog.first.base_url, "tag", tag.name))
       cat.articles.each do |article|
         article.tags << tag
         article.save
@@ -29,6 +31,5 @@ class DropsCategoriesForTags < ActiveRecord::Migration
     drop_table :categories
   end
 
-  def down
-  end
+  def down; end
 end

data/db/migrate/20150207131657_add_missing_indexes.rb

@@ -1,4 +1,6 @@
-class AddMissingIndexes < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class AddMissingIndexes < ActiveRecord::Migration[4.2]
   def change
     add_index :feedback, [:id, :type]
     add_index :feedback, :user_id

data/db/migrate/20150807134129_simplify_redirect_relations.rb

@@ -1,4 +1,6 @@
-class SimplifyRedirectRelations < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class SimplifyRedirectRelations < ActiveRecord::Migration[4.2]
   class Redirect < ActiveRecord::Base; end
   class Redirection < ActiveRecord::Base; end
 
@@ -9,8 +11,10 @@ class SimplifyRedirectRelations < ActiveRecord::Migration
       if redirections.count > 1
         raise "Expected zero or one redirections, found #{redirections.count}"
       end
+
       redirection = redirections.first
       next unless redirection
+
       redirect.content_id = redirection.content_id
       redirect.save!
     end
@@ -31,6 +35,7 @@ class SimplifyRedirectRelations < ActiveRecord::Migration
 
     Redirect.find_each do |redirect|
       next unless redirect.content_id
+
       Redirection.create(redirect_id: redirect.id, content_id: redirect.content_id)
     end
     remove_column :redirects, :content_id

data/db/migrate/20150808052637_add_blog_ids.rb

@@ -1,4 +1,6 @@
-class AddBlogIds < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class AddBlogIds < ActiveRecord::Migration[4.2]
   class Blog < ActiveRecord::Base; end
   class Content < ActiveRecord::Base; end
   class Sidebar < ActiveRecord::Base; end
@@ -14,18 +16,20 @@ class AddBlogIds < ActiveRecord::Migration
       Sidebar.update_all("blog_id = #{default_blog_id}")
     end
 
-    change_column :sidebars, :blog_id, :integer, :null => false
+    change_column :sidebars, :blog_id, :integer, null: false
   end
 
   def down
-    if adapter_name == 'PostgreSQL'
+    if adapter_name == "PostgreSQL"
       indexes(:contents).each do |index|
-        if index.name =~ /blog_id/
-          remove_index(:contents, :name => index.name)
-        end
+        remove_index(:contents, name: index.name) if /blog_id/.match?(index.name)
       end
     else
-      remove_index :contents, :blog_id rescue nil
+      begin
+        remove_index :contents, :blog_id
+      rescue
+        nil
+      end
     end
     remove_column :contents, :blog_id
     remove_column :sidebars, :blog_id

data/db/migrate/20150808191127_add_blog_id_to_redirects.rb

@@ -1,4 +1,6 @@
-class AddBlogIdToRedirects < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class AddBlogIdToRedirects < ActiveRecord::Migration[4.2]
   class Redirect < ActiveRecord::Base; end
 
   def up

data/db/migrate/20150810094754_add_blog_id_to_tags.rb

@@ -1,4 +1,6 @@
-class AddBlogIdToTags < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class AddBlogIdToTags < ActiveRecord::Migration[4.2]
   class Tag < ActiveRecord::Base; end
 
   def up

data/db/migrate/20160108111120_add_devise_to_users.rb

@@ -1,4 +1,6 @@
-class AddDeviseToUsers < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class AddDeviseToUsers < ActiveRecord::Migration[4.2]
   def self.up
     ## Database authenticatable
     change_column :users, :email, :string, null: false, default: ""