thredded 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 868d81f0b7ff77d6ae58e572377f1001be7131b7
-  data.tar.gz: f23376c4be14345f85932348d1b9745322ac642a
+  metadata.gz: cb9af60f2898343a1404af723bb3dd314807876a
+  data.tar.gz: 7b6ac99f8869dc6722671e4c7491997815463cf7
 SHA512:
-  metadata.gz: 11bf79cf05bbf641a8c78540d6d07c2522dbb6ba660de178bdbbe1d98a18958b0edbc4360eaf74b71bb6db71f3f60717eb945326791ae03903f0cf64d1fc780e
-  data.tar.gz: 12b1603c89e6e4660d67fb7a6ed90993c42d2edd408a261d8b15f107e201d1a47dbff2b157ad94628e74713cf9d4607f1ae2a10fcbdbf86b36b49a4dac6a5f95
+  metadata.gz: 28a32a71b5e598e03fe027194b96b7577be422cae39f4208b28719e991d740ec78e8580be3f03b202f28b1bf19bb825d936608ecf18968ac1ebe5462c6be0b94
+  data.tar.gz: fe05b0331bb1f3fa9d4ed33749dbe78e6e836f5ece7cc53dc864e3ff69792a308e403854a6eb516f21865e7734ca7833cafc009f006a2274f0fe8b9b21b72264

data/{CHANGELOG.mkdn → CHANGELOG.md}

@@ -1,3 +1,16 @@
+# v0.6.2
+
+This is a minor bugfix release.
+
+## Fixed
+
+* Moderating posts, topics, and users no longer changes their `updated_at` attribute.
+* Posts and topics that are not yet visible to all users no longer appear as last posts / topics in the respective
+  topic / messageboard.
+* Cleaned up dependencies.
+
+See the full list of changes here: https://github.com/thredded/thredded/compare/v0.6.1...v0.6.2.
+
 # v0.6.1
 
 This is a minor bugfix release.

data/{README.mkdn → README.md}

