message_train 0.5.2 → 0.5.3

data/app/models/message_train/ignore.rb

@@ -1,14 +1,20 @@
 module MessageTrain
+  # Ignore model
   class Ignore < ActiveRecord::Base
     belongs_to :participant, polymorphic: true
     belongs_to :conversation, foreign_key: :message_train_conversation_id
 
     validates_presence_of :conversation, :participant
 
-    scope :find_all_by_participant, ->(participant) { where(participant: participant) }
+    scope :find_all_by_participant, (lambda do |participant|
+      where(participant: participant)
+    end)
 
     def self.conversations
-      MessageTrain::Conversation.joins(:ignores).where(message_train_ignores: { id: where(nil) })
+      MessageTrain::Conversation.joins(:ignores)
+                                .where(
+                                  message_train_ignores: { id: where(nil) }
+                                )
     end
   end
 end

data/app/models/message_train/message.rb

@@ -1,4 +1,5 @@
 module MessageTrain
+  # Message model
   class Message < ActiveRecord::Base
     # Serializations
     serialize :recipients_to_save, Hash
@@ -19,7 +20,11 @@ module MessageTrain
     after_save :set_conversation_subject_if_alone
 
     # Nested Attributes
-    accepts_nested_attributes_for :attachments, reject_if: :all_blank, allow_destroy: true
+    accepts_nested_attributes_for(
+      :attachments,
+      reject_if: :all_blank,
+      allow_destroy: true
+    )
 
     # Scopes
     default_scope { order(updated_at: :desc) }
@@ -27,12 +32,15 @@ module MessageTrain
     scope :drafts, -> { where(draft: true) }
     scope :by, ->(participant) { where(sender: participant) }
     scope :drafts_by, ->(participant) { drafts.by(participant) }
+    scope :filter_by_receipt_method, (lambda do |receipt_method, participant|
+      where(
+        id: where(nil).receipts.send(receipt_method, participant).message_ids
+      )
+    end)
 
     def mark(mark_to_set, participant)
       receipt_to_mark = receipts.for(participant).first
-      unless receipt_to_mark.nil?
-        receipt_to_mark.mark(mark_to_set)
-      end
+      receipt_to_mark.present? && receipt_to_mark.mark(mark_to_set)
     end
 
     def self.mark(mark_to_set, participant)
@@ -54,37 +62,45 @@ module MessageTrain
     end
 
     def self.receipts
-      MessageTrain::Receipt.joins(:message).where(message_train_messages: { id: where(nil) })
+      MessageTrain::Receipt.joins(:message)
+                           .where(message_train_messages: { id: where(nil) })
     end
 
     def self.conversations
-      MessageTrain::Conversation.joins(:messages).where(message_train_messages: { id: where(nil) })
+      MessageTrain::Conversation.joins(:messages)
+                                .where(
+                                  message_train_messages: { id: where(nil) }
+                                )
     end
 
     def method_missing(method_sym, *arguments, &block)
-      # the first argument is a Symbol, so you need to_s it if you want to pattern match
+      # the first argument is a Symbol, so you need to_s it if you want to
+      # pattern match
       if method_sym.to_s =~ /^is_((.*)_(by|to|for|through))\?$/
-        !receipts.send($1.to_sym, arguments.first).empty?
+        !receipts.send(Regexp.last_match[1].to_sym, arguments.first).empty?
       elsif method_sym.to_s =~ /^mark_(.*)_for$/
-        receipts.for(arguments.first).first.mark($1.to_sym)
+        receipts.for(arguments.first).first.mark(Regexp.last_match[1].to_sym)
       else
         super
       end
     end
 
     def self.method_missing(method_sym, *arguments, &block)
-      # the first argument is a Symbol, so you need to_s it if you want to pattern match
+      # the first argument is a Symbol, so you need to_s it if you want to
+      # pattern match
       if method_sym.to_s =~ /^with_(.*_(by|to|for|through))$/
-        filter_by_receipt_method($1.to_sym, arguments.first)
+        filter_by_receipt_method(Regexp.last_match[1].to_sym, arguments.first)
       else
         super
       end
     end
 
