message_train 0.6.17 → 0.7.1

data/app/controllers/message_train/unsubscribes_controller.rb

@@ -8,81 +8,116 @@ module MessageTrain
 
     # POST /unsubscribes
     def create
-      if params[:all]
-        @from = nil
-        @unsubscribe = @box_user.unsubscribe_from(@from)
-        if @unsubscribe.errors.empty?
-          flash[:notice] = :unsubscribe_from_all_message.l
-        else
-          flash[:error] = @unsubscribe.errors.full_messages.to_sentence
-        end
-        redirect_to message_train.unsubscribes_url
-        return
-      end
-      unsub = unsubscribe_params
-      model = unsub[:from_type].constantize
-      @from = model.find(unsub[:from_id])
-      if @from == @box_user || @from.allows_receiving_by?(@box_user)
-        @unsubscribe = @box_user.unsubscribe_from(@from)
-        if @unsubscribe.errors.empty?
-          if @from == @box_user
-            flash[:notice] = :unsubscribe_message.l
-          else
-            name_column = MessageTrain.configuration.name_columns[
-              @from.class.table_name.to_sym
-            ]
-            collective_name = @from.send(name_column)
-            collective_type = @from.class.name
-            flash[:notice] = :collective_unsubscribe_message.l(
-              collective_name: collective_name,
-              collective_type: collective_type
-            )
-          end
-        else
-          flash[:error] = @unsubscribe.errors.full_messages.to_sentence
-        end
-      else
-        flash[:error] = :you_are_not_in_that_collective_type.l(
-          collective_type: model.name
-        )
-        raise ActiveRecord::RecordNotFound
-      end
+      return unsubscribe_from_all if params[:all]
+      return unless unsubscribe_from_one
+      flash[:notice] = if @from == @box_user
+                         unsubscribe_message_from_box_user
+                       else
+                         unsubscribe_message_from_other
+                       end
       redirect_to message_train.unsubscribes_url
     end
 
     # DELETE /unsubscribes/:id
     def destroy
-      if params[:all]
-        @unsubscribe = @box_user.unsubscribes.where(from: nil).destroy_all
-        flash[:notice] = :unsubscribe_all_removed_message.l
-      else
-        @unsubscribe = @box_user.unsubscribes.find(params[:id])
-        @from = @unsubscribe.from
-        if @from == @box_user
-          message = :unsubscribe_removed_message.l
-        else
-          name_column = MessageTrain.configuration.name_columns[
-            @unsubscribe.from.class.table_name.to_sym
-          ]
-          collective_name = @unsubscribe.from.send(name_column)
-          collective_type = @unsubscribe.from_type
-          message = :collective_unsubscribe_removed_message.l(
-            collective_name: collective_name,
-            collective_type: collective_type
-          )
-        end
-        @unsubscribe.destroy
-        flash[:notice] = message
-      end
+      flash[:notice] = params[:all] ? destroy_all : destroy_one
       redirect_to message_train.unsubscribes_url
     end
 
     private
 
+    def destroy_all
+      @unsubscribe = @box_user.unsubscribes.where(from: nil).destroy_all
+      :unsubscribe_all_removed_message.l
+    end
+
+    def destroy_one
+      @unsubscribe = @box_user.unsubscribes.find(params[:id])
+      @from = @unsubscribe.from
+      @unsubscribe.destroy
+      if @from == @box_user
+        destroy_message_through_self
+      else
+        destroy_message_through_other
+      end
+    end
+
+    def destroy_message_through_self
+      :unsubscribe_removed_message.l
+    end
+
+    def destroy_message_through_other
+      name_column = MessageTrain.configuration.name_columns[
+        @unsubscribe.from.class.table_name.to_sym
+      ]
+      collective_name = @unsubscribe.from.send(name_column)
+      collective_type = @unsubscribe.from_type
+      :collective_unsubscribe_removed_message.l(
+        collective_name: collective_name,
+        collective_type: collective_type
+      )
+    end
+
     # Never trust parameters from the scary internet, only allow the white list
     # through.
     def unsubscribe_params
       params.require(:unsubscribe).permit(:from_type, :from_id)
     end
+
+    def unsubscribe_from_all
+      @unsubscribe = @box_user.unsubscribe_from(nil)
+      if @unsubscribe.errors.empty?
+        flash[:notice] = :unsubscribe_from_all_message.l
+      else
+        flash[:error] = @unsubscribe.errors.full_messages.to_sentence
+      end
+      redirect_to message_train.unsubscribes_url
+    end
+
+    def unsubscribe_from_one
+      unsub = unsubscribe_params
+      model = unsub[:from_type].constantize
+
+      @from = model.find(unsub[:from_id])
+      authorize_unsubscribe
+
+      @unsubscribe = @box_user.unsubscribe_from(@from)
+
+      if @unsubscribe.errors.any?
+        unsubscribe_errors
+      else
+        true
+      end
+    end
+
+    def authorize_unsubscribe
+      return true if @from.allows_receiving_by?(@box_user)
+      flash[:error] = :you_are_not_in_that_collective_type.l(
+        collective_type: @from.class.name
+      )
+      raise ActiveRecord::RecordNotFound
+    end
+
+    def unsubscribe_errors
+      flash[:error] = @unsubscribe.errors.full_messages.to_sentence
+      redirect_to message_train.unsubscribes_url
+      false
+    end
+
+    def unsubscribe_message_from_box_user
+      :unsubscribe_message.l
+    end
+
+    def unsubscribe_message_from_other
+      name_column = MessageTrain.configuration.name_columns[
+        @from.class.table_name.to_sym
+      ]
+      collective_name = @from.send(name_column)
+      collective_type = @from.class.name
+      :collective_unsubscribe_message.l(
+        collective_name: collective_name,
+        collective_type: collective_type
+      )
+    end
   end
 end

data/app/helpers/message_train/application_helper.rb

@@ -7,17 +7,23 @@ module MessageTrain
 
     def fuzzy_date(date)
       time = Time.parse(date.strftime('%F %T'))
-      case Time.now - time
-      when 0..1.minute
-        :just_now.l
+      change_in_time = Time.now - time
+      return :just_now.l if (0..1.minute).cover? change_in_time
+      l(time, format: fuzzy_date_format(change_in_time))
+    end
+
+    private
+
+    def fuzzy_date_format(change_in_time)
+      case change_in_time
       when 1.minute..1.day
-        l(time, format: :fuzzy_today)
+        :fuzzy_today
       when 1.day..1.week
-        l(time, format: :fuzzy_this_week)
+        :fuzzy_this_week
       when 1.week..1.year
-        l(time, format: :fuzzy_date_without_year)
+        :fuzzy_date_without_year
       else
-        l(time, format: :fuzzy_date)
+        :fuzzy_date
       end
     end
   end

data/app/helpers/message_train/attachments_helper.rb

@@ -2,18 +2,10 @@ module MessageTrain
   # Attachments helper
   module AttachmentsHelper
     def attachment_icon(attachment)
-      html = ''
-      if attachment.image?
-        html << image_tag(attachment.attachment.url(:thumb))
-      else
-        html << content_tag(
-          :span,
-          '',
-          class: 'glyphicon glyphicon-save-file glyphicon-thumbnail'
-        )
-        html << tag(:br)
-        html << attachment.attachment_file_name
-      end
+      return image_tag(attachment.attachment.url(:thumb)) if attachment.image?
+      icon_class = 'glyphicon glyphicon-save-file glyphicon-thumbnail'
+      html = content_tag(:span, '', class: icon_class)
+      html << tag(:br) + attachment.attachment_file_name
       html.html_safe
     end
 

data/app/helpers/message_train/boxes_helper.rb

@@ -60,30 +60,20 @@ module MessageTrain
     end
 
     def boxes_dropdown_cache_key(boxes)
-      parts = [
-        'boxes-dropdown',
-        @box_user
-      ]
+      parts = ['boxes-dropdown', @box_user]
       updated_at = boxes.collect do |x|
         x.conversations && x.conversations.maximum(:updated_at)
       end.compact.max
-      updated_at && parts << [
-        updated_at
-      ]
+      parts << [updated_at] if updated_at
       parts
     end
 
     def boxes_widget_cache_key(boxes)
-      parts = [
-        'boxes-widget',
-        @box_user
-      ]
+      parts = ['boxes-widget', @box_user]
       updated_at = boxes.collect do |x|
         x.conversations && x.conversations.maximum(:updated_at)
       end.compact.max
-      updated_at && parts << [
-        updated_at
-      ]
+      parts << [updated_at] if updated_at
       parts
     end
   end

data/app/helpers/message_train/collectives_helper.rb

@@ -9,18 +9,27 @@ module MessageTrain
     end
 
     def collective_nav_item(box, box_user)
-      text = collective_name(box.parent)
+      parent = box.parent
+      return unless parent.allows_access_by? box_user
+      division = default_division_for_box(box, box_user)
+      nav_item(
+        (collective_name(parent) + collective_badge(box)).html_safe,
+        message_train.collective_box_path(parent.path_part, division)
+      )
+    end
+
+    def collective_badge(box)
+      count = box.unread_count
+      return '' if count.zero?
+      badge(count.to_s, 'info pull-right')
+    end
+
+    def default_division_for_box(box, box_user)
       if box.parent.allows_receiving_by? box_user
-        division = :in
+        :in
       elsif box.parent.allows_sending_by? box_user
-        division = :sent
-      else
-        return
+        :sent
       end
-      link = message_train.collective_box_path(box.parent.path_part, division)
-      unread_count = box.unread_count
-      unread_count > 0 && text << badge(unread_count.to_s, 'info pull-right')
-      nav_item text.html_safe, link
     end
 
     def collective_list_item(box, html_options = {})
