thredded 0.6.2 → 0.6.3

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

@@ -3,18 +3,26 @@
 <% content_for :thredded_breadcrumbs, render('thredded/private_topics/breadcrumbs') %>
 
 <%= thredded_page do %>
-  <%= content_tag :section, class: 'thredded--main-section thredded--private-topics',
-                  'data-thredded-topics' => true do %>
+  <%= content_tag :section,
+    class: 'thredded--main-section thredded--private-topics',
+    'data-thredded-topics' => true do %>
+
     <% if @private_topics.empty? -%>
       <%= render 'thredded/private_topics/no_private_topics' %>
     <% else -%>
       <%= render 'thredded/private_topics/form',
-                 messageboard:  messageboard,
-                 private_topic: @new_private_topic,
-                 css_class:     'thredded--is-compact',
-                 placeholder:   t('thredded.private_topics.form.title_placeholder_start') %>
+        messageboard:  messageboard,
+        private_topic: @new_private_topic,
+        css_class:     'thredded--is-compact',
+        placeholder:   t('thredded.private_topics.form.title_placeholder_start') %>
+
       <%= render @private_topics %>
     <% end -%>
+
+    <%= link_to t('thredded.nav.mark_all_read'),
+      mark_all_private_topics_read_path,
+      class: 'thredded--button thredded--button-light thredded--button-wide',
+      method: :put -%>
   <% end %>
 
   <footer>

data/config/locales/en.yml

@@ -24,6 +24,7 @@ en:
       updated_notice: Messageboard has been updated
     messageboard_group:
       create: Create a New Messageboard Group
+      created_notice: Messageboard group has been created
     moderation:
       approve_btn: Approve
       block_btn: Block
@@ -48,6 +49,7 @@ en:
       edit_post: Edit Post
       edit_private_topic: :thredded.nav.edit_topic
       edit_topic: Edit
+      mark_all_read: Mark All As Read
       moderation: Moderation
       moderation_history: History
       moderation_pending: Pending
@@ -153,4 +155,3 @@ en:
       posts_count:
         one: "Posted once"
         other: "Posted %{count} times"
-

data/config/locales/pt-BR.yml

@@ -23,6 +23,7 @@ pt-BR:
       updated_notice: Fórum de mensagem foi atualizado
     messageboard_group:
       create: Criar um novo grupo de mensagens
+      created_notice: Grupo de mensagens foi criado
     moderation:
       approve_btn: Aprovar
       block_btn: Quadra
@@ -33,9 +34,8 @@ pt-BR:
       post_approved_html: Pós aprovado por %{moderator} %{time_ago}.
       post_blocked_html: Pós bloqueado por %{moderator} %{time_ago}.
       post_deleted_notice: Este post foi apagado.
-      posts_content_changed_since_moderation_html: >-
-        O <a href="%{post_url}">de pós</a> alteração de conteúdo, uma vez que foi moderado. Abaixo está o conteúdo
-        no momento em que foi moderado.
+      posts_content_changed_since_moderation_html: O <a href="%{post_url}">de pós</a> alteração de conteúdo, uma
+        vez que foi moderado. Abaixo está o conteúdo no momento em que foi moderado.
       search_users:
         form_label: Buscar usuários
         form_placeholder: :thredded.moderation.search_users.form_label
@@ -47,6 +47,7 @@ pt-BR:
       edit_post: Editar Post
       edit_private_topic: :thredded.nav.edit_topic
       edit_topic: Editar
+      mark_all_read: Marcar Como Lido
       moderation: Moderação
       moderation_activity: Atividade
       moderation_history: História
@@ -71,15 +72,13 @@ pt-BR:
       form:
         global_preferences_label: Configurações Globais
         messageboard_notify_on_mention:
-          hint: >-
-            Quando alguém mencionar você através do seu usuário (ex.: @sam) neste fórum de mensagens, você irá receber
-            um e-mail com o conteúdo deste post.
+          hint: 'Quando alguém mencionar você através do seu usuário (ex.: @sam) neste fórum de mensagens, você
+            irá receber um e-mail com o conteúdo deste post.'
           label: :thredded.preferences.form.notify_on_mention.label
         messageboard_preferences_label_html: Configurações de Notificação para <em>%{messageboard}</em>
         notify_on_mention:
