thredded 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e51fb06c46a1ac737586fd08eba81d5b6ae89859
-  data.tar.gz: 90d303e8f71a40f43933563765ca31c66e46db64
+SHA256:
+  metadata.gz: 7479689d3c4544cbb07114f0b5d0913b9e95d129a698843547268931af3248ba
+  data.tar.gz: 4f89703ac0b690feb520ab9b2eb757e09bd4e0bd1e81733ce937e2edbde7b29a
 SHA512:
-  metadata.gz: ef37394887b6fdf54d90ac4f8827485aac03e771ba1006b6a909a79b424923455c3df3b5079032c26f05be5c3210f82ff2c8b65c9ab9be5827f38a6fca357b60
-  data.tar.gz: a7ba0cefb485cbdd85a5ff470faa8032bf31b5b11e50a0cf8a6a96e27d03b10acb27b7661c7af78c05c02103126591746d2035e7e0dcc913876f6fcee5e228cb
+  metadata.gz: aeed2175ca8e77c44b53f7c35538e8282981212a0d889343c071ab481599cd3c17082daf07a27ae29697c46d54203649bac2e77e79e973bc63106fe08fe268d2
+  data.tar.gz: 40fa290e20a92388903b6e557a7a45b8fd1e7c862684a5ba253613820727646f3be39080bbb9c4f05616b511ab064c6af8d42a7a7debfadd7858eab568285d0f

data/README.md

