thredded 0.16.9 → 0.16.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b7ad12ea287ef3ace9212dffab574e960a41da130062cf74bc1a476a0987f56
-  data.tar.gz: bafa7540a4a298026def2a48b5cbd4dddc26830b60eb516357f55ff1adc86d5f
+  metadata.gz: 78b0d8ea36cff88b87fc05f44d4419af0872e6f2c6747fc316df5b010d1affd3
+  data.tar.gz: 5f82a2fdc6c287cd85cb3dd3a5ef12631e5227dfbef4ab2d68c7495c990bf523
 SHA512:
-  metadata.gz: 8702e8deeb2916ed4df9dac747513a98a90e4b842841caed2c5394348b0daa18db1dbbc87cd6a137866a7496204d41bdc7761b0d110c83cae88c5cfa1a02cbee
-  data.tar.gz: 371c8dc989fe40b6dea0aed48243137e1b4757cd496ef5f0a78a7b452f74c143561b5fd226578834d921119873feb0eab0904c07db15e15a14d2851b7d20b120
+  metadata.gz: ec6c4e0b3ec14274519dcff925d6f10c3de0721de4dd074fd44ba193e682e178d1fabe3253e026bdc6cbdf53d13933675f39dbe61e308a8edb5af540930ade5c
+  data.tar.gz: befd728ca48d0a7c9313850fd1297f1afe9a1f52e73b960ad1b35b044484f131f0c2d9e7713cbc62dc453b45ba4888ec6a19872424071ddc67f83be03715fa83

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

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

