thredded 0.2.2 → 0.3.0

data/lib/generators/thredded/install/install_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Thredded
   module Generators
     class InstallGenerator < Rails::Generators::Base

data/lib/generators/thredded/install/templates/initializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Thredded configuration
 
 # ==> User Configuration
@@ -18,6 +19,9 @@ Thredded.user_path = lambda do |user|
   main_app.respond_to?(user_path) ? main_app.send(user_path, user) : "/users/#{user.to_param}"
 end
 
+# This method is used by Thredded controllers and views to fetch the currently signed-in user
+Thredded.current_user_method = :"current_#{Thredded.user_class.name.underscore}"
+
 # User avatar URL. rb-gravatar gem is used by default:
 Thredded.avatar_url = ->(user) { Gravatar.src(user.email, 128, 'mm') }
 
@@ -49,3 +53,16 @@ Thredded.admin_column = :admin
 # ==> View Configuration
 # Set the layout for rendering the thredded views.
 Thredded.layout = 'thredded/application'
+
+# ==> Error Handling
+# By default Thredded just renders a flash alert on errors such as Topic not found, or Login required.
+# Below is an example of overriding the default behavior on LoginRequired:
+#
+# Rails.application.config.to_prepare do
+#   Thredded::ApplicationController.module_eval do
+#     rescue_from Thredded::Errors::LoginRequired do |exception|
+#       @message = exception.message
+#       render template: 'sessions/new', status: :forbidden
+#     end
+#   end
+# end

data/lib/html/pipeline/at_mention_filter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'thredded/at_users'
 
 module HTML
@@ -5,7 +6,7 @@ module HTML
     class AtMentionFilter < Filter
       def initialize(text, context = nil, result = nil)
         super text, context, result
-        @text = text.to_s.gsub "\r", ''
+        @text = text.to_s.delete("\r")
         @post = context[:post]
         @view_context = context[:view_context]
       end

data/lib/html/pipeline/bbcode_filter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'bbcoder'
 
 module HTML
@@ -5,14 +6,22 @@ module HTML
     class BbcodeFilter < TextFilter
       def initialize(text, context = {}, result = nil)
         super text, context, result
-        @context = context
-        @text = @text.gsub "\r", ''
       end
 
       def call
-        html = BBCoder.new(@text).to_html.gsub(/\n|\r\n/, '<br />')
+        html = BBCoder.new(@text).to_html
+        html = remove_url_link_contents(html)
+        html.delete('<br>')
         html.rstrip!
