thredded 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0404295457d213a2f5fdb46e8cff204fb08dc55b
-  data.tar.gz: 11dd30fc6953380143931bb1ebd52b7dd6ec1f57
+  metadata.gz: fc3545dd645f403b5ae3ca2bed2d5a6ab6b3f627
+  data.tar.gz: ca8d375aa187a223f7a250415c36e4749328074c
 SHA512:
-  metadata.gz: 1d66513bb8d504e9f1f6762b709f857c435a8fd6729f9e10ec08fcc0cae746e792132f3bbc64cf366c62603a6bc6fbae1fa1d6b3df9587bff8c618615a84383b
-  data.tar.gz: 58ea29e130f147a419b27f75312411c4e6786af2320a20563ae6ee895733cbaac787168beacbb7943480690cb34622f05a119866d87f2f56978af68b48f501b9
+  metadata.gz: 9cf1df595f1f50cea1c495adc89ad1049024a702af881632799a9a0ea8305087a4ce1c51a55c9419465b33fb7f1af4313d979da93da5fab27ee9fcb477ba4e1c
+  data.tar.gz: e52bed5a33b9852a5bebcff13484ffe9ff97c7cbe93f4b0e5f470152beafc99f15c4eb6a4acf483cc5e0375b1aa3216e0a48ed5d7bc547572bb8d8eea5a12029

data/CHANGELOG.mkdn