@@ -23,7 +23,7 @@ module Thredded
         result = all
         ActiveRecord::Associations::Preloader.new.preload(
           result.map(&:postable), :first_post,
-          Thredded::Post.where(<<~SQL.delete("\n"))
+          unscoped.where(<<~SQL.delete("\n"))
           #{posts_table_name}.created_at = (
           SELECT MAX(p2.created_at) from #{posts_table_name} p2 WHERE p2.postable_id = #{posts_table_name}.postable_id)
         SQL

data/app/models/thredded/messageboard.rb

@@ -24,7 +24,7 @@ module Thredded
     validates :name, uniqueness: true, length: { within: Thredded.messageboard_name_length_range }, presence: true
     validates :topics_count, numericality: true
     validates :position, presence: true, on: :update
-    before_save :ensure_position, on: :create
+    before_save :ensure_position
 
     def ensure_position
       self.position ||= (created_at || Time.zone.now).to_i

data/app/models/thredded/messageboard_group.rb

@@ -10,7 +10,7 @@ module Thredded
     scope :ordered, -> { order(position: :asc, id: :asc) }
     validates :name, presence: true, uniqueness: true
     validates :position, presence: true, on: :update
-    before_save :ensure_position, on: :create
+    before_save :ensure_position
 
     def ensure_position
       self.position ||= Time.zone.now.to_i

data/app/views/layouts/thredded/application.html.erb

@@ -5,10 +5,11 @@
     <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0' name='viewport' />
     <%= stylesheet_link_tag 'thredded', 'data-turbolinks-track': 'reload' %>
     <%= csrf_meta_tag %>
+    <%= csp_meta_tag if Thredded.rails_supports_csp_nonce? %>
     <%= javascript_include_tag 'thredded',
                                async: !Rails.application.config.assets.debug,
                                defer: true,
-                               'data-turbolinks-track': 'reload'%>
+                               'data-turbolinks-track': 'reload' %>
     <%== Gravatar.prefetch_dns %>
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
   </head>

data/app/views/thredded/shared/_page.html.erb

@@ -8,8 +8,8 @@
 <%# If thredded JS is loaded via an [async] script, the JS may
 run before or after DOMContentLoaded. Expose a flag to Thredded
 so it can initialize correctly. %>
-<script data-turbolinks-eval="false">
+<%= javascript_tag 'data-turbolinks-eval': 'false', **(Thredded.rails_supports_csp_nonce? ? {nonce: true} : {}) do %>
   document.addEventListener('DOMContentLoaded', function() {
     (window.Thredded = window.Thredded || {}).DOMContentLoadedFired = true;
   });
-</script>
+<% end %>

data/config/locales/de.yml

@@ -259,13 +259,13 @@ de:
       last_active_html: Zuletzt aktiv %{time_ago}
       posted_in_topic_html: Hochgeladen in %{topic_link}
       posts_count:
-        one: Einmalig hochgeladen
-        other: "%{count} -mal hochgeladen"
+        one: "%{count}-mal hochgeladen"
+        other: "%{count}-mal hochgeladen"
       recent_activity: :thredded.recent_activity
       send_private_message: Private Nachricht senden
       started_topic_html: "%{topic_link} gestartet"
       started_topics_count:
-        one: Eine Diskussion gestartet
+        one: "%{count} Diskussion gestartet"
         other: "%{count} Diskussionen gestartet"
       user_posted_in_topic_html: "%{user_link} hochgeladen in %{topic_link}"
       user_since_html: Nutzer seit %{time_ago}

data/config/locales/en.yml

@@ -255,13 +255,13 @@ en:
       last_active_html: Last active %{time_ago}
       posted_in_topic_html: Posted in %{topic_link}
       posts_count:
-        one: Posted once
+        one: Posted %{count} time
         other: Posted %{count} times
       recent_activity: :thredded.recent_activity
       send_private_message: Send private message
       started_topic_html: Started %{topic_link}
       started_topics_count:
-        one: Started one topic
+        one: Started %{count} topic
         other: Started %{count} topics
       user_posted_in_topic_html: "%{user_link} posted in %{topic_link}"
       user_since_html: User since %{time_ago}

data/config/locales/es.yml

@@ -259,13 +259,13 @@ es:
       last_active_html: Última vez activo hace %{time_ago}
       posted_in_topic_html: Escribió en %{topic_link}
       posts_count:
-        one: Ha escrito una vez
+        one: Ha escrito %{count} vez
         other: Ha escrito %{count} veces
       recent_activity: :thredded.recent_activity
       send_private_message: Enviar mensaje privado
       started_topic_html: Empezó %{topic_link}
       started_topics_count:
-        one: Ha empezado un tema
+        one: Ha empezado %{count} tema
         other: Ha empezado %{count} temas
       user_posted_in_topic_html: "%{user_link} escribió en %{topic_link}"
       user_since_html: Usuario desde %{time_ago}

data/config/locales/fr.yml

@@ -257,13 +257,13 @@ fr:
       last_active_html: 'Actif pour la dernière fois : %{time_ago}'
       posted_in_topic_html: Commenté dans %{topic_link}
       posts_count:
-        one: Commenté une seule fois
+        one: Commenté %{count} fois
         other: Commenté %{count} fois
       recent_activity: :thredded.recent_activity
       send_private_message: Envoyer un message privé
       started_topic_html: Démarré %{topic_link}
       started_topics_count:
-        one: Démarré un sujet
+        one: Démarré %{count} sujet
         other: Démarré %{count} sujets
       user_posted_in_topic_html: "%{user_link} a commenté dans %{topic_link}"
       user_since_html: Utilisateur depuis %{time_ago}

data/config/locales/it.yml

@@ -259,13 +259,13 @@ it:
       last_active_html: Ultima attività %{time_ago}
       posted_in_topic_html: Ha scritto in %{topic_link}
       posts_count:
-        one: Ha commentato una volta
+        one: Ha commentato %{count} volta
         other: Ha commentato %{count} volte
       recent_activity: :thredded.recent_activity
       send_private_message: Invia un messaggio privato
       started_topic_html: Ha iniziato %{topic_link}
       started_topics_count:
-        one: Ha iniziato una discussione
+        one: Ha iniziato %{count} discussione
         other: Ha iniziato %{count} discussioni
       user_posted_in_topic_html: "%{user_link} ha commentato in %{topic_link}"
       user_since_html: Utente da %{time_ago}

data/config/locales/pl.yml

@@ -257,7 +257,7 @@ pl:
       posts_count:
         few: Napisał %{count} postów
         many: Napisał %{count} postów
-        one: Napisał 1 post
+        one: Napisał %{count} post
         other: Napisał %{count} postów
       recent_activity: :thredded.recent_activity
       send_private_message: Wyślij Wiadomość Prywatną
@@ -265,7 +265,7 @@ pl:
       started_topics_count:
         few: Rozpoczął %{count} tematy
         many: Rozpoczął %{count} tematów
-        one: Rozpoczął 1 temat
+        one: Rozpoczął %{count} temat
         other: Rozpoczął %{count} tematów
       user_posted_in_topic_html: "%{user_link} napisał w %{topic_link}"
       user_since_html: Zarejestrowany od %{time_ago}

data/config/locales/pt-BR.yml

@@ -260,14 +260,14 @@ pt-BR:
       last_active_html: Última atividade %{time_ago}
       posted_in_topic_html: Postou em %{topic_link}
       posts_count:
-        one: Postado uma vez
+        one: Postado %{count} vez
         other: Postado %{count} vezes
       recent_activity: :thredded.recent_activity
       send_private_message: Enviar mensagem privada
       started_topic_html: Começou %{topic_link}
       started_topics_count:
-        one: Começou um tópico
-        other: tópicos iniciados %{count}
+        one: Começou %{count} tópico
+        other: Começou %{count} tópicos
       user_posted_in_topic_html: "%{user_link} postou em %{topic_link}"
       user_since_html: Usuário desde %{time_ago}
       user_started_topic_html: "%{user_link} começou %{topic_link}"

data/config/locales/zh-CN.yml

@@ -248,13 +248,13 @@ zh-CN:
       last_active_html: 最后活跃%{time_ago}
       posted_in_topic_html: 在%{topic_link}中回复到：
       posts_count:
-        one: 一个回复
+        one: "%{count} 个回复"
         other: "%{count} 个回复"
       recent_activity: :thredded.recent_activity
       send_private_message: 发送私人讯息
       started_topic_html: 发布帖子 %{topic_link}
       started_topics_count:
-        one: 发布一个帖子
+        one: 发布 %{count} 个帖子
         other: 发布 %{count} 个帖子
       user_posted_in_topic_html: "%{user_link} 回复在 %{topic_link}"
       user_since_html: 用户自%{time_ago}

data/db/upgrade_migrations/20170125033319_upgrade_v0_9_to_v0_10.rb

@@ -4,10 +4,10 @@ require 'thredded/base_migration'
 
 class UpgradeV09ToV010 < Thredded::BaseMigration
   def up
-    remove_foreign_key :thredded_messageboard_users, :thredded_messageboards
+    remove_foreign_key_if_present :thredded_messageboard_users, :thredded_messageboards
     add_foreign_key :thredded_messageboard_users, :thredded_messageboards,
                     column: :thredded_messageboard_id, on_delete: :cascade
-    remove_foreign_key :thredded_messageboard_users, :thredded_user_details
+    remove_foreign_key_if_present :thredded_messageboard_users, :thredded_user_details
     add_foreign_key :thredded_messageboard_users, :thredded_user_details,
                     column: :thredded_user_detail_id, on_delete: :cascade
 
@@ -33,4 +33,24 @@ class UpgradeV09ToV010 < Thredded::BaseMigration
     remove_foreign_key :thredded_messageboard_users, :thredded_messageboards
     add_foreign_key :thredded_messageboard_users, :thredded_messageboards
   end
+
+  private
+
+  def remove_foreign_key_if_present(table, column)
+    # We had an inconsistency between v0.9 initial and upgrade migrations, as only one of them added these foreign keys.
+    # Here we remove the foreign keys before adding new ones.
+    if respond_to?(:foreign_key_exists?)
+      if foreign_key_exists?(table, column)
+        remove_foreign_key table, column
+      else
+        say "Not removing foreign key for (#{table}, #{column}) because there isn't one"
+      end
+    else
+      begin
+        remove_foreign_key table, column
+      rescue StandardError
+        say "Not removing foreign key for (#{table}, #{column}) because there isn't one"
+      end
+    end
+  end
 end

data/lib/thredded.rb

@@ -250,6 +250,12 @@ module Thredded # rubocop:disable Metrics/ModuleLength
       @rails_gte_51 = (Rails.gem_version >= Gem::Version.new('5.1.0')) if @rails_gte_51.nil?
       @rails_gte_51
     end
+
+    # @api private
+    def rails_supports_csp_nonce?
+      @rails_supports_csp_nonce = (Rails.gem_version >= Gem::Version.new('5.2.0')) if @rails_supports_csp_nonce.nil?
+      @rails_supports_csp_nonce
+    end
   end
 
   self.user_name_column = :name

data/lib/thredded/collection_to_strings_with_cache_renderer.rb

@@ -83,7 +83,17 @@ module Thredded
     # @return [Array<String>]
     def render_partials_serial(view_context, collection, opts)
       partial_renderer = ActionView::PartialRenderer.new(@lookup_context)
-      collection.map { |object| partial_renderer.render(view_context, opts.merge(object: object), nil) }
+      collection.map { |object| render_partial(partial_renderer, view_context, opts.merge(object: object)) }
+    end
+
+    if Rails::VERSION::MAJOR >= 6
+      def render_partial(partial_renderer, view_context, opts)
+        partial_renderer.render(view_context, opts, nil).body
+      end
+    else
+      def render_partial(partial_renderer, view_context, opts)
+        partial_renderer.render(view_context, opts, nil)
+      end
     end
   end
 end

data/lib/thredded/database_seeder.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'factory_bot_rails'
+require 'factory_bot'
 require_relative '../../spec/support/features/fake_content'
 
 # rubocop:disable HandleExceptions

data/lib/thredded/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.16.9
+  version: 0.16.10
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-02 00:00:00.000000000 Z
+date: 2019-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_union
@@ -340,19 +340,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_bot_rails
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -395,34 +395,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.58.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.58.2
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.28.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.28.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -465,20 +437,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: i18n-tasks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.18
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.18
 - !ruby/object:Gem::Dependency
   name: kaminari-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -555,28 +513,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: roadie-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement