thredded 0.8.4 → 0.9.1

data/app/models/thredded/user_private_topic_read_state.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Thredded
   class UserPrivateTopicReadState < ActiveRecord::Base
-    include UserTopicReadStateCommon
+    include Thredded::UserTopicReadStateCommon
     belongs_to :user,
                class_name: Thredded.user_class,
                inverse_of: :thredded_private_topic_read_states

data/app/models/thredded/user_topic_read_state.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Thredded
   class UserTopicReadState < ActiveRecord::Base
-    include UserTopicReadStateCommon
+    include Thredded::UserTopicReadStateCommon
     belongs_to :user,
                class_name: Thredded.user_class,
                inverse_of: :thredded_topic_read_states

data/app/notifiers/thredded/base_notifier.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Thredded
+  class BaseNotifier
+    def self.validate_notifier(notifier)
+      unless notifier.respond_to?(:key) && /^[a-z_]+$/.match(notifier.key)
+        fail "Notifier problem: #{notifier.class.name} must respond to #key with a snake_case string"
+      end
+      [:human_name, :new_post, :new_private_post].each do |m|
+        unless notifier.respond_to?(m)
+          fail "#{notifier.class.name} must respond to ##{m}"
+        end
+      end
+    end
+
+    class NotificationsDefault
+      def initialize(enabled)
+        @enabled = enabled
+      end
+
+      attr_reader :enabled
+
+      def enabled?
+        enabled
+      end
+    end
+  end
+end

data/app/notifiers/thredded/email_notifier.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+module Thredded
+  class EmailNotifier
+    def human_name
+      I18n.t('thredded.email_notifier.by_email')
+    end
+
+    def key
+      'email'
+    end
+
+    def new_post(post, users)
+      PostMailer.post_notification(post.id, users.map(&:email)).deliver_now
+      MembersMarkedNotified.new(post, users).run
+    end
+
+    def new_private_post(post, users)
+      users = exclude_previously_notified(post, users)
+      return unless users.present?
+      PrivateTopicMailer
+        .message_notification(post.postable.id, users.map(&:email))
+        .deliver_now
+      MembersMarkedNotified.new(post, users).run
+    end
+
+    def exclude_previously_notified(post, users)
+      emails_notified = post.post_notifications.map(&:email)
+
+      users.reject do |user|
+        emails_notified.include? user.email
+      end
+    end
+  end
+end

data/app/policies/thredded/post_policy.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require_dependency 'thredded/topic_policy'
 module Thredded
   class PostPolicy
     # The scope of readable posts.
@@ -30,7 +29,7 @@ module Thredded
     end
 
     def read?
-      TopicPolicy.new(@user, @post.postable).read? && @post.moderation_state_visible_to_user?(@user)
+      Thredded::TopicPolicy.new(@user, @post.postable).read? && @post.moderation_state_visible_to_user?(@user)
     end
 
     def update?
@@ -38,7 +37,7 @@ module Thredded
     end
 
     def destroy?
-      @post.postable.first_post != @post && update?
+      !@post.first_post_in_topic? && update?
     end
 
     delegate :moderate?, to: :messageboard_policy
@@ -46,7 +45,7 @@ module Thredded
     private
 
     def messageboard_policy
-      @messageboard_policy ||= MessageboardPolicy.new(@user, @post.messageboard)
+      @messageboard_policy ||= Thredded::MessageboardPolicy.new(@user, @post.messageboard)
     end
 
     def own_post?

data/app/policies/thredded/private_post_policy.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require_dependency 'thredded/private_topic_policy'
 module Thredded
   class PrivatePostPolicy
     # @param user [Thredded.user_class]
@@ -14,7 +13,7 @@ module Thredded
     end
 
     def read?
-      PrivateTopicPolicy.new(@user, @post.postable).read?
+      Thredded::PrivateTopicPolicy.new(@user, @post.postable).read?
     end
 
     def update?
@@ -22,7 +21,7 @@ module Thredded
     end
 
     def destroy?
-      @post.postable.first_post != @post && update?
+      !@post.first_post_in_topic? && update?
     end
 
     private

data/app/policies/thredded/topic_policy.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require_dependency 'thredded/messageboard_policy'
 module Thredded
   class TopicPolicy
     # The scope of readable topics.
@@ -23,7 +22,7 @@ module Thredded
     def initialize(user, topic)
       @user                = user
       @topic               = topic
-      @messageboard_policy = MessageboardPolicy.new(user, topic.messageboard)
+      @messageboard_policy = Thredded::MessageboardPolicy.new(user, topic.messageboard)
     end
 
     def create?

data/app/view_hooks/thredded/all_view_hooks.rb

@@ -1,7 +1,4 @@
 # frozen_string_literal: true
-require 'thredded/view_hooks/config'
-require 'thredded/view_hooks/renderer'
-
 module Thredded
   class AllViewHooks
     # @return [PostForm]

data/app/view_models/thredded/base_topic_view.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require_dependency 'thredded/urls_helper'
 module Thredded
   # A view model for TopicCommon.
   class BaseTopicView

data/app/view_models/thredded/post_view.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require_dependency 'thredded/urls_helper'
 module Thredded
   # A view model for PostCommon.
   class PostView

data/app/view_models/thredded/posts_page_view.rb

@@ -1,7 +1,4 @@
 # frozen_string_literal: true
-require_dependency 'thredded/post_view'
-require_dependency 'thredded/topic_view'
-require_dependency 'thredded/private_topic_view'
 module Thredded
   # A view model for a page of PostViews.
   class PostsPageView
@@ -20,7 +17,7 @@ module Thredded
     # @param paginated_scope [ActiveRecord::Relation<Thredded::PostCommon>]
     def initialize(user, paginated_scope)
       @paginated_scope = paginated_scope
-      @post_views      = paginated_scope.map { |post| PostView.new(post, Pundit.policy!(user, post)) }
+      @post_views      = paginated_scope.map { |post| Thredded::PostView.new(post, Pundit.policy!(user, post)) }
     end
   end
 end

data/app/view_models/thredded/private_topic_view.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 module Thredded
   # A view model for PrivateTopic.
-  class PrivateTopicView < BaseTopicView
+  class PrivateTopicView < Thredded::BaseTopicView
+    delegate :users, to: :@topic
+
     def edit_path
       Thredded::UrlsHelper.edit_private_topic_path(@topic)
     end

data/app/view_models/thredded/private_topics_page_view.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require_dependency 'thredded/private_topic_view'
 module Thredded
   # A view model for a page of BaseTopicViews.
   class PrivateTopicsPageView
@@ -15,10 +14,16 @@ module Thredded
     # @param user [Thredded.user_class] the user who is viewing the posts page
     # @param topics_page_scope [ActiveRecord::Relation<Thredded::Topic>]
     def initialize(user, topics_page_scope)
-      @topics_page_scope = topics_page_scope
+      @topics_page_scope = refine_scope(topics_page_scope)
       @topic_views = @topics_page_scope.with_read_states(user).map do |(topic, read_state)|
-        PrivateTopicView.new(topic, read_state, Pundit.policy!(user, topic))
+        Thredded::PrivateTopicView.new(topic, read_state, Pundit.policy!(user, topic))
       end
     end
+
+    protected
+
+    def refine_scope(topics_page_scope)
+      topics_page_scope.includes(:user, :last_user, :users)
+    end
   end
 end

data/app/view_models/thredded/topic_posts_page_view.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
-require_dependency 'thredded/posts_page_view'
 module Thredded
   # A view model for a page of PostViews of a Topic.
-  class TopicPostsPageView < PostsPageView
+  class TopicPostsPageView < Thredded::PostsPageView
     # @return [Thredded::BaseTopicView]
     attr_reader :topic
 

data/app/view_models/thredded/topic_view.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Thredded
   # A view model for Topic.
-  class TopicView < BaseTopicView
+  class TopicView < Thredded::BaseTopicView
     delegate :categories, :id, :blocked?, :last_moderation_record, :followers,
              :last_post, :messageboard_id, :messageboard_name,
              to: :@topic
@@ -17,8 +17,8 @@ module Thredded
     def self.from_user(topic, user)
       read_state = follow = nil
       if user && !user.thredded_anonymous?
-        read_state = UserTopicReadState.find_by(user_id: user.id, postable_id: topic.id)
-        follow = UserTopicFollow.find_by(user_id: user.id, topic_id: topic.id)
+        read_state = Thredded::UserTopicReadState.find_by(user_id: user.id, postable_id: topic.id)
+        follow = Thredded::UserTopicFollow.find_by(user_id: user.id, topic_id: topic.id)
       end
       new(topic, read_state, follow, Pundit.policy!(user, topic))
     end

data/app/view_models/thredded/topics_page_view.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require_dependency 'thredded/topic_view'
 module Thredded
   # A view model for a page of BaseTopicViews.
   class TopicsPageView

data/app/views/thredded/messageboard_groups/new.html.erb

@@ -16,7 +16,11 @@
         <%= f.text_field :name, required: true %>
       </li>
 
-      <li><%= f.submit t('thredded.messageboard_group.create'), class: 'thredded--form--submit' %></li>
+      <li>
+        <%= f.submit t('thredded.messageboard_group.create'),
+                     class: 'thredded--form--submit',
+                     'data-disable-with' => t('thredded.messageboard_group.form.create_btn_submitting') %>
+      </li>
     </ul>
   <% end %>
 <% end %>

data/app/views/thredded/messageboards/_form.html.erb

@@ -13,7 +13,12 @@
       <%= f.collection_select :messageboard_group_id, Thredded::MessageboardGroup.all, :id, :name,
                               include_blank: t('thredded.messageboard.form.no_group') %>
     </li>
-    <li><%= f.submit @messageboard.persisted? ? t('thredded.messageboard.update') : t('thredded.messageboard.create'),
-                     class: 'thredded--form--submit' %></li>
+    <li>
+      <%= f.submit @messageboard.persisted? ? t('thredded.messageboard.update') : t('thredded.messageboard.create'),
+                   class: 'thredded--form--submit',
+                   'data-disable-with' => @messageboard.persisted? ?
+                       t('thredded.messageboard.form.update_btn_submitting') :
+                       t('thredded.messageboard.form.create_btn_submitting') %>
+    </li>
   </ul>
 <% end %>

data/app/views/thredded/posts/_form.html.erb

@@ -2,4 +2,5 @@
            topic: topic,
            post: post,
            content_label: t('thredded.posts.form.content_label'),
-           button_text: button_text %>
+           button_text: button_text,
+           button_submitting_text: local_assigns.key?(:button_submitting_text) ? button_submitting_text : nil %>

data/app/views/thredded/posts/edit.html.erb

@@ -9,9 +9,10 @@
 <%= thredded_page do %>
   <section class="thredded--main-section">
     <%= render 'thredded/posts/form',
-               messageboard: messageboard,
+               messageboard: (messageboard unless @post.private_topic_post?),
                topic:        topic,
                post:         @post,
-               button_text:  t('thredded.posts.form.update_btn') %>
+               button_text:  t('thredded.posts.form.update_btn'),
+               button_submitting_text: t('thredded.posts.form.update_btn_submitting')%>
   </section>
 <% end %>

data/app/views/thredded/posts_common/_form.html.erb

@@ -1,3 +1,4 @@
+<%# locals: messageboard, topic, post, content_label, button_text, button_submitting_text. %>
 <%= form_for (post.private_topic_post? ? [topic, post] : [messageboard, topic, post]), as: :post,
              html: {
                  class: 'thredded--form thredded--post-form',
@@ -7,9 +8,12 @@
              } do |form| %>
   <ul class="thredded--form-list">
     <%= render 'thredded/posts_common/form/content_field', form: form, content_label: content_label %>
-
     <li>
-      <%= form.submit button_text, class: 'thredded--form--submit' %>
+      <% button_submitting_text ||=
+             post.persisted? ? t('thredded.form.update_btn_submitting') : t('thredded.form.create_btn_submitting') %>
+      <button type="submit" class="thredded--form--submit" data-disable-with="<%= button_submitting_text %>">
+        <%= button_text %>
+      </button>
     </li>
   </ul>
 <% end %>

data/app/views/thredded/preferences/_form.html.erb

@@ -11,31 +11,37 @@
   <ul class="thredded--form-list">
     <li>
       <%= f.label :follow_topics_on_mention do %>
-        <%= f.check_box :follow_topics_on_mention %>
+        <%= f.check_box :follow_topics_on_mention, 'data-thredded-bound-messageboard-pref' => 'user_preferences_form[messageboard_follow_topics_on_mention]' %>
         <%= t 'thredded.preferences.form.follow_topics_on_mention.label' %>
         <p class="thredded--form-list--hint">
           <%= t 'thredded.preferences.form.follow_topics_on_mention.hint' %>
         </p>
       <% end %>
     </li>