-    # It's important to know Object defines respond_to to take two parameters: the method to check, and whether to include private methods
+    # It's important to know Object defines respond_to to take two parameters:
+    # the method to check, and whether to include private methods
     # http://www.ruby-doc.org/core/classes/Object.html#M000333
     def respond_to?(method_sym, include_private = false)
-      if method_sym.to_s =~ /^is_.*_(by|to|for|through)\?$/ || method_sym.to_s =~ /^mark_.*_for\?$/
+      if method_sym.to_s =~ /^is_.*_(by|to|for|through)\?$/ ||
+         method_sym.to_s =~ /^mark_.*_for\?$/
         true
       else
         super
@@ -99,11 +115,7 @@ module MessageTrain
       end
     end
 
-  private
-
-    scope :filter_by_receipt_method, ->(receipt_method, participant) {
-      where(id: where(nil).receipts.send(receipt_method, participant).message_ids)
-    }
+    private
 
     def create_conversation_if_blank
       if conversation.nil?
@@ -112,35 +124,20 @@ module MessageTrain
     end
 
     def generate_sender_receipt
-      receipts.first_or_create!(recipient: sender, received_through: sender, sender: true)
+      receipts.first_or_create!(
+        recipient: sender,
+        received_through: sender,
+        sender: true
+      )
     end
 
     def generate_receipts_or_set_draft
       unless draft
         recipients_to_save.each do |table, slugs|
-          model_name = table.classify
-          model = model_name.constantize
-
-          slugs.split(',').each do |slug|
-            slug = slug.strip
-            slug_column = MessageTrain.configuration.slug_columns[table.to_sym] || :slug
-            if model.exists?(slug_column => slug)
-              recipient = model.find_by(slug_column => slug)
-              end_recipient_method = MessageTrain.configuration.valid_recipients_methods[table.to_sym]
-              if end_recipient_method.nil?
-                unless conversation.is_ignored?(recipient)
-                  receipts.create!(recipient: recipient, received_through: recipient)
-                end
-              else
-                recipient.send(end_recipient_method).uniq.each do |end_recipient|
-                  unless conversation.is_ignored?(end_recipient) || end_recipient == sender
-                    receipts.create!(recipient: end_recipient, received_through: recipient)
-                  end
-                end
-              end
-            else
-              errors.add :recipients_to_save, :name_not_found.l(name: slug)
-            end
+          slugs = slugs.split(',')
+          sender.class.table_name == table && (slugs -= [sender.slug])
+          slugs.each do |slug|
+            send_receipts(table, slug)
           end
         end
         reload
@@ -158,5 +155,38 @@ module MessageTrain
       end
     end
 
+    def send_receipts(table, slug)
+      model_name = table.classify
+      model = model_name.constantize
+      slug = slug.strip
+      slug_column = MessageTrain.configuration
+                                .slug_columns[table.to_sym] || :slug
+      if model.exists?(slug_column => slug)
+        recipient = model.find_by(slug_column => slug)
+        end_recipient_method = MessageTrain.configuration
+                                           .valid_recipients_methods[
+                                             table.to_sym
+                                           ]
+        if end_recipient_method.nil?
+          unless conversation.participant_ignored?(recipient)
+            receipts.create!(
+              recipient: recipient,
+              received_through: recipient
+            )
+          end
+        else
+          recipient.send(end_recipient_method).uniq.each do |end_recipient|
+            next if conversation.participant_ignored?(end_recipient) ||
+                    end_recipient == sender
+            receipts.create!(
+              recipient: end_recipient,
+              received_through: recipient
+            )
+          end
+        end
+      else
+        errors.add :recipients_to_save, :name_not_found.l(name: slug)
+      end
+    end
   end
 end

data/app/models/message_train/receipt.rb

@@ -1,4 +1,5 @@
 module MessageTrain
+  # Receipt model
   class Receipt < ActiveRecord::Base
     belongs_to :recipient, polymorphic: true
     belongs_to :received_through, polymorphic: true
