message_train 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bb7f77562529d2b1188b842eb4ed71774d54061
-  data.tar.gz: abd3169166b791465703f7afc039fb9d50cc44c8
+  metadata.gz: 712bc245d27104152fc3be51a4d599273f839b44
+  data.tar.gz: 6decf2e25a128e08535900656121aece93e6f02f
 SHA512:
-  metadata.gz: e2ac933194e6cac58dab162a980ab8d5789833d9503a3e3a5b9664ff63bf2e3a68d9a726061ee334a9043f5bd73c49916c2ed5000b7280587f502c1eaeb6b4f7
-  data.tar.gz: a94b66e5f57065064bc06bc34cb0e108b8f8e49629d84091516166d50b59c77a4c075a11757d852adf3edc3c150b1670e404be2569e7c446f048b08a80e3729c
+  metadata.gz: 9853cb01edcc15fe18103c15a66f4f008868a7e9143b395c6d41b1967b35950da5370a2b47783bee75e76b4ea3e3af41a84bb973f22212dd61e7928ed3ccfb5a
+  data.tar.gz: c140454a9b30a82c4c37cf2a235b5110dac49aafe55f03e8a9159f243225b9a9311f99e9956683cb1001e5229c436734fecd815f641aa55aa63a2ba5a2355260

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/config/routes.rb

@@ -14,7 +14,18 @@ MessageTrain::Engine.routes.draw do
     resources :unsubscribes, only: [:index, :create, :destroy]
   end
 
-  match '/box(/*path)', to: redirect(MessageTrain.configuration.user_sign_in_path), via: [:get, :put, :post, :delete]
-  match '/collectives(/*path)', to: redirect(MessageTrain.configuration.user_sign_in_path), via: [:get, :put, :post, :delete]
-  match '/unsubscribes(/*path)', to: redirect(MessageTrain.configuration.user_sign_in_path), via: [:get, :put, :post, :delete]
+  match '/box(/*path)' => redirect { |p, req|
+          req.flash[:error] = :you_must_sign_in_or_sign_up_to_continue.l
+          MessageTrain.configuration.user_sign_in_path
+  }, via: [:get, :put, :post, :delete]
+
+  match '/collectives(/*path)' => redirect { |p, req|
+          req.flash[:error] = :you_must_sign_in_or_sign_up_to_continue.l
+          MessageTrain.configuration.user_sign_in_path
+        }, via: [:get, :put, :post, :delete]
+
+  match '/unsubscribes(/*path)' => redirect { |p, req|
+          req.flash[:error] = :you_must_sign_in_or_sign_up_to_continue.l
+          MessageTrain.configuration.user_sign_in_path
+        }, via: [:get, :put, :post, :delete]
 end

data/message_train.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: message_train 0.3.0 ruby lib
+# stub: message_train 0.3.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "message_train"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/spec/controllers/message_train/concerns_spec.rb

@@ -6,12 +6,13 @@ describe MessageTrain::BoxesController do
   routes { MessageTrain::Engine.routes }
 
   describe "GET #show"  do
-    describe 'when not logged in' do
-      before do
-        get :show, division: 'in'
-      end
-      it_should_behave_like 'a redirect with notice', '/users/sign_in', 'You must sign in or sign up to continue.'
-    end
+    # describe 'when not logged in' do
+    #   before do
+    #     access_anonymous
+    #     get :show, division: 'in'
+    #   end
+    #   it_should_behave_like 'a redirect with error', '/users/sign_in', 'You must sign in or sign up to continue.'
+    # end
 
     describe 'when neither sending nor receiving is allowed' do
       before do

data/spec/features/boxes_spec.rb

@@ -2,6 +2,9 @@ require 'rails_helper'
 RSpec.feature 'Boxes' do
   include_context 'loaded site'
 
+  it_behaves_like 'an authenticated section', '/box'
+  it_behaves_like 'an authenticated section', '/collectives/groups:membered-group'
+
   describe 'When logged in as first-user' do
     before do
       login_as first_user

data/spec/features/conversations_spec.rb

@@ -2,41 +2,45 @@ require 'rails_helper'
 RSpec.feature 'Conversations' do
   include_context 'loaded site'
 
-  before do
-    login_as first_user
-  end
-  describe 'Showing' do
-    describe 'at /box/in/conversations/:id' do
-      before do
-        visit '/box/in/conversations/' + unread_conversation.id.to_s
-      end
-      it_behaves_like 'a bootstrap page showing an item', MessageTrain::Conversation, 'Unread Conversation'
+  it_behaves_like 'an authenticated section', '/box/in/conversations/1'
 
-      describe 'shows a reply link' do
-        before do
-          click_link 'Reply'
-        end
-        it_behaves_like 'a bootstrap page', title: 'Reply'
-      end
+  describe 'When logged in' do
+    before do
+      login_as first_user
     end
-  end
-  describe 'Marking', js: true do
-    describe 'at /box/in/conversations/:id' do
-      describe 'Marking Read' do
+    describe 'Showing' do
+      describe 'at /box/in/conversations/:id' do
         before do
           visit '/box/in/conversations/' + unread_conversation.id.to_s
-          click_link "mark_read_#{unread_message.id.to_s}"
         end
-        it_behaves_like 'a bootstrap page with an alert', 'info', 'Update successful'
+        it_behaves_like 'a bootstrap page showing an item', MessageTrain::Conversation, 'Unread Conversation'
+
+        describe 'shows a reply link' do
+          before do
+            click_link 'Reply'
+          end
+          it_behaves_like 'a bootstrap page', title: 'Reply'
+        end
       end
-      describe 'Marking Ignored' do
-        before do
-          visit '/box/in/conversations/' + unread_conversation.id.to_s
-          accept_confirm do
-            click_link 'Mark as Ignored'
+    end
+    describe 'Marking', js: true do
+      describe 'at /box/in/conversations/:id' do
+        describe 'Marking Read' do
+          before do
+            visit '/box/in/conversations/' + unread_conversation.id.to_s
+            click_link "mark_read_#{unread_message.id.to_s}"
+          end
+          it_behaves_like 'a bootstrap page with an alert', 'info', 'Update successful'
+        end
+        describe 'Marking Ignored' do
+          before do
+            visit '/box/in/conversations/' + unread_conversation.id.to_s
+            accept_confirm do
+              click_link 'Mark as Ignored'
+            end
           end
+          it_behaves_like 'a bootstrap page with an alert', 'info', 'Update successful'
         end
-        it_behaves_like 'a bootstrap page with an alert', 'info', 'Update successful'
       end
     end
   end

data/spec/features/messages_spec.rb

@@ -3,65 +3,69 @@ RSpec.feature 'Messages' do
   include_context 'loaded site'
   include Wysihtml5Helper
 
-  before do
-    login_as first_user
-  end
-  describe 'Drafting', js: true do
-    describe 'at /box/in/messages' do
-      before do
-        visit '/box/in/messages/new/'
-        recipient_input = find(:css, "#message_recipients_to_save_users .tags-input")
-        recipient_input.set("")
-        fill_in 'Subject', with: 'This is a draft.'
-        fill_in_html 'Body', with: 'This is the body.'
-        click_button 'Send'
-      end
-      it_behaves_like 'a bootstrap page with an alert', 'warning', 'Message saved as draft.'
+  it_behaves_like 'an authenticated section', '/box/in/messages/new'
+
+  describe 'When logged in' do
+    before do
+      login_as first_user
     end
-  end
-  describe 'Composing', js: true do
-    describe 'at /box/in/messages' do
-      before do
-        visit '/box/in/messages/new/'
-        recipient_input = find(:css, "#message_recipients_to_save_users .tags-input")
-        recipient_input.set("sec") # Should auto-complete to second-user with the following two key-presses
-        recipient_input.native.send_keys :arrow_down
-        recipient_input.native.send_keys :return
-        fill_in 'Subject', with: 'This is the subject.'
-        fill_in_html 'Body', with: 'This is the body.'
-        click_link 'add-attachment'
-        click_link 'add-attachment'
-        click_link 'add-attachment'
-        within '#attachments .nested-fields:nth-child(1)' do
-          attach_file 'Attachment', File.absolute_path('./spec/dummy/app/assets/files/message_train/attachments/example.pdf')
-        end
-        within '#attachments .nested-fields:nth-child(2)' do
-          attach_file 'Attachment', File.absolute_path('./spec/dummy/app/assets/files/message_train/attachments/Bambisj.jpg')
+    describe 'Drafting', js: true do
+      describe 'at /box/in/messages' do
+        before do
+          visit '/box/in/messages/new/'
+          recipient_input = find(:css, "#message_recipients_to_save_users .tags-input")
+          recipient_input.set("")
+          fill_in 'Subject', with: 'This is a draft.'
+          fill_in_html 'Body', with: 'This is the body.'
+          click_button 'Send'
         end
-        within '#attachments .nested-fields:nth-child(3)' do
-          accept_confirm do
-            find('.remove_fields').click
+        it_behaves_like 'a bootstrap page with an alert', 'warning', 'Message saved as draft.'
+      end
+    end
+    describe 'Composing', js: true do
+      describe 'at /box/in/messages' do
+        before do
+          visit '/box/in/messages/new/'
+          recipient_input = find(:css, "#message_recipients_to_save_users .tags-input")
+          recipient_input.set("sec") # Should auto-complete to second-user with the following two key-presses
+          recipient_input.native.send_keys :arrow_down
+          recipient_input.native.send_keys :return
+          fill_in 'Subject', with: 'This is the subject.'
+          fill_in_html 'Body', with: 'This is the body.'
+          click_link 'add-attachment'
+          click_link 'add-attachment'
+          click_link 'add-attachment'
+          within '#attachments .nested-fields:nth-child(1)' do
+            attach_file 'Attachment', File.absolute_path('./spec/dummy/app/assets/files/message_train/attachments/example.pdf')
+          end
+          within '#attachments .nested-fields:nth-child(2)' do
+            attach_file 'Attachment', File.absolute_path('./spec/dummy/app/assets/files/message_train/attachments/Bambisj.jpg')
+          end
+          within '#attachments .nested-fields:nth-child(3)' do
+            accept_confirm do
+              find('.remove_fields').click
+            end
           end
