thredded 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5b1a2f3452e32092928cdeaa8ccb705e9f2a7d8
-  data.tar.gz: ff7a72e796b7dd7b20d0becc114ec3734ead905b
+  metadata.gz: 8023f4374b36ef9c88f7619b9768b5be2c4bca46
+  data.tar.gz: 9d18f2e394e2bbf3e4469735cd48ca5f0003bfd2
 SHA512:
-  metadata.gz: 9d4db4b55939ec62cc509a46ba8fe1e67c1f919ed826637e2202adf52ed1da8b67d6b4e58943b3d4fff8cef6ed5f7420fdab39a1464cb8eebca5c316be2e79e6
-  data.tar.gz: 6b6a9c0faa439d62c8bd53fdc7937efbd51261416e9506f0b67b1eeb659e79b706594f7c06438d447c18bdaa4780a711ed0ffd100a6ddd5941fc9604ea3c462a
+  metadata.gz: 8144322f3774be32136e270fdf52733062d53917882e2759a1b122280332904df9fd558085d17a4b565dea5a4f5c17dc8019a81b16b022cd471518a64b3880d1
+  data.tar.gz: 41d7acb3dfbe5a619cb6abb47ee313ab04e6697867ec2c09566f7a6fadf85c32547b99729c844d57a9b2248738e9d455edcaf38588693f1e9d77bb24631c1f46

data/CHANGELOG.mkdn

@@ -1,6 +1,26 @@
-# MASTER
+# 0.4.0 - 2016-05-21
 
-## 0.3.2 - 2016-05-04
+**NB:** If updating to this version from 0.3.x, you will need to copy and run [this migration](https://github.com/thredded/thredded/blob/559fc205b9ee405abfe3968b981254f01f928027/db/upgrade_migrations/20160429222452_upgrade_v0_3_to_v0_4.rb).
+
+## Fixed
+
+* Results from messageboards that cannot be read by the user no longer appear in the search results. [77293c](https://github.com/thredded/thredded/commit/77293c88980ec97f178d9a47405fdf915cd36ccc)
+* Word-wrap is no longer a hard one (wraps in the middle of a word), and now wraps in a more
+  acceptable spot - after words, at hyphens, etc.
+* Mailers now use permalinks to posts that always redirect to the correct page number. [#301](https://github.com/thredded/thredded/pull/301)
+
+## Added
+
+* Messageboard groups ([#261](https://github.com/thredded/thredded/issues/261)) and editing ([#303](https://github.com/thredded/thredded/pull/303)).
+* Spoiler(s) tag for post contents [5c8102a](https://github.com/thredded/thredded/commit/5c8102) `[spoiler]vader is luke's father[spoiler]`
+* Styled blockquote tags.
+* Empty partials before and after post textareas (for customization and extensibility) [#293](https://github.com/thredded/thredded/pull/293)
+* New topic form page now allows pre-filling the fields from URL parameters. [#297](https://github.com/thredded/thredded/issues/297)
+* Date format fix for dates older than 1 week. [9d71ba](https://github.com/thredded/thredded/commit/9d71ba2f1ddeac761e084e872a4b0a84ab62e35c)
+
+See the full list of changes here: https://github.com/thredded/thredded/compare/v0.3.2...v0.4.0.
+
+# 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)

data/README.mkdn

@@ -37,18 +37,17 @@ dependencies other than the database and, if configured in the parent applicatio
 backend dependency such as Redis. Currently only MRI Ruby 2.2+ is supported. We would love to
 support JRuby and Rubinius as well.
 
-If you're looking for variations on a theme - see [Forem] and [Discourse]. Forem is also an engine,
-while Discourse is a full app.
+If you're looking for variations on a theme - see [Discourse]. However, It is a full rails
+application and not an engine like Thredded.
 
 [Discourse]: http://www.discourse.org/
-[Forem]: https://github.com/rubysherpas/forem
 
 ## Installation
 
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 0.3.2'
+gem 'thredded', '~> 0.4.0'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.
@@ -89,10 +88,11 @@ DbTextSearch::CaseInsensitive.add_index(
 
 ### Migrating from Forem
 
-Using [Forem]? Thredded provides [a migration][forem-to-thredded] to copy all your existing forums from Forem over
+Are you currently using [Forem]? Thredded provides [a migration][forem-to-thredded] to copy all of your existing data from Forem over
 to Thredded.
 
 [forem-to-thredded]: https://github.com/thredded/thredded/wiki/Migrate-from-Forem
+[Forem]: https://github.com/rubysherpas/forem
 
 ## Views and other assets
 
@@ -147,6 +147,18 @@ mkdir -p app/views/thredded/posts && cp "$(bundle show thredded)/$_/_post.html.e
 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.
 
+#### Empty view partials included for customization
+
+There are 2 empty view partials included in the gem that exist for the purpose of being overridden
+in the parent app *if desired*. They are:
+
+* `app/views/thredded/posts_common/form/_before_content.html.erb`
+* `app/views/thredded/posts_common/form/_after_content.html.erb`
+
+And are rendered directly before, and directly after the textarea where users type their post
+contents. These exist in the case where a messageboard would like to add things like, wysiwyg/wymean
+editors, buttons, help links, help copy, further customization for the textarea, etc.
+
 ## Theming
 
 The engine comes by default with a light and effective implementation of the

data/app/assets/stylesheets/thredded/base/_typography.scss

@@ -39,3 +39,12 @@
   fill: currentColor;
 }
 
+%thredded--blockquote {
+  margin: 0 0 0.75rem;
+  border-left: solid 5px $thredded-blockquote-border-color;
+  padding: 1rem;
+
+  p:last-of-type {
+    margin-bottom: 0;
+  }
+}

data/app/assets/stylesheets/thredded/base/_variables.scss

@@ -31,6 +31,9 @@ $thredded-nav-color: $thredded-text-color !default;
 $thredded-nav-hover-color: $thredded-action-color !default;
 $thredded-nav-current-color: $thredded-action-color !default;
 $thredded-secondary-nav-color: $thredded-secondary-text-color !default;
+$thredded-spoiler-hidden-color: $thredded-light-gray !default;
+$thredded-spoiler-shown-color: black !default;
+
 
 // Colors of alerts and flash messages
 $thredded-alert-danger-background: #fbe3e4 !default;
@@ -45,6 +48,7 @@ $thredded-alert-warning-color: #8a6d3b !default;
 // Borders
 $thredded-base-border-color: $thredded-light-gray !default;
 $thredded-base-border: 1px solid $thredded-base-border-color !default;
+$thredded-blockquote-border-color: $thredded-light-gray !default;
 
 // Form inputs
 $thredded-form-background: $thredded-background-color !default;

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

@@ -50,6 +50,18 @@
   margin-bottom: 0;
 }
 
-&--messageboard--create {
+&--messageboards--actions {
   text-align: center;
+  a {
+    display: block;
+    margin-top: $thredded-small-spacing;
+  }
+  @include thredded-media-tablet-and-up {
+    a {
+      display: inline-block;
+    }
+    a + a {
+      margin-left: $thredded-small-spacing;
+    }
+  }
 }

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

@@ -57,7 +57,7 @@
 &--post--content {
   font-size: 1.063rem; // 17px
   line-height: 1.65;
-  word-break: break-all;
+  word-break: break-word;
   a {
     @extend %thredded--link;
   }
@@ -74,4 +74,18 @@
   table {
     @extend %thredded--table;
   }
+  blockquote {
+    @extend %thredded--blockquote;
+  }
+
+  &--spoiler {
+    color: $thredded-spoiler-hidden-color;
+    background-color: $thredded-spoiler-hidden-color;
+    cursor: pointer;
+
+    &:hover,
+    &:focus {
+      color: $thredded-spoiler-shown-color;
+    }
+  }
 }

data/app/assets/stylesheets/thredded/layout/_search-navigation.scss

@@ -23,7 +23,7 @@
       border-color: transparent;
       font-size: $thredded-font-size-small;
       line-height: 1rem;
-      min-width: 12.8125rem;
+      min-width: 13rem;
       text-align: right;
       width: auto;
       padding: 0.90625rem $padding-x 0.8125rem $padding-x;

data/app/controllers/thredded/application_controller.rb

@@ -95,7 +95,7 @@ module Thredded
     end
 
     def update_user_activity
-      return if messageboard.nil?
+      return if messageboard.nil? || !signed_in?
 
       Thredded::ActivityUpdaterJob.perform_later(
         thredded_current_user.id,

data/app/controllers/thredded/messageboard_groups_controller.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Thredded
+  class MessageboardGroupsController < Thredded::ApplicationController
+    def new
+      @messageboard_group = MessageboardGroup.new
+      authorize @messageboard_group, :create?
+    end
+
+    def create
+      @messageboard_group = MessageboardGroup.new(messageboard_group_params)
+      authorize @messageboard_group, :create?
+
+      if @messageboard_group.save
+        redirect_to root_path
+      else
+        render action: :new
+      end
+    end
+
+    private
+
+    def messageboard_group_params
+      params
+        .require(:messageboard_group)
+        .permit(:name)
+    end
+  end
+end

data/app/controllers/thredded/messageboards_controller.rb

@@ -1,42 +1,56 @@
 # frozen_string_literal: true
 module Thredded
   class MessageboardsController < Thredded::ApplicationController
+    before_action :thredded_require_login!, only: [:new, :create, :edit, :update]
+
     def index
-      @messageboards = thredded_current_user.thredded_can_read_messageboards
+      @groups = thredded_current_user
+        .thredded_can_read_messageboards
+        .preload(:group).group_by(&:group)
+        .map { |(group, messageboards)| MessageboardGroupView.new(group, messageboards) }
     end
 
     def new
       @messageboard = Messageboard.new
+      @messageboard_group = MessageboardGroup.all
       authorize_creating @messageboard
     end
 
     def create
       @messageboard = Messageboard.new(messageboard_params)
       authorize_creating @messageboard
-
-      if signed_in? && @messageboard.save
+      if @messageboard.save
         Topic.transaction do
           @topic = Topic.create!(topic_params)
           @post = Post.create!(post_params)
         end
-
         redirect_to root_path
       else
-        show_sign_in_error unless signed_in?
-        render action: :new
+        render :new
       end
     end
 
-    private
+    def edit
+      @messageboard = Messageboard.friendly.find(params[:id])
+      authorize @messageboard, :update?
+    end
 
-    def show_sign_in_error
-      flash.now[:error] = 'You are not signed in. Sign in or create an account before creating your messageboard.'
+    def update
+      @messageboard = Messageboard.friendly.find(params[:id])
+      authorize @messageboard, :update?
+      if @messageboard.update(messageboard_params)
+        redirect_to messageboard_topics_path(@messageboard), notice: I18n.t('thredded.messageboard.updated_notice')
+      else
+        render :new
+      end
     end
 
+    private
+
     def messageboard_params
       params
         .require(:messageboard)
-        .permit(:description, :name, :posting_permission, :security)
+        .permit(:name, :description, :messageboard_group_id)
     end
 
     def topic_params

data/app/controllers/thredded/post_permalinks_controller.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+module Thredded
+  class PostPermalinksController < ApplicationController
+    def show
+      post = Post.find(params[:id])
+      authorize post, :read?
+      redirect_to post_url(post), status: :found
+    end
+  end
+end

data/app/controllers/thredded/private_post_permalinks_controller.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+module Thredded
+  class PrivatePostPermalinksController < ApplicationController
+    before_action :thredded_require_login!
+    def show
+      private_post = PrivatePost.find(params[:id])
+      authorize private_post, :read?
+      redirect_to post_url(private_post), status: :found
+    end
+  end
+end

data/app/controllers/thredded/private_topics_controller.rb

@@ -13,7 +13,8 @@ module Thredded
           .for_user(thredded_current_user)
           .order_recently_updated_first
           .includes(:last_user, :user)
-          .page(params[:page]))
+          .page(params[:page])
+      )
 
       PrivateTopicForm.new(user: thredded_current_user).tap do |form|
         @new_private_topic = form if policy(form.private_topic).create?

data/app/controllers/thredded/theme_previews_controller.rb

@@ -23,8 +23,9 @@ module Thredded
       @private_topic     = PrivateTopicView.from_user(private_topic, @user)
       @private_posts     = PostsPageView.new(@user, private_topic, private_topic.posts.page(1).limit(3))
       @private_post      = private_topic.posts.build(
-        id: 1337, postable: private_topic, content: 'A private hello world', user: @user)
-      @preferences       = UserPreferencesForm.new(user: @user, messageboard: @messageboard)
+        id: 1337, postable: private_topic, content: 'A private hello world', user: @user
+      )
+      @preferences = UserPreferencesForm.new(user: @user, messageboard: @messageboard)
     end
   end
 end

data/app/controllers/thredded/topics_controller.rb

@@ -15,7 +15,8 @@ module Thredded
         messageboard.topics
           .order_sticky_first.order_recently_updated_first
           .includes(:categories, :last_user, :user)
-          .page(current_page))
+          .page(current_page)
+      )
       TopicForm.new(messageboard: messageboard, user: thredded_current_user).tap do |form|
         @new_topic = form if policy(form.topic).create?
       end
@@ -36,17 +37,23 @@ module Thredded
 
     def search
       @query = params[:q].to_s
+      topics_scope = if messageboard_or_nil
+                       messageboard.topics
+                     else
+                       Topic.where(messageboard_id: thredded_current_user.thredded_can_read_messageboards.pluck(:id))
+                     end
       @topics = Thredded::TopicsPageView.new(
         thredded_current_user,
-        (messageboard_or_nil ? messageboard.topics : Topic)
+        topics_scope
           .search_query(@query)
           .order_recently_updated_first
           .includes(:categories, :last_user, :user)
-          .page(current_page))
+          .page(current_page)
+      )
     end
 
     def new
-      @new_topic = TopicForm.new(messageboard: messageboard, user: thredded_current_user)
+      @new_topic = TopicForm.new(new_topic_params)
       authorize_creating @new_topic.topic
     end
 
@@ -58,7 +65,8 @@ module Thredded
         @category.topics
           .unstuck
           .order_recently_updated_first
-          .page(current_page))
+          .page(current_page)
+      )
       render :index
     end
 
@@ -103,12 +111,11 @@ module Thredded
       params
         .require(:topic)
         .permit(:title, :locked, :sticky, category_ids: [])
-        .merge(user: thredded_current_user)
     end
 
     def new_topic_params
       params
-        .require(:topic)
+        .fetch(:topic, {})
         .permit(:title, :locked, :sticky, :content, category_ids: [])
         .merge(
           messageboard: messageboard,

data/app/forms/thredded/private_topic_form.rb

@@ -49,13 +49,15 @@ module Thredded
         title: title,
         users: private_users,
         user: non_null_user,
-        last_user: non_null_user)
+        last_user: non_null_user
+      )
     end
 
     def post
       @post ||= private_topic.posts.build(
         content: content,
-        user: non_null_user)
+        user: non_null_user
+      )
     end
 
     private

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)
-      timeago_tag datetime, lang: I18n.locale.to_s.downcase, date_only: false, nojs: true
+      timeago_tag datetime, lang: I18n.locale.to_s.downcase, format: :short, nojs: true
     end
 
     def paginate(collection, args = {})

data/app/helpers/thredded/urls_helper.rb

@@ -22,12 +22,14 @@ module Thredded
       if topic.private?
         private_topic_url(
           topic.slug,
-          params)
+          params
+        )
       else
         messageboard_topic_url(
           topic.messageboard.slug,
           topic.slug,
-          params)
+          params
+        )
       end
     end
 
@@ -41,7 +43,7 @@ module Thredded
     # @return [String] URL of the topic page with the post anchor.
     def post_url(post, params = {})
       params = params.dup
-      params[:anchor] ||= dom_id(post)
+      params[:anchor] ||= ActionView::RecordIdentifier.dom_id(post)
       params[:page] ||= post.page
       topic_url(post.postable, params)
     end

data/app/mailer_previews/thredded/base_mailer_preview.rb

@@ -30,7 +30,8 @@ MARKDOWN
           sticky:       [false, true].sample,
           updated_at:   Time.zone.now,
           user:         mock_user,
-        ))
+        )
+      )
     end
 
     def mock_post(attr = {})
@@ -44,7 +45,8 @@ MARKDOWN
           postable:     topic,
           updated_at:   Time.zone.now,
           user:         topic.last_user,
-        ))
+        )
+      )
     end
 
     def mock_private_topic(attr = {})
@@ -58,7 +60,8 @@ MARKDOWN
           posts_count: 1 + rand(42),
           updated_at:  Time.zone.now,
           user:        mock_user,
-        ))
+        )
+      )
     end
 
     def mock_private_post(attr = {})
@@ -71,7 +74,8 @@ MARKDOWN
           postable:   private_topic,
           updated_at: Time.zone.now,
           user:       private_topic.last_user,
-        ))
+        )
+      )
     end
 
     def mock_messageboard(attr = {})
@@ -86,7 +90,8 @@ MARKDOWN
           posts_count:  rand(1337),
           topics_count: rand(42),
           updated_at:   Time.zone.now,
-        ))
+        )
+      )
     end
 
     def mock_user(attr = {})
@@ -95,7 +100,8 @@ MARKDOWN
         attr.reverse_merge(
           Thredded.user_name_column => name,
           email:                    "#{name.downcase}@test.com",
-        ))
+        )
+      )
     end
   end
 end

data/app/mailer_previews/thredded/post_mailer_preview.rb

@@ -5,7 +5,8 @@ module Thredded
     def at_notification
       PostMailer.at_notification(
         mock_post(content: mock_content(mention_users: %w(glebm joel))),
-        %w(glebm@test.com joel@test.com))
+        %w(glebm@test.com joel@test.com)
+      )
     end
   end
 end

data/app/mailer_previews/thredded/private_post_mailer_preview.rb

@@ -5,7 +5,8 @@ module Thredded
     def at_notification
       PrivatePostMailer.at_notification(
         mock_private_post(content: mock_content(mention_users: %w(glebm joel))),
-        %w(glebm@test.com joel@test.com))
+        %w(glebm@test.com joel@test.com)
+      )
     end
   end
 end

