message_train 0.6.17 → 0.7.1

data/spec/controllers/message_train/participants_controller_spec.rb

@@ -12,7 +12,13 @@ describe MessageTrain::ParticipantsController do
   describe 'GET #index' do
     describe 'with model to users' do
       before do
-        get :index, box_division: 'in', model: 'users', format: :json
+        get(
+          :index,
+          params: {
+            box_division: 'in', model: 'users'
+          },
+          format: :json
+        )
       end
       it_should_behave_like 'a successful page', which_renders: 'index'
 
@@ -24,7 +30,13 @@ describe MessageTrain::ParticipantsController do
     describe 'with model set to groups' do
       describe 'given model responds to fallback method' do
         before do
-          get :index, box_division: 'in', model: 'groups', format: :json
+          get(
+            :index,
+            params: {
+              box_division: 'in', model: 'groups'
+            },
+            format: :json
+          )
         end
         it_should_behave_like 'a successful page', which_renders: 'index'
 
@@ -37,7 +49,13 @@ describe MessageTrain::ParticipantsController do
       describe 'given model does not fallback method' do
         before do
           MessageTrain.configuration.address_book_method = nil
-          get :index, box_division: 'in', model: 'groups', format: :json
+          get(
+            :index,
+            params: {
+              box_division: 'in', model: 'groups'
+            },
+            format: :json
+          )
         end
         it_should_behave_like 'a successful page', which_renders: 'index'
 
@@ -50,7 +68,13 @@ describe MessageTrain::ParticipantsController do
     end
     describe 'with no model set' do
       before do
-        get :index, box_division: 'in', model: '', format: :json
+        get(
+          :index,
+          params: {
+            box_division: 'in', model: ''
+          },
+          format: :json
+        )
       end
       it_should_behave_like 'a 404 Not Found error'
     end
@@ -60,9 +84,11 @@ describe MessageTrain::ParticipantsController do
     before do
       get(
         :show,
-        box_division: 'in',
-        model: 'users',
-        id: first_user.id,
+        params: {
+          box_division: 'in',
+          model: 'users',
+          id: first_user.id
+        },
         format: :json
       )
     end

data/spec/controllers/message_train/unsubscribes_controller_spec.rb

@@ -33,13 +33,13 @@ describe MessageTrain::UnsubscribesController do
   describe 'POST #create' do
     describe 'with invalid attributes' do
       before do
-        post :create, unsubscribe: invalid_attributes
+        post :create, params: { unsubscribe: invalid_attributes }
       end
       it_should_behave_like 'a 404 Not Found error'
     end
     describe 'with valid attributes' do
       before do
-        post :create, unsubscribe: valid_attributes
+        post :create, params: { unsubscribe: valid_attributes }
       end
       it_should_behave_like(
         'a redirect with a message',
@@ -52,7 +52,7 @@ describe MessageTrain::UnsubscribesController do
     end
     describe 'with :all set to true' do
       before do
-        post :create, all: true
+        post :create, params: { all: true }
       end
       it_should_behave_like(
         'a redirect with a message',
@@ -70,10 +70,12 @@ describe MessageTrain::UnsubscribesController do
       before do
         delete(
           :destroy,
-          id: first_user.unsubscribes.where(
-            from_type: 'Group',
-            from_id: unsubscribed_group.id
-          ).first.id
+          params: {
+            id: first_user.unsubscribes.where(
+              from_type: 'Group',
+              from_id: unsubscribed_group.id
+            ).first.id
+          }
         )
       end
       it_should_behave_like(
@@ -86,7 +88,7 @@ describe MessageTrain::UnsubscribesController do
     end
     describe 'with :all set to true' do
       before do
-        delete :destroy, all: true
+        delete :destroy, params: { all: true }
       end
       it_should_behave_like(
         'a redirect with a message',

data/spec/dummy/app/assets/stylesheets/{application.css.scss → application.scss}

@@ -1,6 +1,7 @@
 // 'bootstrap-sprockets' must be imported before 'bootstrap' and 'bootstrap/variables'
 @import 'bootstrap-sprockets';
-@import 'bootstrap';
+@import 'bootstrap-everything';
+@import 'bootstrap/theme';
 @import 'message_train';
 
 .navbar-header {

data/spec/dummy/app/assets/stylesheets/bootstrap-everything.scss

@@ -0,0 +1,54 @@
+/*!
+ * This file exists to fix a naming conflict.
+ */
+
+// Core variables and mixins
+@import 'bootstrap/variables';
+@import 'bootstrap/mixins';
+
+// Reset and dependencies
+@import 'bootstrap/normalize';
+@import 'bootstrap/print';
+@import 'bootstrap/glyphicons';
+
+// Core CSS
+@import 'bootstrap/scaffolding';
+@import 'bootstrap/type';
+@import 'bootstrap/code';
+@import 'bootstrap/grid';
+@import 'bootstrap/tables';
+@import 'bootstrap/forms';
+@import 'bootstrap/buttons';
+
+// Components
+@import 'bootstrap/component-animations';
+@import 'bootstrap/dropdowns';
+@import 'bootstrap/button-groups';
+@import 'bootstrap/input-groups';
+@import 'bootstrap/navs';
+@import 'bootstrap/navbar';
+@import 'bootstrap/breadcrumbs';
+@import 'bootstrap/pagination';
+@import 'bootstrap/pager';
+@import 'bootstrap/labels';
+@import 'bootstrap/badges';
+@import 'bootstrap/jumbotron';
+@import 'bootstrap/thumbnails';
+@import 'bootstrap/alerts';
+@import 'bootstrap/progress-bars';
+@import 'bootstrap/media';
+@import 'bootstrap/list-group';
+@import 'bootstrap/panels';
+@import 'bootstrap/responsive-embed';
+@import 'bootstrap/wells';
+@import 'bootstrap/close';
+
+// Components w/ JavaScript
+@import 'bootstrap/modals';
+@import 'bootstrap/tooltip';
+@import 'bootstrap/popovers';
+@import 'bootstrap/carousel';
+
+// Utility classes
+@import 'bootstrap/utilities';
+@import 'bootstrap/responsive-utilities';

data/spec/dummy/app/models/group.rb

@@ -13,7 +13,7 @@ class Group < ActiveRecord::Base
   # Callbacks
   before_create :set_slug
 
-  scope :membered_by, ->(user) { with_roles([:member, :owner], user).uniq }
+  scope :membered_by, ->(user) { with_roles([:member, :owner], user).distinct }
 
   def set_slug
     # Manually generate slug instead of using friendly id, for testing.

data/spec/dummy/app/views/layouts/application.html.haml

@@ -15,14 +15,15 @@
 
   .container
     = render_hero_unit
-    - if user_signed_in?
-      = message_train_widget
-    = render_widgets 'md', 3
-    .col-md-9.content
-      = render_h1         # For the h1 tag containing the title alone
-      #alert_area
-        = alert_flash_messages
-      = yield
+    .row
+      - if user_signed_in?
+        = message_train_widget
+      = render_widgets 'md', 3
+      .col-md-9.content
+        = render_h1         # For the h1 tag containing the title alone
+        #alert_area
+          = alert_flash_messages
+        = yield
 
   %footer
   = render_footer_javascript

data/spec/dummy/bin/setup

@@ -2,15 +2,15 @@
 require 'pathname'
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
 
 Dir.chdir APP_ROOT do
   # This script is a starting point to setup your application.
   # Add necessary setup steps to this file:
 
-  puts "== Installing dependencies =="
-  system "gem install bundler --conservative"
-  system "bundle check || bundle install"
+  puts '== Installing dependencies =='
+  system 'gem install bundler --conservative'
+  system 'bundle check || bundle install'
 
   # puts "\n== Copying sample files =="
   # unless File.exist?("config/database.yml")
@@ -18,12 +18,12 @@ Dir.chdir APP_ROOT do
   # end
 
   puts "\n== Preparing database =="
-  system "bin/rake db:setup"
+  system 'bin/rake db:setup'
 
   puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
+  system 'rm -f log/*'
+  system 'rm -rf tmp/cache'
 
   puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
+  system 'touch tmp/restart.txt'
 end

data/spec/dummy/config/application.rb

@@ -30,9 +30,6 @@ module Dummy
     # ]
     # config.i18n.default_locale = :de
 
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
-
     config.generators do |g|
       g.orm             :active_record
       g.template_engine :haml

data/spec/dummy/config/environments/test.rb

@@ -14,8 +14,10 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static file server for tests with Cache-Control for performance.
-  config.serve_static_files   = true
-  config.static_cache_control = 'public, max-age=3600'
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = {
+    'Cache-Control' => 'public, max-age=3600'
+  }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

data/spec/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -13,126 +12,118 @@
 
 ActiveRecord::Schema.define(version: 20160207190409) do
 
-  create_table 'groups', force: :cascade do |t|
-    t.string   'title'
-    t.string   'slug'
-    t.text     'description'
-    t.datetime 'created_at',  null: false
-    t.datetime 'updated_at',  null: false
+  create_table "groups", force: :cascade do |t|
+    t.string   "title"
+    t.string   "slug"
+    t.text     "description"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
   end
 
-  create_table 'message_train_attachments', force: :cascade do |t|
-    t.integer  'message_train_message_id'
-    t.string   'attachment_file_name'
-    t.string   'attachment_content_type'
-    t.integer  'attachment_file_size'
-    t.datetime 'attachment_updated_at'
-    t.datetime 'created_at',               null: false
-    t.datetime 'updated_at',               null: false
+  create_table "message_train_attachments", force: :cascade do |t|
+    t.integer  "message_train_message_id"
+    t.string   "attachment_file_name"
+    t.string   "attachment_content_type"
+    t.integer  "attachment_file_size"
+    t.datetime "attachment_updated_at"
+    t.datetime "created_at",               null: false
+    t.datetime "updated_at",               null: false
+    t.index ["message_train_message_id"], name: "index_message_train_attachments_on_message_train_message_id"
   end
 
-  add_index 'message_train_attachments', ['message_train_message_id'], name: 'index_message_train_attachments_on_message_train_message_id'
-
-  create_table 'message_train_conversations', force: :cascade do |t|
-    t.string   'subject'
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
+  create_table "message_train_conversations", force: :cascade do |t|
+    t.string   "subject"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table 'message_train_ignores', force: :cascade do |t|
-    t.integer  'participant_id'
-    t.string   'participant_type'
-    t.integer  'message_train_conversation_id'
-    t.datetime 'created_at',                    null: false
-    t.datetime 'updated_at',                    null: false
+  create_table "message_train_ignores", force: :cascade do |t|
+    t.string   "participant_type"
+    t.integer  "participant_id"
+    t.integer  "message_train_conversation_id"
+    t.datetime "created_at",                    null: false
+    t.datetime "updated_at",                    null: false
+    t.index ["message_train_conversation_id"], name: "index_message_train_ignores_on_message_train_conversation_id"
+    t.index ["participant_type", "participant_id"], name: "participant_index"
   end
 
-  add_index 'message_train_ignores', ['message_train_conversation_id'], name: 'index_message_train_ignores_on_message_train_conversation_id'
-  add_index 'message_train_ignores', ['participant_type', 'participant_id'], name: 'participant_index'
-
-  create_table 'message_train_messages', force: :cascade do |t|
-    t.integer  'message_train_conversation_id'
-    t.integer  'sender_id'
-    t.string   'sender_type'
-    t.text     'recipients_to_save'
-    t.string   'subject'
-    t.text     'body'
-    t.boolean  'draft',                         default: false
-    t.datetime 'created_at',                                    null: false
-    t.datetime 'updated_at',                                    null: false
+  create_table "message_train_messages", force: :cascade do |t|
+    t.integer  "message_train_conversation_id"
+    t.string   "sender_type"
+    t.integer  "sender_id"
+    t.text     "recipients_to_save"
+    t.string   "subject"
+    t.text     "body"
+    t.boolean  "draft",                         default: false
+    t.datetime "created_at",                                    null: false
+    t.datetime "updated_at",                                    null: false
+    t.index ["message_train_conversation_id"], name: "index_message_train_messages_on_message_train_conversation_id"
+    t.index ["sender_type", "sender_id"], name: "index_message_train_messages_on_sender_type_and_sender_id"
   end
 
-  add_index 'message_train_messages', ['message_train_conversation_id'], name: 'index_message_train_messages_on_message_train_conversation_id'
-  add_index 'message_train_messages', ['sender_type', 'sender_id'], name: 'index_message_train_messages_on_sender_type_and_sender_id'
-
-  create_table 'message_train_receipts', force: :cascade do |t|
-    t.integer  'recipient_id'
-    t.string   'recipient_type'
-    t.integer  'message_train_message_id'
-    t.boolean  'marked_read',              default: false
-    t.boolean  'marked_trash',             default: false
-    t.boolean  'marked_deleted',           default: false
-    t.boolean  'sender',                   default: false
-    t.datetime 'created_at',                               null: false
-    t.datetime 'updated_at',                               null: false
-    t.integer  'received_through_id'
-    t.string   'received_through_type'
+  create_table "message_train_receipts", force: :cascade do |t|
+    t.string   "recipient_type"
+    t.integer  "recipient_id"
+    t.integer  "message_train_message_id"
+    t.boolean  "marked_read",              default: false
+    t.boolean  "marked_trash",             default: false
+    t.boolean  "marked_deleted",           default: false
+    t.boolean  "sender",                   default: false
+    t.datetime "created_at",                               null: false
+    t.datetime "updated_at",                               null: false
+    t.string   "received_through_type"
+    t.integer  "received_through_id"
+    t.index ["message_train_message_id", "recipient_type", "recipient_id"], name: "message_recipient", unique: true
+    t.index ["message_train_message_id"], name: "index_message_train_receipts_on_message_train_message_id"
+    t.index ["received_through_type", "received_through_id"], name: "index_message_train_receipts_on_received_through"
+    t.index ["recipient_type", "recipient_id"], name: "index_message_train_receipts_on_recipient"
   end
 
-  add_index 'message_train_receipts', ['message_train_message_id', 'recipient_type', 'recipient_id'], name: 'message_recipient', unique: true
-  add_index 'message_train_receipts', ['message_train_message_id'], name: 'index_message_train_receipts_on_message_train_message_id'
-  add_index 'message_train_receipts', ['received_through_type', 'received_through_id'], name: 'index_message_train_receipts_on_received_through'
-  add_index 'message_train_receipts', ['recipient_type', 'recipient_id'], name: 'index_message_train_receipts_on_recipient'
-
-  create_table 'message_train_unsubscribes', force: :cascade do |t|
-    t.integer  'recipient_id'
-    t.string   'recipient_type'
-    t.integer  'from_id'
-    t.string   'from_type'
-    t.datetime 'created_at',     null: false
-    t.datetime 'updated_at',     null: false
+  create_table "message_train_unsubscribes", force: :cascade do |t|
+    t.string   "recipient_type"
+    t.integer  "recipient_id"
+    t.string   "from_type"
+    t.integer  "from_id"
+    t.datetime "created_at",     null: false
+    t.datetime "updated_at",     null: false
+    t.index ["from_type", "from_id"], name: "unsubscribe_from"
+    t.index ["recipient_type", "recipient_id", "from_type", "from_id"], name: "unsubscribe", unique: true
+    t.index ["recipient_type", "recipient_id"], name: "unsubscribe_recipient"
   end
 
-  add_index 'message_train_unsubscribes', ['from_type', 'from_id'], name: 'unsubscribe_from'
-  add_index 'message_train_unsubscribes', ['recipient_type', 'recipient_id', 'from_type', 'from_id'], name: 'unsubscribe', unique: true
-  add_index 'message_train_unsubscribes', ['recipient_type', 'recipient_id'], name: 'unsubscribe_recipient'
-
-  create_table 'roles', force: :cascade do |t|
-    t.string   'name'
-    t.integer  'resource_id'
-    t.string   'resource_type'
-    t.datetime 'created_at'
-    t.datetime 'updated_at'
+  create_table "roles", force: :cascade do |t|
+    t.string   "name"
+    t.string   "resource_type"
+    t.integer  "resource_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.index ["name", "resource_type", "resource_id"], name: "index_roles_on_name_and_resource_type_and_resource_id"
+    t.index ["name"], name: "index_roles_on_name"
   end
 
-  add_index 'roles', ['name', 'resource_type', 'resource_id'], name: 'index_roles_on_name_and_resource_type_and_resource_id'
-  add_index 'roles', ['name'], name: 'index_roles_on_name'
-
-  create_table 'users', force: :cascade do |t|
-    t.string   'email',                  default: "", null: false
-    t.string   'encrypted_password',     default: "", null: false
-    t.string   'reset_password_token'
-    t.datetime 'reset_password_sent_at'
-    t.datetime 'remember_created_at'
-    t.integer  'sign_in_count',          default: 0,  null: false
-    t.datetime 'current_sign_in_at'
-    t.datetime 'last_sign_in_at'
-    t.string   'current_sign_in_ip'
-    t.string   'last_sign_in_ip'
-    t.datetime 'created_at',                          null: false
-    t.datetime 'updated_at',                          null: false
-    t.string   'display_name'
-    t.string   'slug'
+  create_table "users", force: :cascade do |t|
+    t.string   "email",                  default: "", null: false
+    t.string   "encrypted_password",     default: "", null: false
+    t.string   "reset_password_token"
+    t.datetime "reset_password_sent_at"
+    t.datetime "remember_created_at"
+    t.integer  "sign_in_count",          default: 0,  null: false
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.datetime "created_at",                          null: false
+    t.datetime "updated_at",                          null: false
+    t.string   "display_name"
+    t.string   "slug"
+    t.index ["email"], name: "index_users_on_email", unique: true
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
-  add_index 'users', ['email'], name: 'index_users_on_email', unique: true
-  add_index 'users', ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true
-
-  create_table 'users_roles', id: false, force: :cascade do |t|
-    t.integer 'user_id'
-    t.integer 'role_id'
+  create_table "users_roles", id: false, force: :cascade do |t|
+    t.integer "user_id"
+    t.integer "role_id"
+    t.index ["user_id", "role_id"], name: "index_users_roles_on_user_id_and_role_id"
   end
 
-  add_index 'users_roles', ['user_id', 'role_id'], name: 'index_users_roles_on_user_id_and_role_id'
-
 end