-          hint: >-
-            Quando alguém mencionar você através do seu usuário (ex.: @sam) você irá receber um e-mail com o conteúdo
-            deste post.
+          hint: 'Quando alguém mencionar você através do seu usuário (ex.: @sam) você irá receber um e-mail com
+            o conteúdo deste post.'
           label: "@ Notificações"
         notify_on_message:
           hint: Quando você for adicionado a uma conversa privada, você receberá um e-mail com o conteúdo desta
@@ -141,7 +140,7 @@ pt-BR:
       unfollowed_notice: Você não está mais acompanhando este tópico
       updated_notice: Tópico atualizado
     users:
-      last_active_html: Última %{time_ago} ativa
+      last_active_html: "Última %{time_ago} ativa"
       posted_in_topic_html: Postou em %{topic_link}
       posts_count:
         one: Postado uma vez

data/config/routes.rb

@@ -6,6 +6,7 @@ Thredded::Engine.routes.draw do
   page_constraint = { page: positive_int }
 
   scope path: 'private-topics' do
+    resource :read_state, only: [:update], as: :mark_all_private_topics_read
     resource :private_topic, only: [:new], path: ''
     resources :private_topics, except: [:new, :show], path: '' do
       member do
@@ -42,7 +43,7 @@ Thredded::Engine.routes.draw do
     end
   end
 
-  resource :preferences, only: [:edit, :update]
+  resource :preferences, only: [:edit, :update], as: :global_preferences
   resource :messageboard, path: 'messageboards', only: [:new]
   resources :messageboards, only: [:edit, :update]
   resources :messageboards, only: [:index, :create], path: '' do

data/db/seeds.rb

@@ -1,120 +1,3 @@
 # frozen_string_literal: true
-require 'factory_girl_rails'
 
-# rubocop:disable HandleExceptions
-begin
-  if FactoryGirl.factories.instance_variable_get(:@items).none?
-    require_relative '../spec/factories'
-  end
-rescue NameError
-end
-# rubocop:enable HandleExceptions
-
-module Thredded
-  class SeedDatabase
-    attr_reader :user, :users, :messageboard, :topics, :private_topics, :posts
-
-    SKIP_CALLBACKS = [
-      [Thredded::Post, :commit, :after, :auto_follow_and_notify],
-      [Thredded::PrivatePost, :commit, :after, :notify_users],
-    ].freeze
-
-    def self.run(users: 200, topics: 55, posts: (1..60))
-      STDERR.puts 'Seeding the database...'
-      # Disable callbacks to avoid creating notifications and performing unnecessary updates
-      SKIP_CALLBACKS.each { |(klass, *args)| klass.skip_callback(*args) }
-      s = new
-      Messageboard.transaction do
-        s.create_first_user
-        s.create_users(count: users)
-        s.create_messageboard
-        s.create_topics(count: topics)
-        s.create_posts(count: posts)
-        s.create_private_posts(count: posts)
-        s.create_additional_messageboards
-        s.log 'Running after_commit callbacks'
-      end
-    ensure
-      # Re-enable callbacks
-      SKIP_CALLBACKS.each { |(klass, *args)| klass.set_callback(*args) }
-    end
-
-    def log(message)
-      STDERR.puts "- #{message}"
-    end
-
-    def create_first_user
-      @user ||= ::User.first || FactoryGirl.create(:user, :approved, :admin, name: 'Joe', email: 'joe@example.com')
-    end
-
-    def create_users(count:)
-      log "Creating #{count} users..."
-      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
-      log 'Creating a messageboard...'
-      @messageboard = FactoryGirl.create(
-        :messageboard,
-        name:        'Main Board',
-        slug:        'main-board',
-        description: 'A board is not a board without some posts'
-      )
-    end
-
-    def create_additional_messageboards
-      meta_group_id = MessageboardGroup.create!(name: 'Meta').id
-      additional_messageboards = [
-        ['Off-Topic', "Talk about whatever here, it's all good."],
-        ['Help, Bugs, and Suggestions',
-         'Need help using the forum? Want to report a bug or make a suggestion? This is the place.', meta_group_id],
-        ['Praise', 'Want to tell us how great we are? This is the place.', meta_group_id]
-      ]
-      log "Creating #{additional_messageboards.length} additional messageboards..."
-      additional_messageboards.each do |(name, description, group_id)|
-        messageboard = Messageboard.create!(name: name, description: description, messageboard_group_id: group_id)
-        FactoryGirl.create_list(:topic, 1 + rand(3), messageboard: messageboard, with_posts: 1)
-      end
-    end
-
-    def create_topics(count: 26, messageboard: self.messageboard)
-      log "Creating #{count} topics in #{messageboard.name}..."
-      @topics = FactoryGirl.create_list(
-        :topic, count,
-        messageboard: messageboard,
-        user:         users.sample,
-        last_user:    users.sample
-      )
-
-      @private_topics = FactoryGirl.create_list(
-        :private_topic, count,
-        user:      users.sample,
-        last_user: users.sample,
-        users:     [user]
-      )
-    end
-
-    def create_posts(count: (1..30))
-      log "Creating #{count} additional posts in each topic..."
-      @posts = topics.flat_map do |topic|
-        (count.min + rand(count.max + 1)).times do
-          FactoryGirl.create(:post, postable: topic, messageboard: messageboard, user: users.sample)
-        end
-      end
-    end
-
-    def create_private_posts(count: (1..30))
-      log "Creating #{count} additional posts in each private topic..."
-      @private_posts = private_topics.flat_map do |topic|
-        (count.min + rand(count.max + 1)).times do
-          FactoryGirl.create(:private_post, postable: topic, user: users.sample)
-        end
-      end
-    end
-  end
-end
-
-Thredded::SeedDatabase.run
+Thredded::DatabaseSeeder.run

data/heroku.gemfile

@@ -5,8 +5,7 @@ ruby '2.3.1'
 gem 'thredded', path: File.dirname(__FILE__)
 
 # Rails 5
-gem 'rails', '~> 5.0.0.rc2'
-gem 'active_record_union', '>= 1.2.0'
+gem 'rails', '~> 5.0.0'
 
 # Make these gems available in production
 gem 'puma'

data/heroku.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    thredded (0.6.2)
+    thredded (0.6.3)
       active_record_union (>= 1.2.0)
       autoprefixer-rails
       autosize-rails
@@ -30,48 +30,48 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.0.rc2)
-      actionpack (= 5.0.0.rc2)
+    actioncable (5.0.0.1)
+      actionpack (= 5.0.0.1)
       nio4r (~> 1.2)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.0.rc2)
-      actionpack (= 5.0.0.rc2)
-      actionview (= 5.0.0.rc2)
-      activejob (= 5.0.0.rc2)
+    actionmailer (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (5.0.0.rc2)
-      actionview (= 5.0.0.rc2)
-      activesupport (= 5.0.0.rc2)
-      rack (~> 2.x)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.0.1)
+      actionview (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      rack (~> 2.0)
       rack-test (~> 0.6.3)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.0.rc2)