data/app/mailer_previews/thredded/private_topic_mailer_preview.rb

@@ -9,7 +9,8 @@ module Thredded
             mock_private_post(content: mock_content(mention_users: ['glebm']), postable: private_topic)
           ]
         end,
-        %w(glebm@test.com joel@test.com))
+        %w(glebm@test.com joel@test.com)
+      )
     end
   end
 end

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

@@ -17,21 +17,22 @@ module Thredded
       end
     ].freeze
 
-    WHITELIST_ELEMENTS = HTML::Pipeline::SanitizationFilter::WHITELIST[:elements] + [
-      'iframe',
-    ].freeze
+    WHITELIST_ELEMENTS = HTML::Pipeline::SanitizationFilter::WHITELIST[:elements] + %w(
+      iframe span
+    ).freeze
 
     WHITELIST = HTML::Pipeline::SanitizationFilter::WHITELIST.deep_merge(
       elements: WHITELIST_ELEMENTS,
       transformers: WHITELIST_TRANSFORMERS,
       attributes: {
         'a' => %w(href rel),
-        'iframe' => %w(src width height frameborder allowfullscreen sandbox seamless)
+        'iframe' => %w(src width height frameborder allowfullscreen sandbox seamless),
+        'span' => %w(class),
       },
       add_attributes: {
         'iframe' => {
           'seamless' => 'seamless',
-          'sandbox' => 'allow-forms allow-scripts'
+          'sandbox' => 'allow-forms allow-scripts',
         }
       }
     ).freeze

data/app/models/thredded/messageboard.rb

@@ -6,7 +6,16 @@ module Thredded
                 use:            [:slugged, :reserved],
                 # Avoid route conflicts
                 reserved_words: ::Thredded::FriendlyIdReservedWordsAndPagination.new(
-                  %w(messageboards preferences private-topics autocomplete-users theme-preview)
+                  %w(
+                    admin
+                    autocomplete-users
+                    messageboards
+                    posts
+                    preferences
+                    private-posts
+                    private-topics
+                    theme-preview
+                  )
                 )
 
     validates :name, uniqueness: true, length: { maximum: 60 }, presence: true
@@ -33,8 +42,16 @@ module Thredded
              through:    :recently_active_user_details,
              source:     :user
 
+    belongs_to :group,
+               inverse_of: :messageboards,
+               foreign_key: :messageboard_group_id,
+               class_name: 'Thredded::MessageboardGroup'
+
     default_scope { where(closed: false).order(topics_count: :desc) }
 
+    scope :top_level_messageboards, -> { where(group: nil) }
+    scope :by_messageboard_group, ->(group) { where(group: group.id) }
+
     def latest_user
       latest_topic.last_user
     end

data/app/models/thredded/messageboard_group.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+module Thredded
+  class MessageboardGroup < ActiveRecord::Base
+    has_many :messageboards,
+             inverse_of: :group,
+             foreign_key: :messageboard_group_id,
+             dependent: :nullify
+
+    validates :name, presence: true
+  end
+end

data/app/models/thredded/null_user.rb

@@ -12,15 +12,11 @@ module Thredded
     end
 
     def id
-      0
-    end
-
-    def member_of?(_)
-      false
+      nil
     end
 
     def name
-      'Anonymous User'
+      I18n.t('thredded.null_user_name')
     end
 
     def to_s

data/app/policies/thredded/messageboard_group_policy.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+module Thredded
+  class MessageboardGroupPolicy
+    # @param user [Thredded.user_class]
+    # @param messageboard_group [Thredded::MessageboardGroup]
+    def initialize(user, group)
+      @user = user
+      @group = group
+    end
+
+    def create?
+      @user.thredded_admin?
+    end
+  end
+end