-    <li>
-      <%= f.label :followed_topic_emails do %>
-        <%= f.check_box :followed_topic_emails %>
-        <%= t 'thredded.preferences.form.followed_topic_emails.label' %>
-        <p class="thredded--form-list--hint">
-          <%= t 'thredded.preferences.form.followed_topic_emails.hint' %>
-        </p>
-      <% end %>
-    </li>
-    <li>
-      <%= f.label :notify_on_message do %>
-        <%= f.check_box :notify_on_message %>
-        <%= t 'thredded.preferences.form.notify_on_message.label' %>
-        <p class="thredded--form-list--hint">
-          <%= t 'thredded.preferences.form.notify_on_message.hint' %>
-        </p>
-      <% end %>
-    </li>
+    <% if Thredded.notifiers.present? %>
+      <li>
+        <label><%= t 'thredded.preferences.form.notifications_for_followed_topics.label' %></label>
+        <%= f.fields_for :notifications_for_followed_topics, preferences.notifications_for_followed_topics do |fn| %>
+          <%= fn.label :enabled do %>
+            <%= fn.hidden_field :notifier_key %>
+            <%= fn.check_box :enabled,
+                             'data-thredded-bound-messageboard-pref' =>
+                                 "user_preferences_form[messageboard_notifications_for_followed_topics_attributes][#{fn.index}][enabled]" %>
+            <%= fn.object.notifier_human_name %>
+          <%- end %>
+        <%- end %>
+      </li>
+      <li>
+        <label><%= t 'thredded.preferences.form.notifications_for_private_topics.label' %></label>
+        <%= f.fields_for :notifications_for_private_topics, preferences.notifications_for_private_topics do |fn| %>
+          <%= fn.label :enabled do %>
+            <%= fn.hidden_field :notifier_key %>
+            <%= fn.check_box :enabled %>
+            <%= fn.object.notifier_human_name %>
+          <% end %>
+        <% end %>
+      </li>
+    <% end %>
   </ul>
   <% if preferences.messageboard %>
     <h3>
@@ -51,18 +57,24 @@
           </p>
         <% end %>
       </li>
-      <li>
-        <%= f.label :messageboard_followed_topic_emails do %>
-          <%= f.check_box :messageboard_followed_topic_emails %>
-          <%= t 'thredded.preferences.form.messageboard_followed_topic_emails.label' %>
-          <p class="thredded--form-list--hint">
-            <%= t 'thredded.preferences.form.messageboard_followed_topic_emails.hint' %>
-          </p>
-        <% end %>
-      </li>
+      <% if Thredded.notifiers.present? %>
+        <li>
+          <label><%= t 'thredded.preferences.form.messageboard_notifications_for_followed_topics.label' %></label>
+          <%= f.fields_for :messageboard_notifications_for_followed_topics,
+                           preferences.messageboard_notifications_for_followed_topics do |fn| %>
+            <%= fn.label :enabled do %>
+              <%= fn.hidden_field :notifier_key %>
+              <%= fn.hidden_field :messageboard_id %>
+              <%= fn.check_box :enabled %>
+              <%= fn.object.notifier_human_name %>
+            <% end %>
+          <%- end %>
+        </li>
+      <% end %>
     </ul>
   <% end %>
-  <button type="submit" class="thredded--form--submit">
+  <button type="submit" class="thredded--form--submit"
+          data-disable-with="<%= t 'thredded.preferences.form.update_btn_submitting' %>">
     <%= t 'thredded.preferences.form.submit_btn' %>
   </button>
 <% end %>

data/app/views/thredded/private_posts/_form.html.erb

@@ -2,4 +2,5 @@
            topic: topic,
            post: post,
            button_text: t('thredded.private_posts.form.create_btn'),
+           button_submitting_text: t('thredded.private_posts.form.create_btn_submitting'),
            content_label: t('thredded.private_posts.form.content_label') %>

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

@@ -1,6 +1,6 @@
 <%= form_for private_topic,
              url:  private_topics_path(@private_topic),
-             html: { class: "thredded--form #{local_assigns[:css_class]}", 'data-thredded-topic-form' => true } do |form| %>
+             html: { class: "thredded--form thredded--new-private-topic-form #{local_assigns[:css_class]}", 'data-thredded-topic-form' => true } do |form| %>
 
   <ul class="thredded--form-list on-top">
     <li class="title">
@@ -21,7 +21,8 @@
                content_label: t('thredded.private_topics.form.content_label') %>
 
     <li>
-      <button type="submit" class="thredded--form--submit">
+      <button type="submit" class="thredded--form--submit"
+              data-disable-with="<%= t 'thredded.private_topics.form.create_btn_submitting' %>">
         <%= t('thredded.private_topics.form.create_btn') %>
       </button>
     </li>