thredded 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b5574ac2e8dfa7854f79cc64d96192b8b0d071a
-  data.tar.gz: ae647c742cf56c13d5f6e65c600adef8dc7da725
+  metadata.gz: a5b1a2f3452e32092928cdeaa8ccb705e9f2a7d8
+  data.tar.gz: ff7a72e796b7dd7b20d0becc114ec3734ead905b
 SHA512:
-  metadata.gz: e4a92b070aab8d1eadec6c02ca96b6b579ff5fdc801824af5272d774bdd9c128d15e5884aedbe695b0602d1da110df0490ab9e2411b7fc6a46c36ea6d1d1a3e8
-  data.tar.gz: 3fcb63ce387ecbf395617425197d41bf37432a915a9582d96f7a9c33ad2d2d4faa263243e7a79daa3c7efbd6494fa010ff27766d8ff9993e2f91c2588dc2d184
+  metadata.gz: 9d4db4b55939ec62cc509a46ba8fe1e67c1f919ed826637e2202adf52ed1da8b67d6b4e58943b3d4fff8cef6ed5f7420fdab39a1464cb8eebca5c316be2e79e6
+  data.tar.gz: 6b6a9c0faa439d62c8bd53fdc7937efbd51261416e9506f0b67b1eeb659e79b706594f7c06438d447c18bdaa4780a711ed0ffd100a6ddd5941fc9604ea3c462a

data/CHANGELOG.mkdn

@@ -1,3 +1,11 @@
+# MASTER
+
+## 0.3.2 - 2016-05-04
+
+* Main app routes are delegated correctly when using the standalone layout. [8a2ff56](https://github.com/thredded/thredded/commit/8a2ff56f73afe0d6e8e8ecede9666b8d65817fa3)
+* Posts now have `word-break: break-all` applied to prevent overly long string form breaking the layout. [#267](https://github.com/thredded/thredded/issues/267)
+* I18n for [rails-timeago](https://github.com/jgraichen/rails-timeago). [#270](https://github.com/thredded/thredded/issues/270)
+
 # 0.3.1 - 2016-05-01
 
 ## Fixed

data/README.mkdn

@@ -48,7 +48,7 @@ while Discourse is a full app.
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 0.3.1'
+gem 'thredded', '~> 0.3.2'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.
@@ -78,6 +78,45 @@ Mount the thredded engine in your routes file:
 mount Thredded::Engine => '/forum'
 ```
 
+You also may want to add an index to the user name column in your users table.
+Thredded uses it to find @-mentions and perform name prefix autocompletion on the private topic form.
+Add the index in a migration like so:
+
+```ruby
+DbTextSearch::CaseInsensitive.add_index(
+    connection, Thredded.user_class.table_name, Thredded.user_name_column, unique: true)
+```
+
+### Migrating from Forem
+
+Using [Forem]? Thredded provides [a migration][forem-to-thredded] to copy all your existing forums from Forem over
+to Thredded.
+
+[forem-to-thredded]: https://github.com/thredded/thredded/wiki/Migrate-from-Forem
+
+## Views and other assets
+
+### Standalone layout
+
+By default, thredded renders in its own layout.
+
+When using the standalone thredded layout, the log in / sign out links will be rendered in the navigation.
+For these links (and only for these links), Thredded makes the assumption that you are using devise as your auth
+library. If you are using something different you need to override the partial at
+`app/views/thredded/shared/nav/_standalone.html.erb` and use the appropriate log in / sign out path URL helpers.
+
+You can override the partial by copying it into the app:
+
+```bash
+mkdir -p app/views/thredded/shared/nav && cp "$(bundle show thredded)/$_/_standalone.html.erb" "$_"
+```
+
+### Application layout
+
+You can also use Thredded with the application layout by by setting `Thredded.layout` in the initializer.
+
+In this case, you will also need to include Thredded styles and JavaScript into the application styles and JavaScript.
+
 Add thredded styles to your `application.scss` (see below for customizing the styles):
 
 ```scss
@@ -90,23 +129,23 @@ Include thredded JavaScripts in your `application.js`:
 //= require thredded
 ```
 
-You also may want to add an index to the user name column in your users table.
-Thredded uses it to find @-mentions and perform name prefix autocompletion on the private topic form.
-Add the index in a migration like so:
-
-```ruby
-DbTextSearch::CaseInsensitive.add_index(
-    connection, Thredded.user_class.table_name, Thredded.user_name_column, unique: true)
-```
+Thredded views also provide two `content_tag`s available to yield - `:thredded_page_title` and `:thredded_page_id`.
+The views within Thredded pass those up through to your layout if you would like to use them.
 
-[initializer]: https://github.com/thredded/thredded/blob/master/lib/generators/thredded/install/templates/initializer.rb
+### Customizing views
 
-### Migrating from Forem
+You can also override any views and assets by placing them in the same path in your application as they are in the gem.
+This uses the [standard Rails mechanism](http://guides.rubyonrails.org/engines.html#overriding-views) for overriding
+engine views. For example, to copy the post view for customization:
 
-Using [Forem]? Thredded provides [a migration][forem-to-thredded] to copy all your existing forums from Forem over
-to Thredded.
+```bash
+# Copy the post view into the application to customize it:
+mkdir -p app/views/thredded/posts && cp "$(bundle show thredded)/$_/_post.html.erb" "$_"
+```
 
-[forem-to-thredded]: https://github.com/thredded/thredded/wiki/Migrate-from-Forem
+**NB:** Overriding the views like this means that on every update of the thredded gem you have to check that your
+customizations are still compatible with the new version of thredded. This is difficult and error-prone.
+Whenever possible, use the styles and i18n to customize Thredded to your needs.
 
 ## Theming
 
@@ -144,27 +183,6 @@ any duplicate CSS.
 [select2-rails]: https://github.com/argerim/select2-rails
 [thredded-scss-base]: https://github.com/thredded/thredded/blob/master/app/assets/stylesheets/thredded/_base.scss
 
-### Views and other assets
-
-By default, thredded renders in its own layout, but you can easily override this by setting `Thredded.layout` in the
-initializer.
-
-You can also override any views and assets by placing them in the same path in your application as they are in the gem.
-This uses the [standard Rails mechanism](http://guides.rubyonrails.org/engines.html#overriding-views) for overriding
-engine views. For example, to copy the post view for customization:
-
-```bash
-# Copy the post view into the application to customize it:
-mkdir -p app/views/thredded/posts && cp "$(bundle show thredded)/$_/_post.html.erb" "$_"
-```
-
-**NB:** Overriding the views like this means that on every update of the thredded gem you have to check that your
-customizations are still compatible with the new version of thredded. This is difficult and error-prone.
-Whenever possible, use the styles and i18n to customize Thredded to your needs.
-
-Thredded views also provide two content_tags available to yield - `:thredded_page_title` and `:thredded_page_id`.
-The views within Thredded pass those up through to your layout if you would like to use them.
-
 ### Emails
 
 Thredded sends several notification emails to the users. You can override in the same way as the views.
@@ -173,6 +191,19 @@ If you use [Rails Email Preview], you can include Thredded emails into the list
 
 [Rails Email Preview]: https://github.com/glebm/rails_email_preview
 
+## I18n
+
+Thredded is mostly internationalized. It is currently available in English and Brazilian Portuguese. We welcome PRs
+adding support for new languages.
+
+If you use thredded in languages other than English, you probably want to add `rails-i18n` to your Gemfile.
+Additionally, you will need to require the translations for rails-timeago in you JavaScript,
+e.g. for Brazilian Portuguese:
+
+```js
+//= require locales/jquery.timeago.pt-br
+```
+
 ## Permissions
 
 Thredded comes with a flexible permissions system that can be configured per messageboard/user.
@@ -402,3 +433,4 @@ docker-compose run web bundle exec rake
 
 The docker container uses PostgreSQL.
 
+[initializer]: https://github.com/thredded/thredded/blob/master/lib/generators/thredded/install/templates/initializer.rb

data/app/assets/stylesheets/thredded/components/_post.scss

@@ -57,6 +57,7 @@
 &--post--content {
   font-size: 1.063rem; // 17px
   line-height: 1.65;
+  word-break: break-all;
   a {
     @extend %thredded--link;
   }

data/app/commands/thredded/messageboard_destroyer.rb

@@ -59,7 +59,7 @@ module Thredded
     end
 
     def say(message)
-      puts message unless Rails.env.test?
+      Rails.logger.info message unless Rails.env.test?
     end
   end
 end

data/app/commands/thredded/notify_private_topic_users.rb

@@ -2,7 +2,7 @@
 module Thredded
   class NotifyPrivateTopicUsers
     def initialize(private_topic)
-      @post = private_topic.posts.first || Post.new
+      @post = private_topic.posts.order_oldest_first.first
       @private_topic = private_topic
     end
 

data/app/forms/thredded/private_topic_form.rb

@@ -3,6 +3,9 @@ module Thredded
   class PrivateTopicForm
     include ActiveModel::Model
 
+    delegate :id,
+             to: :private_topic
+
     attr_accessor \
       :title,
       :category_ids,
@@ -31,10 +34,6 @@ module Thredded
       Thredded::PrivateTopic.model_name
     end
 
-    def id
-      private_topic.id
-    end
-
     def save
       return false unless valid?
 

data/app/forms/thredded/user_preferences_form.rb

@@ -45,12 +45,14 @@ module Thredded
     def user_messageboard_preference
       return nil unless @messageboard
       @user_messageboard_preference ||=
-        user_preference.messageboard_preferences.where(messageboard_id: @messageboard.id).first_or_initialize
+        user_preference.messageboard_preferences.find_or_initialize_by(messageboard_id: @messageboard.id)
     end
 
     def validate_children
       promote_errors(user_preference.errors) if user_preference.invalid?
-      promote_errors(user_messageboard_preference.errors, :messageboard) if messageboard && user_messageboard_preference.invalid?
+      if messageboard && user_messageboard_preference.invalid?
+        promote_errors(user_messageboard_preference.errors, :messageboard)
+      end
     end
 
     def promote_errors(child_errors, prefix = nil)

data/app/helpers/thredded/application_helper.rb

@@ -20,7 +20,7 @@ module Thredded
     # @param datetime [DateTime]
     # @return [String] html_safe datetime presentation
     def time_ago(datetime)
-      render partial: 'thredded/shared/time_ago', locals: { datetime: datetime }
+      timeago_tag datetime, lang: I18n.locale.to_s.downcase, date_only: false, nojs: true
     end
 
     def paginate(collection, args = {})

data/app/jobs/thredded/activity_updater_job.rb

@@ -6,15 +6,14 @@ module Thredded
     def perform(user_id, messageboard_id)
       now = Time.current
 
-      user_detail = Thredded::UserDetail.where(user_id: user_id).first_or_initialize
+      user_detail = Thredded::UserDetail.find_or_initialize_by(user_id: user_id)
       user_detail.update!(last_seen_at: now)
 
       Thredded::MessageboardUser
-        .where(
+        .find_or_initialize_by(
           thredded_messageboard_id: messageboard_id,
           thredded_user_detail_id: user_detail.id
         )
-        .first_or_initialize
         .update!(last_seen_at: now)
     end
   end

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

@@ -12,10 +12,9 @@ module Thredded
       scope :order_recently_updated_first, -> { order(updated_at: :desc, id: :desc) }
       scope :on_page, -> page_num { page(page_num).per(30) }
 
-      validates_presence_of :hash_id
-      validates_presence_of :last_user_id
-      validates_numericality_of :posts_count
-      validates_uniqueness_of :hash_id
+      validates :hash_id, presence: true, uniqueness: true
+      validates :last_user_id, presence: true
+      validates :posts_count, numericality: true
 
       before_validation do
         self.hash_id = SecureRandom.hex(10) if hash_id.nil?

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

@@ -21,7 +21,7 @@ module Thredded
         # TODO: Switch to upsert once Travis supports PostgreSQL 9.5.
         # Travis issue: https://github.com/travis-ci/travis-ci/issues/4264
         # Upsert gem: https://github.com/seamusabshere/upsert
-        state = where(user_id: user_id, postable_id: topic_id).first_or_initialize
+        state = find_or_initialize_by(user_id: user_id, postable_id: topic_id)
         fail ArgumentError, "expected post_page >= 1, given #{post_page.inspect}" if post_page < 1
         return unless !state.read_at? || state.read_at < post.updated_at
         state.update!(read_at: post.updated_at, page: post_page)

data/app/models/thredded/stats.rb

@@ -3,22 +3,8 @@ module Thredded
   class Stats
     include ActionView::Helpers::NumberHelper
 
-    class << self
-      def messageboards_count
-        new.messageboards_count
-      end
-
-      def topics_count
-        new.topics_count
-      end
-
-      def posts_count
-        new.posts_count
-      end
-    end
-
     def messageboards_count
-      messageboards.count
+      number_to_human(messageboards.count, precision: 4)
     end
 
     def topics_count

data/app/models/thredded/topic.rb

@@ -29,7 +29,7 @@ module Thredded
                counter_cache: true,
                touch: true,
                inverse_of: :topics
-    validates_presence_of :messageboard_id
+    validates :messageboard_id, presence: true
 
     belongs_to :user_detail,
                primary_key:   :user_id,

data/app/models/thredded/user_messageboard_preference.rb

@@ -14,7 +14,7 @@ module Thredded
     validates :messageboard_id, presence: true
 
     def self.in(messageboard)
-      where(messageboard_id: messageboard.id).first_or_initialize
+      find_or_initialize_by(messageboard_id: messageboard.id)
     end
   end
 end

data/app/view_models/thredded/base_topic_view.rb

@@ -47,7 +47,7 @@ module Thredded
     module ClassMethods
       def from_user(topic, user)
         read_state = if user && !user.thredded_anonymous?
-                       topic.association(:user_read_states).klass.where(user_id: user.id, postable_id: topic.id).first
+                       topic.association(:user_read_states).klass.find_by(user_id: user.id, postable_id: topic.id)
                      end
         new(topic, read_state, Pundit.policy!(user, topic))
       end

data/app/view_models/thredded/post_view.rb

@@ -35,6 +35,7 @@ module Thredded
 
     def cache_key
       [
+        I18n.locale,
         @post,
         @post.user,
         [can_update?, can_destroy?].map { |p| p ? '+' : '-' } * ''

data/db/migrate/20160329231848_create_thredded.rb

@@ -1,4 +1,7 @@
 # frozen_string_literal: true
+# rubocop:disable Metrics/ClassLength
+# rubocop:disable Metrics/MethodLength
+# rubocop:disable Metrics/LineLength
 class CreateThredded < ActiveRecord::Migration
   def change
     unless table_exists?(:friendly_id_slugs)
@@ -167,3 +170,6 @@ class CreateThredded < ActiveRecord::Migration
     end
   end
 end
+# rubocop:enable Metrics/LineLength
+# rubocop:enable Metrics/MethodLength
+# rubocop:enable Metrics/ClassLength

data/db/seeds.rb

@@ -44,10 +44,7 @@ module Thredded
     end
 
     def create_first_user
-      @user ||= begin
-        ::User.first ||
-          ::User.create(name: 'Joe', email: 'joe@example.com')
-      end
+      @user ||= ::User.first || ::User.create(name: 'Joe', email: 'joe@example.com')
     end
 
     def create_users(count: 5)

data/db/upgrade_migrations/20160410111522_upgrade_v0_2_to_v0_3.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+# rubocop:disable Metrics/MethodLength
+# rubocop:disable Metrics/LineLength
 class UpgradeV02ToV03 < ActiveRecord::Migration
   def up
     remove_index :thredded_notification_preferences, name: :index_thredded_notification_preferences_on_messageboard_id
@@ -57,3 +59,5 @@ class UpgradeV02ToV03 < ActiveRecord::Migration
     remove_column :thredded_user_preferences, :notify_on_message
   end
 end
+# rubocop:enable Metrics/LineLength
+# rubocop:enable Metrics/MethodLength

data/heroku.gemfile

@@ -15,6 +15,8 @@ gem 'pg'
 gem 'rails_email_preview', '>= 1.0.3'
 gem 'jquery-turbolinks'
 gem 'turbolinks'
+gem 'rails-i18n'
+gem 'http_accept_language'
 gem 'factory_girl_rails'
 gem 'faker', '>= 1.6.2'
 

data/heroku.gemfile.lock

@@ -17,7 +17,7 @@ GIT
 PATH
   remote: .
   specs:
-    thredded (0.3.0)
+    thredded (0.3.2)
       active_record_union (>= 1.1.1)
       autoprefixer-rails
       autosize-rails
@@ -103,7 +103,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
-    concurrent-ruby (1.0.1)
+    concurrent-ruby (1.0.2)
     crass (1.0.2)
     dalli (2.7.6)
     db_text_search (0.2.0)
@@ -131,8 +131,9 @@ GEM
     html-pipeline-youtube (0.1.2)
       html-pipeline (~> 2.0)
     htmlentities (4.3.4)
+    http_accept_language (2.0.5)
     i18n (0.7.0)
-    inline_svg (0.6.4)
+    inline_svg (0.7.0)
       activesupport (>= 4.0.4)
       loofah (>= 2.0)
       nokogiri (~> 1.6)
@@ -155,7 +156,7 @@ GEM
     mime-types-data (3.2016.0221)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
-    multi_json (1.11.3)
+    multi_json (1.12.0)
     newrelic_rpm (3.15.2.317)
     nio4r (1.2.1)
     nokogiri (1.6.7.2)
@@ -193,6 +194,9 @@ GEM
       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-timeago (2.13.0)
       actionpack (>= 3.1)
       activesupport (>= 3.1)
@@ -212,7 +216,7 @@ GEM
     ref (2.0.0)
     request_store (1.3.1)
     rinku (1.7.3)
-    rollbar (2.10.0)
+    rollbar (2.11.1)
       multi_json
     sanitize (4.0.1)
       crass (~> 1.0.2)
@@ -260,6 +264,7 @@ DEPENDENCIES
   dalli
   factory_girl_rails
   faker (>= 1.6.2)
+  http_accept_language
   jquery-turbolinks
   kaminari!
   newrelic_rpm
@@ -267,6 +272,7 @@ DEPENDENCIES
   puma
   rack-canonical-host
   rails (~> 5.0.0.beta4)
+  rails-i18n
   rails_email_preview (>= 1.0.3)
   rollbar
   therubyracer
@@ -277,4 +283,4 @@ RUBY VERSION
    ruby 2.3.1p112
 
 BUNDLED WITH
-   1.12.0
+   1.12.1

data/lib/thredded/engine.rb

@@ -19,10 +19,8 @@ module Thredded
         Thredded.user_class.send(:include, Thredded::UserExtender)
       end
 
-      unless Thredded.standalone_layout?
-        # Delegate all main_app routes to allow calling them directly.
-        ::Thredded::ApplicationController.helper ::Thredded::MainAppRouteDelegator
-      end
+      # Delegate all main_app routes to allow calling them directly.
+      ::Thredded::ApplicationController.helper ::Thredded::MainAppRouteDelegator
     end
 
     initializer 'thredded.setup_assets' do

data/lib/thredded/search_parser.rb

@@ -20,16 +20,15 @@ module Thredded
         keyword_scan = @query.scan(regex)
         @query = @query.gsub(regex, '')
 
-        if keyword_scan.present?
-          keyword_scan.each do |term|
-            keyword_term = term.delete(' ').split(':')
+        next unless keyword_scan.present?
+        keyword_scan.each do |term|
+          keyword_term = term.delete(' ').split(':')
 
-            if found_terms_hash[keyword].nil?
-              found_terms_hash[keyword] = []
-            end
-
-            found_terms_hash[keyword] << keyword_term[1]
+          if found_terms_hash[keyword].nil?
+            found_terms_hash[keyword] = []
           end
+
+          found_terms_hash[keyword] << keyword_term[1]
         end
       end
 

data/lib/thredded/version.rb

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

data/thredded.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.description = 'A messageboard engine for Rails 4.2+ apps'
 
   s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec|script)/|^\.}) } -
-    %w(Dockerfile docker-compose.yml Rakefile Gemfile shared.gemfile)
+            %w(Dockerfile docker-compose.yml Rakefile Gemfile shared.gemfile)
 
   # backend
   s.add_dependency 'bbcoder', '~> 1.0'
@@ -59,6 +59,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'test-unit'
 
   # dummy app dependencies
+  s.add_development_dependency 'rails-i18n'
+  s.add_development_dependency 'http_accept_language'
   s.add_development_dependency 'mysql2'
   s.add_development_dependency 'pg'
   s.add_development_dependency 'sqlite3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-01 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bbcoder
@@ -473,6 +473,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails-i18n
+  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: http_accept_language
+  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: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -768,7 +796,6 @@ files:
 - app/views/thredded/shared/_header.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/nav/_notification_preferences.html.erb
 - app/views/thredded/shared/nav/_private_topics.html.erb
 - app/views/thredded/shared/nav/_standalone.html.erb
@@ -831,7 +858,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A messageboard engine

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

@@ -1,7 +0,0 @@
-<% if datetime.nil? %>
-<abbr>a little while ago</abbr>
-<% else %>
-<abbr class="timeago" title="<%= datetime.getutc.iso8601 %>">
-  <%= datetime.to_s %>
-</abbr>
-<% end %>