acts_as_messenger 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/acts_as_messenger.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_messenger}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Nelson"]
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
      "generators/acts_as_messenger/templates/models/message_thread.rb",
      "generators/acts_as_messenger/templates/models/recipient.rb",
      "lib/acts_as_messenger.rb",
+     "lib/acts_as_messenger/message.rb",
      "lib/acts_as_messenger/thread.rb",
      "spec/acts_as_messenger_spec.rb",
      "spec/database.yml",

data/lib/acts_as_messenger.rb

@@ -1,50 +1,2 @@
-module SocialButterfly
-  module Message
-    def self.included(model)
-      model.extend(SocialButterfly::Message::ClassMethods)
-      model.send(:include, SocialButterfly::Message::InstanceMethods)
-    end
-    
-    module ClassMethods
-      def acts_as_messenger
-          has_many :recipients, :as => :receiver
-          has_many :unread_recipients, :source => :recipients, :class_name => 'Recipient', :as => :receiver, :conditions => {:read => false}
-          has_many :read_recipients, :source => :recipients, :class_name => 'Recipient', :as => :receiver, :conditions => {:read => true}
-
-          has_many :sent_messages, :class_name => 'MessageThread', :foreign_key => :author_id
-          has_many :unread_messages, :through => :unread_recipients, :source => :message_thread
-          has_many :read_messages, :through => :read_recipients, :source => :message_thread
-      end
-    end
-    
-    module InstanceMethods
-      def send_message(title, body, recips)
-        thread = ::MessageThread.create(:author => self, :title => title, :body => body, :private_thread => true)
-        thread.recipients = [recips].flatten.uniq.collect{|r| rdata = recipient_data(r); thread.recipients.create(:receiver_id => rdata[0], :receiver_type => rdata[1])}
-        thread
-      end
-      def recipient_for(message)
-        self.recipients.find(:first, :conditions => ['message_thread_id = ?', message.id])
-      end
-      
-      def comment_on(message, body)
-        if message && body
-          message.comments.create(:author => self, :body => body)
-          recip = recipient_for(message)
-          (message.recipients - [recip].compact).each{|r| r.unread!}
-          true
-        else
-          false
-        end
-      end
-
-			private 
-			
-				def recipient_data(given)
-					given.is_a?(Fixnum) && [given, self.class.name] || [given.id, given.class.name]
-				end
-    end
-  end
-end
-
-::ActiveRecord::Base.send :include, SocialButterfly::Message
+require File.dirname(__FILE__) + '/acts_as_messenger/thread.rb'
+require File.dirname(__FILE__) + '/acts_as_messenger/message.rb'

data/lib/acts_as_messenger/message.rb

@@ -0,0 +1,50 @@
+module SocialButterfly
+  module Message
+    def self.included(model)
+      model.extend(SocialButterfly::Message::ClassMethods)
+      model.send(:include, SocialButterfly::Message::InstanceMethods)
+    end
+    
+    module ClassMethods
+      def acts_as_messenger
+          has_many :recipients, :as => :receiver
+          has_many :unread_recipients, :source => :recipients, :class_name => 'Recipient', :as => :receiver, :conditions => {:read => false}
+          has_many :read_recipients, :source => :recipients, :class_name => 'Recipient', :as => :receiver, :conditions => {:read => true}
+
+          has_many :sent_messages, :class_name => 'MessageThread', :foreign_key => :author_id
+          has_many :unread_messages, :through => :unread_recipients, :source => :message_thread
+          has_many :read_messages, :through => :read_recipients, :source => :message_thread
+      end
+    end
+    
+    module InstanceMethods
+      def send_message(title, body, recips)
+        thread = ::MessageThread.create(:author => self, :title => title, :body => body, :private_thread => true)
+        thread.recipients = [recips].flatten.uniq.collect{|r| rdata = recipient_data(r); thread.recipients.create(:receiver_id => rdata[0], :receiver_type => rdata[1])}
+        thread
+      end
+      def recipient_for(message)
+        self.recipients.find(:first, :conditions => ['message_thread_id = ?', message.id])
+      end
+      
+      def comment_on(message, body)
+        if message && body
+          message.comments.create(:author => self, :body => body)
+          recip = recipient_for(message)
+          (message.recipients - [recip].compact).each{|r| r.unread!}
+          true
+        else
+          false
+        end
+      end
+
+			private 
+			
+				def recipient_data(given)
+					given.is_a?(Fixnum) && [given, self.class.name] || [given.id, given.class.name]
+				end
+    end
+  end
+end
+
+::ActiveRecord::Base.send :include, SocialButterfly::Message

data/spec/debug.log

@@ -2517,3 +2517,236 @@
   User Load (0.5ms)   SELECT * FROM `users` WHERE (`users`.`id` IN (20,21)) 
   Recipient Load (0.3ms)   SELECT * FROM `recipients` WHERE (`recipients`.message_thread_id = 7) ORDER BY has_read ASC, created_at DESC
   User Load (0.2ms)   SELECT * FROM `users` WHERE (`users`.`id` IN (20,21)) 
+  SQL (0.1ms)   SET NAMES 'utf8'
+  SQL (0.1ms)   SET SQL_AUTO_IS_NULL=0
+  SQL (72.5ms)   SHOW TABLES
+  SQL (44.3ms)   DROP TABLE `comments`
+  SQL (81.9ms)   CREATE TABLE `comments` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `commentable_id` int(11), `commentable_type` varchar(255), `author_id` int(11), `body` text, `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+  SQL (0.6ms)   SHOW TABLES
+  SQL (2.5ms)   DROP TABLE `message_threads`
+  SQL (333.6ms)   CREATE TABLE `message_threads` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `author_id` int(11), `title` varchar(255), `body` text, `private_thread` tinyint(1) DEFAULT 1, `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+  SQL (1.2ms)   SHOW TABLES
+  SQL (5.9ms)   DROP TABLE `recipients`
+  SQL (113.4ms)   CREATE TABLE `recipients` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `receiver_id` int(11), `receiver_type` varchar(255), `message_thread_id` int(11), `has_read` tinyint(1), `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+  SQL (0.7ms)   SHOW TABLES
+  SQL (3.1ms)   DROP TABLE `users`
+  SQL (141.2ms)   CREATE TABLE `users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+  SQL (0.9ms)   SHOW TABLES
+  SQL (0.9ms)   SELECT version FROM `schema_migrations`
+  User Columns (1.7ms)   SHOW FIELDS FROM `users`
+  SQL (0.1ms)   BEGIN
+  User Create (0.2ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES('Mike', '2010-02-02 01:10:39', '2010-02-02 01:10:39')
+  SQL (0.6ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  User Create (0.2ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES('John', '2010-02-02 01:10:39', '2010-02-02 01:10:39')
+  SQL (0.5ms)   COMMIT
+  SQL (0.2ms)   BEGIN
+  User Create (0.2ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES('Sky', '2010-02-02 01:10:40', '2010-02-02 01:10:40')
+  SQL (18.9ms)   COMMIT
+  SQL (0.2ms)   BEGIN
+  User Create (0.3ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES('Mike', '2010-02-02 01:10:40', '2010-02-02 01:10:40')
+  SQL (0.7ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  User Create (0.2ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES('John', '2010-02-02 01:10:40', '2010-02-02 01:10:40')
+  SQL (0.6ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  User Create (0.2ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES('Sky', '2010-02-02 01:10:40', '2010-02-02 01:10:40')
+  SQL (0.6ms)   COMMIT
+  MessageThread Columns (1.6ms)   SHOW FIELDS FROM `message_threads`
+  SQL (0.1ms)   BEGIN
+  MessageThread Create (0.2ms)   INSERT INTO `message_threads` (`created_at`, `title`, `body`, `updated_at`, `private_thread`, `author_id`) VALUES('2010-02-02 01:10:40', 'Title', 'Body', '2010-02-02 01:10:40', 1, 4)
+  SQL (0.6ms)   COMMIT
+  Recipient Columns (1.3ms)   SHOW FIELDS FROM `recipients`
+  SQL (0.1ms)   BEGIN
+  Recipient Create (0.2ms)   INSERT INTO `recipients` (`receiver_type`, `created_at`, `receiver_id`, `updated_at`, `has_read`, `message_thread_id`) VALUES('User', '2010-02-02 01:10:40', 5, '2010-02-02 01:10:40', NULL, 1)
+  SQL (0.5ms)   COMMIT
+  Recipient Load (0.3ms)   SELECT * FROM `recipients` WHERE (`recipients`.message_thread_id = 1) ORDER BY has_read ASC, created_at DESC
+  SQL (0.1ms)   BEGIN
+  SQL (0.1ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  User Create (0.2ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES('Mike', '2010-02-02 01:10:40', '2010-02-02 01:10:40')
+  SQL (0.6ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  User Create (0.2ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES('John', '2010-02-02 01:10:40', '2010-02-02 01:10:40')
+  SQL (8.1ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  User Create (0.2ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES('Sky', '2010-02-02 01:10:40', '2010-02-02 01:10:40')
+  SQL (0.5ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  MessageThread Create (0.2ms)   INSERT INTO `message_threads` (`created_at`, `title`, `body`, `updated_at`, `private_thread`, `author_id`) VALUES('2010-02-02 01:10:40', 'Title 1', 'Body 1', '2010-02-02 01:10:40', 1, 7)
+  SQL (0.5ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  Recipient Create (0.3ms)   INSERT INTO `recipients` (`receiver_type`, `created_at`, `receiver_id`, `updated_at`, `has_read`, `message_thread_id`) VALUES('User', '2010-02-02 01:10:40', 8, '2010-02-02 01:10:40', NULL, 2)
+  SQL (0.5ms)   COMMIT
+  Recipient Load (0.3ms)   SELECT * FROM `recipients` WHERE (`recipients`.message_thread_id = 2) ORDER BY has_read ASC, created_at DESC
+  SQL (0.1ms)   BEGIN
+  SQL (0.1ms)   COMMIT
+  SQL (0.3ms)   SELECT count(*) AS count_all FROM `recipients` WHERE (`recipients`.receiver_id = 8 AND `recipients`.receiver_type = 'User') 
+  SQL (0.2ms)   SELECT count(*) AS count_all FROM `recipients` WHERE (`recipients`.receiver_id = 7 AND `recipients`.receiver_type = 'User') 
+  SQL (0.1ms)   BEGIN
+  MessageThread Create (0.2ms)   INSERT INTO `message_threads` (`created_at`, `title`, `body`, `updated_at`, `private_thread`, `author_id`) VALUES('2010-02-02 01:10:40', 'Title 2', 'Body 2', '2010-02-02 01:10:40', 1, 8)
+  SQL (0.5ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  Recipient Create (0.2ms)   INSERT INTO `recipients` (`receiver_type`, `created_at`, `receiver_id`, `updated_at`, `has_read`, `message_thread_id`) VALUES('User', '2010-02-02 01:10:40', 7, '2010-02-02 01:10:40', NULL, 3)
+  SQL (0.5ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  Recipient Create (0.1ms)   INSERT INTO `recipients` (`receiver_type`, `created_at`, `receiver_id`, `updated_at`, `has_read`, `message_thread_id`) VALUES('User', '2010-02-02 01:10:40', 9, '2010-02-02 01:10:40', NULL, 3)
+  SQL (0.5ms)   COMMIT
+  Recipient Load (0.3ms)   SELECT * FROM `recipients` WHERE (`recipients`.message_thread_id = 3) ORDER BY has_read ASC, created_at DESC
+  SQL (0.1ms)   BEGIN
+  SQL (0.1ms)   COMMIT
+  User Load (0.2ms)   SELECT * FROM `users` WHERE (`users`.`id` = 7) 
+  User Load (0.1ms)   SELECT * FROM `users` WHERE (`users`.`id` = 8) 
+  User Load (0.1ms)   SELECT * FROM `users` WHERE (`users`.`id` = 9) 
+  SQL (0.2ms)   SELECT count(*) AS count_all FROM `recipients` WHERE (`recipients`.receiver_id = 7 AND `recipients`.receiver_type = 'User') 
+  SQL (0.2ms)   SELECT count(*) AS count_all FROM `recipients` WHERE (`recipients`.receiver_id = 8 AND `recipients`.receiver_type = 'User') 
+  SQL (0.2ms)   SELECT count(*) AS count_all FROM `recipients` WHERE (`recipients`.receiver_id = 9 AND `recipients`.receiver_type = 'User') 
+  SQL (0.1ms)   BEGIN
+  User Create (0.2ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES('Mike', '2010-02-02 01:10:40', '2010-02-02 01:10:40')
+  SQL (0.6ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  User Create (0.1ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES('John', '2010-02-02 01:10:40', '2010-02-02 01:10:40')
+  SQL (1.0ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  User Create (0.1ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES('Sky', '2010-02-02 01:10:40', '2010-02-02 01:10:40')
+  SQL (0.5ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  MessageThread Create (0.2ms)   INSERT INTO `message_threads` (`created_at`, `title`, `body`, `updated_at`, `private_thread`, `author_id`) VALUES('2010-02-02 01:10:40', 'Title 3', 'Body 3', '2010-02-02 01:10:40', 1, 10)
+  SQL (0.6ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  Recipient Create (0.2ms)   INSERT INTO `recipients` (`receiver_type`, `created_at`, `receiver_id`, `updated_at`, `has_read`, `message_thread_id`) VALUES('User', '2010-02-02 01:10:40', 11, '2010-02-02 01:10:40', NULL, 4)
+  SQL (0.5ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  Recipient Create (0.1ms)   INSERT INTO `recipients` (`receiver_type`, `created_at`, `receiver_id`, `updated_at`, `has_read`, `message_thread_id`) VALUES('User', '2010-02-02 01:10:40', 12, '2010-02-02 01:10:40', NULL, 4)
+  SQL (0.5ms)   COMMIT
+  Recipient Load (0.3ms)   SELECT * FROM `recipients` WHERE (`recipients`.message_thread_id = 4) ORDER BY has_read ASC, created_at DESC
+  SQL (0.1ms)   BEGIN
+  SQL (0.1ms)   COMMIT
+  Recipient Load (0.2ms)   SELECT * FROM `recipients` WHERE (`recipients`.receiver_id = 11 AND `recipients`.receiver_type = 'User') ORDER BY has_read ASC, created_at DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  Recipient Update (0.2ms)   UPDATE `recipients` SET `updated_at` = '2010-02-02 01:10:40', `has_read` = 1 WHERE `id` = 5
+  SQL (0.6ms)   COMMIT
+  SQL (0.4ms)   SELECT count(*) AS count_all FROM `recipients` WHERE (((has_read = 1) AND (`recipients`.receiver_id = 11 AND `recipients`.receiver_type = 'User')) AND (`recipients`.receiver_id = 11 AND `recipients`.receiver_type = 'User')) 
+  SQL (0.3ms)   SELECT count(*) AS count_all FROM `recipients` WHERE (((has_read = 0) AND (`recipients`.receiver_id = 11 AND `recipients`.receiver_type = 'User')) AND (`recipients`.receiver_id = 11 AND `recipients`.receiver_type = 'User')) 
+  Comment Columns (1.4ms)   SHOW FIELDS FROM `comments`
+  SQL (0.1ms)   BEGIN
+  Comment Create (0.2ms)   INSERT INTO `comments` (`created_at`, `commentable_type`, `body`, `commentable_id`, `updated_at`, `author_id`) VALUES('2010-02-02 01:10:40', 'MessageThread', 'This is totally awesome', 4, '2010-02-02 01:10:40', 12)
+  SQL (0.5ms)   COMMIT
+  Recipient Load (0.3ms)   SELECT * FROM `recipients` WHERE (`recipients`.receiver_id = 12 AND `recipients`.receiver_type = 'User' AND (message_thread_id = 4)) ORDER BY has_read ASC, created_at DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  Recipient Update (0.2ms)   UPDATE `recipients` SET `updated_at` = '2010-02-02 01:10:40', `has_read` = 0 WHERE `id` = 5
+  SQL (0.5ms)   COMMIT
+  SQL (0.2ms)   SELECT count(*) AS count_all FROM `recipients` WHERE (((has_read = 0) AND (`recipients`.receiver_id = 11 AND `recipients`.receiver_type = 'User')) AND (`recipients`.receiver_id = 11 AND `recipients`.receiver_type = 'User')) 
+  SQL (0.7ms)   SELECT count(*) AS count_all FROM `recipients` WHERE (((has_read = 1) AND (`recipients`.receiver_id = 11 AND `recipients`.receiver_type = 'User')) AND (`recipients`.receiver_id = 11 AND `recipients`.receiver_type = 'User')) 
+  Recipient Load (0.3ms)   SELECT * FROM `recipients` WHERE (`recipients`.receiver_id = 11 AND `recipients`.receiver_type = 'User') ORDER BY has_read ASC, created_at DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  Recipient Destroy (0.2ms)   DELETE FROM `recipients` WHERE `id` = 5
+  SQL (0.7ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  Comment Create (0.2ms)   INSERT INTO `comments` (`created_at`, `commentable_type`, `body`, `commentable_id`, `updated_at`, `author_id`) VALUES('2010-02-02 01:10:40', 'MessageThread', 'Seriously, i love this', 4, '2010-02-02 01:10:40', 12)
+  SQL (0.6ms)   COMMIT
+  Recipient Load (0.3ms)   SELECT * FROM `recipients` WHERE (`recipients`.receiver_id = 12 AND `recipients`.receiver_type = 'User' AND (message_thread_id = 4)) ORDER BY has_read ASC, created_at DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  SQL (0.1ms)   COMMIT
+  SQL (0.2ms)   SELECT count(*) AS count_all FROM `recipients` WHERE (`recipients`.receiver_id = 11 AND `recipients`.receiver_type = 'User') 
+  SQL (0.1ms)   BEGIN
+  User Create (0.2ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES('Mike', '2010-02-02 01:10:40', '2010-02-02 01:10:40')
+  SQL (0.7ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  User Create (0.1ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES('John', '2010-02-02 01:10:40', '2010-02-02 01:10:40')
+  SQL (0.6ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  User Create (0.2ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES('Sky', '2010-02-02 01:10:40', '2010-02-02 01:10:40')
+  SQL (0.7ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  MessageThread Create (0.2ms)   INSERT INTO `message_threads` (`created_at`, `title`, `body`, `updated_at`, `private_thread`, `author_id`) VALUES('2010-02-02 01:10:40', 'Title 4', 'Body 4', '2010-02-02 01:10:40', 1, 13)
+  SQL (0.6ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  Recipient Create (0.2ms)   INSERT INTO `recipients` (`receiver_type`, `created_at`, `receiver_id`, `updated_at`, `has_read`, `message_thread_id`) VALUES('User', '2010-02-02 01:10:40', 14, '2010-02-02 01:10:40', NULL, 5)
+  SQL (0.5ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  Recipient Create (0.2ms)   INSERT INTO `recipients` (`receiver_type`, `created_at`, `receiver_id`, `updated_at`, `has_read`, `message_thread_id`) VALUES('User', '2010-02-02 01:10:40', 15, '2010-02-02 01:10:40', NULL, 5)
+  SQL (0.7ms)   COMMIT
+  Recipient Load (0.3ms)   SELECT * FROM `recipients` WHERE (`recipients`.message_thread_id = 5) ORDER BY has_read ASC, created_at DESC
+  SQL (0.1ms)   BEGIN
+  SQL (0.1ms)   COMMIT
+  SQL (0.2ms)   SELECT count(*) AS count_all FROM `recipients` WHERE (`recipients`.receiver_id = 14 AND `recipients`.receiver_type = 'User') 
+  SQL (0.1ms)   BEGIN
+  Comment Load (0.2ms)   SELECT * FROM `comments` WHERE (`comments`.commentable_id = 5 AND `comments`.commentable_type = 'MessageThread') ORDER BY created_at asc
+  Recipient Destroy (0.2ms)   DELETE FROM `recipients` WHERE `id` = 7
+  Recipient Destroy (0.1ms)   DELETE FROM `recipients` WHERE `id` = 8
+  MessageThread Destroy (0.1ms)   DELETE FROM `message_threads` WHERE `id` = 5
+  SQL (0.6ms)   COMMIT
+  SQL (0.2ms)   SELECT count(*) AS count_all FROM `recipients` WHERE (`recipients`.receiver_id = 14 AND `recipients`.receiver_type = 'User') 
+  SQL (0.2ms)   SELECT count(*) AS count_all FROM `recipients` WHERE (`recipients`.receiver_id = 15 AND `recipients`.receiver_type = 'User') 
+  SQL (0.1ms)   BEGIN
+  User Create (0.2ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES('Mike', '2010-02-02 01:10:40', '2010-02-02 01:10:40')
+  SQL (0.6ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  User Create (0.1ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES('John', '2010-02-02 01:10:40', '2010-02-02 01:10:40')
+  SQL (0.6ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  User Create (0.1ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES('Sky', '2010-02-02 01:10:40', '2010-02-02 01:10:40')
+  SQL (0.6ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  MessageThread Create (0.2ms)   INSERT INTO `message_threads` (`created_at`, `title`, `body`, `updated_at`, `private_thread`, `author_id`) VALUES('2010-02-02 01:10:40', 'Title 5', 'Body 5', '2010-02-02 01:10:40', 1, 16)
+  SQL (0.6ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  Recipient Create (0.2ms)   INSERT INTO `recipients` (`receiver_type`, `created_at`, `receiver_id`, `updated_at`, `has_read`, `message_thread_id`) VALUES('User', '2010-02-02 01:10:40', 17, '2010-02-02 01:10:40', NULL, 6)
+  SQL (0.6ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  Recipient Create (0.1ms)   INSERT INTO `recipients` (`receiver_type`, `created_at`, `receiver_id`, `updated_at`, `has_read`, `message_thread_id`) VALUES('User', '2010-02-02 01:10:40', 18, '2010-02-02 01:10:40', NULL, 6)
+  SQL (0.5ms)   COMMIT
+  Recipient Load (0.3ms)   SELECT * FROM `recipients` WHERE (`recipients`.message_thread_id = 6) ORDER BY has_read ASC, created_at DESC
+  SQL (0.1ms)   BEGIN
+  SQL (0.1ms)   COMMIT
+  User Load (0.3ms)   SELECT DISTINCT `users`.* FROM `users` INNER JOIN `comments` ON `users`.id = `comments`.author_id WHERE ((`comments`.commentable_type = 'MessageThread') AND (`comments`.commentable_id = 6)) 
+  SQL (0.1ms)   BEGIN
+  Comment Create (0.2ms)   INSERT INTO `comments` (`created_at`, `commentable_type`, `body`, `commentable_id`, `updated_at`, `author_id`) VALUES('2010-02-02 01:10:40', 'MessageThread', 'Test', 6, '2010-02-02 01:10:40', 17)
+  SQL (0.6ms)   COMMIT
+  Recipient Load (0.3ms)   SELECT * FROM `recipients` WHERE (`recipients`.receiver_id = 17 AND `recipients`.receiver_type = 'User' AND (message_thread_id = 6)) ORDER BY has_read ASC, created_at DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  Recipient Update (0.2ms)   UPDATE `recipients` SET `updated_at` = '2010-02-02 01:10:40', `has_read` = 0 WHERE `id` = 10
+  SQL (0.7ms)   COMMIT
+  MessageThread Load (0.2ms)   SELECT * FROM `message_threads` WHERE (`message_threads`.`id` = 6) 
+  User Load (0.2ms)   SELECT * FROM `users` WHERE (`users`.`id` = 16) 
+  User Load (0.3ms)   SELECT DISTINCT `users`.* FROM `users` INNER JOIN `comments` ON `users`.id = `comments`.author_id WHERE ((`comments`.commentable_type = 'MessageThread') AND (`comments`.commentable_id = 6)) 
+  SQL (0.1ms)   BEGIN
+  Comment Create (0.2ms)   INSERT INTO `comments` (`created_at`, `commentable_type`, `body`, `commentable_id`, `updated_at`, `author_id`) VALUES('2010-02-02 01:10:40', 'MessageThread', 'Tester', 6, '2010-02-02 01:10:40', 18)
+  SQL (0.5ms)   COMMIT
+  Recipient Load (0.3ms)   SELECT * FROM `recipients` WHERE (`recipients`.receiver_id = 18 AND `recipients`.receiver_type = 'User' AND (message_thread_id = 6)) ORDER BY has_read ASC, created_at DESC LIMIT 1
+  Recipient Load (0.2ms)   SELECT * FROM `recipients` WHERE (`recipients`.message_thread_id = 6) ORDER BY has_read ASC, created_at DESC
+  SQL (0.1ms)   BEGIN
+  Recipient Update (0.2ms)   UPDATE `recipients` SET `updated_at` = '2010-02-02 01:10:40', `has_read` = 0 WHERE `id` = 9
+  SQL (0.5ms)   COMMIT
+  MessageThread Load (0.2ms)   SELECT * FROM `message_threads` WHERE (`message_threads`.`id` = 6) 
+  User Load (0.1ms)   SELECT * FROM `users` WHERE (`users`.`id` = 16) 
+  User Load (0.2ms)   SELECT DISTINCT `users`.* FROM `users` INNER JOIN `comments` ON `users`.id = `comments`.author_id WHERE ((`comments`.commentable_type = 'MessageThread') AND (`comments`.commentable_id = 6)) 
+  SQL (0.1ms)   BEGIN
+  User Create (0.2ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES('Mike', '2010-02-02 01:10:40', '2010-02-02 01:10:40')
+  SQL (0.5ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  User Create (0.2ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES('John', '2010-02-02 01:10:40', '2010-02-02 01:10:40')
+  SQL (0.6ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  User Create (0.1ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES('Sky', '2010-02-02 01:10:40', '2010-02-02 01:10:40')
+  SQL (0.6ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  MessageThread Create (0.2ms)   INSERT INTO `message_threads` (`created_at`, `title`, `body`, `updated_at`, `private_thread`, `author_id`) VALUES('2010-02-02 01:10:40', 'Title 6', 'Body 6', '2010-02-02 01:10:40', 1, 19)
+  SQL (0.5ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  Recipient Create (0.2ms)   INSERT INTO `recipients` (`receiver_type`, `created_at`, `receiver_id`, `updated_at`, `has_read`, `message_thread_id`) VALUES('User', '2010-02-02 01:10:40', 20, '2010-02-02 01:10:40', NULL, 7)
+  SQL (0.6ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  Recipient Create (0.2ms)   INSERT INTO `recipients` (`receiver_type`, `created_at`, `receiver_id`, `updated_at`, `has_read`, `message_thread_id`) VALUES('User', '2010-02-02 01:10:40', 21, '2010-02-02 01:10:40', NULL, 7)
+  SQL (0.9ms)   COMMIT
+  Recipient Load (0.3ms)   SELECT * FROM `recipients` WHERE (`recipients`.message_thread_id = 7) ORDER BY has_read ASC, created_at DESC
+  SQL (0.1ms)   BEGIN
+  SQL (0.1ms)   COMMIT
+  SQL (0.1ms)   BEGIN
+  User Create (0.2ms)   INSERT INTO `users` (`name`, `created_at`, `updated_at`) VALUES(NULL, '2010-02-02 01:10:40', '2010-02-02 01:10:40')
+  SQL (0.7ms)   COMMIT
+  Recipient Load (0.2ms)   SELECT * FROM `recipients` WHERE (`recipients`.message_thread_id = 7) ORDER BY has_read ASC, created_at DESC
+  User Load (0.2ms)   SELECT * FROM `users` WHERE (`users`.`id` IN (20,21)) 
+  Recipient Load (0.2ms)   SELECT * FROM `recipients` WHERE (`recipients`.message_thread_id = 7) ORDER BY has_read ASC, created_at DESC
+  User Load (0.2ms)   SELECT * FROM `users` WHERE (`users`.`id` IN (20,21)) 

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ require 'spec/autorun'
 require 'models/user.rb'
 require File.dirname(__FILE__) + "/../lib/acts_as_messenger/thread"
 %w(comment message_thread recipient).each do |model|
-	require File.dirname(__FILE__) + "/../generators/acts_as_messenger/models/#{model}.rb"
+	require File.dirname(__FILE__) + "/../generators/acts_as_messenger/templates/models/#{model}.rb"
 end
 
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + '/debug.log')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_messenger
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Mike Nelson
@@ -55,6 +55,7 @@ files:
 - generators/acts_as_messenger/templates/models/message_thread.rb
 - generators/acts_as_messenger/templates/models/recipient.rb
 - lib/acts_as_messenger.rb
+- lib/acts_as_messenger/message.rb
 - lib/acts_as_messenger/thread.rb
 - spec/acts_as_messenger_spec.rb
 - spec/database.yml