@@ -100,7 +100,7 @@ cp `bundle show thredded`/db/upgrade_migrations/20160501151908_upgrade_v0_4_to_v
 rake db:migrate
 ```
 
-Note that for guaranteed best results you will want to run this with the gem checked out with v0.5.0
+Note that for guaranteed best results you will want to run this with the gem checked out with v0.5.0.
 
 ### Migrating from Forem
 

data/app/commands/thredded/moderate_post.rb

@@ -16,20 +16,32 @@ module Thredded
           moderation_state: moderation_state,
         )
         if post.user_id && post.user_detail.pending_moderation?
-          post.user_detail.update!(moderation_state: moderation_state)
+          update_without_timestamping!(post.user_detail, moderation_state: moderation_state)
         end
         if post.postable.first_post == post
-          post.postable.update!(moderation_state: moderation_state)
+          update_without_timestamping!(post.postable, moderation_state: moderation_state)
           if moderation_state == :blocked
             # When blocking the first post of a topic, also block all the other posts in the topic by this user.
             post.postable.posts.where(user_id: post.user.id).where.not(id: post.id).each do |a_post|
-              a_post.update!(moderation_state: moderation_state)
+              update_without_timestamping!(a_post, moderation_state: moderation_state)
             end
           end
         end
-        post.update!(moderation_state: moderation_state)
+        update_without_timestamping!(post, moderation_state: moderation_state)
         post_moderation_record
       end
     end
+
+    # @param record [ActiveRecord]
+    # @api private
+    def update_without_timestamping!(record, *attr)
+      record_timestamps_was = record.record_timestamps
+      begin
+        record.record_timestamps = false
+        record.update!(*attr)
+      ensure
+        record.record_timestamps = record_timestamps_was
+      end
+    end
   end
 end

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

@@ -10,18 +10,12 @@ module Thredded
     included do
       before_validation :set_default_moderation_state, on: :create
 
+      scope :moderation_state_visible_to_all, -> { where(visible_to_all_arel_node) }
+
       scope :moderation_state_visible_to_user, (lambda do |user|
+        visible = visible_to_all_arel_node
         # @type [Arel::Table]
         table = arel_table
-        # @type [Arel::Nodes::Node]
-        visible =
-          if Thredded.content_visible_while_pending_moderation
-            # All non-blocked content
-            table[:moderation_state].not_eq(moderation_states[:blocked])
-          else
-            # Only approved content
-            table[:moderation_state].eq(moderation_states[:approved])
-          end
         if user && !user.thredded_anonymous?
           # Own content
           visible = visible.or(table[:user_id].eq(user.id))
@@ -33,6 +27,18 @@ module Thredded
         end
         where(visible)
       end)
+
+      # @return [Arel::Nodes::Node]
+      # @api private
+      def self.visible_to_all_arel_node
+        if Thredded.content_visible_while_pending_moderation
+          # All non-blocked content
+          arel_table[:moderation_state].not_eq(moderation_states[:blocked])
+        else
+          # Only approved content
+          arel_table[:moderation_state].eq(moderation_states[:approved])
+        end
+      end
     end
 
     # Whether this is visible to anyone based on the moderation state.

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

@@ -15,8 +15,6 @@ module Thredded
 
       scope :order_oldest_first, -> { order(id: :asc) }
       scope :order_newest_first, -> { order(id: :desc) }
-
-      after_commit :update_parent_last_user_and_timestamp, on: [:create, :destroy]
     end
 
     def avatar_url
@@ -28,17 +26,5 @@ module Thredded
     def filtered_content(view_context, users_provider: -> (names) { readers_from_user_names(names) })
       Thredded::ContentFormatter.new(view_context, users_provider: users_provider).format_content(content)
     end
-
-    private
-
-    def update_parent_last_user_and_timestamp
-      return if postable.destroyed?
-      last_post = if destroyed?
-                    postable.posts.order_oldest_first.select(:user_id, :created_at).last
-                  else
-                    self
-                  end
-      postable.update!(last_user_id: last_post.user_id, updated_at: last_post.created_at)
-    end
   end
 end

data/app/models/thredded/post.rb

@@ -26,6 +26,7 @@ module Thredded
 
     validates :messageboard_id, presence: true
 
+    after_commit :update_parent_last_user_and_timestamp, on: [:create, :destroy]
     after_commit :auto_follow_and_notify, on: [:create, :update]
 
     # @param [Integer] per_page
@@ -50,6 +51,8 @@ module Thredded
         .in(user_names)
     end
 
+    private
+
     def auto_follow_and_notify
       return unless user
       # need to do this in-process so that it appears to them immediately
@@ -57,5 +60,19 @@ module Thredded
       # everything else can happen later
       AutoFollowAndNotifyJob.perform_later(id)
     end
+
+    def update_parent_last_user_and_timestamp
+      return if postable.destroyed?
+      last_post = if destroyed? || !moderation_state_visible_to_all?
+                    postable.posts.order_oldest_first.moderation_state_visible_to_all.select(:user_id, :updated_at).last
+                  else
+                    self
+                  end
+      if last_post
+        postable.update_columns(last_user_id: last_post.user_id, updated_at: last_post.updated_at)
+      else
+        postable.update_columns(last_user_id: nil, updated_at: postable.created_at)
+      end
+    end
   end
 end

data/app/models/thredded/private_post.rb

@@ -15,6 +15,7 @@ module Thredded
                primary_key: :user_id,
                foreign_key: :user_id
 
+    after_commit :update_parent_last_user_and_timestamp, on: [:create, :destroy]
     after_commit :notify_users, on: [:create]
 
     # @param [Integer] per_page
@@ -37,8 +38,20 @@ module Thredded
         .in(user_names)
     end
 
+    private
+
     def notify_users
       Thredded::NotifyPrivateTopicUsersJob.perform_later(id)
     end
+
+    def update_parent_last_user_and_timestamp
+      return if postable.destroyed?
+      last_post = if destroyed?
+                    postable.posts.order_oldest_first.select(:user_id, :updated_at).last
+                  else
+                    self
+                  end
+      postable.update_columns(last_user_id: last_post.user_id, updated_at: last_post.updated_at)
+    end
   end
 end

data/app/models/thredded/topic.rb

@@ -125,12 +125,12 @@ module Thredded
 
     def update_messageboard_last_topic
       return if messageboard.destroyed?
-      last_topic = if destroyed?
-                     messageboard.topics.order_recently_updated_first.select(:id).first
+      last_topic = if destroyed? || !moderation_state_visible_to_all?
+                     messageboard.topics.order_recently_updated_first.moderation_state_visible_to_all.select(:id).first
                    else
                      self
                    end
-      messageboard.update!(last_topic_id: last_topic.try(:id))
+      messageboard.update_columns(last_topic_id: last_topic.try(:id))
     end
   end
 end

data/db/seeds.rb

@@ -49,7 +49,10 @@ module Thredded
 
     def create_users(count:)
       log "Creating #{count} users..."
-      @users = [user] + FactoryGirl.create_list(:user, count, *(%i(approved) if rand > 0.1))
+      approved_users_count = (count * 0.97).round
+      @users = [user] +
+               FactoryGirl.create_list(:user, approved_users_count, :approved) +
+               FactoryGirl.create_list(:user, count - approved_users_count)
     end
 
     def create_messageboard

data/heroku.gemfile

@@ -5,15 +5,17 @@ ruby '2.3.1'
 gem 'thredded', path: File.dirname(__FILE__)
 
 # Rails 5
-gem 'rails', '~> 5.0.0.racecar1'
-gem 'active_record_union', git: 'https://github.com/glebm/active_record_union', branch: 'rails-5-test-harness'
+gem 'rails', '~> 5.0.0.rc2'
+gem 'active_record_union', '>= 1.2.0'
 
 # Make these gems available in production
 gem 'puma'
 gem 'pg'
 gem 'rails_email_preview', '>= 1.0.3'
 gem 'jquery-turbolinks'
-gem 'turbolinks'
+# TODO: upgrade once Turbolinks 5 is supported by jquery-turbolinks:
+# https://github.com/kossnocorp/jquery.turbolinks/pull/58
+gem 'turbolinks', '~> 2.5'
 gem 'rails-i18n'
 gem 'http_accept_language'
 gem 'factory_girl_rails'

data/heroku.gemfile.lock

@@ -1,16 +1,8 @@
-GIT
-  remote: https://github.com/glebm/active_record_union
-  revision: fde21fb8fe7d5d3cc24f1dc5d6627d92c30f10e5
-  branch: rails-5-test-harness
-  specs:
-    active_record_union (1.1.1)
-      activerecord (>= 4.0)
-
 PATH
   remote: .
   specs:
-    thredded (0.6.1)
-      active_record_union (>= 1.1.1)
+    thredded (0.6.2)
+      active_record_union (>= 1.2.0)
       autoprefixer-rails
       autosize-rails
       bbcoder (~> 1.0)
@@ -38,39 +30,41 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.0.rc1)
-      actionpack (= 5.0.0.rc1)
+    actioncable (5.0.0.rc2)
+      actionpack (= 5.0.0.rc2)
       nio4r (~> 1.2)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.0.rc1)
-      actionpack (= 5.0.0.rc1)
-      actionview (= 5.0.0.rc1)
-      activejob (= 5.0.0.rc1)
+    actionmailer (5.0.0.rc2)
+      actionpack (= 5.0.0.rc2)
+      actionview (= 5.0.0.rc2)
+      activejob (= 5.0.0.rc2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (5.0.0.rc1)
-      actionview (= 5.0.0.rc1)
-      activesupport (= 5.0.0.rc1)
+    actionpack (5.0.0.rc2)
+      actionview (= 5.0.0.rc2)
+      activesupport (= 5.0.0.rc2)
       rack (~> 2.x)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.0.rc1)
-      activesupport (= 5.0.0.rc1)
+    actionview (5.0.0.rc2)
+      activesupport (= 5.0.0.rc2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (5.0.0.rc1)
-      activesupport (= 5.0.0.rc1)
+    active_record_union (1.2.0)
+      activerecord (>= 4.0)
+    activejob (5.0.0.rc2)
+      activesupport (= 5.0.0.rc2)
       globalid (>= 0.3.6)
-    activemodel (5.0.0.rc1)
-      activesupport (= 5.0.0.rc1)
-    activerecord (5.0.0.rc1)
-      activemodel (= 5.0.0.rc1)
-      activesupport (= 5.0.0.rc1)
+    activemodel (5.0.0.rc2)
+      activesupport (= 5.0.0.rc2)
+    activerecord (5.0.0.rc2)
+      activemodel (= 5.0.0.rc2)
+      activesupport (= 5.0.0.rc2)
       arel (~> 7.0)
-    activesupport (5.0.0.rc1)
+    activesupport (5.0.0.rc2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -87,9 +81,9 @@ GEM
       execjs (~> 2.0)
     bbcoder (1.1.1)
     builder (3.2.2)
-    coffee-rails (4.1.1)
+    coffee-rails (4.2.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.1.x)
+      railties (>= 4.0.0, < 5.2.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -124,7 +118,7 @@ GEM
     htmlentities (4.3.4)
     http_accept_language (2.0.5)
     i18n (0.7.0)
-    inline_svg (0.8.0)
+    inline_svg (0.9.0)
       activesupport (>= 4.0.4)
       loofah (>= 2.0)
       nokogiri (~> 1.6)
@@ -135,7 +129,6 @@ GEM
     jquery-turbolinks (2.1.0)
       railties (>= 3.1.0)
       turbolinks
-    json (1.8.3)
     kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -151,7 +144,7 @@ GEM
     mini_portile2 (2.1.0)
     minitest (5.9.0)
     multi_json (1.12.1)
-    newrelic_rpm (3.15.2.317)
+    newrelic_rpm (3.16.0.318)
     nio4r (1.2.1)
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
@@ -163,24 +156,23 @@ GEM
     puma (3.4.0)
     pundit (1.1.0)
       activesupport (>= 3.0.0)
-    rack (2.0.0.rc1)
-      json
+    rack (2.0.1)
     rack-canonical-host (0.2.2)
       addressable (> 0, < 3)
       rack (>= 1.0.0, < 3)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.0.rc1)
-      actioncable (= 5.0.0.rc1)
-      actionmailer (= 5.0.0.rc1)
-      actionpack (= 5.0.0.rc1)
-      actionview (= 5.0.0.rc1)
-      activejob (= 5.0.0.rc1)
-      activemodel (= 5.0.0.rc1)
-      activerecord (= 5.0.0.rc1)
-      activesupport (= 5.0.0.rc1)
+    rails (5.0.0.rc2)
+      actioncable (= 5.0.0.rc2)
+      actionmailer (= 5.0.0.rc2)
+      actionpack (= 5.0.0.rc2)
+      actionview (= 5.0.0.rc2)
+      activejob (= 5.0.0.rc2)
+      activemodel (= 5.0.0.rc2)
+      activerecord (= 5.0.0.rc2)
+      activesupport (= 5.0.0.rc2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.0.rc1)
+      railties (= 5.0.0.rc2)
       sprockets-rails (>= 2.0.0)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -193,7 +185,7 @@ GEM
     rails-i18n (4.0.2)
       i18n (~> 0.6)
       rails (>= 4.0)
-    rails-timeago (2.13.0)
+    rails-timeago (2.14.0)
       actionpack (>= 3.1)
       activesupport (>= 3.1)
     rails_email_preview (2.0.1)
@@ -201,9 +193,9 @@ GEM
       request_store
       sass-rails
       turbolinks
-    railties (5.0.0.rc1)
-      actionpack (= 5.0.0.rc1)
-      activesupport (= 5.0.0.rc1)
+    railties (5.0.0.rc2)
+      actionpack (= 5.0.0.rc2)
+      activesupport (= 5.0.0.rc2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -211,7 +203,7 @@ GEM
     rb-gravatar (1.0.5)
     ref (2.0.0)
     request_store (1.3.1)
-    rollbar (2.11.5)
+    rollbar (2.12.0)
       multi_json
     sanitize (4.0.1)
       crass (~> 1.0.2)
@@ -226,14 +218,14 @@ GEM
       tilt (>= 1.1, < 3)
     select2-rails (3.5.10)
       thor (~> 0.14)
-    sprockets (3.6.1)
+    sprockets (3.6.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-es6 (0.9.0)
       babel-source (>= 5.8.11)
       babel-transpiler
       sprockets (>= 3.0.0)
-    sprockets-rails (3.0.4)
+    sprockets-rails (3.1.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -255,7 +247,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  active_record_union!
+  active_record_union (>= 1.2.0)
   dalli
   factory_girl_rails
   faker (>= 1.6.2)
@@ -265,16 +257,16 @@ DEPENDENCIES
   pg
   puma
   rack-canonical-host
-  rails (~> 5.0.0.racecar1)
+  rails (~> 5.0.0.rc2)
   rails-i18n
   rails_email_preview (>= 1.0.3)
   rollbar
   therubyracer
   thredded!
-  turbolinks
+  turbolinks (~> 2.5)
 
 RUBY VERSION
    ruby 2.3.1p112
 
 BUNDLED WITH
-   1.12.3
+   1.12.5

data/lib/thredded/content_formatter.rb

@@ -64,7 +64,9 @@ module Thredded
     def format_content(content)
       pipeline = HTML::Pipeline.new(content_pipeline_filters, content_pipeline_options.merge(@pipeline_options))
       result = pipeline.call(content, view_context: @view_context)
+      # rubocop:disable Rails/OutputSafety
       result[:output].to_s.html_safe
+      # rubocop:enable Rails/OutputSafety
     end
 
     protected

data/lib/thredded/version.rb

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

data/thredded.gemspec

@@ -10,17 +10,20 @@ Gem::Specification.new do |s|
   s.authors     = ['Joel Oliveira', 'Gleb Mazovetskiy']
   s.email       = ['joel@thredded.com', 'glex.spb@gmail.com']
   s.homepage    = 'https://www.thredded.com'
-  s.summary     = 'A messageboard engine'
+  s.summary     = 'The best Rails forums engine ever.'
   s.license     = 'MIT'
-  s.description = 'A messageboard engine for Rails 4.2+ apps'
+  s.description = 'The best Rails 4.2+ forums engine ever. Its goal is to be as simple and feature rich as possible.
+Thredded works with SQLite, MySQL (v5.6.4+), and PostgreSQL. See the demo at https://thredded.org/.'
 
   s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec|script)/|^\.}) } -
             %w(Dockerfile docker-compose.yml Rakefile Gemfile shared.gemfile)
 
+  s.required_ruby_version = '~> 2.1'
+
   # backend
   s.add_dependency 'bbcoder', '~> 1.0'
   s.add_dependency 'pundit', '>= 1.1.0'
-  s.add_dependency 'active_record_union', '>= 1.1.1'
+  s.add_dependency 'active_record_union', '>= 1.2.0'
   s.add_dependency 'db_text_search', '~> 0.2.0'
   s.add_dependency 'friendly_id'
   s.add_dependency 'html-pipeline'
@@ -69,5 +72,7 @@ Gem::Specification.new do |s|
 
   # dummy app frontend
   s.add_development_dependency 'jquery-turbolinks'
-  s.add_development_dependency 'turbolinks'
+  # TODO: upgrade once Turbolinks 5 is supported by jquery-turbolinks:
+  # https://github.com/kossnocorp/jquery.turbolinks/pull/58
+  s.add_development_dependency 'turbolinks', '~> 2.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-18 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bbcoder
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: db_text_search
   requirement: !ruby/object:Gem::Requirement
@@ -589,17 +589,19 @@ dependencies:
   name: turbolinks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: A messageboard engine for Rails 4.2+ apps
+        version: '2.5'
+description: |-
+  The best Rails 4.2+ forums engine ever. Its goal is to be as simple and feature rich as possible.
+  Thredded works with SQLite, MySQL (v5.6.4+), and PostgreSQL. See the demo at https://thredded.org/.
 email:
 - joel@thredded.com
 - glex.spb@gmail.com
@@ -607,10 +609,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.mkdn
+- CHANGELOG.md
 - MIT-LICENSE
 - Procfile
-- README.mkdn
+- README.md
 - app/assets/images/thredded/breadcrumb-chevron.svg
 - app/assets/images/thredded/moderation.svg
 - app/assets/images/thredded/private-messages.svg
@@ -876,9 +878,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -889,5 +891,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: A messageboard engine
+summary: The best Rails forums engine ever.
 test_files: []