@@ -6,15 +7,19 @@ module MessageTrain
     validates_presence_of :recipient, :message
 
     default_scope { order(updated_at: :desc) }
-    scope :sender_receipt, -> { where('sender = ?', true) }
-    scope :recipient_receipt, -> { where('sender = ?', false) }
+    scope :sender_receipt, -> { where(sender: true) }
+    scope :recipient_receipt, -> { where(sender: false) }
     scope :by, ->(sender) { sender_receipt.for(sender) }
-    scope :for, ->(recipient) { where('recipient_type = ? AND recipient_id = ?', recipient.class.name, recipient.id) }
+    scope :for, (lambda do |recipient|
+      where(recipient: recipient)
+    end)
     scope :to, ->(recipient) { recipient_receipt.for(recipient) }
-    scope :through, ->(received_through) { where('received_through_type = ? AND received_through_id = ?', received_through.class.name, received_through.id) }
-    scope :trashed, ->(setting = true) { where('marked_trash = ?', setting) }
-    scope :read, ->(setting = true) { where('marked_read = ?', setting) }
-    scope :deleted, ->(setting = true) { where('marked_deleted = ?', setting) }
+    scope :through, (lambda do |received_through|
+      where(received_through: received_through)
+    end)
+    scope :trashed, ->(setting = true) { where(marked_trash: setting) }
+    scope :read, ->(setting = true) { where(marked_read: setting) }
+    scope :deleted, ->(setting = true) { where(marked_deleted: setting) }
 
     after_create :notify
 
@@ -35,7 +40,8 @@ module MessageTrain
     end
 
     def self.messages
-      MessageTrain::Message.joins(:receipts).where(message_train_receipts: { id: where(nil) })
+      MessageTrain::Message.joins(:receipts)
+                           .where(message_train_receipts: { id: where(nil) })
     end
 
     def self.conversation_ids
@@ -43,36 +49,43 @@ module MessageTrain
     end
 
     def self.conversations
-      MessageTrain::Conversation.joins(:receipts).where(message_train_receipts: { id: where(nil) })
+      MessageTrain::Conversation.joins(:receipts)
+                                .where(
+                                  message_train_receipts: { id: where(nil) }
+                                )
     end
 
     def self.method_missing(method_sym, *arguments, &block)
-      # the first argument is a Symbol, so you need to_s it if you want to pattern match
+      # the first argument is a Symbol, so you need to_s it if you want to
+      # pattern match
       if method_sym.to_s =~ /^receipts_(by|to|for|through)$/
-        send($1.to_sym, arguments.first)
+        send(Regexp.last_match[1].to_sym, arguments.first)
       elsif method_sym.to_s =~ /^(.*)_(by|to|for|through)$/
-        send($1.to_sym).send($2.to_sym, arguments.first)
+        send(Regexp.last_match[1].to_sym)
+          .send(Regexp.last_match[2].to_sym, arguments.first)
       elsif method_sym.to_s =~ /^un(.*)$/
-        send($1.to_sym, false)
+        send(Regexp.last_match[1].to_sym, false)
       else
         super
       end
     end
 
-    # It's important to know Object defines respond_to to take two parameters: the method to check, and whether to include private methods
+    # It's important to know Object defines respond_to to take two parameters:
+    # the method to check, and whether to include private methods
     # http://www.ruby-doc.org/core/classes/Object.html#M000333
     def self.respond_to?(method_sym, include_private = false)
-      if method_sym.to_s =~ /^(.*)_(by|to|for|through)$/ || method_sym.to_s =~ /^un(.*)$/
+      if method_sym.to_s =~ /^(.*)_(by|to|for|through)$/ ||
+         method_sym.to_s =~ /^un(.*)$/
         true
       else
         super
       end
     end
 
-  private
+    private
 
     def notify
-      unless sender? or recipient.unsubscribed_from?(received_through)
+      unless sender? || recipient.unsubscribed_from?(received_through)
         ReceiptMailer.notification_email(self).deliver_later
       end
     end

data/app/models/message_train/unsubscribe.rb

@@ -1,4 +1,5 @@
 module MessageTrain
+  # Unsubscribe model
   class Unsubscribe < ActiveRecord::Base
     belongs_to :recipient, polymorphic: true
     belongs_to :from, polymorphic: true

data/app/views/application/404.html.haml

@@ -1,3 +1,3 @@
 - add_hero_unit do
   %h1
-    404 - Page Not Found
+    404 - Page Not Found

data/app/views/layouts/mailer.html.haml

@@ -1,6 +1,6 @@
 !!!
-%html{ lang: "en" }
+%html{ lang: 'en' }
   %head
   %body
     #wrapper
-      =yield
+      =yield

data/app/views/layouts/mailer.text.haml

@@ -1 +1 @@
-= yield
+= yield

data/app/views/message_train/application/_attachment_fields.html.haml

@@ -4,4 +4,4 @@
     - if f.object.attachment.exists?
       .attachment
         = attachment_link(f.object)
-    = f.file_field :attachment
+    = f.file_field :attachment

data/app/views/message_train/application/_widget.html.haml

@@ -4,4 +4,4 @@
       = boxes_widget @box_user
   - else
     - add_widget do
-      = collective_boxes_widget @collective, @box_user
+      = collective_boxes_widget @collective, @box_user

data/app/views/message_train/application/results.json.jbuilder

@@ -5,4 +5,4 @@ unless @box.results.all.empty?
     json.path item[:path]
     json.message item[:message]
   end
-end
+end

data/app/views/message_train/boxes/_dropdown_list.html.haml

@@ -1,4 +1,4 @@
 - unless boxes.empty?
   = dropdown_nav_item "#{:box_title_in.l} #{badge(boxes.first.unread_count.to_s) unless boxes.first.unread_count == 0}".html_safe, '#' do
     - boxes.each do |box|
-      = box_nav_item box
+      = box_nav_item box

data/app/views/message_train/boxes/_list_item.html.haml

@@ -2,4 +2,4 @@
   %li{ html_options }
     = link_to box.title, message_train.box_path(box.division)
     - if unread_count > 0
-      = badge unread_count.to_s
+      = badge unread_count.to_s

data/app/views/message_train/boxes/show.html.haml

@@ -52,4 +52,4 @@
       = hidden_field_tag :mark_to_set
     %table#message-train-conversations.message-train-conversations.table.table-condensed
       = render @conversations
-    = paginate @conversations
+    = paginate @conversations

data/app/views/message_train/collectives/_dropdown_list.html.haml

@@ -3,4 +3,4 @@
     - if show[key]
       = dropdown_nav_item "#{key.to_s.humanize} #{badge(total_unread_count[key].to_s) unless total_unread_count[key] == 0}".html_safe, '#' do
         - boxes.each do |box|
-          = collective_nav_item box, box_user
+          = collective_nav_item box, box_user

data/app/views/message_train/collectives/_list_item.html.haml

@@ -2,4 +2,4 @@
   %li{ html_options }
     = link_to box.title, message_train.collective_box_path(box.parent.path_part, box.division)
     - if unread_count > 0
-      = badge unread_count.to_s
+      = badge unread_count.to_s

data/app/views/message_train/conversations/_deleted_toggle.html.haml

@@ -1 +1 @@
-= conversation_toggle conversation, 'remove', :deleted, :put, :mark_as_name.l(name: :deleted.l), data: { confirm: :delete_forever_this_cannot_be_undone.l }, collective: collective
+= conversation_toggle conversation, 'remove', :deleted, :put, :mark_as_name.l(name: :deleted.l), data: { confirm: :delete_forever_this_cannot_be_undone.l }, collective: collective

data/app/views/message_train/conversations/_ignored_toggle.html.haml

@@ -1,4 +1,4 @@
-- if conversation.is_ignored?(@box_user)
+- if conversation.participant_ignored?(@box_user)
   = conversation_toggle conversation, 'volume-up', :unignore, :delete, :mark_as_name.l(name: :unignored.l), collective: collective
 - else
-  = conversation_toggle conversation, 'volume-off', :ignore, :delete, :mark_as_name.l(name: :ignored.l), data: { confirm: :are_you_sure.l}, collective: collective
+  = conversation_toggle conversation, 'volume-off', :ignore, :delete, :mark_as_name.l(name: :ignored.l), data: { confirm: :are_you_sure.l}, collective: collective

data/app/views/message_train/conversations/_read_toggle.html.haml

@@ -1,4 +1,4 @@
 - if conversation.includes_unread_for?(@box_user)
   = conversation_toggle conversation, 'eye-open', :read, :put, :mark_as_name.l(name: :read.l), collective: collective
 - else
-  = conversation_toggle conversation, 'eye-close', :unread, :put, :mark_as_name.l(name: :unread.l), collective: collective
+  = conversation_toggle conversation, 'eye-close', :unread, :put, :mark_as_name.l(name: :unread.l), collective: collective

data/app/views/message_train/conversations/_toggle.html.haml

@@ -1,4 +1,4 @@
 - if options[:collective].nil?
   = icon_link_to icon, '', message_train.box_path(@box.division, objects: { 'conversations' => {conversation.id.to_s => conversation.id.to_s}}, mark_to_set: mark_to_set, format: :json), options
 - else
-  = icon_link_to icon, '', message_train.collective_box_path(options[:collective].path_part, @box.division, objects: { 'conversations' => {conversation.id.to_s => conversation.id.to_s}}, mark_to_set: mark_to_set, format: :json), options
+  = icon_link_to icon, '', message_train.collective_box_path(options[:collective].path_part, @box.division, objects: { 'conversations' => {conversation.id.to_s => conversation.id.to_s}}, mark_to_set: mark_to_set, format: :json), options

data/app/views/message_train/conversations/_trashed_toggle.html.haml

@@ -1,4 +1,4 @@
 - if conversation.includes_untrashed_for?(@box_user)
   = conversation_toggle conversation, 'trash', :trash, :put, :mark_as_name.l(name: :trashed.l), data: { confirm: :are_you_sure.l}, collective: collective
 - else
-  = conversation_toggle conversation, 'inbox', :untrash, :put, :mark_as_name.l(name: :untrashed.l), collective: collective
+  = conversation_toggle conversation, 'inbox', :untrash, :put, :mark_as_name.l(name: :untrashed.l), collective: collective

data/app/views/message_train/conversations/show.html.haml

@@ -5,8 +5,8 @@
     .btn.btn-default.btn-lg= conversation_ignored_toggle(@conversation)
   #message_train_conversation.clear-both
     - unless @messages.empty?
-      #message_train_messages.messages.panel-group{aria: { multiselectable: 'true' }, role: "tablist"}
+      #message_train_messages.messages.panel-group{aria: { multiselectable: 'true' }, role: 'tablist'}
         = render @messages
       = paginate @messages
 = modal 'attachment_preview', :attachment_preview.l do
-  #image_placeholder
+  #image_placeholder

data/app/views/message_train/conversations/show.json.jbuilder

@@ -1,2 +1,6 @@
 json.id @conversation.id
-json.html render partial: 'conversation', formats: [:html], locals: { conversation: @conversation }
+json.html render(
+  partial: 'conversation',
+  formats: [:html],
+  locals: { conversation: @conversation }
+)

data/app/views/message_train/messages/_form.html.haml

@@ -8,7 +8,7 @@
       = g.text_field :users, label: :recipients.l, class: 'recipient-input'
     - add_footer_javascript do
       :javascript
-        url = "/box/in/participants/users.json"
+        url = '/box/in/participants/users.json'
         var suggestions = new Bloodhound({
             prefetch: url,
             remote: {

data/app/views/message_train/messages/_message.html.haml

@@ -1,33 +1,33 @@
 - if message.draft
   .panel.panel-default{ class: message_class(@box, message), id: "message_train_message_#{message.id}", data: { mark_path: message_train.box_conversation_path(@box.division, id: message.message_train_conversation_id, objects: { 'messages' => {message.id.to_s => message.id.to_s} }) } }
-    .panel-heading{role: "tab", id: "message_#{message.id}_heading"}
+    .panel-heading{role: 'tab', id: "message_#{message.id}_heading"}
       .message-actions.pull-right
         = message_read_toggle message
         = message_trashed_toggle message
         - if @box.division == :trash
           = message_deleted_toggle message
       %h4.panel-title
-        = link_to "#message_#{message.id}_collapse", aria: { controls: "message_#{message.id}_collapse", expanded: 'true' }, data: { parent: '#accordion', toggle: 'collapse' }, role: "button" do
+        = link_to "#message_#{message.id}_collapse", aria: { controls: "message_#{message.id}_collapse", expanded: 'true' }, data: { parent: '#accordion', toggle: 'collapse' }, role: 'button' do
           %span.caret
           = :message_draft.l
           %small= message.updated_at
-    .panel-collapse.collapse.in{aria: { labelledby: "message_#{message.id}_heading" }, role: "tabpanel", id: "message_#{message.id}_collapse"}
+    .panel-collapse.collapse.in{aria: { labelledby: "message_#{message.id}_heading" }, role: 'tabpanel', id: "message_#{message.id}_collapse"}
       .panel-body
         = render partial: 'message_train/messages/form', locals: { message: message }
 - else
   .panel.panel-default{ class: message_class(@box, message), id: "message_train_message_#{message.id}", data: { mark_path: message_train.box_conversation_path(@box.division, id: message.message_train_conversation_id, objects: { 'messages' => {message.id.to_s => message.id.to_s} }) } }
-    .panel-heading{role: "tab", id: "message_#{message.id}_heading"}
+    .panel-heading{role: 'tab', id: "message_#{message.id}_heading"}
       .message-actions.pull-right
         = message_read_toggle message
         = message_trashed_toggle message
         - if @box.division == :trash
           = message_deleted_toggle message
       %h4.panel-title
-        = link_to "#message_#{message.id}_collapse", aria: { controls: "message_#{message.id}_collapse", expanded: 'true' }, data: { parent: '#accordion', toggle: 'collapse' }, role: "button" do
+        = link_to "#message_#{message.id}_collapse", aria: { controls: "message_#{message.id}_collapse", expanded: 'true' }, data: { parent: '#accordion', toggle: 'collapse' }, role: 'button' do
           %span.caret
           = :from_sender.l(sender: message.sender.display_name)
           %small= message.updated_at
-    .panel-collapse.collapse.in{aria: { labelledby: "message_#{message.id}_heading" }, role: "tabpanel", id: "message_#{message.id}_collapse"}
+    .panel-collapse.collapse.in{aria: { labelledby: "message_#{message.id}_heading" }, role: 'tabpanel', id: "message_#{message.id}_collapse"}
       .panel-body
         %p= :to_recipient.l(recipient: message_recipients(message))
         %p.lead= message.subject

data/app/views/message_train/messages/_toggle.html.haml

@@ -1 +1 @@
-= icon_link_to icon, '', message_train.box_path(@box.division, objects: { 'messages' => {message.id.to_s => message.id.to_s}}, mark_to_set: mark_to_set, format: :json), options
+= icon_link_to icon, '', message_train.box_path(@box.division, objects: { 'messages' => {message.id.to_s => message.id.to_s}}, mark_to_set: mark_to_set, format: :json), options

data/app/views/message_train/messages/show.json.jbuilder

@@ -1,2 +1,6 @@
 json.id @message.id
-json.html render partial: 'message', formats: [:html], locals: { message: @message }
+json.html render(
+  partial: 'message',
+  formats: [:html],
+  locals: { message: @message }
+)

data/app/views/message_train/participants/_participant.json.jbuilder

@@ -2,4 +2,4 @@ json.id participant.id
 json.model_name participant.class.name
 json.slug box_participant_slug(participant)
 json.name box_participant_name(participant)
-json.path message_train.box_model_participant_path(@box, participant.class.table_name, participant.id)
+json.path box_participant_path(participant)

data/app/views/message_train/participants/index.json.jbuilder

@@ -1,3 +1,3 @@
 json.participants @participants do |participant|
   json.partial! partial: 'participant', locals: { participant: participant }
-end
+end

data/app/views/message_train/participants/show.json.jbuilder

@@ -1 +1 @@
-json.participant render partial: 'participant', locals: { participant: @participant }
+json.participant render(@participant)

data/app/views/message_train/receipt_mailer/notification_email.html.haml

@@ -10,4 +10,4 @@
   %p= :at_time_through_received_a_message.l(time: @receipt.created_at, through: @through_name, subject: @receipt.message.subject, path: message_train.collective_box_conversation_path(@through, :in, @receipt.message.conversation))
   %p{ style: 'font-size: .8rem; color: #666' }
     = :unsubscribe_from_option.l(from: @through_name)
-    = link_to :manage_your_email_notifications.l, message_train.unsubscribes_url
+    = link_to :manage_your_email_notifications.l, message_train.unsubscribes_url

data/app/views/message_train/receipt_mailer/notification_email.text.haml

@@ -9,4 +9,4 @@
   = :at_time_through_received_a_message.l(time: @receipt.created_at, through: @through_name, subject: @receipt.message.subject, path: message_train.collective_box_conversation_path(@through, :in, @receipt.message.conversation))
 
   = :unsubscribe_from_option.l(from: @through_name)
-  = message_train.unsubscribes_url
+  = message_train.unsubscribes_url

data/app/views/message_train/unsubscribes/index.html.haml

@@ -11,7 +11,7 @@
             %td= subscription[:from_name]
             - if subscription[:unsubscribe].nil?
               %td= :subscribed.l
-              %td= button_to :disable_notifications.l, message_train.unsubscribes_path(unsubscribe: { from_type: subscription[:from_type], from_id: subscription[:from_id] }), class: 'btn btn-danger', id: "unsubscribe-#{subscription[:from_type].downcase}-#{subscription[:from_id]}", confirm: :are_you_sure.l
+              %td= button_to :disable_notifications.l, message_train.unsubscribes_path(unsubscribe: { from_type: subscription[:from_type], from_id: subscription[:from_id] }), class: 'btn btn-danger', id: "unsubscribe-#{subscription[:from_type].downcase}-#{subscription[:from_id]}"
             - else
               %td= :unsubscribed.l
               %td= button_to :enable_notifications.l, message_train.unsubscribe_path(subscription[:unsubscribe].id), method: :delete, class: 'btn btn-primary', id: "remove-unsubscribe-#{subscription[:unsubscribe].id}"

data/config/environment.rb

@@ -1 +1 @@
-ActionMailer::Base.register_template_extension('haml')
+ActionMailer::Base.register_template_extension('haml')

data/config/initializers/date_time.rb

@@ -1,5 +1,5 @@
 # Date
-Date::DATE_FORMATS[:default] = "%m/%d/%Y"
+Date::DATE_FORMATS[:default] = '%m/%d/%Y'
 
 # Time
-Time::DATE_FORMATS[:default] = "%m/%d/%Y %I:%M %p"
+Time::DATE_FORMATS[:default] = '%m/%d/%Y %I:%M %p'

data/config/locales/en.yml

@@ -92,7 +92,7 @@ en:
   untrashed: 'Untrashed'
   update_successful: 'Update successful'
   updated_at_time: "Updated at %{time}"
-  wrong_number_of_arguments_for_thing_expected_right_got_wrong: "Wrong number of arguments for %{thing} (expected %{right}, got %{wrong})"
+  wrong_number_of_arguments_right_wrong: "Wrong number of arguments for %{thing} (expected %{right}, got %{wrong})"
   you_are_not_in_that_collective_type: "You are not in that %{collective_type}"
   you_have_chosen_not_to_be_emailed: 'You have chosen not to be emailed when new messages arrive.'
   you_must_sign_in_or_sign_up_to_continue: 'You must sign in or sign up to continue.'