+          click_button 'Send'
         end
-        click_button 'Send'
+        it_behaves_like 'a bootstrap page with an alert', 'info', 'Message sent.'
       end
-      it_behaves_like 'a bootstrap page with an alert', 'info', 'Message sent.'
     end
-  end
-  describe 'Editing a Draft', js: true do
-    describe 'at /box/in/messages' do
-      before do
-        visit "/box/in/conversations/#{draft_conversation.id}"
-        recipient_input = find(:css, "#message_recipients_to_save_users .tags-input")
-        recipient_input.set("sec") # Should auto-complete to second-user with the following two key-presses
-        recipient_input.native.send_keys :arrow_down
-        recipient_input.native.send_keys :return
-        fill_in 'Subject', with: 'This is the subject.'
-        fill_in_html 'Body', with: 'This is the body.'
-        click_button 'Send'
+    describe 'Editing a Draft', js: true do
+      describe 'at /box/in/messages' do
+        before do
+          visit "/box/in/conversations/#{draft_conversation.id}"
+          recipient_input = find(:css, "#message_recipients_to_save_users .tags-input")
+          recipient_input.set("sec") # Should auto-complete to second-user with the following two key-presses
+          recipient_input.native.send_keys :arrow_down
+          recipient_input.native.send_keys :return
+          fill_in 'Subject', with: 'This is the subject.'
+          fill_in_html 'Body', with: 'This is the body.'
+          click_button 'Send'
+        end
+        it_behaves_like 'a bootstrap page with an alert', 'info', 'Message sent.'
+        it_behaves_like 'a bootstrap page without an alert', 'warning'
       end
-      it_behaves_like 'a bootstrap page with an alert', 'info', 'Message sent.'
-      it_behaves_like 'a bootstrap page without an alert', 'warning'
     end
   end
 end

data/spec/features/unsubscribes_spec.rb

@@ -2,37 +2,41 @@ require 'rails_helper'
 RSpec.feature 'Unsubscribes' do
   include_context 'loaded site'
 
-  before do
-    login_as first_user
-  end
-  describe 'Index' do
-    describe 'at /unsubscribes' do
-      before do
-        visit '/unsubscribes'
-      end
-      it_behaves_like 'a bootstrap page', title: 'Manage Your Email Notifications'
-      context "displays a list of #subscriptions in .subscription" do
-        subject { page }
-        it { should have_css("#subscriptions .subscription", minimum: 3) }
+  it_behaves_like 'an authenticated section', '/unsubscribes'
+
+  describe 'When logged in' do
+    before do
+      login_as first_user
+    end
+    describe 'Index' do
+      describe 'at /unsubscribes' do
+        before do
+          visit '/unsubscribes'
+        end
+        it_behaves_like 'a bootstrap page', title: 'Manage Your Email Notifications'
+        context "displays a list of #subscriptions in .subscription" do
+          subject { page }
+          it { should have_css("#subscriptions .subscription", minimum: 3) }
+        end
       end
     end
-  end
-  describe 'Unsubscribing' do
-    describe 'at /unsubscribes' do
-      before do
-        visit '/unsubscribes'
-        find("#unsubscribe-group-#{membered_group.id.to_s}").click
+    describe 'Unsubscribing' do
+      describe 'at /unsubscribes' 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
-      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
-    describe 'at /unsubscribes' do
-      before do
-        visit '/unsubscribes'
-        find("#remove-unsubscribe-#{unsubscribed_group.id.to_s}").click
+    describe 'Removing an Unsubscribe' do
+      describe 'at /unsubscribes' do
+        before do
+          visit '/unsubscribes'
+          find("#remove-unsubscribe-#{unsubscribed_group.id.to_s}").click
+        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
-      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
   end
 end

data/spec/support/feature_behaviors.rb

@@ -1,3 +1,17 @@
+shared_examples_for 'an authenticated section' do |path|
+  describe 'requires login' do
+    before do
+      visit path
+    end
+    it_behaves_like 'a bootstrap page with an alert', 'danger', 'You must sign in or sign up to continue.'
+    context 'displays a login form' do
+      subject { page }
+      it { should have_selector 'form.new_user input#user_email' }
+      it { should have_selector 'form.new_user input#user_password' }
+    end
+  end
+end
+
 shared_examples_for 'a bootstrap page' do |options = {}|
   include ERB::Util
   context 'displays a page with bootstrap elements' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: message_train
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Karen Lundgren