-        "<p>#{html}</p>"
+        html
+      end
+
+      def remove_url_link_contents(html)
+        doc = Nokogiri::HTML::DocumentFragment.parse(html)
+        doc.css('a').each do |link|
+          link.content = link.content.gsub(%r{https?://}, '')
+        end
+        doc.to_html
       end
     end
   end

data/lib/tasks/thredded_tasks.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 namespace :thredded do
   desc 'Destroy messageboard and all related data'
   task :destroy, [:slug] => :environment do |_, args|

data/lib/thredded.rb

@@ -1,13 +1,18 @@
+# frozen_string_literal: true
 # Backend
-require 'cancan'
+require 'pundit'
+require 'active_record_union'
 require 'db_text_search'
 require 'friendly_id'
 require 'html/pipeline'
 require 'html/pipeline/at_mention_filter'
 require 'html/pipeline/bbcode_filter'
+require 'html/pipeline/vimeo/vimeo_filter'
+require 'html/pipeline/youtube/youtube_filter'
 require 'kaminari'
 require 'rb-gravatar'
 require 'active_job'
+require 'inline_svg'
 
 # Asset compilation
 require 'autoprefixer-rails'
@@ -18,25 +23,22 @@ require 'select2-rails'
 require 'sprockets/es6'
 
 require 'thredded/engine'
-require 'thredded/errors'
-require 'thredded/messageboard_user_permissions'
-require 'thredded/post_user_permissions'
-require 'thredded/private_topic_user_permissions'
-require 'thredded/topic_user_permissions'
-require 'thredded/search_sql_builder'
-require 'thredded/main_app_route_delegator'
 
 module Thredded
-  mattr_accessor :user_class,
-    :user_name_column,
+  mattr_accessor \
+    :active_user_threshold,
     :avatar_url,
-    :email_incoming_host,
     :email_from,
+    :email_incoming_host,
     :email_outgoing_prefix,
     :email_reply_to,
-    :user_path,
     :layout,
-    :active_user_threshold
+    :user_class,
+    :user_name_column,
+    :user_path
+
+  # @return [Symbol] The name of the method used by Thredded controllers and views to fetch the currently signed-in user
+  mattr_accessor :current_user_method
 
   # @return [Symbol] The name of the moderator flag column on the users table for the default permissions model
   mattr_accessor :moderator_column
@@ -44,13 +46,13 @@ module Thredded
   # @return [Symbol] The name of the admin flag column on the users table for the default permissions model
   mattr_accessor :admin_column
 
-  self.user_name_column = :name
-  self.avatar_url = ->(user) { Gravatar.src(user.email, 128, 'mm') }
   self.active_user_threshold = 5.minutes
-  self.layout = 'thredded/application'
+  self.admin_column = :admin
+  self.avatar_url = ->(user) { Gravatar.src(user.email, 128, 'mm') }
   self.email_reply_to = -> postable { "#{postable.hash_id}@#{Thredded.email_incoming_host}" }
+  self.layout = 'thredded/application'
   self.moderator_column = :admin
-  self.admin_column = :admin
+  self.user_name_column = :name
 
   # @return [Class<Thredded::UserExtender>] the user class from the host application.
   def self.user_class

data/lib/thredded/at_users.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Thredded
   class AtUsers
     def self.render(content, post, view_context)

data/lib/thredded/engine.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+require_dependency 'thredded/main_app_route_delegator'
 module Thredded
   class Engine < ::Rails::Engine
     isolate_namespace Thredded
 
-    config.autoload_paths << File.expand_path('../../../app/decorators', __FILE__)
-    config.autoload_paths << File.expand_path('../../../app/forms', __FILE__)
-    config.autoload_paths << File.expand_path('../../../app/commands', __FILE__)
-    config.autoload_paths << File.expand_path('../../../app/jobs', __FILE__)
+    %w(app/view_models app/forms app/commands app/jobs lib).each do |path|
+      config.autoload_paths << File.expand_path("../../#{path}", File.dirname(__FILE__))
+    end
 
     config.generators do |g|
       g.test_framework :rspec, fixture: true
@@ -28,8 +29,16 @@ module Thredded
       Thredded::Engine.config.assets.precompile += %w(
         thredded.js
         thredded.css
-        thredded/breadcrumb-chevron.svg
+        thredded/*.svg
       )
     end
+
+    initializer 'thredded.setup_bbcoder' do
+      BBCoder.configure do
+        tag :img, match: %r{^https?://.*(png|bmp|jpe?g|gif)$}, singular: false do
+          %(<img src="#{singular? ? meta : content}" />)
+        end
+      end
+    end
   end
 end

data/lib/thredded/errors.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Thredded
   class Error < StandardError
   end
@@ -5,7 +6,13 @@ module Thredded
   module Errors
     class DatabaseEmpty < Thredded::Error
       def message
-        'Seed the database with "rake thredded:dev:seed".'
+        'Seed the database with "rake db:seed".'
+      end
+    end
+
+    class LoginRequired < Thredded::Error
+      def message
+        I18n.t('thredded.errors.login_required')
       end
     end
 
@@ -17,7 +24,7 @@ module Thredded
 
     class PrivateTopicNotFound < Thredded::Error
       def message
-        'This private topic does not exist.'
+        I18n.t('thredded.errors.private_topic_not_found')
       end
     end
 
@@ -51,16 +58,9 @@ module Thredded
       end
     end
 
-    class PrivateTopicCreateDenied < TopicCreateDenied
-    end
-
-    class EmptySearchResults < Thredded::Error
-      def initialize(query)
-        @query = query
-      end
-
+    class PrivateTopicCreateDenied < Thredded::Error
       def message
-        "There are no results for your search - '#{@query}'"
+        I18n.t('thredded.errors.private_topic_create_denied')
       end
     end
   end

data/lib/thredded/main_app_route_delegator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Thredded
   # If thredded is rendered within an application layout, this module allows
   # referring to the routes in the layout directly, without having to use `main_app.`.

data/lib/thredded/search_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Thredded
   class SearchParser
     def initialize(query)
@@ -21,7 +22,7 @@ module Thredded
 
         if keyword_scan.present?
           keyword_scan.each do |term|
-            keyword_term = term.gsub(' ', '').split(':')
+            keyword_term = term.delete(' ').split(':')
 
             if found_terms_hash[keyword].nil?
               found_terms_hash[keyword] = []

data/lib/thredded/topics_search.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+require_dependency 'thredded/search_parser'
+module Thredded
+  class TopicsSearch
+    def initialize(query, scope)
+      @terms = SearchParser.new(query).parse
+      @scope = scope
+
+      @search_categories = @search_users = @search_text = nil
+    end
+
+    # @return [ActiveRecord::Relation<Thredded::Topic>]
+    def search
+      if categories.present?
+        @scope = @scope.joins(:topic_categories).merge(TopicCategory.where(category_id: categories))
+      end
+      if text.present? || users.present?
+        [search_topics, search_posts].compact.reduce(:union)
+      else
+        @scope
+      end
+    end
+
+    protected
+
+    def search_topics
+      scope = @scope
+      scope = @scope.where(user_id: users) if users.present?
+      scope = DbTextSearch::FullText.new(scope, :title).search(text) if text.present?
+      scope
+    end
+
+    def search_posts
+      posts_scope = Thredded::Post
+      posts_scope = posts_scope.where(user_id: users) if users.present?
+      posts_scope = DbTextSearch::FullText.new(posts_scope, :content).search(text) if text.present?
+      @scope.joins(:posts).merge(posts_scope)
+    end
+
+    def categories
+      @search_categories ||=
+        if @terms['in'].present?
+          DbTextSearch::CaseInsensitive
+            .new(Category, :name)
+            .in(@terms['in']).pluck(:id)
+        else
+          []
+        end
+    end
+
+    def users
+      @search_users ||=
+        if @terms['by']
+          DbTextSearch::CaseInsensitive
+            .new(Thredded.user_class, Thredded.user_name_column)
+            .in(@terms['by']).pluck(:id)
+        else
+          []
+        end
+    end
+
+    # @return [Array<String>]
+    def text
+      @terms['text']
+    end
+  end
+end

data/lib/thredded/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Thredded
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

data/thredded.gemspec

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 $LOAD_PATH.push File.expand_path('../lib', __FILE__)
 
 require 'thredded/version'
@@ -18,15 +19,19 @@ Gem::Specification.new do |s|
 
   # backend
   s.add_dependency 'bbcoder', '~> 1.0'
-  s.add_dependency 'cancancan'
-  s.add_dependency 'db_text_search', '~> 0.1.1'
+  s.add_dependency 'pundit', '>= 1.1.0'
+  s.add_dependency 'active_record_union', '>= 1.1.1'
+  s.add_dependency 'db_text_search', '~> 0.2.0'
   s.add_dependency 'friendly_id'
   s.add_dependency 'html-pipeline'
+  s.add_dependency 'html-pipeline-vimeo'
+  s.add_dependency 'html-pipeline-youtube'
   s.add_dependency 'htmlentities'
   s.add_dependency 'kaminari'
   s.add_dependency 'nokogiri'
-  s.add_dependency 'rails', '>= 4.1.0'
+  s.add_dependency 'rails', '>= 4.2.0'
   s.add_dependency 'rb-gravatar'
+  s.add_dependency 'inline_svg'
 
   # html-pipeline dependencies, see https://github.com/jch/html-pipeline#dependencies
   s.add_dependency 'gemoji'
@@ -45,22 +50,21 @@ Gem::Specification.new do |s|
 
   # test dependencies
   s.add_development_dependency 'capybara', '~> 2.4'
-  s.add_development_dependency 'chronic'
   s.add_development_dependency 'database_cleaner'
   s.add_development_dependency 'factory_girl_rails'
-  s.add_development_dependency 'faker'
+  s.add_development_dependency 'faker', '>= 1.6.2'
   s.add_development_dependency 'launchy'
   s.add_development_dependency 'rspec-rails'
-  s.add_development_dependency 'rubocop', '0.32.0'
-  s.add_development_dependency 'shoulda-matchers', '~> 2.7'
+  s.add_development_dependency 'rubocop', '~> 0.39'
   s.add_development_dependency 'test-unit'
-  s.add_development_dependency 'timecop'
 
   # dummy app dependencies
   s.add_development_dependency 'mysql2'
   s.add_development_dependency 'pg'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'puma'
+  s.add_development_dependency 'rails_email_preview', '>= 1.0.3'
+  s.add_development_dependency 'i18n-tasks'
 
   # dummy app frontend
   s.add_development_dependency 'jquery-turbolinks'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bbcoder
@@ -26,33 +26,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: cancancan
+  name: pundit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: active_record_union
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: db_text_search
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +95,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: html-pipeline-vimeo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: html-pipeline-youtube
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -129,14 +171,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rb-gravatar
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +193,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: inline_svg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gemoji
   requirement: !ruby/object:Gem::Requirement
@@ -319,20 +375,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
-- !ruby/object:Gem::Dependency
-  name: chronic
-  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'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -367,14 +409,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -407,32 +449,32 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: '0.39'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: '0.39'
 - !ruby/object:Gem::Dependency
-  name: shoulda-matchers
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -446,7 +488,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -460,7 +502,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -474,7 +516,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -488,21 +530,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rails_email_preview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
-  name: puma
+  name: i18n-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -553,14 +595,21 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.mkdn
 - MIT-LICENSE
+- Procfile
 - README.mkdn
 - app/assets/images/thredded/breadcrumb-chevron.svg
+- app/assets/images/thredded/private-messages.svg
+- app/assets/images/thredded/settings.svg
 - app/assets/javascripts/thredded.es6
-- app/assets/javascripts/thredded/currently_online.es6
-- app/assets/javascripts/thredded/post_form.es6
-- app/assets/javascripts/thredded/time_stamps.es6
-- app/assets/javascripts/thredded/topic_form.es6
-- app/assets/javascripts/thredded/users_select.es6
+- app/assets/javascripts/thredded/components/currently_online.es6
+- app/assets/javascripts/thredded/components/post_form.es6
+- app/assets/javascripts/thredded/components/time_stamps.es6
+- app/assets/javascripts/thredded/components/topic_form.es6
+- app/assets/javascripts/thredded/components/topics.es6
+- app/assets/javascripts/thredded/components/user_preferences_form.es6
+- app/assets/javascripts/thredded/components/users_select.es6
+- app/assets/javascripts/thredded/dependencies.js
+- app/assets/javascripts/thredded/thredded.es6
 - app/assets/stylesheets/thredded.scss
 - app/assets/stylesheets/thredded/_base.scss
 - app/assets/stylesheets/thredded/_dependencies.scss
@@ -570,14 +619,17 @@ files:
 - app/assets/stylesheets/thredded/base/_forms.scss
 - app/assets/stylesheets/thredded/base/_grid.scss
 - app/assets/stylesheets/thredded/base/_lists.scss
+- app/assets/stylesheets/thredded/base/_nav.scss
 - app/assets/stylesheets/thredded/base/_tables.scss
 - app/assets/stylesheets/thredded/base/_typography.scss
 - app/assets/stylesheets/thredded/base/_variables.scss
+- app/assets/stylesheets/thredded/components/_alerts.scss
 - app/assets/stylesheets/thredded/components/_base.scss
 - app/assets/stylesheets/thredded/components/_currently-online.scss
 - app/assets/stylesheets/thredded/components/_empty.scss
 - app/assets/stylesheets/thredded/components/_flash-message.scss
 - app/assets/stylesheets/thredded/components/_form-list.scss
+- app/assets/stylesheets/thredded/components/_icons.scss
 - app/assets/stylesheets/thredded/components/_main-section.scss
 - app/assets/stylesheets/thredded/components/_messageboard.scss
 - app/assets/stylesheets/thredded/components/_pagination.scss
@@ -590,7 +642,8 @@ files:
 - app/assets/stylesheets/thredded/components/_topics.scss
 - app/assets/stylesheets/thredded/layout/_main-container.scss
 - app/assets/stylesheets/thredded/layout/_main-navigation.scss
-- app/assets/stylesheets/thredded/layout/_topic-navigation.scss
+- app/assets/stylesheets/thredded/layout/_navigation.scss
+- app/assets/stylesheets/thredded/layout/_search-navigation.scss
 - app/assets/stylesheets/thredded/layout/_user-navigation.scss
 - app/assets/stylesheets/thredded/utilities/_is-compact.scss
 - app/assets/stylesheets/thredded/utilities/_is-expanded.scss
@@ -599,9 +652,8 @@ files:
 - app/commands/thredded/messageboard_destroyer.rb
 - app/commands/thredded/notify_mentioned_users.rb
 - app/commands/thredded/notify_private_topic_users.rb
-- app/commands/thredded/user_reads_private_topic.rb
-- app/commands/thredded/user_resets_private_topic_to_unread.rb
 - app/controllers/thredded/application_controller.rb
+- app/controllers/thredded/autocomplete_users_controller.rb
 - app/controllers/thredded/messageboards_controller.rb
 - app/controllers/thredded/posts_controller.rb
 - app/controllers/thredded/preferences_controller.rb
@@ -609,36 +661,32 @@ files:
 - app/controllers/thredded/setups_controller.rb
 - app/controllers/thredded/theme_previews_controller.rb
 - app/controllers/thredded/topics_controller.rb
-- app/decorators/thredded/base_topic_decorator.rb
-- app/decorators/thredded/base_user_topic_decorator.rb
-- app/decorators/thredded/messageboard_decorator.rb
-- app/decorators/thredded/post_decorator.rb
-- app/decorators/thredded/private_topic_decorator.rb
-- app/decorators/thredded/topic_decorator.rb
-- app/decorators/thredded/topic_email_decorator.rb
-- app/decorators/thredded/user_private_topic_decorator.rb
-- app/decorators/thredded/user_topic_decorator.rb
 - app/forms/thredded/private_topic_form.rb
 - app/forms/thredded/topic_form.rb
+- app/forms/thredded/user_preferences_form.rb
 - app/helpers/thredded/application_helper.rb
+- app/helpers/thredded/urls_helper.rb
 - app/jobs/thredded/activity_updater_job.rb
 - app/jobs/thredded/at_notifier_job.rb
 - app/jobs/thredded/notify_private_topic_users_job.rb
+- app/mailer_previews/thredded/base_mailer_preview.rb
+- app/mailer_previews/thredded/post_mailer_preview.rb
+- app/mailer_previews/thredded/private_post_mailer_preview.rb
+- app/mailer_previews/thredded/private_topic_mailer_preview.rb
 - app/mailers/thredded/base_mailer.rb
 - app/mailers/thredded/post_mailer.rb
 - app/mailers/thredded/private_post_mailer.rb
 - app/mailers/thredded/private_topic_mailer.rb
+- app/models/concerns/thredded/friendly_id_reserved_words_and_pagination.rb
 - app/models/concerns/thredded/post_common.rb
 - app/models/concerns/thredded/topic_common.rb
-- app/models/thredded/ability.rb
+- app/models/concerns/thredded/user_topic_read_state_common.rb
 - app/models/thredded/category.rb
 - app/models/thredded/messageboard.rb
 - app/models/thredded/messageboard_user.rb
-- app/models/thredded/notification_preference.rb
 - app/models/thredded/null_preference.rb
-- app/models/thredded/null_topic.rb
-- app/models/thredded/null_topic_read.rb
 - app/models/thredded/null_user.rb
+- app/models/thredded/null_user_topic_read_state.rb
 - app/models/thredded/post.rb
 - app/models/thredded/post_notification.rb
 - app/models/thredded/private_post.rb
@@ -649,6 +697,7 @@ files:
 - app/models/thredded/topic_category.rb
 - app/models/thredded/user_detail.rb
 - app/models/thredded/user_extender.rb
+- app/models/thredded/user_messageboard_preference.rb
 - app/models/thredded/user_permissions/admin/if_admin_column_true.rb
 - app/models/thredded/user_permissions/admin/none.rb
 - app/models/thredded/user_permissions/message/readers_of_writeable_boards.rb
@@ -658,9 +707,24 @@ files:
 - app/models/thredded/user_permissions/write/all.rb
 - app/models/thredded/user_permissions/write/none.rb
 - app/models/thredded/user_preference.rb
-- app/models/thredded/user_topic_read.rb
+- app/models/thredded/user_private_topic_read_state.rb
+- app/models/thredded/user_topic_read_state.rb
+- app/policies/thredded/messageboard_policy.rb
+- app/policies/thredded/post_policy.rb
+- app/policies/thredded/private_post_policy.rb
+- app/policies/thredded/private_topic_policy.rb
+- app/policies/thredded/topic_policy.rb
+- app/view_models/thredded/base_topic_view.rb
+- app/view_models/thredded/post_view.rb
+- app/view_models/thredded/posts_page_view.rb
+- app/view_models/thredded/private_topic_view.rb
+- app/view_models/thredded/topic_email_view.rb
+- app/view_models/thredded/topic_view.rb
+- app/view_models/thredded/topics_page_view.rb
 - app/views/layouts/thredded/application.html.erb
 - app/views/thredded/categories/_category.html.erb
+- app/views/thredded/error_pages/forbidden.html.erb
+- app/views/thredded/error_pages/not_found.html.erb
 - app/views/thredded/kaminari/_first_page.html.erb
 - app/views/thredded/kaminari/_gap.html.erb
 - app/views/thredded/kaminari/_last_page.html.erb
@@ -690,38 +754,47 @@ files:
 - app/views/thredded/private_topic_mailer/message_notification.text.erb
 - app/views/thredded/private_topics/_breadcrumbs.html.erb
 - app/views/thredded/private_topics/_form.html.erb
+- app/views/thredded/private_topics/_header.html.erb
 - app/views/thredded/private_topics/_no_private_topics.html.erb
 - app/views/thredded/private_topics/_private_topic.html.erb
+- app/views/thredded/private_topics/edit.html.erb
 - app/views/thredded/private_topics/index.html.erb
 - app/views/thredded/private_topics/new.html.erb
 - app/views/thredded/private_topics/show.html.erb
 - app/views/thredded/search/_form.html.erb
+- app/views/thredded/shared/_breadcrumbs.html.erb
 - app/views/thredded/shared/_currently_online.html.erb
 - app/views/thredded/shared/_flash_messages.html.erb
 - app/views/thredded/shared/_header.html.erb
-- app/views/thredded/shared/_messageboard_topics_breadcrumbs.html.erb
-- app/views/thredded/shared/_notification_preferences.html.erb
+- app/views/thredded/shared/_nav.html.erb
 - app/views/thredded/shared/_page.html.erb
 - app/views/thredded/shared/_time_ago.html.erb
-- app/views/thredded/shared/_top_nav.html.erb
-- app/views/thredded/shared/_topic_nav.html.erb
+- app/views/thredded/shared/nav/_notification_preferences.html.erb
+- app/views/thredded/shared/nav/_private_topics.html.erb
+- app/views/thredded/shared/nav/_standalone.html.erb
 - app/views/thredded/theme_previews/_section_title.html.erb
 - app/views/thredded/theme_previews/show.html.erb
 - app/views/thredded/topics/_form.html.erb
-- app/views/thredded/topics/_recent_topics_by_user.html.erb
+- app/views/thredded/topics/_header.html.erb
 - app/views/thredded/topics/_topic.html.erb
 - app/views/thredded/topics/_topic_form_admin_options.html.erb
-- app/views/thredded/topics/by_category.html.erb
 - app/views/thredded/topics/edit.html.erb
 - app/views/thredded/topics/index.html.erb
 - app/views/thredded/topics/menu/_new_topic.html.erb
 - app/views/thredded/topics/new.html.erb
 - app/views/thredded/topics/search.html.erb
 - app/views/thredded/topics/show.html.erb
-- app/views/thredded/topics_common/_header.html.erb
 - app/views/thredded/users/_link.html.erb
+- bin/rails
+- config.ru
+- config/i18n-tasks.yml
+- config/locales/en.yml
 - config/routes.rb
 - db/migrate/20160329231848_create_thredded.rb
+- db/seeds.rb
+- db/upgrade_migrations/20160410111522_upgrade_v0_2_to_v0_3.rb
+- heroku.gemfile
+- heroku.gemfile.lock
 - lib/generators/thredded/install/USAGE
 - lib/generators/thredded/install/install_generator.rb
 - lib/generators/thredded/install/templates/initializer.rb
@@ -733,16 +806,8 @@ files:
 - lib/thredded/engine.rb
 - lib/thredded/errors.rb
 - lib/thredded/main_app_route_delegator.rb
-- lib/thredded/messageboard_user_permissions.rb
-- lib/thredded/post_sql_builder.rb
-- lib/thredded/post_user_permissions.rb
-- lib/thredded/private_topic_user_permissions.rb
 - lib/thredded/search_parser.rb
-- lib/thredded/search_sql_builder.rb
-- lib/thredded/seed_database.rb
-- lib/thredded/table_sql_builder.rb
-- lib/thredded/topic_sql_builder.rb
-- lib/thredded/topic_user_permissions.rb
+- lib/thredded/topics_search.rb
 - lib/thredded/version.rb
 - thredded.gemspec
 homepage: https://www.thredded.com
@@ -765,9 +830,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A messageboard engine
 test_files: []
-has_rdoc: