thredded 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 267a7718fa00308d076699e3970f2e3d74946f28
-  data.tar.gz: 40e40286c2af13e04f3af5b72b376d5a3e3a8209
+  metadata.gz: 9da3f257731b6397128563a35788225046e8a589
+  data.tar.gz: fc0b9d0117acd6de8c6d21fa1d3ff629e3e463e3
 SHA512:
-  metadata.gz: 0b2074d057c58a048c9cb3bba55de02e95099f604a95fc75b843cd0c48fb71a81d04b8c2d18a89e0e0a71e193039cacec83aa27eb0d9ea9f09b75e85efe6fb5d
-  data.tar.gz: 2ebee2bec698ce19036b4845ff4ca1ec04ecf0c5848d71ad5f67593fac08e979997cae369739cfdbc04fcbf6a71295372eee7da8df881f6085ce0eb62bb3e043
+  metadata.gz: d811130638a892c28e07b2065f05b0c8e6edd8d2aabea59691dd0f5653424818978fd4bb2d0676875aa85110e9b58bacda911efc60c26ce4dd5bb53fefa306c6
+  data.tar.gz: b78b12a3e681153c4b82363b6334a5c09648e86910f17f8d997e4f53dac0cd84555a3141c83d7da20f885b4b532a385913703ad6ff8a36982cc7c4ecc91636d1

data/README.md

@@ -99,7 +99,7 @@ Then, see the rest of this Readme for more information about using and customizi
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 0.11.1'
+gem 'thredded', '~> 0.12.0'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.
@@ -151,7 +151,7 @@ But then compare this with the previous version to decide what to keep.
 2) To upgrade the database (in this example from v0.10 to v0.11):
 
 ```console
-# Note that for guaranteed best results you will want to run this with the gem checked out with v0.10.0
+# Note that for guaranteed best results you will want to run this with the gem checked out with v0.11
 cp `bundle show thredded`/db/upgrade_migrations/20170312131417_upgrade_thredded_v0_10_to_v0_11.rb db/migrate
 rake db:migrate
 ```
@@ -193,9 +193,6 @@ In your layout you will probably have links to other paths in your app (e.g. nav
 For any url helpers (like `users_path` or `projects_path` or whatever) will need to have `main_app.`
 prefixed to them so that they can be found from thredded (`main_app.users_path` will work from both thredded and your app).
 
-However if you don't want to update your layouts and partials, you can define methods automatically to delegate to the main_app's routes:
-See https://gist.github.com/timdiggins/bf6d09b28828a392198562c93554ad07.
-
 #### Add Thredded styles
 
 In this case, you will also need to include Thredded styles and JavaScript into the application styles and JavaScript.

data/app/assets/javascripts/thredded/components/post_form.es6

@@ -1,6 +1,6 @@
 //= require ./preview_area
 
-(($) => {
+(($, autosize) => {
   const COMPONENT_SELECTOR = '[data-thredded-post-form]';
 
   class ThreddedPostForm {
@@ -18,11 +18,11 @@
     }
 
     autosize($textarea) {
-      $textarea.autosize()
+      autosize($textarea)
     }
 
     destroy($nodes) {
-      $nodes.find(this.textareaSelector).trigger('autosize.destroy');
+      autosize.destroy($nodes.find(this.textareaSelector));
     }
   }
 
@@ -39,4 +39,4 @@
       new ThreddedPostForm().destroy($nodes);
     }
   });
-})(jQuery);
+})(jQuery, window.autosize);

data/app/assets/javascripts/thredded/components/quote_post.es6

@@ -0,0 +1,45 @@
+(function() {
+  window.Thredded.onPageLoad(() => {
+    Array.prototype.forEach.call(document.querySelectorAll('[data-thredded-quote-post]'), (el) => {
+      el.addEventListener('click', onClick);
+    });
+  });
+
+  function onClick(evt) {
+    // Handle only left clicks with no modifier keys
+    if (evt.button !== 0 || evt.ctrlKey || evt.altKey || evt.metaKey || evt.shiftKey) return;
+    evt.preventDefault();
+    const target = document.getElementById('post_content');
+    target.scrollIntoView();
+    target.value = '...';
+    fetchReply(evt.target.getAttribute('data-thredded-quote-post'), (replyText) => {
+      if (!target.ownerDocument.body.contains(target)) return;
+      target.focus();
+      target.value = replyText;
+
+      const autosizeUpdateEvent = document.createEvent('Event');
+      autosizeUpdateEvent.initEvent('autosize:update', true, false);
+      target.dispatchEvent(autosizeUpdateEvent);
+      // Scroll into view again as the size might have changed.
+      target.scrollIntoView();
+    }, (errorMessage) => {
+      target.value = errorMessage;
+    });
+  }
+
+  function fetchReply(url, onSuccess, onError) {
+    const request = new XMLHttpRequest();
+    request.open('GET', url, /* async */ true);
+    request.onload = () => {
+      if (request.status >= 200 && request.status < 400) {
+        onSuccess(request.responseText);
+      } else {
+        onError(`Error (${request.status}): ${request.statusText} ${request.responseText}`);
+      }
+    };
+    request.onerror = () => {
+      onError('Network Error');
+    };
+    request.send();
+  }
+})();

data/app/assets/javascripts/thredded/components/topic_form.es6

@@ -1,4 +1,4 @@
-(($) => {
+(($, autosize) => {
   const COMPONENT_SELECTOR = '[data-thredded-topic-form]';
   class ThreddedTopicForm {
     constructor() {
@@ -15,7 +15,7 @@
     }
 
     init($nodes) {
-      $nodes.find(this.textareaSelector).autosize();
+      autosize($nodes.find(this.textareaSelector));
       $nodes.each(function() {
         new ThreddedPreviewArea($(this));
       });
@@ -47,7 +47,7 @@
     }
 
     destroy($nodes) {
-      $nodes.find(this.textareaSelector).trigger('autosize.destroy');
+      autosize.destroy($nodes.find(this.textareaSelector));
     }
   }
 
@@ -64,6 +64,6 @@
       new ThreddedTopicForm().destroy($nodes);
     }
   });
-})(jQuery);
+})(jQuery, window.autosize);
 
 

data/app/assets/javascripts/thredded/core/on_page_load.es6

@@ -26,6 +26,14 @@
   };
 
   if (isTurbolinks5) {
+    // In Turbolinks 5.0.1, turbolinks:load may have already fired (before DOMContentLoaded).
+    // If so, add our own DOMContentLoaded listener:
+    // See: https://github.com/turbolinks/turbolinks/commit/69d353ea73d10ee6b25c2866fc5706879ba403e3
+    if (window.Turbolinks.controller.lastRenderedLocation) {
+      document.addEventListener('DOMContentLoaded', () => {
+        triggerOnPageLoad();
+      });
+    }
     document.addEventListener('turbolinks:load', () => {
       triggerOnPageLoad();
     });

data/app/assets/javascripts/thredded/dependencies.js

@@ -2,7 +2,7 @@
 // Require jquery.timeago instead of rails-timeago so that we can control the initialization.
 //= require jquery.timeago
 //= require jquery_ujs
-//= require jquery.autosize
+//= require autosize
 //= require jquery.textcomplete
 //= require select2
 

data/app/assets/stylesheets/thredded/_email.scss

@@ -21,14 +21,13 @@
   margin: 0;
 
   &--author {
-    margin-bottom: 1em;
+    margin-bottom: 2px;
   }
 
   .thredded--post--content {
     font-size: inherit;
-    border-left: solid 5px $thredded-blockquote-border-color;
     margin: 0 0 0.75rem;
-    padding: ($thredded-small-spacing / 2) $thredded-small-spacing;
+    padding-left: 0;
 
     .onebox-wrapper-table {
       width: 100%;

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

@@ -1,6 +1,19 @@
-.thredded--preferences-header {
-  &--title {
-    @extend %thredded--heading;
-    font-size: 1.5rem; // 24px
+.thredded--preferences--title {
+  @extend %thredded--heading;
+  font-size: 1.5rem; // 24px
+}
+
+.thredded--preferences--form {
+  padding-bottom: $thredded-base-spacing;
+}
+
+.thredded--preferences--messageboards-nav {
+  border-top: $thredded-base-border;
+  padding-top: $thredded-base-spacing;
+}
+
+.thredded--preferences--messageboards-nav--item {
+  &.thredded--messageboard {
+    padding: $thredded-small-spacing;
   }
 }

data/app/controllers/concerns/thredded/new_post_params.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+module Thredded
+  # @api private
+  module NewPostParams
+    protected
+
+    def new_post_params
+      params.fetch(:post, {})
+        .permit(:content, :quote_post_id)
+        .merge(ip: request.remote_ip).tap do |p|
+        quote_id = p.delete(:quote_post_id)
+        if quote_id
+          post = Post.find(quote_id)
+          authorize_reading post
+          p[:quote_post] = post
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/thredded/new_private_post_params.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+module Thredded
+  # @api private
+  module NewPrivatePostParams
+    protected
+
+    def new_private_post_params
+      params.fetch(:post, {})
+        .permit(:content, :quote_private_post_id)
+        .merge(ip: request.remote_ip).tap do |p|
+        quote_id = p.delete(:quote_private_post_id)
+        if quote_id
+          post = PrivatePost.find(quote_id)
+          authorize_reading post
+          p[:quote_post] = post
+        end
+      end
+    end
+  end
+end

data/app/controllers/thredded/posts_controller.rb

@@ -3,29 +3,39 @@ module Thredded
   # A controller for managing {Post}s.
   class PostsController < Thredded::ApplicationController
     include ActionView::RecordIdentifier
+    include Thredded::NewPostParams
 
     helper_method :topic
     after_action :update_user_activity
 
     after_action :verify_authorized
 
-    def create
-      post = parent_topic.posts.build(post_params)
-      authorize_creating post
-      post.save!
+    def new
+      @post_form = PostForm.new(user: thredded_current_user, topic: parent_topic, post_params: new_post_params)
+      authorize_creating @post_form.post
+    end
 
-      redirect_to post_path(post, user: thredded_current_user)
+    def create
+      @post_form = PostForm.new(user: thredded_current_user, topic: parent_topic, post_params: new_post_params)
+      authorize_creating @post_form.post
+
+      if @post_form.save
+        redirect_to post_path(@post_form.post, user: thredded_current_user)
+      else
+        render :new
+      end
     end
 
     def edit
-      authorize post, :update?
+      @post_form = PostForm.for_persisted(post)
+      authorize @post_form.post, :update?
       return redirect_to(canonical_topic_params) unless params_match?(canonical_topic_params)
       render
     end
 
     def update
       authorize post, :update?
-      post.update_attributes(post_params.except(:user, :ip))
+      post.update_attributes(new_post_params)
 
       redirect_to post_path(post, user: thredded_current_user)
     end
@@ -45,6 +55,11 @@ module Thredded
       after_mark_as_unread # customization hook
     end
 
+    def quote
+      authorize_reading post
+      render plain: Thredded::ContentFormatter.quote_content(post.content)
+    end
+
     private
 
     def canonical_topic_params
@@ -59,12 +74,6 @@ module Thredded
       post.postable
     end
 
-    def post_params
-      params.require(:post)
-        .permit(:content)
-        .merge(user: thredded_current_user, ip: request.remote_ip, messageboard: messageboard)
-    end
-
     def parent_topic
       Topic
         .where(messageboard: messageboard)

data/app/controllers/thredded/preferences_controller.rb

@@ -21,6 +21,7 @@ module Thredded
       @preferences = UserPreferencesForm.new(
         user:         thredded_current_user,
         messageboard: messageboard_or_nil,
+        messageboards: policy_scope(Messageboard.all),
         params: preferences_params
       )
     end

data/app/controllers/thredded/private_posts_controller.rb

@@ -3,22 +3,35 @@ module Thredded
   # A controller for managing {PrivatePost}s.
   class PrivatePostsController < Thredded::ApplicationController
     include ActionView::RecordIdentifier
+    include NewPrivatePostParams
 
     helper_method :topic
     after_action :update_user_activity
 
     after_action :verify_authorized
 
-    def create
-      post = parent_topic.posts.build(post_params)
-      authorize_creating post
-      post.save!
+    def new
+      @post_form = PrivatePostForm.new(
+        user: thredded_current_user, topic: parent_topic, post_params: new_private_post_params
+      )
+      authorize_creating @post_form.post
+    end
 
-      redirect_to post_path(post, user: thredded_current_user)
+    def create
+      @post_form = PrivatePostForm.new(
+        user: thredded_current_user, topic: parent_topic, post_params: new_private_post_params
+      )
+      authorize_creating @post_form.post
+      if @post_form.save
+        redirect_to post_path(@post_form.post, user: thredded_current_user)
+      else
+        render :new
+      end
     end
 
     def edit
-      authorize post, :update?
+      @post_form = PrivatePostForm.for_persisted(post)
+      authorize @post_form.post, :update?
       return redirect_to(canonical_topic_params) unless params_match?(canonical_topic_params)
       render
     end
@@ -45,6 +58,11 @@ module Thredded
       after_mark_as_unread # customization hook
     end
 
+    def quote
+      authorize_reading post
+      render plain: Thredded::ContentFormatter.quote_content(post.content)
+    end
+
     private
 
     def canonical_topic_params
@@ -59,12 +77,6 @@ module Thredded
       post.postable
     end
 
-    def post_params
-      params.require(:post)
-        .permit(:content)
-        .merge(user: thredded_current_user, ip: request.remote_ip)
-    end
-
     def parent_topic
       PrivateTopic
         .includes(:private_users)

data/app/controllers/thredded/private_topics_controller.rb

@@ -2,6 +2,7 @@
 module Thredded
   class PrivateTopicsController < Thredded::ApplicationController
     include Thredded::NewPrivateTopicParams
+    include Thredded::NewPrivatePostParams
 
     before_action :thredded_require_login!
 
@@ -37,7 +38,9 @@ module Thredded
         )
       end
 
-      @post = private_topic.posts.build
+      @new_post = Thredded::PrivatePostForm.new(
+        user: thredded_current_user, topic: private_topic, post_params: new_private_post_params
+      )
     end
 
     def new

data/app/controllers/thredded/theme_previews_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Thredded
   class ThemePreviewsController < Thredded::ApplicationController
-    def show
+    def show # rubocop:disable Metrics/MethodLength
       @messageboard = Messageboard.first
       fail Thredded::Errors::DatabaseEmpty unless @messageboard
       @user              = if thredded_current_user.thredded_anonymous?
@@ -16,7 +16,8 @@ module Thredded
       @topic             = TopicView.from_user(topic, @user)
       @posts             = TopicPostsPageView.new(@user, topic, topic.posts.page(1).limit(3))
       @post              = topic.posts.build(id: 1337, postable: topic, content: 'Hello world', user: @user)
-      @new_post          = @messageboard.posts.build(postable: topic)
+      @post_form         = PostForm.for_persisted(@post)
+      @new_post          = PostForm.new(user: @user, topic: topic)
       @new_topic         = TopicForm.new(user: @user, messageboard: @messageboard)
       @new_private_topic = PrivateTopicForm.new(user: @user)
       private_topic      = PrivateTopic.new(id: 1337, title: 'Hello', user: @user, last_user: @user, users: [@user])
@@ -25,6 +26,7 @@ module Thredded
       @private_post      = private_topic.posts.build(
         id: 1337, postable: private_topic, content: 'A private hello world', user: @user
       )
+      @private_post_form = PrivatePostForm.for_persisted(@private_post)
       @preferences = UserPreferencesForm.new(user: @user, messageboard: @messageboard)
     end
   end