thredded 0.16.14 → 0.16.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b96a82c0482d773cd074fdd77a4e67a408ba43e2e079bbbd2a4eefeb55085f37
-  data.tar.gz: 6949b12a03a39430340dbd8870cb6e5cc4dcddc583e093de576e2a3621becdb4
+  metadata.gz: ac00c63103252bbf9bff35aa057a6630605ad897368010665476b8b4d2abfc3a
+  data.tar.gz: cf7c0937115c8967c8fed0ba5789e4445db0a9e8b098a3109563b63be3883059
 SHA512:
-  metadata.gz: 4403418748bbb9b7bdcf5a503908fb526d60ff0f6100d11be98d64f625da8e9479c2be127adb2b88435686371d58cb75c39d1e4c73789e5e8297eabf9d01198d
-  data.tar.gz: 154ddbcd92f7e8f705bf4fe27bbc32f03fff0e3af7fdb81aca82143783dfd389eed1cbd516802356288af0c839cd3ddc61087209037c60bc521bee072939efa6
+  metadata.gz: cd1d9295ea54d35b3f6f1ac48f741b2766645c118b4519b717d5c4f87d926be12492ff2f4b76449088dfe2357b10e518b28442c76ac2998c19614ea2d3631603
+  data.tar.gz: 6d8892713aba82af3017146f0c4f5f8238af39842f4536640689915fa3833b68dc63023502c23e1311a63b6dd45aec0c02c14e4be3367fa6b67e3a471df70caf

data/README.md

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

data/app/helpers/thredded/icon_helper.rb

@@ -25,7 +25,7 @@ module Thredded
     def inline_svg_once(filename, id:, **transform_params)
       return if @already_inlined_svg_ids&.include?(id)
       record_already_inlined_svg(filename, id)
-      inline_svg(filename, id: id, **transform_params)
+      inline_svg_tag(filename, id: id, **transform_params)
     end
 
     private

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

@@ -27,10 +27,9 @@ module Thredded
     end
 
     def calculate_post_counts
+      relation = self.class.visible_posts_scope(user).where(postable_id: postable_id)
       unread_posts_count, read_posts_count =
-        self.class.visible_posts_scope(user)
-          .where(postable_id: postable_id)
-          .pluck(*self.class.post_counts_arel(read_at))[0]
+        Thredded::ArelCompat.pluck(relation, *self.class.post_counts_arel(read_at))[0]
       { unread_posts_count: unread_posts_count || 0, read_posts_count: read_posts_count || 0 }
     end
 
@@ -89,9 +88,9 @@ module Thredded
       def calculate_post_counts
         states = arel_table
         posts = post_class.arel_table
-        joins(states.join(posts).on(states[:postable_id].eq(posts[:postable_id])).join_sources)
+        relation = joins(states.join(posts).on(states[:postable_id].eq(posts[:postable_id])).join_sources)
           .group(states[:id])
-          .pluck(states[:id], *post_counts_arel(states[:read_at], posts: posts))
+        Thredded::ArelCompat.pluck(relation, states[:id], *post_counts_arel(states[:read_at], posts: posts))
       end
     end
   end

data/app/models/thredded/messageboard.rb

@@ -139,9 +139,11 @@ module Thredded
             .and(read_states[:user_id].eq(user.id))
             .and(read_states[:unread_posts_count].eq(0))
 
-        joins(:topics).merge(topics_scope).joins(
+        relation = joins(:topics).merge(topics_scope).joins(
           messageboards.outer_join(read_states).on(read_states_join_cond).join_sources
-        ).group(messageboards[:id]).pluck(
+        ).group(messageboards[:id])
+        Thredded::ArelCompat.pluck(
+          relation,
           :id,
           Arel::Nodes::Subtraction.new(topics[:id].count, read_states[:id].count)
         ).to_h

data/app/models/thredded/user_private_topic_read_state.rb

@@ -27,6 +27,9 @@ module Thredded
         return if !overwrite_newer && state.read_at? && state.read_at >= post.created_at
         state.read_at = post.created_at
         state.update!(state.calculate_post_counts)
+      rescue ActiveRecord::RecordNotUnique
+        # The record has been created from another connection, retry to find it.
+        retry
       end
 
       # @param [Thredded.user_class] user

data/app/models/thredded/user_topic_read_state.rb

@@ -31,6 +31,9 @@ module Thredded
         state.messageboard_id = post.messageboard_id
         state.read_at = post.created_at
         state.update!(state.calculate_post_counts)
+      rescue ActiveRecord::RecordNotUnique
+        # The record has been created from another connection, retry to find it.
+        retry
       end
 
       # @param [Thredded.user_class] user

data/app/views/thredded/posts_common/_actions.html.erb

@@ -20,7 +20,7 @@
 
 <%- if actions_html.present? %>
   <div class='thredded--post--dropdown'>
-    <%= inline_svg 'thredded/three-dot-menu.svg', class: 'thredded--post--dropdown--toggle' %>
+    <%= inline_svg_tag 'thredded/three-dot-menu.svg', class: 'thredded--post--dropdown--toggle' %>
     <div class='thredded--post--dropdown--actions'>
       <%= actions_html %>
     </div>

data/app/views/thredded/shared/nav/_moderation.html.erb

@@ -2,9 +2,9 @@
   <% current = current_page_moderation? %>
   <li class="thredded--user-navigation--item thredded--user-navigation--moderation<%= ' thredded--is-current' if current %>">
     <%= link_to current ? nav_back_path : pending_moderation_path, rel: 'nofollow' do %>
-      <%= inline_svg 'thredded/moderation.svg',
-                     class: 'thredded--icon',
-                     title: t('thredded.nav.moderation') %>
+      <%= inline_svg_tag 'thredded/moderation.svg',
+                         class: 'thredded--icon',
+                         title: t('thredded.nav.moderation') %>
       <span class="thredded--nav-text"><%= t 'thredded.nav.moderation' %></span>
       <% if posts_pending_moderation_count > 0 %>
         <span class="thredded--user-navigation--moderation--pending-count"><%= posts_pending_moderation_count %></span>

data/app/views/thredded/shared/nav/_notification_preferences.html.erb

@@ -1,7 +1,7 @@
 <% current = current_page_preferences? %>
 <li class="thredded--user-navigation--settings thredded--user-navigation--item<%= ' thredded--is-current' if current %>">
   <%= link_to current ? nav_back_path(messageboard) : edit_preferences_path(messageboard), rel: 'nofollow' do %>
-    <%= inline_svg 'thredded/settings.svg', class: 'thredded--icon', title: t('thredded.nav.settings') %>
+    <%= inline_svg_tag 'thredded/settings.svg', class: 'thredded--icon', title: t('thredded.nav.settings') %>
     <span class="thredded--nav-text"><%= t('thredded.nav.settings') %></span>
   <% end %>
 </li>

data/app/views/thredded/shared/nav/_private_topics.html.erb

@@ -1,9 +1,9 @@
 <% current = current_page_private_topics? %>
 <li class="thredded--user-navigation--item thredded--user-navigation--private-topics<%= ' thredded--is-current' if current %>">
   <%= link_to current ? nav_back_path : private_topics_path, rel: 'nofollow' do %>
-    <%= inline_svg 'thredded/private-messages.svg',
-                   class: 'thredded--icon',
-                   title: t('thredded.nav.private_topics') %>
+    <%= inline_svg_tag 'thredded/private-messages.svg',
+                       class: 'thredded--icon',
+                       title: t('thredded.nav.private_topics') %>
     <span class="thredded--nav-text"><%= t('thredded.nav.private_topics') %></span>
     <% if unread_private_topics_count > 0 -%>
       <span class="thredded--user-navigation--private-topics--unread"><%= unread_private_topics_count %></span>

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

@@ -20,7 +20,7 @@
         </span>
         <%= button_to topic.unfollow_path, form: {class: 'thredded--topic-header--follow-info--unfollow'} do %>
           <%= t('thredded.topics.unfollow') %>
-          <%= inline_svg 'thredded/follow.svg', class: 'thredded--topic-header--follow-icon' %>
+          <%= inline_svg_tag 'thredded/follow.svg', class: 'thredded--topic-header--follow-icon' %>
         <% end %>
       </div>
     <% else %>

data/lib/thredded/arel_compat.rb

@@ -4,28 +4,37 @@ unless Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR >= 2 || Rails::VERSIO
   require 'thredded/rails_lt_5_2_arel_case_node.rb'
 end
 
-if Rails::VERSION::MAJOR == 4
-  # Make `pluck` compatible with Arel.
-  require 'active_record/relation'
-  ActiveRecord::Relation.prepend(Module.new do
-    def pluck(*column_names)
-      super(*column_names.map do |n|
-        if n.is_a?(Arel::Node)
-          Arel.sql(n.to_sql)
-        elsif n.is_a?(Arel::Attributes::Attribute)
-          n.name
-        else
-          n
-        end
-      end)
-    end
-  end)
-end
-
 module Thredded
   module ArelCompat
     module_function
 
+    # On Rails >= 5, this method simply returns `relation.pluck(*columns)`.
+    #
+    # Rails 4 `pluck` does not support Arel nodes and attributes. This method does.
+    #
+    # This is an external method because monkey-patching `pluck` would
+    # have compatibility issues, see:
+    #
+    # https://github.com/thredded/thredded/issues/842
+    # https://blog.newrelic.com/engineering/ruby-agent-module-prepend-alias-method-chains/
+    if Rails::VERSION::MAJOR > 4
+      def pluck(relation, *columns)
+        relation.pluck(*columns)
+      end
+    else
+      def pluck(relation, *columns)
+        relation.pluck(*columns.map do |n|
+          if n.is_a?(Arel::Node)
+            Arel.sql(n.to_sql)
+          elsif n.is_a?(Arel::Attributes::Attribute)
+            n.name
+          else
+            n
+          end
+        end)
+      end
+    end
+
     # @param [#connection] engine
     # @param [Arel::Nodes::Node] a integer node
     # @param [Arel::Nodes::Node] b integer node

data/lib/thredded/html_pipeline/onebox_filter.rb

@@ -39,12 +39,10 @@ module Thredded
         # Regardless, always store the onebox in a file cache to enable offline development,
         # persistence between test runs, and to improve performance.
         attr_accessor :onebox_views_cache
-        attr_accessor :onebox_data_cache
       end
 
       if Rails.env.development? || Rails.env.test?
         self.onebox_views_cache = ActiveSupport::Cache::FileStore.new('tmp/cache/onebox-views')
-        self.onebox_data_cache = ActiveSupport::Cache::FileStore.new('tmp/cache/onebox-data')
       end
 
       def call
@@ -84,8 +82,7 @@ module Thredded
       end
 
       def onebox_options(_url)
-        { cache: context[:onebox_data_cache] || self.class.onebox_data_cache || Rails.cache,
-          sanitize_config: SANITIZE_CONFIG }
+        { sanitize_config: SANITIZE_CONFIG }
       end
 
       def onebox_views_cache

data/lib/thredded/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.16.14
+  version: 0.16.15
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2019-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_union
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +208,7 @@ dependencies:
         version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.48
+        version: 1.8.99
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -218,7 +218,7 @@ dependencies:
         version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.48
+        version: 1.8.99
 - !ruby/object:Gem::Dependency
   name: rinku
   requirement: !ruby/object:Gem::Requirement
@@ -1037,7 +1037,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The best Rails forums engine ever.