publify_core 9.1.0 → 9.2.0

data/db/migrate/114_fixes_buggy_articles_and_notes.rb

@@ -1,10 +1,13 @@
+# 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
@@ -29,16 +32,16 @@ class FixesBuggyArticlesAndNotes < ActiveRecord::Migration[4.2]
   end
 
   def self.up
-    say 'Fixing contents permalinks, this may take some time'
+    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, '')
+    say "Fixes empty notes GUID"
+    notes = Note.where("guid is ? or guid = ?", nil, "")
     notes.each do |n|
       n.create_guid
       n.save
@@ -46,6 +49,6 @@ class FixesBuggyArticlesAndNotes < ActiveRecord::Migration[4.2]
   end
 
   def self.down
-    say 'Nothing to do here'
+    say "Nothing to do here"
   end
 end

data/db/migrate/115_drops_categories_for_tags.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class DropsCategoriesForTags < ActiveRecord::Migration[4.2]
   class Categorization < ActiveRecord::Base
     belongs_to :article
@@ -18,7 +20,7 @@ class DropsCategoriesForTags < ActiveRecord::Migration[4.2]
       end
 
       Redirect.create(from_path: "category/#{cat.permalink}",
-                      to_path: File.join(Blog.first.base_url, 'tag', tag.name))
+                      to_path: File.join(Blog.first.base_url, "tag", tag.name))
       cat.articles.each do |article|
         article.tags << tag
         article.save

data/db/migrate/20150207131657_add_missing_indexes.rb

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

data/db/migrate/20150807134129_simplify_redirect_relations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SimplifyRedirectRelations < ActiveRecord::Migration[4.2]
   class Redirect < ActiveRecord::Base; end
   class Redirection < ActiveRecord::Base; end
@@ -6,9 +8,13 @@ class SimplifyRedirectRelations < ActiveRecord::Migration[4.2]
     add_column :redirects, :content_id, :integer
     Redirect.find_each do |redirect|
       redirections = Redirection.where(redirect_id: redirect.id)
-      raise "Expected zero or one redirections, found #{redirections.count}" if redirections.count > 1
+      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
@@ -29,6 +35,7 @@ class SimplifyRedirectRelations < ActiveRecord::Migration[4.2]
 
     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,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddBlogIds < ActiveRecord::Migration[4.2]
   class Blog < ActiveRecord::Base; end
   class Content < ActiveRecord::Base; end
@@ -18,9 +20,9 @@ class AddBlogIds < ActiveRecord::Migration[4.2]
   end
 
   def down
-    if adapter_name == 'PostgreSQL'
+    if adapter_name == "PostgreSQL"
       indexes(:contents).each do |index|
-        remove_index(:contents, name: index.name) if index.name =~ /blog_id/
+        remove_index(:contents, name: index.name) if /blog_id/.match?(index.name)
       end
     else
       begin

data/db/migrate/20150808191127_add_blog_id_to_redirects.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddBlogIdToRedirects < ActiveRecord::Migration[4.2]
   class Redirect < ActiveRecord::Base; end
 

data/db/migrate/20150810094754_add_blog_id_to_tags.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddBlogIdToTags < ActiveRecord::Migration[4.2]
   class Tag < ActiveRecord::Base; end
 

data/db/migrate/20160108111120_add_devise_to_users.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 class AddDeviseToUsers < ActiveRecord::Migration[4.2]
   def self.up
     ## Database authenticatable
-    change_column :users, :email, :string, null: false, default: ''
+    change_column :users, :email, :string, null: false, default: ""
     rename_column :users, :password, :encrypted_password
-    change_column :users, :encrypted_password, :string, null: false, default: ''
+    change_column :users, :encrypted_password, :string, null: false, default: ""
 
     change_table(:users) do |t|
       ## Recoverable

data/db/migrate/20160108184201_move_last_connection_to_last_sign_in_at.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MoveLastConnectionToLastSignInAt < ActiveRecord::Migration[4.2]
   class User < ActiveRecord::Base
   end

data/db/migrate/20160110094906_remove_profiles_rights.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveProfilesRights < ActiveRecord::Migration[4.2]
   def up
     drop_table :profiles_rights

data/db/migrate/20160605103918_replace_profile_id_with_string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ReplaceProfileIdWithString < ActiveRecord::Migration[4.2]
   class Profile < ActiveRecord::Base
   end

data/db/migrate/20160605154632_remove_profiles.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveProfiles < ActiveRecord::Migration[4.2]
   class Profile < ActiveRecord::Base
     serialize :modules
@@ -14,11 +16,14 @@ class RemoveProfiles < ActiveRecord::Migration[4.2]
       t.text   :modules
     end
 
-    Profile.create!(label: 'admin', nicename: 'Publify administrator',
-                    modules: [:dashboard, :articles, :notes, :pages, :feedback, :media, :themes, :sidebar, :profile, :users, :settings, :seo])
-    Profile.create!(label: 'publisher', nicename: 'Blog publisher',
-                    modules: [:dashboard, :articles, :notes, :pages, :feedback, :media, :profile])
-    Profile.create!(label: 'contributor', nicename: 'Contributor',
+    Profile.create!(label: "admin", nicename: "Publify administrator",
+                    modules: [:dashboard, :articles, :notes, :pages, :feedback,
+                              :media, :themes, :sidebar, :profile, :users,
+                              :settings, :seo])
+    Profile.create!(label: "publisher", nicename: "Blog publisher",
+                    modules: [:dashboard, :articles, :notes, :pages, :feedback,
+                              :media, :profile])
+    Profile.create!(label: "contributor", nicename: "Contributor",
                     modules: [:dashboard, :profile])
   end
 end

data/db/migrate/20160701061851_demand_blog_id_on_contents.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class DemandBlogIdOnContents < ActiveRecord::Migration[4.2]
   def up
     change_column :contents, :blog_id, :integer, null: false

data/db/migrate/20160701062604_add_blog_id_to_resources.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddBlogIdToResources < ActiveRecord::Migration[4.2]
   class Blog < ActiveRecord::Base; end
   class Content < ActiveRecord::Base; end

data/db/migrate/20170528093024_move_resources_to_content.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MoveResourcesToContent < ActiveRecord::Migration[5.0]
   def change
     rename_column :resources, :article_id, :content_id

data/db/migrate/20170528094923_move_tags_to_content.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MoveTagsToContent < ActiveRecord::Migration[5.0]
   def change
     rename_column :articles_tags, :article_id, :content_id

data/db/migrate/20170528201606_remove_separate_published_flag.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveSeparatePublishedFlag < ActiveRecord::Migration[5.0]
   def change
     remove_column :contents, :published, :boolean, default: false

data/db/migrate/20170605071626_remove_extra_state_columns_from_feedback.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveExtraStateColumnsFromFeedback < ActiveRecord::Migration[5.0]
   def change
     remove_column :feedback, :published, :boolean, default: false

data/db/migrate/20170702105201_remove_published_at_from_feedback.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemovePublishedAtFromFeedback < ActiveRecord::Migration[5.0]
   def change
     remove_column :feedback, :published_at, :datetime

data/db/migrate/20190208151235_add_text_filter_name_fields.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddTextFilterNameFields < ActiveRecord::Migration[5.2]
+  def change
+    add_column :contents, :text_filter_name, :string
+    add_column :feedback, :text_filter_name, :string
+    add_column :users, :text_filter_name, :string
+  end
+end

data/db/migrate/20190208152646_move_text_filter_to_name.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+class MoveTextFilterToName < ActiveRecord::Migration[5.2]
+  class Content < ActiveRecord::Base
+    self.inheritance_column = :bogus
+
+    belongs_to :text_filter, optional: true
+  end
+
+  class Feedback < ActiveRecord::Base
+    self.table_name = "feedback"
+    self.inheritance_column = :bogus
+
+    belongs_to :text_filter, optional: true
+  end
+
+  class User < ActiveRecord::Base
+    belongs_to :text_filter, optional: true
+  end
+
+  class TextFilter < ActiveRecord::Base
+    serialize :filters, Array
+    serialize :params, Hash
+  end
+
+  def up
+    Content.find_each do |content|
+      filter = content.text_filter
+      filter_name = filter&.name || "none"
+      content.update!(text_filter_name: filter_name, text_filter_id: nil)
+    end
+
+    Feedback.find_each do |feedback|
+      filter = feedback.text_filter
+      filter_name = filter&.name || "none"
+      feedback.update!(text_filter_name: filter_name, text_filter_id: nil)
+    end
+
+    User.find_each do |user|
+      filter = user.text_filter
+      filter_name = filter&.name || "none"
+      user.update!(text_filter_name: filter_name, text_filter_id: nil)
+    end
+
+    TextFilter.destroy_all
+  end
+
+  def down
+    TextFilter.
+      create_with(description: "None", markup: "none", filters: [], params: {}).
+      find_or_create_by!(name: "none")
+    TextFilter.
+      create_with(description: "Markdown", markup: "markdown", filters: [], params: {}).
+      find_or_create_by!(name: "markdown")
+    TextFilter.
+      create_with(description: "SmartyPants", markup: "none", filters: [:smartypants],
+                  params: {}).
+      find_or_create_by!(name: "smartypants")
+    TextFilter.
+      create_with(description: "Markdown with SmartyPants", markup: "markdown",
+                  filters: [:smartypants], params: {}).
+      find_or_create_by!(name: "markdown smartypants")
+    TextFilter.
+      create_with(description: "Textile", markup: "textile", filters: [], params: {}).
+      find_or_create_by!(name: "textile")
+
+    Content.find_each do |content|
+      filter_name = content.text_filter_name
+      next unless filter_name
+
+      filter = TextFilter.find(name: filter_name)
+      raise "Filter #{filter_name} not found" unless filter
+
+      content.update!(text_filter: filter)
+    end
+
+    Feedback.find_each do |feedback|
+      filter_name = feedback.text_filter_name
+      next unless filter_name
+
+      filter = TextFilter.find(name: filter_name)
+      raise "Filter #{filter_name} not found" unless filter
+
+      feedback.update!(text_filter: filter)
+    end
+
+    User.find_each do |user|
+      filter_name = user.text_filter_name
+      next unless filter_name
+
+      filter = TextFilter.find(name: filter_name)
+      raise "Filter #{filter_name} not found" unless filter
+
+      user.update!(text_filter: filter)
+    end
+  end
+end

data/db/migrate/20190209155717_remove_text_filter_ids.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class RemoveTextFilterIds < ActiveRecord::Migration[5.2]
+  def up
+    remove_column :contents, :text_filter_id
+    remove_column :feedback, :text_filter_id
+    remove_column :users, :text_filter_id
+  end
+
+  def down
+    add_column :contents, :text_filter_id, :integer
+    add_column :feedback, :text_filter_id, :integer
+    add_column :users, :text_filter_id, :string, default: "1"
+
+    add_index :contents, [:text_filter_id]
+    add_index :feedback, [:text_filter_id]
+    add_index :users, [:text_filter_id]
+  end
+end

data/db/migrate/20190209160610_remove_text_filters.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class RemoveTextFilters < ActiveRecord::Migration[5.2]
+  def up
+    drop_table :text_filters
+  end
+
+  def down
+    create_table :text_filters do |t|
+      t.string :name
+      t.string :description
+      t.string :markup
+      t.text :filters
+      t.text :params
+    end
+  end
+end

data/db/migrate/20200413140440_add_unique_indexes.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddUniqueIndexes < ActiveRecord::Migration[5.2]
+  def change
+    add_index :post_types, :name, unique: true
+    add_index :redirects, :from_path, unique: true
+    add_index :tags, [:blog_id, :name], unique: true
+    add_index :users, :login, unique: true
+  end
+end

data/db/seeds.rb

@@ -1,5 +1,9 @@
-# This file should contain all the record creation needed to seed the database with its default values.
-# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+# frozen_string_literal: true
+
+# This file should contain all the record creation needed to seed the database
+# with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the
+# db with db:setup).
 #
 # Examples:
 #
@@ -16,20 +20,6 @@ unless blog.sidebars.any?
   MetaSidebar.create!(active_position: 4, blog_id: blog.id)
 end
 
-TextFilter.
-  create_with(description: 'None', markup: 'none', filters: [], params: {}).
-  find_or_create_by!(name: 'none')
-TextFilter.
-  create_with(description: 'Markdown', markup: 'markdown', filters: [], params: {}).
-  find_or_create_by!(name: 'markdown')
-TextFilter.
-  create_with(description: 'SmartyPants', markup: 'none', filters: [:smartypants], params: {}).
-  find_or_create_by!(name: 'smartypants')
-TextFilter.
-  create_with(description: 'Markdown with SmartyPants', markup: 'markdown', filters: [:smartypants], params: {}).
-  find_or_create_by!(name: 'markdown smartypants')
-TextFilter.
-  create_with(description: 'Textile', markup: 'textile', filters: [], params: {}).
-  find_or_create_by!(name: 'textile')
-
-Dir.mkdir("#{::Rails.root}/public/files") unless File.directory?("#{::Rails.root}/public/files")
+unless File.directory?("#{::Rails.root}/public/files")
+  Dir.mkdir("#{::Rails.root}/public/files")
+end

data/lib/email_notify.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 # TODO: Use deliver_later to avoid slowness and errors
 class EmailNotify
   def self.logger
-    @@logger ||= ::Rails.logger || Logger.new(STDOUT)
+    @@logger ||= ::Rails.logger || Logger.new($stdout)
   end
 
   def self.send_comment(comment, user)

data/lib/format.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Format
   # Laxly matches an IP Address , would also pass numbers > 255 though
-  IP_ADDRESS = /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/
+  IP_ADDRESS = /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.freeze
 
   # Laxly matches an HTTP(S) URI
-  HTTP_URI = %r{^https?:\/\/\S+$}
+  HTTP_URI = %r{^https?://\S+$}.freeze
 end