message_train 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc19fc2e0a39e267e10c61fb9090fa72fd8bf7ae
-  data.tar.gz: b7f16af91e7cc61d8b050e1cf5c6bdfc8194c267
+  metadata.gz: 15585f52023b76e3644608f8b946af0d1038d35a
+  data.tar.gz: e55821a75e12d95933e3af05b9a37076d594252a
 SHA512:
-  metadata.gz: 63d3fb74b09bc2b5dee0bf57153fc1f35c82994541b4c2b2ba07ee09b85729f6c87b470cd6f81b7577ada84d9534d5c24a8b3c22adcf8792daca7cc7fee17c9e
-  data.tar.gz: 0438d2ca2ecd8f450626642ac0dfb9fa848c6cd3d3f4a7c16ba39fca5c5112fad0b650e547dddc8e46f8a8609c3d96b2641b3bff80117128d1969fc0b18a4318
+  metadata.gz: 4128dfbe8d5f208bd2896b3b21b938dfc97574a4ab4a482c677f96288ab48031d01928aba8a2040db7112737228aec976a2249730aef7ee1ed75dee5a94bb58b
+  data.tar.gz: 1451529ece9f6cb4832e95ff978cda5ca5aa680340b7ad50ff0e0481f4a84782d16c103dd23e5dc42607a759387cbf3e50f31af9b001da2fb35c6cebc376ca1a

data/README.rdoc

@@ -10,7 +10,7 @@ Messages can be saved as drafts instead of sending. Message composition features
 
 Conversations are grouped into various boxes, depending on their status for that user: in, sent, all, drafts, trash, ignored. Any message can be trashed by the user, at which point the user has the option to permanently delete it.
 
-Email messages are sent when a user receives a message, either directly or through a collective (unless they have unsubscribed from those notifications).
+Email messages are sent when a user receives a message, either directly or through a collective (unless they have unsubscribed from those notifications or all notifications).
 
 == Installation
 

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/app/controllers/message_train/unsubscribes_controller.rb

@@ -8,44 +8,59 @@ module MessageTrain
 
     # POST /unsubscribes
     def create
-      unsub = unsubscribe_params
-      model = unsub[:from_type].constantize
-      @from = model.find(unsub[:from_id])
-      if @from == @box_user || @from.allows_receiving_by?(@box_user)
+      if params[:all]
+        @from = nil
         @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
+          flash[:notice] = :unsubscribe_from_all_message.l
         else
           flash[:error] = @unsubscribe.errors.full_messages.to_sentence
         end
-        redirect_to message_train.unsubscribes_url
       else
-        flash[:error] = :you_are_not_in_that_collective_type.l(collective_type: model.name)
-        raise ActiveRecord::RecordNotFound
+        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
       end
+      redirect_to message_train.unsubscribes_url
     end
 
     # DELETE /unsubscribes/:id
     def destroy
-      @unsubscribe = @box_user.unsubscribes.find(params[:id])
-      @from = @unsubscribe.from
-      if @from == @box_user
-        message = :unsubscribe_removed_message.l
+      if params[:all]
+        @unsubscribe = @box_user.unsubscribes.where(from: nil).destroy_all
+        flash[:notice] = :unsubscribe_all_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)
+        @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
-      @unsubscribe.destroy
-      flash[:notice] = message
       redirect_to message_train.unsubscribes_url
     end
 

data/app/models/message_train/unsubscribe.rb

@@ -2,6 +2,6 @@ module MessageTrain
   class Unsubscribe < ActiveRecord::Base
     belongs_to :recipient, polymorphic: true
     belongs_to :from, polymorphic: true
-    validates_presence_of :recipient, :from
+    validates_presence_of :recipient
   end
 end

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

@@ -1,10 +1,19 @@
 - add_title :manage_your_email_notifications.l