@@ -1,3 +1,19 @@
+# 0.5.1
+
+This is a minor bugfix release.
+
+## Fixed
+
+* Security: only allow http, https, and relative iframe src protocols.
+* Security: sanitization filter is applied last (no actual issues were discovered, but this is how it should be).
+* Fixes multiple issues with @-mentions parsing and highlighting. [e6357ff](https://github.com/thredded/thredded/commit/e6357ffb45bf9118a9f5c7df0d436bdffe0a84c6)
+* Minor CSS fixes.
+* Messageboards index page title is now i18n'd.
+* The "Delete Topic" now shows a confirmation dialog.
+* Editing posts by deleted users no longer throws an exception.
+
+See the full list of changes here: https://github.com/thredded/thredded/compare/v0.5.0...v0.5.1.
+
 # 0.5.0
 
 **NB:** If updating to this version from 0.4.x, you will need to copy and run [this migration](https://github.com/thredded/thredded/blob/5e203c8eec05919d97f4d26fa2a1fc3081e992a7/db/upgrade_migrations/20160501151908_upgrade_v0_4_to_v0_5.rb).

data/README.mkdn

@@ -44,7 +44,7 @@ application and not an engine like Thredded.
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 0.5.0'
+gem 'thredded', '~> 0.5.1'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.

data/app/assets/stylesheets/thredded/components/_post.scss

@@ -13,6 +13,7 @@
   margin-right: $thredded-small-spacing;
   position: relative;
   top: 6px;
+  vertical-align: baseline;
   width: 1.75rem; // 28px
 
   @media (min-width: $thredded-grid-container-max-width + 4rem) {

data/app/assets/stylesheets/thredded/layout/_search-navigation.scss

@@ -40,7 +40,7 @@
         box-shadow: none;
         margin-right: 0;
         -webkit-margin-end: 0;
-        min-width: 18rem;
+        min-width: 16rem;
         text-align: left;
       }
 

data/app/commands/thredded/at_notification_extractor.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 module Thredded
   class AtNotificationExtractor
+    # Matches the names in @joe, @"Joe 1", but not email@host.com.
+    # The matched name is captured and may contain the surrounding quotes.
+    MATCH_NAME_RE = /(?:^|[\s>])@([\w]+|"[\w ]+")(?=\W|$)/
+
     def initialize(content)
       @content = content
     end
 
     def run
-      scanned_names = @content.scan(/@([\w]+)(\W)?/)
-      scanned_names += @content.scan(/@"([\w\ ]+)"(\W)?/)
-      scanned_names
-        .map(&:first)
-        .uniq
+      @content.scan(MATCH_NAME_RE).map(&:first).map { |m| m.start_with?('"') ? m[1..-2] : m }.uniq
     end
   end
 end

data/app/models/concerns/thredded/topic_common.rb

@@ -10,7 +10,7 @@ module Thredded
                  foreign_key: 'last_user_id'
 
       scope :order_recently_updated_first, -> { order(updated_at: :desc, id: :desc) }
-      scope :on_page, -> page_num { page(page_num).per(30) }
+      scope :on_page, -> (page_num) { page(page_num).per(30) }
 
       validates :hash_id, presence: true, uniqueness: true
       validates :last_user_id, presence: true

data/app/models/thredded/post.rb

@@ -49,6 +49,7 @@ module Thredded
     end
 
     def auto_follow_and_notify
+      return unless user
       # need to do this in-process so that it appears to them immediately
       UserTopicFollow.create_unless_exists(user.id, postable_id, :posted)
       # everything else can happen later

data/app/models/thredded/topic.rb

@@ -5,13 +5,13 @@ module Thredded
     include TopicCommon
     include ContentModerationState
 
-    scope :for_messageboard, -> messageboard { where(messageboard_id: messageboard.id) }
+    scope :for_messageboard, -> (messageboard) { where(messageboard_id: messageboard.id) }
 
     scope :stuck, -> { where(sticky: true) }
     scope :unstuck, -> { where(sticky: false) }
 
     # Using `search_query` instead of `search` to avoid conflict with Ransack.
-    scope :search_query, -> query { ::Thredded::TopicsSearch.new(query, self).search }
+    scope :search_query, -> (query) { ::Thredded::TopicsSearch.new(query, self).search }
 
     scope :order_sticky_first, -> { order(sticky: :desc) }
 

data/app/views/thredded/messageboards/index.html.erb

@@ -1,4 +1,4 @@
-<% content_for :thredded_page_title, 'Messageboards' %>
+<% content_for :thredded_page_title, t('thredded.messageboard.index.page_title') %>
 <% content_for :thredded_page_id, 'thredded--messageboards-index' %>
 <% content_for :thredded_breadcrumbs, render('thredded/shared/breadcrumbs') %>
 <%= thredded_page do %>

data/app/views/thredded/topics/show.html.erb

@@ -21,9 +21,10 @@
 
     <% if topic.can_destroy? %>
       <div class="thredded--topic-delete--wrapper">
-        <%= form_tag topic.destroy_path, method: :delete, class: 'thredded--topic-delete-form' do %>
-          <%= submit_tag 'Delete Topic', class: 'thredded--form--submit' %>
-        <% end %>
+        <%= button_to t('thredded.topics.delete_topic'), topic.destroy_path, method: :delete,
+                      form_class: 'thredded--topic-delete-form',
+                      class: 'thredded--button',
+                      'data-confirm' => t('thredded.topics.delete_confirm') %>
       </div>
     <% end %>
   <% end %>

data/config/locales/en.yml

@@ -1,20 +1,22 @@
 ---
 en:
   thredded:
-    form:
-      update: Update
     errors:
       login_required: Please sign in first.
       not_authorized: You are not authorized to access this page.
       private_topic_create_denied: You are not authorized to create private topics.
       private_topic_not_found: This private topic does not exist.
+    form:
+      update: Update
     messageboard:
       create: Create a New Messageboard
-      update: :thredded.form.update
       form:
         no_group: No Group
+      index:
+        page_title: Messageboards
       last_updated_by_html: Updated %{time_ago} <cite>by %{user}</cite>
       topics_and_posts_counts: "%{topics_count} topics / %{posts_count} posts"
+      update: :thredded.form.update
       updated_notice: Messageboard has been updated
     messageboard_group:
       create: Create a New Messageboard Group
@@ -22,25 +24,26 @@ en:
       approve_btn: Approve
       block_btn: Block
       pending_empty:
-        title: Good job!
         content: All posts have been moderated.
+        title: Good job!
       post_approved_html: Post approved by %{moderator} %{time_ago}.
       post_blocked_html: Post blocked by %{moderator} %{time_ago}.
       post_deleted_notice: This post has been deleted.
-      posts_content_changed_since_moderation_html: The <a href="%{post_url}">post's</a> content change since it was moderated. Below is the content at the time it was moderated.
+      posts_content_changed_since_moderation_html: >-
+        The <a href="%{post_url}">post's</a> content change since it was moderated. Below is the content at the
+        time it was moderated.
     nav:
       all_messageboards: All Messageboards
       edit_messageboard: Edit Messageboard
       edit_post: Edit Post
       edit_private_topic: :thredded.nav.edit_topic
       edit_topic: Edit
-      private_topics: Private Messages
-      settings: Notification Settings
       moderation: Moderation
       moderation_history: History
+      private_topics: Private Messages
+      settings: Notification Settings
     null_user_name: Deleted user
     posts:
-      pending_moderation_notice: Your post will be published when it has been reviewed by a moderator.
       delete: Delete Post
       delete_confirm: Are you sure you want to delete this post?
       deleted_notice: Your post has been deleted.
@@ -49,6 +52,7 @@ en:
         content_label: Content
         create_btn: Submit Reply
         update_btn: Update Post
+      pending_moderation_notice: Your post will be published when it has been reviewed by a moderator.
     preferences:
       edit:
         page_title: :thredded.nav.settings
@@ -56,15 +60,15 @@ en:
         global_preferences_label: Global Settings
         messageboard_notify_on_mention:
           hint: >-
-            When someone mentions you by your username (eg: @sam) in this messageboard you will follow
-            the topic. You will receive emails with the contents of that post and any replies.
+            When someone mentions you by your username (eg: @sam) in this messageboard you will follow the topic.
+            You will receive emails with the contents of that post and any replies.
           label: :thredded.preferences.form.notify_on_mention.label
         messageboard_preferences_label_html: Notification Settings for <em>%{messageboard}</em>
         notify_on_mention:
           hint: >-
-            When someone mentions you by your username (eg: @sam) you will follow the topic.
-            You will receive emails with the contents of that post and any replies.
-          label: "Follow topics you are mentioned in"
+            When someone mentions you by your username (eg: @sam) you will follow the topic. You will receive emails
+            with the contents of that post and any replies.
+          label: Follow topics you are mentioned in
         notify_on_message:
           hint: When you are added to a private conversation you will receive an email with its content.
           label: Private Message Notifications
@@ -98,8 +102,16 @@ en:
         label: Search
         placeholder: Search Topics and Posts
     topics:
+      delete_confirm: Are you sure you want to delete this topic? This CANNOT be undone.
+      delete_topic: Delete Topic
       deleted_notice: Topic deleted
       edit: Edit Topic
+      followed_notice: You are now following this topic
+      following:
+        manual: You are following this topic.
+        mentioned: You are following this topic because you were mentioned on it.
+        posted: You are following this topic because you posted to it.
+      following_will_receive_emails: You will receive email updates.
       form:
         categories_placeholder: Categories
         content_label: :thredded.posts.form.content_label
@@ -112,11 +124,5 @@ en:
         page_title: Topics Search Results
         results_message: Search Results for %{query}
       started_by_html: Started %{time_ago} by %{user}
-      updated_notice: Topic updated
-      followed_notice: You are now following this topic
       unfollowed_notice: You are no longer following this topic
-      following:
-        manual: You are following this topic.
-        posted: You are following this topic because you posted to it.
-        mentioned: You are following this topic because you were mentioned on it.
-      following_will_receive_emails: You will receive email updates.
+      updated_notice: Topic updated

data/config/locales/pt-BR.yml

@@ -12,6 +12,8 @@ pt-BR:
       create: Criar um novo Fórum de Mensagem
       form:
         no_group: Sem Grupo
+      index:
+        page_title: Fóruns de Mensagens
       last_updated_by_html: Atualizado %{time_ago} <cite>por %{user}</cite>
       topics_and_posts_counts: "%{topics_count} tópicos / %{posts_count} posts"
       update: :thredded.form.update
@@ -101,8 +103,16 @@ pt-BR:
         label: Buscar
         placeholder: Buscar Tópicos e Posts
     topics:
+      delete_confirm: Você tem certeza que deseja remover este tópico? Isto não pode ser desfeito.
+      delete_topic: Remover Tópico
       deleted_notice: Tópico removido
       edit: Editar Tópico
+      followed_notice: You are now following this topic
+      following:
+        manual: You are following this topic.
+        mentioned: You are following this topic because you were mentioned on it.
+        posted: You are following this topic because you posted to it.
+      following_will_receive_emails: You will receive email updates.
       form:
         categories_placeholder: Categorias
         content_label: :thredded.posts.form.content_label
@@ -115,11 +125,5 @@ pt-BR:
         page_title: Tópicos dos Resultados da Busca
         results_message: Resultados de Busca para %{query}
       started_by_html: Iniciado %{time_ago} por %{user}
-      updated_notice: Tópico atualizado
-      followed_notice: You are now following this topic
       unfollowed_notice: You are no longer following this topic
-      following:
-        manual: You are following this topic.
-        posted: You are following this topic because you posted to it.
-        mentioned: You are following this topic because you were mentioned on it.
-      following_will_receive_emails: You will receive email updates.
+      updated_notice: Tópico atualizado

data/db/migrate/20160329231848_create_thredded.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 # rubocop:disable Metrics/ClassLength
 # rubocop:disable Metrics/MethodLength
-# rubocop:disable Metrics/LineLength
 class CreateThredded < ActiveRecord::Migration
   def change
     unless table_exists?(:friendly_id_slugs)
@@ -12,11 +11,13 @@ class CreateThredded < ActiveRecord::Migration
         t.string :sluggable_type, limit: 50
         t.string :scope, limit: 191
         t.datetime :created_at, null: false
+        t.index [:slug, :sluggable_type, :scope],
+                name: :index_friendly_id_slugs_on_slug_and_sluggable_type_and_scope,
+                unique: true
+        t.index [:slug, :sluggable_type], name: :index_friendly_id_slugs_on_slug_and_sluggable_type
+        t.index [:sluggable_id], name: :index_friendly_id_slugs_on_sluggable_id
+        t.index [:sluggable_type], name: :index_friendly_id_slugs_on_sluggable_type
       end
-      add_index :friendly_id_slugs, [:slug, :sluggable_type, :scope], name: :index_friendly_id_slugs_on_slug_and_sluggable_type_and_scope, unique: true
-      add_index :friendly_id_slugs, [:slug, :sluggable_type], name: :index_friendly_id_slugs_on_slug_and_sluggable_type
-      add_index :friendly_id_slugs, [:sluggable_id], name: :index_friendly_id_slugs_on_sluggable_id
-      add_index :friendly_id_slugs, [:sluggable_type], name: :index_friendly_id_slugs_on_sluggable_type
     end
 
     create_table :thredded_categories do |t|
@@ -25,9 +26,9 @@ class CreateThredded < ActiveRecord::Migration
       t.string :description, limit: 255
       t.timestamps null: false
       t.string :slug, limit: 191, null: false
+      t.index [:messageboard_id, :slug], name: :index_thredded_categories_on_messageboard_id_and_slug, unique: true
+      t.index [:messageboard_id], name: :index_thredded_categories_on_messageboard_id
     end
-    add_index :thredded_categories, [:messageboard_id, :slug], name: :index_thredded_categories_on_messageboard_id_and_slug, unique: true
-    add_index :thredded_categories, [:messageboard_id], name: :index_thredded_categories_on_messageboard_id
     DbTextSearch::CaseInsensitive.add_index connection, :thredded_categories, :name, name: :thredded_categories_name_ci
 
     create_table :thredded_messageboards do |t|
@@ -40,17 +41,17 @@ class CreateThredded < ActiveRecord::Migration
       t.references :messageboard_group
       t.timestamps null: false
       t.index [:messageboard_group_id], name: :index_thredded_messageboards_on_messageboard_group_id
+      t.index [:closed], name: :index_thredded_messageboards_on_closed
+      t.index [:slug], name: :index_thredded_messageboards_on_slug
     end
-    add_index :thredded_messageboards, [:closed], name: :index_thredded_messageboards_on_closed
-    add_index :thredded_messageboards, [:slug], name: :index_thredded_messageboards_on_slug
 
     create_table :thredded_post_notifications do |t|
       t.string :email, limit: 191, null: false
       t.integer :post_id, null: false
       t.timestamps null: false
       t.string :post_type, limit: 191
+      t.index [:post_id, :post_type], name: :index_thredded_post_notifications_on_post
     end
-    add_index :thredded_post_notifications, [:post_id, :post_type], name: :index_thredded_post_notifications_on_post
 
     create_table :thredded_posts do |t|
       t.integer :user_id, limit: 4
@@ -64,11 +65,11 @@ class CreateThredded < ActiveRecord::Migration
       t.index [:moderation_state, :updated_at],
               order: { updated_at: :asc },
               name:  :index_thredded_posts_for_display
+      t.index [:messageboard_id], name: :index_thredded_posts_on_messageboard_id
+      t.index [:postable_id], name: :index_thredded_posts_on_postable_id
+      t.index [:postable_id], name: :index_thredded_posts_on_postable_id_and_postable_type
+      t.index [:user_id], name: :index_thredded_posts_on_user_id
     end
-    add_index :thredded_posts, [:messageboard_id], name: :index_thredded_posts_on_messageboard_id
-    add_index :thredded_posts, [:postable_id], name: :index_thredded_posts_on_postable_id
-    add_index :thredded_posts, [:postable_id], name: :index_thredded_posts_on_postable_id_and_postable_type
-    add_index :thredded_posts, [:user_id], name: :index_thredded_posts_on_user_id
     DbTextSearch::FullText.add_index connection, :thredded_posts, :content, name: :thredded_posts_content_fts
 
     create_table :thredded_private_posts do |t|
@@ -87,24 +88,24 @@ class CreateThredded < ActiveRecord::Migration
       t.integer :posts_count, default: 0
       t.string :hash_id, limit: 191, null: false
       t.timestamps null: false
+      t.index [:hash_id], name: :index_thredded_private_topics_on_hash_id
+      t.index [:slug], name: :index_thredded_private_topics_on_slug
     end
-    add_index :thredded_private_topics, [:hash_id], name: :index_thredded_private_topics_on_hash_id
-    add_index :thredded_private_topics, [:slug], name: :index_thredded_private_topics_on_slug
 
     create_table :thredded_private_users do |t|
       t.integer :private_topic_id, limit: 4
       t.integer :user_id, limit: 4
       t.timestamps null: false
+      t.index [:private_topic_id], name: :index_thredded_private_users_on_private_topic_id
+      t.index [:user_id], name: :index_thredded_private_users_on_user_id
     end
-    add_index :thredded_private_users, [:private_topic_id], name: :index_thredded_private_users_on_private_topic_id
-    add_index :thredded_private_users, [:user_id], name: :index_thredded_private_users_on_user_id
 
     create_table :thredded_topic_categories do |t|
       t.integer :topic_id, null: false
       t.integer :category_id, null: false
+      t.index [:category_id], name: :index_thredded_topic_categories_on_category_id
+      t.index [:topic_id], name: :index_thredded_topic_categories_on_topic_id
     end
-    add_index :thredded_topic_categories, [:category_id], name: :index_thredded_topic_categories_on_category_id
-    add_index :thredded_topic_categories, [:topic_id], name: :index_thredded_topic_categories_on_topic_id
 
     create_table :thredded_topics do |t|
       t.integer :user_id, null: false
@@ -122,11 +123,11 @@ class CreateThredded < ActiveRecord::Migration
       t.index %i(moderation_state sticky updated_at),
               order: { sticky: :desc, updated_at: :desc },
               name:  :index_thredded_topics_for_display
+      t.index [:hash_id], name: :index_thredded_topics_on_hash_id
+      t.index [:messageboard_id, :slug], name: :index_thredded_topics_on_messageboard_id_and_slug, unique: true
+      t.index [:messageboard_id], name: :index_thredded_topics_on_messageboard_id
+      t.index [:user_id], name: :index_thredded_topics_on_user_id
     end
-    add_index :thredded_topics, [:hash_id], name: :index_thredded_topics_on_hash_id
-    add_index :thredded_topics, [:messageboard_id, :slug], name: :index_thredded_topics_on_messageboard_id_and_slug, unique: true
-    add_index :thredded_topics, [:messageboard_id], name: :index_thredded_topics_on_messageboard_id
-    add_index :thredded_topics, [:user_id], name: :index_thredded_topics_on_user_id
     DbTextSearch::FullText.add_index connection, :thredded_topics, :title, name: :thredded_topics_title_fts
 
     create_table :thredded_user_details do |t|
@@ -149,29 +150,29 @@ class CreateThredded < ActiveRecord::Migration
       t.references :thredded_user_detail, foreign_key: true, null: false
       t.references :thredded_messageboard, foreign_key: true, null: false
       t.datetime :last_seen_at, null: false
-    end
-    add_index :thredded_messageboard_users, [:thredded_messageboard_id, :thredded_user_detail_id],
+      t.index [:thredded_messageboard_id, :thredded_user_detail_id],
               name: :index_thredded_messageboard_users_primary
-    add_index :thredded_messageboard_users, [:thredded_messageboard_id, :last_seen_at],
+      t.index [:thredded_messageboard_id, :last_seen_at],
               name: :index_thredded_messageboard_users_for_recently_active
+    end
 
     create_table :thredded_user_preferences do |t|
       t.integer :user_id, null: false
       t.boolean :notify_on_mention, default: true, null: false
       t.boolean :notify_on_message, default: true, null: false
       t.timestamps null: false
+      t.index [:user_id], name: :index_thredded_user_preferences_on_user_id
     end
-    add_index :thredded_user_preferences, [:user_id], name: :index_thredded_user_preferences_on_user_id
 
     create_table :thredded_user_messageboard_preferences do |t|
       t.integer :user_id, null: false
       t.integer :messageboard_id, null: false
       t.boolean :notify_on_mention, default: true, null: false
       t.timestamps null: false
+      t.index [:user_id, :messageboard_id],
+              name: :thredded_user_messageboard_preferences_user_id_messageboard_id,
+              unique: true
     end
-    add_index :thredded_user_messageboard_preferences, [:user_id, :messageboard_id],
-              unique: true,
-              name: :thredded_user_messageboard_preferences_user_id_messageboard_id
 
     %i(topic private_topic).each do |topics_table|
       table_name = :"thredded_user_#{topics_table}_read_states"
@@ -180,8 +181,8 @@ class CreateThredded < ActiveRecord::Migration
         t.integer :postable_id, null: false
         t.integer :page, default: 1, null: false
         t.timestamp :read_at, null: false
+        t.index [:user_id, :postable_id], name: :"#{table_name}_user_postable", unique: true
       end
-      add_index table_name, [:user_id, :postable_id], name: :"#{table_name}_user_postable", unique: true
     end
 
     create_table :thredded_messageboard_groups do |t|
@@ -194,8 +195,8 @@ class CreateThredded < ActiveRecord::Migration
       t.integer :topic_id, null: false
       t.datetime :created_at, null: false
       t.integer :reason, limit: 1
+      t.index [:user_id, :topic_id], name: :thredded_user_topic_follows_user_topic, unique: true
     end
-    add_index :thredded_user_topic_follows, [:user_id, :topic_id], name: :thredded_user_topic_follows_user_topic, unique: true
 
     create_table :thredded_post_moderation_records do |t|
       t.references :post
@@ -213,6 +214,5 @@ class CreateThredded < ActiveRecord::Migration
     end
   end
 end
-# rubocop:enable Metrics/LineLength
 # rubocop:enable Metrics/MethodLength
 # rubocop:enable Metrics/ClassLength

data/heroku.gemfile

@@ -6,7 +6,6 @@ gem 'thredded', path: File.dirname(__FILE__)
 
 # Rails 5
 gem 'rails', '~> 5.0.0.racecar1'
-gem 'kaminari', git: 'https://github.com/amatsuda/kaminari'
 gem 'active_record_union', git: 'https://github.com/glebm/active_record_union', branch: 'rails-5-test-harness'
 
 # Make these gems available in production

data/heroku.gemfile.lock

@@ -1,11 +1,3 @@
-GIT
-  remote: https://github.com/amatsuda/kaminari
-  revision: f93231e6e7624dde21b528726ec471029ffb8b02
-  specs:
-    kaminari (1.0.0.alpha)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
-
 GIT
   remote: https://github.com/glebm/active_record_union
   revision: fde21fb8fe7d5d3cc24f1dc5d6627d92c30f10e5
@@ -17,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    thredded (0.5.0)
+    thredded (0.5.1)
       active_record_union (>= 1.1.1)
       autoprefixer-rails
       autosize-rails
@@ -145,6 +137,9 @@ GEM
       railties (>= 3.1.0)
       turbolinks
     json (1.8.3)
+    kaminari (0.17.0)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
     libv8 (3.16.14.15)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
@@ -268,7 +263,6 @@ DEPENDENCIES
   faker (>= 1.6.2)
   http_accept_language
   jquery-turbolinks
-  kaminari!
   newrelic_rpm
   pg
   puma

data/lib/tasks/thredded_tasks.rake

@@ -12,7 +12,8 @@ namespace :thredded do
     task :emoji do
       require 'emoji'
 
-      target = "#{Rake.original_dir}/public"
+      target = Rails.application.root.join('public')
+      STDERR.puts "Copying emoji to #{target}"
       `mkdir -p '#{target}' && cp -Rp '#{Emoji.images_path}/emoji' '#{target}'`
     end
   end

data/lib/thredded/at_users.rb

@@ -10,8 +10,9 @@ module Thredded
 
         members.each do |member|
           member_path = Thredded.user_path(view_context, member)
-          content.gsub!(/(@#{member.to_s})\b/i,
-                        %(<a href="#{ERB::Util.html_escape member_path}">\\1</a>))
+          name = member.to_s
+          content.gsub!(/(^|[\s>])(@#{name.include?(' ') ? %("#{name}") : name})\b/i,
+                        %(\1<a href="#{ERB::Util.html_escape member_path}">@#{ERB::Util.html_escape name}</a>))
         end
       end
 

data/lib/thredded/content_formatter.rb

@@ -31,6 +31,11 @@ module Thredded
           'seamless' => 'seamless',
           'sandbox'  => 'allow-same-origin allow-scripts allow-forms',
         }
+      },
+      protocols: {
+        'iframe' => {
+          'src' => ['https', 'http', :relative]
+        }
       }
     )
 
@@ -38,14 +43,14 @@ module Thredded
     mattr_accessor :pipeline_filters
 
     self.pipeline_filters = [
+      HTML::Pipeline::AtMentionFilter,
       HTML::Pipeline::VimeoFilter,
       HTML::Pipeline::YoutubeFilter,
       HTML::Pipeline::BbcodeFilter,
       HTML::Pipeline::MarkdownFilter,
-      HTML::Pipeline::SanitizationFilter,
-      HTML::Pipeline::AtMentionFilter,
       HTML::Pipeline::EmojiFilter,
       HTML::Pipeline::AutolinkFilter,
+      HTML::Pipeline::SanitizationFilter,
     ].freeze
 
     # @param view_context [Object] the context of the rendering view.

data/lib/thredded/search_parser.rb

@@ -22,13 +22,8 @@ module Thredded
 
         next unless keyword_scan.present?
         keyword_scan.each do |term|
-          keyword_term = term.delete(' ').split(':')
-
-          if found_terms_hash[keyword].nil?
-            found_terms_hash[keyword] = []
-          end
-
-          found_terms_hash[keyword] << keyword_term[1]
+          found_terms_hash[keyword] ||= []
+          found_terms_hash[keyword] << term.delete(' ').split(':')[1]
         end
       end
 

data/lib/thredded/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Thredded
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/lib/thredded.rb

@@ -52,7 +52,7 @@ module Thredded
   self.active_user_threshold = 5.minutes
   self.admin_column = :admin
   self.avatar_url = ->(user) { Gravatar.src(user.email, 128, 'mm') }
-  self.email_reply_to = -> postable { "#{postable.hash_id}@#{Thredded.email_incoming_host}" }
+  self.email_reply_to = -> (postable) { "#{postable.hash_id}@#{Thredded.email_incoming_host}" }
   self.layout = 'thredded/application'
   self.moderator_column = :admin
   self.user_name_column = :name
@@ -60,9 +60,7 @@ module Thredded
 
   # @return [Class<Thredded::UserExtender>] the user class from the host application.
   def self.user_class
-    if @@user_class.is_a?(Class)
-      fail 'Please use a string instead of a class'
-    end
+    fail 'Please use a string instead of a class' if @@user_class.is_a?(Class)
 
     if @@user_class.is_a?(String)
       begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bbcoder