@@ -98,7 +98,7 @@ Then, see the rest of this Readme for more information about using and customizi
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 0.14.1'
+gem 'thredded', '~> 0.14.2'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.
@@ -558,6 +558,28 @@ To disable moderation, e.g. if you run internal forums that do not need moderati
 change_column_default :thredded_user_details, :moderation_state, 1 # approved
 ```
 
+### Requiring authentication to access Thredded
+
+To require users to be authenticated to access any part of Thredded, add the following to your initializer:
+
+```ruby
+# config/initializers/thredded.rb
+Rails.application.config.to_prepare do
+  Thredded::ApplicationController.module_eval do
+    # Require authentication to access the forums:
+    before_action :thredded_require_login!
+
+    # You may also want to render a login form after the
+    # "Please sign in first" message:
+    rescue_from Thredded::Errors::LoginRequired do |exception|
+      # Place the code for rendering the login form here, for example:
+      @message = exception.message
+      render template: 'sessions/new', status: :forbidden
+    end
+  end
+end
+```
+
 ## Plugins
 
 The following official plugins are available for Thredded:

data/app/assets/javascripts/thredded/components/user_textcomplete.es6

@@ -7,10 +7,13 @@
   Thredded.UserTextcomplete = {
     DROPDOWN_CLASS_NAME: 'thredded--textcomplete-dropdown',
 
-    formatUser({avatar_url, name}) {
+    formatUser({avatar_url, name, display_name}) {
       return "<div class='thredded--textcomplete-user-result'>" +
         `<img class='thredded--textcomplete-user-result__avatar' src='${Thredded.escapeHtml(avatar_url)}' >` +
         `<span class='thredded--textcomplete-user-result__name'>${Thredded.escapeHtml(name)}</span>` +
+        (name !== display_name && display_name ?
+          `<span class='thredded--textcomplete-user-result__display_name'>${Thredded.escapeHtml(display_name)}</span>` :
+          '') +
         '</div>';
     },
 
@@ -29,8 +32,8 @@
             callback([]);
             return;
           }
-          callback(JSON.parse(request.responseText).results.map(({avatar_url, id, name}) => {
-            return {avatar_url, id, name, match};
+          callback(JSON.parse(request.responseText).results.map(({avatar_url, id, display_name, name}) => {
+            return {avatar_url, id, name, display_name, match};
           }));
         };
         request.send();

data/app/assets/stylesheets/thredded/components/_mention-autocomplete.scss

@@ -45,4 +45,13 @@ ul.thredded--textcomplete-dropdown {
     display: inline-block;
     margin-left: 0.6rem
   }
+  &__display_name {
+    display: inline-block;
+    margin-left: 0.4rem;
+
+    color: $thredded-secondary-text-color;
+    .textcomplete-item.active & {
+      color: invert($thredded-secondary-text-color);
+    }
+  }
 }

data/app/controllers/thredded/autocomplete_users_controller.rb

@@ -8,11 +8,18 @@ module Thredded
       authorize_creating Thredded::PrivateTopicForm.new(user: thredded_current_user).private_topic
       users = params.key?(:q) ? users_by_prefix : users_by_ids
       render json: {
-        results: users.map do |user|
-          { id:         user.id,
-            name:       user.send(Thredded.user_name_column),
-            avatar_url: Thredded.avatar_url.call(user) }
-        end
+        results: users.map { |user| user_to_autocomplete_result(user) }
+      }
+    end
+
+    protected
+
+    def user_to_autocomplete_result(user)
+      {
+        id: user.id,
+        name: user.send(Thredded.user_name_column),
+        display_name: user.send(Thredded.user_display_name_method),
+        avatar_url: Thredded.avatar_url.call(user)
       }
     end
 

data/app/models/thredded/messageboard.rb

@@ -77,7 +77,7 @@ module Thredded
     scope :ordered_by_created_at_asc, ->() { order(created_at: :asc) }
     scope :ordered_by_last_post_at_desc, ->() {
       joins('LEFT JOIN thredded_topics AS last_topics ON thredded_messageboards.last_topic_id = last_topics.id')
-        .order('COALESCE(last_topics.last_post_at, thredded_messageboards.created_at) DESC')
+        .order(Arel.sql('COALESCE(last_topics.last_post_at, thredded_messageboards.created_at) DESC'))
     }
     scope :ordered_by_topics_count_desc, ->() {
       order(topics_count: :desc)

data/app/view_models/thredded/messageboard_group_view.rb

@@ -11,7 +11,8 @@ module Thredded
     def self.grouped(messageboard_scope)
       messageboard_scope.preload(last_topic: [:last_user])
         .eager_load(:group)
-        .order('coalesce(thredded_messageboard_groups.position, 0) asc, thredded_messageboard_groups.id asc').ordered
+        .order(Arel.sql('COALESCE(thredded_messageboard_groups.position, 0) ASC, thredded_messageboard_groups.id ASC'))
+        .ordered
         .group_by(&:group)
         .map { |(group, messageboards)| MessageboardGroupView.new(group, messageboards) }
     end

data/db/upgrade_migrations/20170125033319_upgrade_v0_9_to_v0_10.rb

@@ -5,9 +5,11 @@ 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
+    add_foreign_key :thredded_messageboard_users, :thredded_messageboards,
+                    column: :thredded_messageboard_id, on_delete: :cascade
     remove_foreign_key :thredded_messageboard_users, :thredded_user_details
-    add_foreign_key :thredded_messageboard_users, :thredded_user_details, on_delete: :cascade
+    add_foreign_key :thredded_messageboard_users, :thredded_user_details,
+                    column: :thredded_user_detail_id, on_delete: :cascade
 
     create_table :thredded_user_post_notifications do |t|
       t.references :user, null: false, index: false, type: user_id_type

data/lib/thredded/db_tools.rb

@@ -5,6 +5,26 @@ module Thredded
     class << self
       MIGRATION_SPEC_SOURCE_VERSION = 'v0.8'
 
+      # Runs the migrations in the given paths.
+      def migrate(paths:, quiet:, &filter)
+        verbose_was = ActiveRecord::Migration.verbose
+        ActiveRecord::Migration.verbose = !quiet
+        migrate = lambda do
+          if Rails::VERSION::STRING >= '5.2'
+            ActiveRecord::MigrationContext.new(paths).migrate(nil, &filter)
+          else
+            ActiveRecord::Migrator.migrate(paths, &filter)
+          end
+        end
+        if quiet
+          silence_active_record(&migrate)
+        else
+          migrate.call
+        end
+      ensure
+        ActiveRecord::Migration.verbose = verbose_was
+      end
+
       def dump_file
         File.expand_path("../../../spec/migration/#{MIGRATION_SPEC_SOURCE_VERSION}.#{adapter}.dump", __FILE__)
       end

data/lib/thredded/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Thredded
-  VERSION = '0.14.1'
+  VERSION = '0.14.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pundit
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: db_text_search
   requirement: !ruby/object:Gem::Requirement
@@ -497,16 +497,16 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -1040,7 +1040,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: The best Rails forums engine ever.