thredded 0.12.1 → 0.12.2

data/db/upgrade_migrations/20160611094616_upgrade_v0_5_to_v0_6.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
-class UpgradeV05ToV06 < ActiveRecord::Migration
+
+require 'thredded/base_migration'
+
+class UpgradeV05ToV06 < Thredded::BaseMigration
   def up
-    add_column :thredded_messageboards, :last_topic_id, :integer
+    add_column :thredded_messageboards, :last_topic_id, column_type(:thredded_topics, :id)
     Thredded::Messageboard.reset_column_information
     Thredded::Messageboard.all.each do |messageboard|
-      messageboard.update!(last_topic_id: messageboard.topics.order(updated_at: :desc, id: :desc).first.try(:id))
+      messageboard.update_column :last_topic_id, messageboard.topics.order(updated_at: :desc, id: :desc).first.try(:id)
     end
     change_column_null :thredded_posts, :postable_id, false
     # Allow null on user_id and last_user_id because users can get deleted.

data/db/upgrade_migrations/20160723012349_upgrade_v0_6_to_v0_7.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
-class UpgradeV06ToV07 < ActiveRecord::Migration
+
+require 'thredded/base_migration'
+
+class UpgradeV06ToV07 < Thredded::BaseMigration
   def up
     Thredded::MessageboardGroup.transaction do
       Thredded::MessageboardGroup.where(

data/db/upgrade_migrations/20161019150201_upgrade_v0_7_to_v0_8.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
-class UpgradeV07ToV08 < ActiveRecord::Migration
+
+require 'thredded/base_migration'
+
+class UpgradeV07ToV08 < Thredded::BaseMigration
   def up
     closed_messageboards = Thredded::Messageboard.unscoped.where(closed: true).to_a
     if closed_messageboards.present?

data/db/upgrade_migrations/20161113161801_upgrade_v0_8_to_v0_9.rb

@@ -1,27 +1,30 @@
 # frozen_string_literal: true
+
+require 'thredded/base_migration'
+
 # rubocop:disable Metrics/MethodLength
-class UpgradeV08ToV09 < ActiveRecord::Migration
+class UpgradeV08ToV09 < Thredded::BaseMigration
   def up
     create_table :thredded_notifications_for_private_topics do |t|
-      t.integer :user_id, null: false
+      t.references :user, null: false, index: false, type: user_id_type
       t.string :notifier_key, null: false, limit: 90
       t.boolean :enabled, default: true, null: false
-      t.index [:user_id, :notifier_key],
+      t.index %i[user_id notifier_key],
               name: 'thredded_notifications_for_private_topics_unique', unique: true
     end
     create_table :thredded_notifications_for_followed_topics do |t|
-      t.integer :user_id, null: false
+      t.references :user, null: false, index: false, type: user_id_type
       t.string :notifier_key, null: false, limit: 90
       t.boolean :enabled, default: true, null: false
-      t.index [:user_id, :notifier_key],
+      t.index %i[user_id notifier_key],
               name: 'thredded_notifications_for_followed_topics_unique', unique: true
     end
     create_table :thredded_messageboard_notifications_for_followed_topics do |t|
-      t.integer :user_id, null: false
-      t.integer :messageboard_id, null: false
+      t.references :user, null: false, index: false, type: user_id_type
+      t.references :messageboard, null: false, index: false, type: column_type(:thredded_messageboards, :id)
       t.string :notifier_key, null: false, limit: 90
       t.boolean :enabled, default: true, null: false
-      t.index [:user_id, :messageboard_id, :notifier_key],
+      t.index %i[user_id messageboard_id notifier_key],
               name: 'thredded_messageboard_notifications_for_followed_topics_unique', unique: true
     end
 

data/db/upgrade_migrations/20170125033319_upgrade_v0_9_to_v0_10.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
-class UpgradeV09ToV010 < ActiveRecord::Migration
+
+require 'thredded/base_migration'
+
+class UpgradeV09ToV010 < Thredded::BaseMigration
   def up
     remove_foreign_key :thredded_messageboard_users, :thredded_messageboards
     add_foreign_key :thredded_messageboard_users, :thredded_messageboards, on_delete: :cascade
@@ -7,14 +10,17 @@ class UpgradeV09ToV010 < ActiveRecord::Migration
     add_foreign_key :thredded_messageboard_users, :thredded_user_details, on_delete: :cascade
 
     create_table :thredded_user_post_notifications do |t|
-      t.references :user, null: false
-      t.foreign_key Thredded.user_class.table_name, column: :user_id, on_delete: :cascade
-      t.references :post, null: false
-      t.foreign_key :thredded_posts, column: :post_id, on_delete: :cascade
+      t.references :user, null: false, index: false, type: user_id_type
+      t.references :post, null: false, index: false, type: column_type(:thredded_posts, :id)
       t.datetime :notified_at, null: false
       t.index :post_id, name: :index_thredded_user_post_notifications_on_post_id
-      t.index [:user_id, :post_id], name: :index_thredded_user_post_notifications_on_user_id_and_post_id, unique: true
+      t.index %i[user_id post_id], name: :index_thredded_user_post_notifications_on_user_id_and_post_id, unique: true
     end
+
+    add_foreign_key :thredded_user_post_notifications,
+                    Thredded.user_class.table_name, column: :user_id, on_delete: :cascade
+    add_foreign_key :thredded_user_post_notifications,
+                    :thredded_posts, column: :post_id, on_delete: :cascade
   end
 
   def down

data/db/upgrade_migrations/20170312131417_upgrade_thredded_v0_10_to_v0_11.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
-class UpgradeThreddedV010ToV011 < ActiveRecord::Migration
+
+require 'thredded/base_migration'
+
+class UpgradeThreddedV010ToV011 < Thredded::BaseMigration
   def up
     drop_table :thredded_post_notifications
     add_column :thredded_user_preferences, :auto_follow_topics, :boolean, default: false, null: false
@@ -11,10 +14,10 @@ class UpgradeThreddedV010ToV011 < ActiveRecord::Migration
     remove_column :thredded_user_preferences, :auto_follow_topics
     create_table :thredded_post_notifications do |t|
       t.string :email, limit: 191, null: false
-      t.references :post, null: false
+      t.references :post, null: false, index: false
       t.timestamps null: false
       t.string :post_type, limit: 191
-      t.index [:post_id, :post_type], name: :index_thredded_post_notifications_on_post
+      t.index %i[post_id post_type], name: :index_thredded_post_notifications_on_post
     end
   end
 end

data/db/upgrade_migrations/20170420163138_upgrade_thredded_v0_11_to_v0_12.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
-class UpgradeThreddedV011ToV012 < ActiveRecord::Migration
+
+require 'thredded/base_migration'
+
+class UpgradeThreddedV011ToV012 < Thredded::BaseMigration
   def up
     FriendlyId::Slug.transaction do
       FriendlyId::Slug.where(sluggable_type: 'Thredded::Topic').where(

data/lib/generators/thredded/install/install_generator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   module Generators
     class InstallGenerator < Rails::Generators::Base

data/lib/generators/thredded/install/templates/initializer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Thredded configuration
 
 # ==> User Configuration

data/lib/tasks/thredded_tasks.rake

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 namespace :thredded do
   namespace :install do
     desc 'Copy emoji to the Rails `public/emoji` directory'

data/lib/thredded.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Backend
 require 'pundit'
 require 'active_record_union'
@@ -181,4 +182,10 @@ module Thredded
         .includes(:postable)
     )
   end
+
+  # @api private
+  def self.rails_gte_51?
+    @rails_gte_51 = (Rails.gem_version >= Gem::Version.new('5.1.0')) if @rails_gte_51.nil?
+    @rails_gte_51
+  end
 end

data/lib/thredded/base_migration.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Thredded
+  class BaseMigration < (Thredded.rails_gte_51? ? ActiveRecord::Migration[5.1] : ActiveRecord::Migration)
+    def user_id_type
+      Thredded.user_class.columns.find { |c| c.name == Thredded.user_class.primary_key }.sql_type
+    end
+
+    def column_type(table, column_name)
+      column_name = column_name.to_s
+      columns(table).find { |c| c.name == column_name }.sql_type
+    end
+  end
+end

data/lib/thredded/collection_to_strings_with_cache_renderer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'action_view/renderer/abstract_renderer'
 module Thredded
   class CollectionToStringsWithCacheRenderer < ActionView::AbstractRenderer

data/lib/thredded/content_formatter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   # Generates HTML from content source.
   class ContentFormatter
@@ -6,7 +7,7 @@ module Thredded
     mattr_accessor :whitelist
 
     self.whitelist = HTML::Pipeline::SanitizationFilter::WHITELIST.deep_merge(
-      elements: HTML::Pipeline::SanitizationFilter::WHITELIST[:elements] + %w(abbr iframe span figure figcaption),
+      elements: HTML::Pipeline::SanitizationFilter::WHITELIST[:elements] + %w[abbr iframe span figure figcaption],
       transformers: HTML::Pipeline::SanitizationFilter::WHITELIST[:transformers] + [
         lambda do |env|
           next unless env[:node_name] == 'a'
@@ -19,12 +20,12 @@ module Thredded
         end
       ],
       attributes: {
-        'a'      => %w(href rel),
-        'abbr'   => %w(title),
-        'span'   => %w(class),
-        'div'    => %w(class),
+        'a'      => %w[href rel],
+        'abbr'   => %w[title],
+        'span'   => %w[class],
+        'div'    => %w[class],
         :all     => HTML::Pipeline::SanitizationFilter::WHITELIST[:attributes][:all] +
-          %w(aria-label aria-labelledby aria-hidden),
+          %w[aria-label aria-labelledby aria-hidden],
       }
     )
 

data/lib/thredded/database_seeder.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'factory_girl_rails'
 require_relative '../../spec/support/features/fake_content'
 

data/lib/thredded/db_tools.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   module DbTools
     class << self
@@ -11,10 +12,10 @@ module Thredded
       def dump(to = dump_file)
         case adapter
         when /sqlite/i
-          system "sqlite3 #{Rails.root.join(database)} .dump > #{to}"
+          system ['sqlite3', Rails.root.join(database), '.dump', '>', to].join(' ')
         when /postgres/i
-          cmd = "pg_dump --host #{host} --username #{username} --verbose --clean --no-owner --no-acl --format=c " \
-            "#{database} > #{to}"
+          cmd = "pg_dump --dbname=postgresql://#{username}:#{password}@#{host}:5432/#{database}" \
+            "--verbose --clean --no-owner --no-acl --format=c > #{to}"
           system cmd
         when /mysql/i
           system("mysqldump --user #{username} -p#{password} #{database} > #{to}")
@@ -25,11 +26,11 @@ module Thredded
         case adapter
         when /postgres/i
           cmd = [
-            "pg_restore --verbose --host #{host}",
-            "--username #{username}",
-            ' --clean --no-owner --no-acl ',
-            " --dbname #{database} #{from}",
-            " > #{Rails.root.join('log/restore.log')}"
+            'pg_restore --verbose --clean --no-owner --no-acl',
+            "--dbname=postgresql://#{username}:#{password}@#{host}:5432/#{database}",
+            from,
+            '>',
+            Rails.root.join('log', 'restore.log')
           ].join(' ')
           system cmd
         when /mysql/i, /sqlite/i

data/lib/thredded/email_transformer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'thredded/email_transformer/onebox'
 
 module Thredded

data/lib/thredded/email_transformer/onebox.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'thredded/email_transformer/base'
 module Thredded
   module EmailTransformer

data/lib/thredded/engine.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class Engine < ::Rails::Engine
     isolate_namespace Thredded
@@ -17,11 +18,11 @@ module Thredded
     end
 
     initializer 'thredded.setup_assets' do
-      Thredded::Engine.config.assets.precompile += %w(
+      Thredded::Engine.config.assets.precompile += %w[
         thredded.js
         thredded.css
         thredded/*.svg
-      )
+      ]
     end
   end
 end

data/lib/thredded/errors.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class Error < StandardError
   end

data/lib/thredded/formatting_demo_content.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   # Content for demo-ing formatting functionality
   module FormattingDemoContent

data/lib/thredded/html_pipeline/at_mention_filter.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 module Thredded
   module HtmlPipeline
     class AtMentionFilter < ::HTML::Pipeline::Filter
-      DEFAULT_IGNORED_ANCESTOR_TAGS = %w(pre code tt a style).freeze
+      DEFAULT_IGNORED_ANCESTOR_TAGS = %w[pre code tt a style].freeze
 
       # @param context [Hash]
       # @option context :users_provider [#call(usernames)] given usernames, returns a list of users.
@@ -42,7 +43,7 @@ module Thredded
 
       def highlight!(text_node_html)
         names = mentioned_names(text_node_html)
-        return unless names.present?
+        return if names.blank?
         @users_provider.call(names).each do |user|
           name = user.thredded_display_name
           maybe_quoted_name = name =~ /[., ()]/ ? %("#{name}") : name

data/lib/thredded/html_pipeline/autolink_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   module HtmlPipeline
     # HTML Filter for auto_linking urls in HTML.

data/lib/thredded/html_pipeline/kramdown_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'kramdown'
 module Thredded
   module HtmlPipeline
@@ -12,7 +13,7 @@ module Thredded
         input: 'GFM',
         gfm_quirks: 'paragraph_end',
         # Smart quotes conflict with @"at mentions". Disable smart quotes.
-        smart_quotes: %w(apos apos quot quot),
+        smart_quotes: %w[apos apos quot quot],
         remove_block_html_tags: false,
         syntax_highlighter: nil
       }

data/lib/thredded/html_pipeline/onebox_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'onebox'
 
 module Thredded
@@ -7,7 +8,7 @@ module Thredded
       SANITIZE_CONFIG = Sanitize::Config.merge(
         Sanitize::Config::ONEBOX,
         attributes: {
-          'a' => Sanitize::Config::ONEBOX[:attributes]['a'] + %w(target),
+          'a' => Sanitize::Config::ONEBOX[:attributes]['a'] + %w[target],
         },
         add_attributes: {
           'iframe' => {

data/lib/thredded/html_pipeline/wrap_iframes_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   module HtmlPipeline
     # Wraps iframes with a <div class="thredded--embed-16-by-9"/>

data/lib/thredded/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
-  VERSION = '0.12.1'
+  VERSION = '0.12.2'
 end

data/lib/thredded/view_hooks/config.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   module ViewHooks
     class Config

data/lib/thredded/view_hooks/renderer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   module ViewHooks
     class Renderer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pundit
@@ -457,14 +457,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.48.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.48.1
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -1002,9 +1002,6 @@ files:
 - config/routes.rb
 - db/migrate/20160329231848_create_thredded.rb
 - db/seeds.rb
-- db/upgrade_migrations/20160410111522_upgrade_v0_2_to_v0_3.rb
-- db/upgrade_migrations/20160429222452_upgrade_v0_3_to_v0_4.rb
-- db/upgrade_migrations/20160501151908_upgrade_v0_4_to_v0_5.rb
 - db/upgrade_migrations/20160611094616_upgrade_v0_5_to_v0_6.rb
 - db/upgrade_migrations/20160723012349_upgrade_v0_6_to_v0_7.rb
 - db/upgrade_migrations/20161019150201_upgrade_v0_7_to_v0_8.rb
@@ -1017,6 +1014,7 @@ files:
 - lib/generators/thredded/install/templates/initializer.rb
 - lib/tasks/thredded_tasks.rake
 - lib/thredded.rb
+- lib/thredded/base_migration.rb
 - lib/thredded/collection_to_strings_with_cache_renderer.rb
 - lib/thredded/content_formatter.rb
 - lib/thredded/database_seeder.rb