-      activesupport (= 5.0.0.rc2)
+    actionview (5.0.0.1)
+      activesupport (= 5.0.0.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     active_record_union (1.2.0)
       activerecord (>= 4.0)
-    activejob (5.0.0.rc2)
-      activesupport (= 5.0.0.rc2)
+    activejob (5.0.0.1)
+      activesupport (= 5.0.0.1)
       globalid (>= 0.3.6)
-    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)
+    activemodel (5.0.0.1)
+      activesupport (= 5.0.0.1)
+    activerecord (5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       arel (~> 7.0)
-    activesupport (5.0.0.rc2)
+    activesupport (5.0.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.4.0)
-    arel (7.0.0)
-    autoprefixer-rails (6.3.6.2)
+    arel (7.1.1)
+    autoprefixer-rails (6.4.0.3)
       execjs
     autosize-rails (1.18.17)
       rails (>= 3.1)
@@ -100,16 +100,16 @@ GEM
     factory_girl_rails (4.7.0)
       factory_girl (~> 4.7.0)
       railties (>= 3.0.0)
-    faker (1.6.3)
+    faker (1.6.6)
       i18n (~> 0.5)
     friendly_id (5.1.0)
       activerecord (>= 4.0.0)
     gemoji (2.1.0)
     github-markdown (0.6.9)
-    globalid (0.3.6)
+    globalid (0.3.7)
       activesupport (>= 4.1.0)
-    html-pipeline (2.4.1)
-      activesupport (>= 2, < 5)
+    html-pipeline (2.4.2)
+      activesupport (>= 2)
       nokogiri (>= 1.4)
     html-pipeline-vimeo (0.1.1)
       html-pipeline (~> 2.0)
@@ -118,11 +118,11 @@ GEM
     htmlentities (4.3.4)
     http_accept_language (2.0.5)
     i18n (0.7.0)
-    inline_svg (0.9.0)
-      activesupport (>= 4.0.4)
+    inline_svg (0.10.0)
+      activesupport (>= 4.0)
       loofah (>= 2.0)
       nokogiri (~> 1.6)
-    jquery-rails (4.1.1)
+    jquery-rails (4.2.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -144,16 +144,16 @@ GEM
     mini_portile2 (2.1.0)
     minitest (5.9.0)
     multi_json (1.12.1)
-    newrelic_rpm (3.16.0.318)
+    newrelic_rpm (3.16.2.321)
     nio4r (1.2.1)
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
-    nokogumbo (1.4.7)
+    nokogumbo (1.4.9)
       nokogiri
     pg (0.18.4)
     pkg-config (1.1.7)
-    puma (3.4.0)
+    puma (3.6.0)
     pundit (1.1.0)
       activesupport (>= 3.0.0)
     rack (2.0.1)
@@ -162,29 +162,26 @@ GEM
       rack (>= 1.0.0, < 3)
     rack-test (0.6.3)
       rack (>= 1.0)
-    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)
+    rails (5.0.0.1)
+      actioncable (= 5.0.0.1)
+      actionmailer (= 5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activerecord (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.0.rc2)
+      railties (= 5.0.0.1)
       sprockets-rails (>= 2.0.0)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    rails-i18n (4.0.2)
-      i18n (~> 0.6)
-      rails (>= 4.0)
+    rails-i18n (5.0.0)
+      i18n (~> 0.7)
+      railties (~> 5.0)
     rails-timeago (2.14.0)
       actionpack (>= 3.1)
       activesupport (>= 3.1)
@@ -193,9 +190,9 @@ GEM
       request_store
       sass-rails
       turbolinks
-    railties (5.0.0.rc2)
-      actionpack (= 5.0.0.rc2)
-      activesupport (= 5.0.0.rc2)
+    railties (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -205,23 +202,23 @@ GEM
     request_store (1.3.1)
     rollbar (2.12.0)
       multi_json
-    sanitize (4.0.1)
+    sanitize (4.2.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)
     sass (3.4.22)
-    sass-rails (5.0.4)
-      railties (>= 4.0.0, < 5.0)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
     select2-rails (3.5.10)
       thor (~> 0.14)
-    sprockets (3.6.2)
+    sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-es6 (0.9.0)
+    sprockets-es6 (0.9.1)
       babel-source (>= 5.8.11)
       babel-transpiler
       sprockets (>= 3.0.0)
@@ -247,7 +244,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  active_record_union (>= 1.2.0)
   dalli
   factory_girl_rails
   faker (>= 1.6.2)
@@ -257,7 +253,7 @@ DEPENDENCIES
   pg
   puma
   rack-canonical-host
-  rails (~> 5.0.0.rc2)
+  rails (~> 5.0.0)
   rails-i18n
   rails_email_preview (>= 1.0.3)
   rollbar