thredded 0.16.3 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70ed5d5d867753bfd5e7586702685ea7ccd08ec4a40413af3d61da3454188908
-  data.tar.gz: 77c4526fbd5d779651f571112b8b22aef3557340d4fceee20feb0e9397b6c5fa
+  metadata.gz: c673448c2a6d28fb179142b35315e75444fce8dd02e7023ed2bacc044fb25fc6
+  data.tar.gz: 1a2c5185e9f7329ef66eba90964ee16a0acc5612721e028b37a065290a2b51f4
 SHA512:
-  metadata.gz: 3ef7aebf6723efd1ecbce8dd49337e31aee80977ed2eda4b5a9cb07bf05118f2bb0087c513f3977948db5c46ff665aa5c90a016cfefcf16dc3744cf6f1a9398d
-  data.tar.gz: e3030a49d320e4db4d5f97066dac4710837a63e638840f3e4dc9c3ab9dccf431897e4aaff642d4113922c9747c25193dc5965fa44a85a050cb5b9e2e16bee63a
+  metadata.gz: 9b63618a95b16216b1527b9317f6d016540692b6de92e2f915b7fb9806979ca480c4c2db6af0bbd7a4889b3b01152844d334a9999b77dd64f193f53c3b163406
+  data.tar.gz: 79fdbe8f94dce3f8519c3635016866ca294ecd11ea5fdceb93edc2df2df29f85c10663aee38c56c2153cf0c84220cb94306e5a9f49e7b32f5cecd9ad11e4c380

data/README.md

@@ -95,7 +95,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.16.3'
+gem 'thredded', '~> 0.16.4'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.

data/app/commands/thredded/at_notification_extractor.rb

@@ -16,7 +16,8 @@ module Thredded
       Thredded::HtmlPipeline::AtMentionFilter.new(
         html,
         view_context: view_context,
-        users_provider: ->(user_names) { @post.readers_from_user_names(user_names).to_a }
+        users_provider: ::Thredded::UsersProvider,
+        users_provider_scope: @post.readers
       ).mentioned_users
     end
   end

data/app/helpers/thredded/application_helper.rb

@@ -85,7 +85,8 @@ module Thredded
     # @param content_partial [String]
     def render_posts(posts, partial: 'thredded/posts/post', content_partial: 'thredded/posts/content', locals: {})
       posts_with_contents = render_collection_to_strings_with_cache(
-        partial: content_partial, collection: posts, as: :post, expires_in: 1.week
+        partial: content_partial, collection: posts, as: :post, expires_in: 1.week,
+        locals: { options: { users_provider: ::Thredded::UsersProviderWithCache.new } }
       )
       render partial: partial, collection: posts_with_contents, as: :post_and_content, locals: locals
     end

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

@@ -33,22 +33,16 @@ module Thredded
 
     # @param view_context [Object] the context of the rendering view.
     # @return [String] formatted and sanitized html-safe post content.
-    def filtered_content(view_context, users_provider: ->(names) { readers_from_user_names(names) }, **options)
-      Thredded::ContentFormatter.new(view_context, users_provider: users_provider, **options).format_content(content)
+    def filtered_content(view_context, users_provider: ::Thredded::UsersProvider, **options)
+      Thredded::ContentFormatter.new(
+        view_context, users_provider: users_provider, users_provider_scope: readers, **options
+      ).format_content(content)
     end
 
     def first_post_in_topic?
       postable.first_post == self
     end
 
-    # @return [ActiveRecord::Relation<Thredded.user_class>] users from the list of user names that can read this post.
-    # @api private
-    def readers_from_user_names(user_names)
-      DbTextSearch::CaseInsensitive
-        .new(readers, Thredded.user_name_column)
-        .in(user_names)
-    end
-
     # Marks all the posts from the given one as unread for the given user
     # @param [Thredded.user_class] user
     def mark_as_unread(user)

data/lib/thredded.rb

@@ -23,6 +23,7 @@ require 'thredded/html_pipeline/kramdown_filter'
 require 'thredded/html_pipeline/onebox_filter'
 require 'thredded/html_pipeline/wrap_iframes_filter'
 require 'thredded/html_pipeline/spoiler_tag_filter'
+require 'thredded/users_provider'
 
 # Asset compilation
 require 'autoprefixer-rails'

data/lib/thredded/html_pipeline/at_mention_filter.rb

@@ -10,6 +10,7 @@ module Thredded
       def initialize(doc, context = nil, result = nil)
         super doc, context, result
         @users_provider = context[:users_provider]
+        @users_provider_scope = context[:users_provider_scope]
         @view_context = context[:view_context]
       end
 
@@ -30,7 +31,7 @@ module Thredded
         names = []
         process_text_nodes! { |node| names.concat mentioned_names(node.to_html) }
         names.uniq!
-        @users_provider.call(names)
+        @users_provider.call(names, @users_provider_scope)
       end
 
       private
@@ -43,8 +44,8 @@ module Thredded
 
       def highlight!(text_node_html)
         names = mentioned_names(text_node_html)
-        return if names.blank?
-        @users_provider.call(names).each do |user|
+        return if names.blank? || @users_provider.nil?
+        @users_provider.call(names, @users_provider_scope).each do |user|
           name = user.thredded_display_name
           maybe_quoted_name = name =~ /[., ()]/ ? %("#{name}") : name
           url = Thredded.user_path(@view_context, user)

data/lib/thredded/users_provider.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Thredded
+  module UsersProvider
+    module_function
+
+    def call(user_names, scope)
+      DbTextSearch::CaseInsensitive
+        .new(scope, Thredded.user_name_column)
+        .in(user_names)
+    end
+  end
+
+  class UsersProviderWithCache
+    def initialize
+      @mutex = Mutex.new
+      @cache = {}
+    end
+
+    def call(names, scope)
+      # This is not the same as the database lowercasing but it's OK.
+      # The worst that can happen is some cache misses.
+      names_with_lowercase = names.zip(names.map(&:downcase))
+      cached = uncached = nil
+      result = @mutex.synchronize do
+        scope_cache = (@cache[scope.to_sql] ||= {})
+        cached, uncached = names_with_lowercase.partition { |(_, lowercase)| scope_cache.key?(lowercase) }
+        fetched = UsersProvider.call(uncached.map(&:first), scope)
+        fetched.each do |user|
+          scope_cache[user.send(Thredded.user_name_column).downcase] = user
+        end
+        cached.map { |(_, lowercase)| scope_cache[lowercase] }.concat(fetched)
+      end
+      result.uniq!
+      result.compact!
+      Rails.logger.info(
+        "  [Thredded::UsersProviderWithCache] #{names.size} user names => #{result.size} users "\
+          "(#{cached.size} cached, #{uncached.size} uncached)"
+      )
+      result
+    end
+  end
+end

data/lib/thredded/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.16.4
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2019-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_union
@@ -1043,6 +1043,7 @@ files:
 - lib/thredded/html_pipeline/utils.rb
 - lib/thredded/html_pipeline/wrap_iframes_filter.rb
 - lib/thredded/rails_lt_5_2_arel_case_node.rb
+- lib/thredded/users_provider.rb
 - lib/thredded/version.rb
 - lib/thredded/view_hooks/config.rb
 - lib/thredded/view_hooks/renderer.rb