@@ -35,21 +44,12 @@ module MessageTrain
     end
 
     def collective_boxes_dropdown_list(box_user)
-      total_unread_count = {}
-      show = {}
-      box_user.collective_boxes.each do |table_sym, collectives|
-        total_unread_count[table_sym] = collectives.collect(&:unread_count).sum
-        show[table_sym] = collectives.select do |collective_box|
-          collective_box.parent.allows_sending_by?(box_user) ||
-            collective_box.parent.allows_receiving_by?(box_user)
-        end.any?
-      end
       render(
         partial: 'message_train/collectives/dropdown_list',
         locals: {
           collective_boxes: box_user.collective_boxes,
-          total_unread_count: total_unread_count,
-          show: show,
+          total_unread_count: box_user.collective_boxes_unread_counts,
+          show: box_user.collective_boxes_show_flags,
           box_user: box_user
         }
       )
@@ -72,18 +72,12 @@ module MessageTrain
     end
 
     def collectives_cache_key(collective_boxes, box_user)
-      parts = [
-        'collectives-dropdown',
-        box_user
-      ]
-      collective_boxes.collect do |table_name, x|
+      parts = ['collectives-dropdown', box_user]
+      collective_boxes.each do |table_name, x|
         updated_at = x.collect do |y|
           y.conversations && y.conversations.maximum(:updated_at)
         end.compact.max
-        updated_at && parts << [
-          table_name,
-          updated_at
-        ]
+        updated_at && parts << [table_name, updated_at]
       end
       parts
     end

data/app/helpers/message_train/conversations_helper.rb

@@ -11,30 +11,10 @@ module MessageTrain
 
     def conversation_class(box, conversation)
       css_classes = []
-
-      css_classes << if conversation.includes_unread_for?(@box_user)
-                       'unread'
-                     else
-                       'read'
-                     end
-
-      conversation.includes_drafts_by?(@box_user) && css_classes << 'draft'
-
-      !conversation.includes_undeleted_for?(@box_user) && css_classes << 'hide'
-
-      if box.division == :trash
-        !conversation.includes_trashed_for?(@box_user) &&
-          css_classes << 'hide'
-      else
-        !conversation.includes_untrashed_for?(@box_user) &&
-          css_classes << 'hide'
-        if box.division == :ignored
-          !conversation.participant_ignored?(@box_user) && css_classes << 'hide'
-        else
-          conversation.participant_ignored?(@box_user) && css_classes << 'hide'
-        end
-      end
-      css_classes.uniq.join(' ')
+      css_classes << conversation_css_for_read_state(conversation)
+      css_classes << conversation_css_for_draft_state(conversation)
+      css_classes << conversation_css_for_hide_state(box, conversation)
+      css_classes.join(' ')
     end
 
     def conversation_trashed_toggle(conversation, collective = nil)
@@ -69,21 +49,63 @@ module MessageTrain
 
     # rubocop:disable Metrics/ParameterLists
     def conversation_toggle(conv, icon, mark, method, title, options = {})
-      options[:remote] = true
-      options[:method] = method
-      options[:title] = title
-      options[:class] ||= ''
-      options[:class] += " #{mark}-toggle"
       render(
         partial: 'message_train/conversations/toggle',
         locals: {
           conversation: conv,
           icon: icon,
           mark_to_set: mark,
-          options: options
+          options: conversation_toggle_options(mark, method, title, options)
         }
       )
     end
     # rubocop:enable Metrics/ParameterLists
+
+    def conversation_toggle_options(mark, method, title, options = {})
+      options[:remote] = true
+      options[:method] = method
+      options[:title] = title
+      options[:class] ||= ''
+      options[:class] += " #{mark}-toggle"
+      options
+    end
+
+    def conversation_css_for_hide_state(box, conversation)
+      conversation_css_for_deleted_state(conversation) ||
+        conversation_css_for_trash_state(box, conversation) ||
+        conversation_css_for_ignore_state(box, conversation)
+    end
+
+    def conversation_css_for_deleted_state(conversation)
+      'hide' unless conversation.includes_undeleted_for?(@box_user)
+    end
+
+    def conversation_css_for_trash_state(box, conversation)
+      if box.division == :trash
+        'hide' unless conversation.includes_trashed_for?(@box_user)
+      elsif !conversation.includes_untrashed_for?(@box_user)
+        'hide'
+      end
+    end
+
+    def conversation_css_for_ignore_state(box, conversation)
+      if box.division == :ignored
+        'hide' unless conversation.participant_ignored?(@box_user)
+      elsif conversation.participant_ignored?(@box_user)
+        'hide'
+      end
+    end
+
+    def conversation_css_for_draft_state(conversation)
+      'draft' if conversation.includes_drafts_by?(@box_user)
+    end
+
+    def conversation_css_for_read_state(conversation)
+      if conversation.includes_unread_for?(@box_user)
+        'unread'
+      else
+        'read'
+      end
+    end
   end
 end