message_train 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 712bc245d27104152fc3be51a4d599273f839b44
-  data.tar.gz: 6decf2e25a128e08535900656121aece93e6f02f
+  metadata.gz: 6ca8f7374b6197d38499d0d1bac1ccfb13387fe4
+  data.tar.gz: 945d789ade7dbe77f94bddbbcfc10f7a06bc261d
 SHA512:
-  metadata.gz: 9853cb01edcc15fe18103c15a66f4f008868a7e9143b395c6d41b1967b35950da5370a2b47783bee75e76b4ea3e3af41a84bb973f22212dd61e7928ed3ccfb5a
-  data.tar.gz: c140454a9b30a82c4c37cf2a235b5110dac49aafe55f03e8a9159f243225b9a9311f99e9956683cb1001e5229c436734fecd815f641aa55aa63a2ba5a2355260
+  metadata.gz: 90ac0f49acf314026f290268f5ba503c3d1327e5b0630ffe230198c83ce4ac220ade58e21297da2c1ca3ee8ccdacca6101547e3d17cb8f744d725b7aa3ccbf01
+  data.tar.gz: 74f865f58d13e3616b61d4a39d79cd4dbc05aea4289db8650c90d980cac5bd2cf2d33db3b5269660c86e5cdb016569984ed29c82e4b37b01665077f4fe870797

data/Gemfile

@@ -1,8 +1,8 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 # Add dependencies required to use your gem here.
 # Example:
-#   gem "activesupport", ">= 2.3.5"
-gem 'rails', '~> 4'
+#   gem 'activesupport', '>= 2.3.5'
+gem 'rails', '~> 4.2.5'
 gem 'paperclip', '~> 4.3'
 gem 'rails-i18n', '~> 4'
 gem 'haml-rails', '~> 0.9'
@@ -23,9 +23,9 @@ gem 'cocoon', '~> 1.2'
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "sdoc", "~> 0.4.1"
-  gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 2.0"
+  gem 'sdoc', '~> 0.4.1'
+  gem 'bundler', '~> 1.0'
+  gem 'jeweler', '~> 2.0'
 end
 
 group :development, :test do
@@ -47,7 +47,7 @@ group :test do
   gem 'database_cleaner', '~> 1.4'
   gem 'rspec-collection_matchers', '~> 1.1'
   gem 'shoulda-matchers', '~> 2.8'
-  gem "launchy", "~> 2.1.2", require: false
+  gem 'launchy', '~> 2.1.2', require: false
   gem 'coveralls', '~> 0.8', require: false
   gem 'rspec-html-matchers', '~> 0.7'
   gem 'selenium-webdriver', '~> 2'

data/README.rdoc

@@ -139,6 +139,10 @@ Or in your initializer:
 
 == Upgrading
 
+=== 0.4.0
+
+Version 0.4.0 introduced database changes to the foreign key columns to work with Rails 4.2.5. Let me know if you need help migrating your app to the newly named foreign keys.
+
 === 0.3.0
 
 A new config variable was added for the user model, which will be used to generate a new user if the user is anonymous.

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/app/controllers/message_train/messages_controller.rb

@@ -11,7 +11,7 @@ module MessageTrain
 
     # GET /box/:division/messages/new
     def new
-      @message = @box.new_message(conversation_id: params[:conversation_id])
+      @message = @box.new_message(message_train_conversation_id: params[:conversation_id])
     end
 
     # GET /box/:division/messages/:id/edit

data/app/models/message_train/attachment.rb

@@ -1,6 +1,6 @@
 module MessageTrain
   class Attachment < ActiveRecord::Base
-    belongs_to :message
+    belongs_to :message, foreign_key: :message_train_message_id
     has_attached_file :attachment, styles: lambda { |attachment|
                                                     attachment.instance.image? ? {
                                                       thumb: '235x',

data/app/models/message_train/box.rb

@@ -60,10 +60,10 @@ module MessageTrain
     end
 
     def new_message(args = {})
-      if args[:conversation_id].nil?
+      if args[:message_train_conversation_id].nil?
         message = MessageTrain::Message.new(args)
       else
-        conversation = find_conversation(args[:conversation_id])
+        conversation = find_conversation(args[:message_train_conversation_id])
         previous_message = conversation.messages.last
         message = conversation.messages.build(args)
         message.subject = "Re: #{conversation.subject}"

data/app/models/message_train/conversation.rb

@@ -1,7 +1,7 @@
 module MessageTrain
   class Conversation < ActiveRecord::Base
-    has_many :messages
-    has_many :ignores
+    has_many :messages, foreign_key: :message_train_conversation_id
+    has_many :ignores, foreign_key: :message_train_conversation_id
     has_many :receipts, through: :messages
     has_many :attachments, through: :messages
 
@@ -111,7 +111,7 @@ module MessageTrain
       }
 
       def self.ignored_ids_for(participant)
-        MessageTrain::Ignore.find_all_by_participant(participant).pluck(:conversation_id)
+        MessageTrain::Ignore.find_all_by_participant(participant).pluck(:message_train_conversation_id)
       end
   end
 end

data/app/models/message_train/ignore.rb

@@ -1,7 +1,7 @@
 module MessageTrain
   class Ignore < ActiveRecord::Base
     belongs_to :participant, polymorphic: true
-    belongs_to :conversation
+    belongs_to :conversation, foreign_key: :message_train_conversation_id
 
     validates_presence_of :conversation, :participant
 

data/app/models/message_train/message.rb

@@ -4,10 +4,10 @@ module MessageTrain
     serialize :recipients_to_save, Hash
 
     # Relationships
-    belongs_to :conversation
+    belongs_to :conversation, foreign_key: :message_train_conversation_id
     belongs_to :sender, polymorphic: true
-    has_many :attachments
-    has_many :receipts
+    has_many :attachments, foreign_key: :message_train_message_id
+    has_many :receipts, foreign_key: :message_train_message_id
 
     # Validations
     validates_presence_of :sender, :subject
@@ -50,7 +50,7 @@ module MessageTrain
     end
 
     def self.conversation_ids
-      pluck(:conversation_id)
+      pluck(:message_train_conversation_id)
     end
 
     def self.receipts

data/app/models/message_train/receipt.rb

@@ -2,7 +2,7 @@ module MessageTrain
   class Receipt < ActiveRecord::Base
     belongs_to :recipient, polymorphic: true
     belongs_to :received_through, polymorphic: true
-    belongs_to :message
+    belongs_to :message, foreign_key: :message_train_message_id
     validates_presence_of :recipient, :message
 
     default_scope { order(updated_at: :desc) }
@@ -31,7 +31,7 @@ module MessageTrain
     end
 
     def self.message_ids
-      pluck(:message_id)
+      pluck(:message_train_message_id)
     end
 
     def self.messages

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

@@ -1,5 +1,5 @@
 - 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.conversation_id, objects: { 'messages' => {message.id.to_s => message.id.to_s} }) } }
+  .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"}
       .message-actions.pull-right
         = message_read_toggle message
@@ -15,7 +15,7 @@
       .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.conversation_id, objects: { 'messages' => {message.id.to_s => message.id.to_s} }) } }
+  .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"}
       .message-actions.pull-right
         = message_read_toggle message
@@ -40,6 +40,6 @@
       - if @box.parent.allows_sending_by?(@box_user)
         .panel-footer
           - if @collective.nil?
-            = link_to :reply.l, message_train.new_box_message_path(@box, conversation_id: message.conversation_id), class: 'btn btn-primary'
+            = link_to :reply.l, message_train.new_box_message_path(@box, conversation_id: message.message_train_conversation_id), class: 'btn btn-primary'
           - else
-            = link_to :reply.l, message_train.new_collective_box_message_path(@collective.path_part, @box, conversation_id: message.conversation_id), class: 'btn btn-primary'
+            = link_to :reply.l, message_train.new_collective_box_message_path(@collective.path_part, @box, conversation_id: message.message_train_conversation_id), class: 'btn btn-primary'

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

@@ -1,4 +1,4 @@
-- if @message.conversation_id.nil?
+- if @message.message_train_conversation_id.nil?
   - add_title :new_message.l
 - else
   - add_title :reply.l

data/db/migrate/20150721160322_create_message_train_messages.rb

@@ -1,7 +1,7 @@
 class CreateMessageTrainMessages < ActiveRecord::Migration
   def change
     create_table :message_train_messages do |t|
-      t.references :conversation, index: true, foreign_key: true
+      t.references :message_train_conversation, index: true, foreign_key: true
       t.references :sender, polymorphic: true, index: true
       t.text :recipients_to_save
       t.string :subject

data/db/migrate/20150721161144_create_message_train_attachments.rb

@@ -1,7 +1,7 @@
 class CreateMessageTrainAttachments < ActiveRecord::Migration
   def change
     create_table :message_train_attachments do |t|
-      t.references :message, index: true, foreign_key: true
+      t.references :message_train_message, index: true, foreign_key: true
       t.attachment :attachment
 
       t.timestamps null: false

data/db/migrate/20150721161940_create_message_train_receipts.rb

@@ -2,7 +2,7 @@ class CreateMessageTrainReceipts < ActiveRecord::Migration
   def change
     create_table :message_train_receipts do |t|
       t.references :recipient, polymorphic: true
-      t.references :message, index: true, foreign_key: true
+      t.references :message_train_message, index: true, foreign_key: true
       t.boolean :marked_read, default: false
       t.boolean :marked_trash, default: false
       t.boolean :marked_deleted, default: false

data/db/migrate/20150721163838_create_message_train_ignores.rb

@@ -2,7 +2,7 @@ class CreateMessageTrainIgnores < ActiveRecord::Migration
   def change
     create_table :message_train_ignores do |t|
       t.references :participant, polymorphic: true
-      t.references :conversation, index: true, foreign_key: true
+      t.references :message_train_conversation, index: true, foreign_key: true
 
       t.timestamps null: false
     end

data/db/migrate/20151004184347_add_unique_index_to_receipts.rb

@@ -1,5 +1,5 @@
 class AddUniqueIndexToReceipts < ActiveRecord::Migration
   def change
-    add_index :message_train_receipts, [:message_id, :recipient_type, :recipient_id], name: :message_recipient, unique: true
+    add_index :message_train_receipts, [:message_train_message_id, :recipient_type, :recipient_id], name: :message_recipient, unique: true
   end
 end

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.3.1 ruby lib
+# stub: message_train 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "message_train"
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   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-01-26"
+  s.date = "2016-02-07"
   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 = [
@@ -205,14 +205,14 @@ Gem::Specification.new do |s|
     "spec/dummy/db/migrate/20150721141009_rolify_create_roles.rb",
     "spec/dummy/db/migrate/20150721141128_create_groups.rb",
     "spec/dummy/db/migrate/20150721150307_add_display_name_column_to_users.rb",
-    "spec/dummy/db/migrate/20150901183629_create_message_train_conversations.message_train.rb",
-    "spec/dummy/db/migrate/20150901183630_create_message_train_messages.message_train.rb",
-    "spec/dummy/db/migrate/20150901183631_create_message_train_attachments.message_train.rb",
-    "spec/dummy/db/migrate/20150901183632_create_message_train_receipts.message_train.rb",
-    "spec/dummy/db/migrate/20150901183633_create_message_train_ignores.message_train.rb",
-    "spec/dummy/db/migrate/20150901183634_add_received_through_to_message_train_receipts.message_train.rb",
-    "spec/dummy/db/migrate/20151004184519_add_unique_index_to_receipts.message_train.rb",
-    "spec/dummy/db/migrate/20151124001417_create_message_train_unsubscribes.message_train.rb",
+    "spec/dummy/db/migrate/20160207190402_create_message_train_conversations.message_train.rb",
+    "spec/dummy/db/migrate/20160207190403_create_message_train_messages.message_train.rb",
+    "spec/dummy/db/migrate/20160207190404_create_message_train_attachments.message_train.rb",
+    "spec/dummy/db/migrate/20160207190405_create_message_train_receipts.message_train.rb",
+    "spec/dummy/db/migrate/20160207190406_create_message_train_ignores.message_train.rb",
+    "spec/dummy/db/migrate/20160207190407_add_received_through_to_message_train_receipts.message_train.rb",
+    "spec/dummy/db/migrate/20160207190408_add_unique_index_to_receipts.message_train.rb",
+    "spec/dummy/db/migrate/20160207190409_create_message_train_unsubscribes.message_train.rb",
     "spec/dummy/db/schema.rb",
     "spec/dummy/db/seeds.rb",
     "spec/dummy/db/seeds/conversations.seeds.rb",
@@ -282,7 +282,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ["~> 4"])
+      s.add_runtime_dependency(%q<rails>, ["~> 4.2.5"])
       s.add_runtime_dependency(%q<paperclip>, ["~> 4.3"])
       s.add_runtime_dependency(%q<rails-i18n>, ["~> 4"])
       s.add_runtime_dependency(%q<haml-rails>, ["~> 0.9"])
@@ -311,7 +311,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<byebug>, ["~> 5"])
       s.add_development_dependency(%q<high_voltage>, ["~> 2.4"])
     else
-      s.add_dependency(%q<rails>, ["~> 4"])
+      s.add_dependency(%q<rails>, ["~> 4.2.5"])
       s.add_dependency(%q<paperclip>, ["~> 4.3"])
       s.add_dependency(%q<rails-i18n>, ["~> 4"])
       s.add_dependency(%q<haml-rails>, ["~> 0.9"])
@@ -341,7 +341,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<high_voltage>, ["~> 2.4"])
     end
   else
-    s.add_dependency(%q<rails>, ["~> 4"])
+    s.add_dependency(%q<rails>, ["~> 4.2.5"])
     s.add_dependency(%q<paperclip>, ["~> 4.3"])
     s.add_dependency(%q<rails-i18n>, ["~> 4"])
     s.add_dependency(%q<haml-rails>, ["~> 0.9"])

data/spec/controllers/message_train/messages_controller_spec.rb

@@ -43,7 +43,7 @@ describe MessageTrain::MessagesController do
 
   describe "GET #new" do
     before do
-      get :new, box_division: 'in', conversation_id: unread_message.conversation_id
+      get :new, box_division: 'in', conversation_id: unread_message.message_train_conversation_id
     end
     it_should_behave_like 'a successful page', which_renders: 'new'
 

data/spec/dummy/config/routes.rb

@@ -1,5 +1,6 @@
 Rails.application.routes.draw do
   
+  
   mount MessageTrain::Engine => '/', :as => 'message_train'
   devise_for :users
 end

data/spec/dummy/db/migrate/{20150901183630_create_message_train_messages.message_train.rb → 20160207190403_create_message_train_messages.message_train.rb}

@@ -2,7 +2,7 @@
 class CreateMessageTrainMessages < ActiveRecord::Migration
   def change
     create_table :message_train_messages do |t|
-      t.references :conversation, index: true, foreign_key: true
+      t.references :message_train_conversation, index: true, foreign_key: true
       t.references :sender, polymorphic: true, index: true
       t.text :recipients_to_save
       t.string :subject

data/spec/dummy/db/migrate/{20150901183631_create_message_train_attachments.message_train.rb → 20160207190404_create_message_train_attachments.message_train.rb}

@@ -2,7 +2,7 @@
 class CreateMessageTrainAttachments < ActiveRecord::Migration
   def change
     create_table :message_train_attachments do |t|
-      t.references :message, index: true, foreign_key: true
+      t.references :message_train_message, index: true, foreign_key: true
       t.attachment :attachment
 
       t.timestamps null: false

data/spec/dummy/db/migrate/{20150901183632_create_message_train_receipts.message_train.rb → 20160207190405_create_message_train_receipts.message_train.rb}

@@ -3,7 +3,7 @@ class CreateMessageTrainReceipts < ActiveRecord::Migration
   def change
     create_table :message_train_receipts do |t|
       t.references :recipient, polymorphic: true
-      t.references :message, index: true, foreign_key: true
+      t.references :message_train_message, index: true, foreign_key: true
       t.boolean :marked_read, default: false
       t.boolean :marked_trash, default: false
       t.boolean :marked_deleted, default: false

data/spec/dummy/db/migrate/{20150901183633_create_message_train_ignores.message_train.rb → 20160207190406_create_message_train_ignores.message_train.rb}

@@ -3,7 +3,7 @@ class CreateMessageTrainIgnores < ActiveRecord::Migration
   def change
     create_table :message_train_ignores do |t|
       t.references :participant, polymorphic: true
-      t.references :conversation, index: true, foreign_key: true
+      t.references :message_train_conversation, index: true, foreign_key: true
 
       t.timestamps null: false
     end

data/spec/dummy/db/migrate/{20151004184519_add_unique_index_to_receipts.message_train.rb → 20160207190408_add_unique_index_to_receipts.message_train.rb}

@@ -1,6 +1,6 @@
 # This migration comes from message_train (originally 20151004184347)
 class AddUniqueIndexToReceipts < ActiveRecord::Migration
   def change
-    add_index :message_train_receipts, [:message_id, :recipient_type, :recipient_id], name: :message_recipient, unique: true
+    add_index :message_train_receipts, [:message_train_message_id, :recipient_type, :recipient_id], name: :message_recipient, unique: true
   end
 end

data/spec/dummy/db/migrate/{20151124001417_create_message_train_unsubscribes.message_train.rb → 20160207190409_create_message_train_unsubscribes.message_train.rb}

@@ -10,6 +10,6 @@ class CreateMessageTrainUnsubscribes < ActiveRecord::Migration
 
     add_index :message_train_unsubscribes, [:recipient_type, :recipient_id], name: :unsubscribe_recipient
     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: :unsubscribes, unique: true
+    add_index :message_train_unsubscribes, [:recipient_type, :recipient_id, :from_type, :from_id], name: :unsubscribe, unique: true
   end
 end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151124001417) do
+ActiveRecord::Schema.define(version: 20160207190409) do
 
   create_table "groups", force: :cascade do |t|
     t.string   "title"
@@ -22,16 +22,16 @@ ActiveRecord::Schema.define(version: 20151124001417) do
   end
 
   create_table "message_train_attachments", force: :cascade do |t|
-    t.integer  "message_id"
+    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.datetime "created_at",               null: false
+    t.datetime "updated_at",               null: false
   end
 
-  add_index "message_train_attachments", ["message_id"], name: "index_message_train_attachments_on_message_id"
+  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"
@@ -42,45 +42,45 @@ ActiveRecord::Schema.define(version: 20151124001417) do
   create_table "message_train_ignores", force: :cascade do |t|
     t.integer  "participant_id"
     t.string   "participant_type"
-    t.integer  "conversation_id"
-    t.datetime "created_at",       null: false
-    t.datetime "updated_at",       null: false
+    t.integer  "message_train_conversation_id"
+    t.datetime "created_at",                    null: false
+    t.datetime "updated_at",                    null: false
   end
 
-  add_index "message_train_ignores", ["conversation_id"], name: "index_message_train_ignores_on_conversation_id"
+  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  "conversation_id"
+    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
+    t.boolean  "draft",                         default: false
+    t.datetime "created_at",                                    null: false
+    t.datetime "updated_at",                                    null: false
   end
 
-  add_index "message_train_messages", ["conversation_id"], name: "index_message_train_messages_on_conversation_id"
+  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_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  "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"
   end
 
-  add_index "message_train_receipts", ["message_id", "recipient_type", "recipient_id"], name: "message_recipient", unique: true
-  add_index "message_train_receipts", ["message_id"], name: "index_message_train_receipts_on_message_id"
+  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"
 
@@ -94,7 +94,7 @@ ActiveRecord::Schema.define(version: 20151124001417) do
   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: "unsubscribes", unique: true
+  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|

data/spec/features/boxes_spec.rb

@@ -17,7 +17,7 @@ RSpec.feature 'Boxes' do
             visit '/box/in'
             click_link 'Last'
           end
-          it_behaves_like 'a bootstrap page listing a collection of items', MessageTrain::Conversation, plural_title: 'Inbox', minimum: 2
+          it_behaves_like 'a bootstrap page listing a collection of items', MessageTrain::Conversation, plural_title: 'Inbox', minimum: 1
 
           describe 'does not list Roles dropdown' do
             subject { page }

data/spec/models/message_train/box_spec.rb

@@ -83,17 +83,18 @@ module MessageTrain
       end
 
       describe '#new_message' do
-        describe 'when no conversation id is set' do
-          subject { user_in_box.new_message }
+        context 'when conversation is set' do
+          let(:expected_recipients) { { 'users' => 'second-user' } }
+          subject { user_in_box.new_message(message_train_conversation_id: unread_conversation.id) }
           it { should be_a_new MessageTrain::Message }
+          its(:subject) { should eq 'Re: Unread Conversation' }
+          its(:recipients_to_save) { should eq expected_recipients }
         end
-        describe 'when a conversation id is set' do
-          let(:user_hash) { { 'users' => 'second-user' } }
-          subject { user_in_box.new_message(conversation_id: unread_conversation.id) }
+        context 'when conversation is not set' do
+          subject { user_in_box.new_message }
           it { should be_a_new MessageTrain::Message }
-          its(:recipients_to_save) { should eq user_hash }
-          its(:subject) { should eq 'Re: Unread Conversation' }
-          its(:body) { should match /<blockquote>.*<\/blockquote>.*<p>&nbsp;<\/p>/ }
+          its(:subject) { should eq nil }
+          its(:recipients_to_save) { should be_empty }
         end
       end
 
@@ -376,22 +377,6 @@ module MessageTrain
         end
       end
 
-      describe '#new_message' do
-        context 'when conversation is set' do
-          let(:expected_recipients) { { 'users' => 'second-user' } }
-          subject { user_in_box.new_message(conversation_id: unread_conversation.id) }
-          it { should be_a_new MessageTrain::Message }
-          its(:subject) { should eq 'Re: Unread Conversation' }
-          its(:recipients_to_save) { should eq expected_recipients }
-        end
-        context 'when conversation is not set' do
-          subject { user_in_box.new_message }
-          it { should be_a_new MessageTrain::Message }
-          its(:subject) { should eq nil }
-          its(:recipients_to_save) { should be_empty }
-        end
-      end
-
       describe '#authorize' do
         describe 'given participant is the same as parent' do
           describe 'when bad type' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message_train
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Karen Lundgren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 4.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 4.2.5
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -597,14 +597,14 @@ files:
 - spec/dummy/db/migrate/20150721141009_rolify_create_roles.rb
 - spec/dummy/db/migrate/20150721141128_create_groups.rb
 - spec/dummy/db/migrate/20150721150307_add_display_name_column_to_users.rb
-- spec/dummy/db/migrate/20150901183629_create_message_train_conversations.message_train.rb
-- spec/dummy/db/migrate/20150901183630_create_message_train_messages.message_train.rb
-- spec/dummy/db/migrate/20150901183631_create_message_train_attachments.message_train.rb
-- spec/dummy/db/migrate/20150901183632_create_message_train_receipts.message_train.rb
-- spec/dummy/db/migrate/20150901183633_create_message_train_ignores.message_train.rb
-- spec/dummy/db/migrate/20150901183634_add_received_through_to_message_train_receipts.message_train.rb
-- spec/dummy/db/migrate/20151004184519_add_unique_index_to_receipts.message_train.rb
-- spec/dummy/db/migrate/20151124001417_create_message_train_unsubscribes.message_train.rb
+- spec/dummy/db/migrate/20160207190402_create_message_train_conversations.message_train.rb
+- spec/dummy/db/migrate/20160207190403_create_message_train_messages.message_train.rb
+- spec/dummy/db/migrate/20160207190404_create_message_train_attachments.message_train.rb
+- spec/dummy/db/migrate/20160207190405_create_message_train_receipts.message_train.rb
+- spec/dummy/db/migrate/20160207190406_create_message_train_ignores.message_train.rb
+- spec/dummy/db/migrate/20160207190407_add_received_through_to_message_train_receipts.message_train.rb
+- spec/dummy/db/migrate/20160207190408_add_unique_index_to_receipts.message_train.rb
+- spec/dummy/db/migrate/20160207190409_create_message_train_unsubscribes.message_train.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/db/seeds/conversations.seeds.rb