publify_core 9.0.0.pre5 → 9.2.0

data/db/migrate/20160108184201_move_last_connection_to_last_sign_in_at.rb

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

data/db/migrate/20160110094906_remove_profiles_rights.rb

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

data/db/migrate/20160605103918_replace_profile_id_with_string.rb

@@ -1,9 +1,9 @@
-class ReplaceProfileIdWithString < ActiveRecord::Migration
-  class Profile < ActiveRecord::Base
+# frozen_string_literal: true
 
+class ReplaceProfileIdWithString < ActiveRecord::Migration[4.2]
+  class Profile < ActiveRecord::Base
   end
   class User < ActiveRecord::Base
-
   end
 
   def up

data/db/migrate/20160605154632_remove_profiles.rb

@@ -1,4 +1,6 @@
-class RemoveProfiles < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class RemoveProfiles < ActiveRecord::Migration[4.2]
   class Profile < ActiveRecord::Base
     serialize :modules
   end
@@ -14,11 +16,14 @@ class RemoveProfiles < ActiveRecord::Migration
       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',
-                    modules: [:dashboard, :profile ])
+    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,4 +1,6 @@
-class DemandBlogIdOnContents < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class DemandBlogIdOnContents < ActiveRecord::Migration[4.2]
   def up
     change_column :contents, :blog_id, :integer, null: false
   end

data/db/migrate/20160701062604_add_blog_id_to_resources.rb

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

data/db/migrate/20170528093024_move_resources_to_content.rb

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

data/db/migrate/20170528094923_move_tags_to_content.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class MoveTagsToContent < ActiveRecord::Migration[5.0]
+  def change
+    rename_column :articles_tags, :article_id, :content_id
+    rename_table :articles_tags, :contents_tags
+  end
+end

data/db/migrate/20170528201606_remove_separate_published_flag.rb

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

data/db/migrate/20170605071626_remove_extra_state_columns_from_feedback.rb

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

data/db/migrate/20170702105201_remove_published_at_from_feedback.rb

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

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,22 +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')
-
-unless File.directory?("#{::Rails.root.to_s}/public/files")
-  Dir.mkdir("#{::Rails.root.to_s}/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,17 +1,9 @@
-module Format
-  EMAIL = /^[_a-z0-9\+\.\-]+\@[_a-z0-9\-]+\.[_a-z0-9\.\-]+$/i
-  PASSWORD = /^[\_a-zA-Z0-9\.\-]+$/
-
-  # matches everything to the last \ or / in a string.
-  # can chop of path of a filename like this : '/tobi/home/tobi.jpg'.sub(/^.*[\\\/]/,'') => tobi.jpg
-  FILENAME = /^.*[\\\/]/
-
-  # good for replacing all special chars with something else, like an underscore
-  FILENORMAL = /[^a-zA-Z0-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 = /^https?:\/\/\S+$/
+  HTTP_URI = %r{^https?://\S+$}.freeze
 end

data/lib/publify_core.rb

@@ -1,45 +1,45 @@
-require 'devise'
-require 'devise-i18n'
+# frozen_string_literal: true
 
-require 'publify_core/version'
-require 'publify_core/engine'
-require 'publify_core/lang'
+require "devise"
+require "devise-i18n"
 
-require 'bootstrap-sass'
-require 'carrierwave'
-require 'dynamic_form'
-require 'jquery-rails'
-require 'jquery-ui-rails'
-require 'kaminari'
-require 'rails_autolink'
-require 'rails-timeago'
-require 'recaptcha/rails'
-require 'sass-rails'
+require "publify_core/version"
+require "publify_core/engine"
+require "publify_core/lang"
 
-require 'email_notify'
-require 'publify_guid'
-require 'publify_textfilter_none'
-require 'publify_textfilter_markdown'
-require 'publify_textfilter_smartypants'
-require 'publify_textfilter_textile'
-require 'publify_textfilter_twitterfilter'
-require 'publify_time'
-require 'sidebar_registry'
-require 'spam_protection'
-require 'stateful'
-require 'text_filter_plugin'
-require 'theme'
-require 'transforms'
+require "carrierwave"
+require "dynamic_form"
+require "jquery-rails"
+require "jquery-ui-rails"
+require "kaminari"
+require "rails_autolink"
+require "rails-timeago"
+require "recaptcha/rails"
+require "sassc-rails"
+
+require "email_notify"
+require "publify_guid"
+require "publify_textfilter_none"
+require "publify_textfilter_markdown"
+require "publify_textfilter_smartypants"
+require "publify_textfilter_textile"
+require "publify_textfilter_twitterfilter"
+require "publify_time"
+require "sidebar_registry"
+require "spam_protection"
+require "text_filter_plugin"
+require "theme"
+require "transforms"
 
 module PublifyCore
-  Theme.register_themes File.join(Engine.root, 'themes')
+  Theme.register_themes File.join(Engine.root, "themes")
 
-  SidebarRegistry.register_sidebar 'ArchivesSidebar'
-  SidebarRegistry.register_sidebar 'MetaSidebar'
-  SidebarRegistry.register_sidebar 'PageSidebar'
-  SidebarRegistry.register_sidebar 'SearchSidebar'
-  SidebarRegistry.register_sidebar 'StaticSidebar'
-  SidebarRegistry.register_sidebar 'TagSidebar'
+  SidebarRegistry.register_sidebar "ArchivesSidebar"
+  SidebarRegistry.register_sidebar "MetaSidebar"
+  SidebarRegistry.register_sidebar "PageSidebar"
+  SidebarRegistry.register_sidebar "SearchSidebar"
+  SidebarRegistry.register_sidebar "StaticSidebar"
+  SidebarRegistry.register_sidebar "TagSidebar"
 
   # Mime type is fully determined by url
   Engine.config.action_dispatch.ignore_accept_header = true

data/lib/publify_core/engine.rb

@@ -1,20 +1,27 @@
+# frozen_string_literal: true
+
 module PublifyCore
   class Engine < ::Rails::Engine
     config.generators do |generators|
       generators.test_framework :rspec, fixture: false
-      generators.fixture_replacement :factory_girl, dir: 'spec/factories'
+      generators.fixture_replacement :factory_bot, dir: "spec/factories"
+    end
+
+    config.to_prepare do
+      DeviseController.layout "accounts"
+      DeviseController.before_action do
+        devise_parameter_sanitizer.permit(:sign_up, keys: [:email])
+      end
     end
 
-    initializer 'publify_core.assets.precompile' do |app|
+    initializer "publify_core.assets.precompile" do |app|
       app.config.assets.precompile += %w(
         publify.js
         publify.css
         publify_admin.js
         publify_admin.css
         accounts.css
-        bootstrap.css
         user-styles.css
-        coderay.css
         spinner-blue.gif
         spinner.gif
       )