-%table#subscriptions.table.table-bordered.table-condensed
-  - @subscriptions.each do |subscription|
-    %tr.subscription
-      %td= subscription[:from_name]
-      %td
-        - if subscription[:unsubscribe].nil?
-          = 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
-        - else
-          = button_to :enable_notifications.l, message_train.unsubscribe_path(subscription[:unsubscribe].id), method: :delete, class: 'btn btn-primary', id: "remove-unsubscribe-#{subscription[:unsubscribe].id}"
+- if current_user.unsubscribed_from_all?
+  %p= :you_have_chosen_not_to_be_emailed.l
+  %p= icon_button_to 'primary', 'check', :enable_some_notifications.l, message_train.unsubscribes_all_path, method: :delete
+- else
+  .row
+    .col-md-10
+      %table#subscriptions.table.table-bordered.table-condensed
+        - @subscriptions.each do |subscription|
+          %tr.subscription
+            %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
+            - 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}"
+    .col-md-2
+      %p= icon_button_to 'danger btn-lg', 'remove', :disable_all_notifications.l, message_train.unsubscribes_all_path, method: :post

data/config/locales/en.yml

@@ -45,9 +45,11 @@ en:
   compose_to_collective: "Compose to %{collective}"
   delete_forever_this_cannot_be_undone: 'Delete forever? This cannot be undone.'
   deleted: 'Deleted'
+  disable_all_notifications: 'Disable All Notifications'
   disable_notifications: 'Disable Notifications'
   edit_draft: 'Edit Draft'
   enable_notifications: 'Enable Notifications'
+  enable_some_notifications: 'Enable Some Notifications'
   from_sender: "From: %{sender}"
   ignored: 'Ignored'
   invalid_sender_for_thing: "Invalid sender for %{thing}"
@@ -60,7 +62,7 @@ en:
   message_sent: 'Message sent.'
   messages: 'Messages'
   messages_to_collective: "Messages to %{collective}"
-  messages_to_myself: 'Messages to Myself'
+  messages_directly_to_myself: 'Messages Directly to Myself'
   name_not_found: "%{name} not found"
   new_message: 'New Message'
   new_message_on_site_name: "New Message on %{site_name}"
@@ -74,19 +76,24 @@ en:
   remove_attachment: 'Remove Attachment'
   save_as_draft: 'Save As Draft'
   send: 'Send'
+  subscribed: 'Subscribed'
   table_recipients: "%{table} Recipients"
   to_recipient: 'To: %{recipient}'
   toggle_dropdown: 'Toggle Dropdown'
   trashed: 'Trashed'
   unignored: 'Unignored'
   unread: 'Unread'
+  unsubscribed: 'Unsubscribed'
   unsubscribe_message: "You are now unsubscribed from messages to you, which means that you will not be notified by email of any messages received in your inbox."
+  unsubscribe_from_all_message: 'You have unsubscribed from all messages, which means that you will not be notified by email of any messages received in any of your boxes.'
   unsubscribe_from_option: "You received this email because you are set to receive notifications of messages to %{from}. To unsubscribe, please visit this link:"
+  unsubscribe_all_removed_message: 'You are no longer unsubscribed from all messages, which means that you will now be notified by email of any messages received in boxes you are subscribed to.'
   unsubscribe_removed_message: "You are no longer unsubscribed from messages to you, which means that you will now be notified by email of any messages received in your inbox"
   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})"
   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.'
   your_inbox: 'your inbox'

data/config/routes.rb

@@ -11,6 +11,8 @@ MessageTrain::Engine.routes.draw do
   authenticated MessageTrain.configuration.user_route_authentication_method do
     concerns :boxable
     resources :collectives, as: :collective, only: [], concerns: :boxable
+    post 'unsubscribes/all', to: 'unsubscribes#create', all: true
+    delete 'unsubscribes/all', to: 'unsubscribes#destroy', all: true
     resources :unsubscribes, only: [:index, :create, :destroy]
   end
 

data/lib/message_train/mixin.rb

@@ -231,8 +231,12 @@ module MessageTrain
           end
         }
 
+        send(:define_method, :unsubscribed_from_all?) {
+          unsubscribes.where(from: nil).exists?
+        }
+
         send(:define_method, :unsubscribed_from?) { |from|
-          unsubscribes.where(from: from).exists?
+          unsubscribed_from_all? or unsubscribes.where(from: from).exists?
         }
 
         send(:define_method, :unsubscribe_from) { |from|
@@ -245,7 +249,7 @@ module MessageTrain
               from: self,
               from_type: self.class.name,
               from_id: self.id,
-              from_name: :messages_to_myself.l,
+              from_name: :messages_directly_to_myself.l,
               unsubscribe: self.unsubscribes.find_by(from: self)
           }
           collective_boxes.values.each do |boxes|

data/message_train.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: message_train 0.5.0 ruby lib
+# stub: message_train 0.5.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "message_train"
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Karen Lundgren"]
-  s.date = "2016-02-20"
+  s.date = "2016-03-01"
   s.description = "Rails 4 Engine providing private/public messaging for any object, such as Users or Groups"
   s.email = "karen.e.lundgren@gmail.com"
   s.extra_rdoc_files = [

data/spec/controllers/message_train/unsubscribes_controller_spec.rb

@@ -44,13 +44,27 @@ describe MessageTrain::UnsubscribesController do
       it_should_behave_like 'a redirect with a message', '/unsubscribes', notice: 'You are now unsubscribed from Membered Group, which means that you will not be notified by email of any messages received by that Group.'
       it_should_behave_like 'a response without error'
     end
+    describe 'with :all set to true' do
+      before do
+        post :create, all: true
+      end
+      it_should_behave_like 'a redirect with a message', '/unsubscribes', notice: 'You have unsubscribed from all messages, which means that you will not be notified by email of any messages received in any of your boxes.'
+      it_should_behave_like 'a response without error'
+    end
   end
 
   describe "DELETE #destroy" do
-    before do
-      delete :destroy, id: first_user.unsubscribes.where(from_type: 'Group', from_id: unsubscribed_group.id).first.id
+    describe 'with an id' do
+      before do
+        delete :destroy, id: first_user.unsubscribes.where(from_type: 'Group', from_id: unsubscribed_group.id).first.id
+      end
+      it_should_behave_like 'a redirect with a message', '/unsubscribes', notice: 'You are no longer unsubscribed from Unsubscribed Group, which means that you will now be notified by email of any messages received in that Group.'
+    end
+    describe 'with :all set to true' do
+      before do
+        delete :destroy, all: true
+      end
+      it_should_behave_like 'a redirect with a message', '/unsubscribes', notice: 'You are no longer unsubscribed from all messages, which means that you will now be notified by email of any messages received in boxes you are subscribed to.'
     end
-    it_should_behave_like 'a redirect with a message', '/unsubscribes', notice: 'You are no longer unsubscribed from Unsubscribed Group, which means that you will now be notified by email of any messages received in that Group.'
   end
-
 end

data/spec/features/unsubscribes_spec.rb

@@ -22,11 +22,20 @@ RSpec.feature 'Unsubscribes' do
     end
     describe 'Unsubscribing' do
       describe 'at /unsubscribes' do
-        before do
-          visit '/unsubscribes'
-          find("#unsubscribe-group-#{membered_group.id.to_s}").click
+        describe 'with a specific item' do
+          before do
+            visit '/unsubscribes'
+            find("#unsubscribe-group-#{membered_group.id.to_s}").click
+          end
+          it_behaves_like 'a bootstrap page with an alert', 'info', 'You are now unsubscribed from Membered Group, which means that you will not be notified by email of any messages received by that Group.'
+        end
+        describe 'with all button' do
+          before do
+            visit '/unsubscribes'
+            click_link 'Disable All Notifications'
+          end
+          it_behaves_like 'a bootstrap page with an alert', 'info', 'You have unsubscribed from all messages, which means that you will not be notified by email of any messages received in any of your boxes.'
         end
-        it_behaves_like 'a bootstrap page with an alert', 'info', 'You are now unsubscribed from Membered Group, which means that you will not be notified by email of any messages received by that Group.'
       end
     end
     describe 'Removing an Unsubscribe' do
@@ -37,6 +46,14 @@ RSpec.feature 'Unsubscribes' do
         end
         it_behaves_like 'a bootstrap page with an alert', 'info', 'You are no longer unsubscribed from Unsubscribed Group, which means that you will now be notified by email of any messages received in that Group.'
       end
+      describe 'with all button' do
+        before do
+          visit '/unsubscribes'
+          click_link 'Disable All Notifications'
+          click_link 'Enable Some Notifications'
+        end
+        it_behaves_like 'a bootstrap page with an alert', 'info', 'You are no longer unsubscribed from all messages, which means that you will now be notified by email of any messages received in boxes you are subscribed to.'
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message_train
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Karen Lundgren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails