mailboxer 0.0.7 → 0.0.8

data/app/models/mailboxer_conversation.rb

@@ -4,19 +4,19 @@ class MailboxerConversation < ActiveRecord::Base
   has_many :mailboxer_mails, :through => :mailboxer_messages
   #  before_create :clean
   scope :participant, lambda {|participant|
-    joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s)    
+    joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s).order("mailboxer_conversations.updated_at DESC")
   }
   scope :inbox, lambda {|participant|
-    joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s, 'mailboxer_mails.mailbox_type' => 'inbox','mailboxer_mails.trashed' => false) 
+    joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s, 'mailboxer_mails.mailbox_type' => 'inbox','mailboxer_mails.trashed' => false).order("mailboxer_conversations.updated_at DESC")
   }
   scope :sentbox, lambda {|participant|
-    joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s, 'mailboxer_mails.mailbox_type' => 'sentbox','mailboxer_mails.trashed' => false)    
+    joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s, 'mailboxer_mails.mailbox_type' => 'sentbox','mailboxer_mails.trashed' => false).order("mailboxer_conversations.updated_at DESC")    
   }
   scope :trash, lambda {|participant|
-    joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s,'mailboxer_mails.trashed' => true)
+    joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s,'mailboxer_mails.trashed' => true).order("mailboxer_conversations.updated_at DESC")
   }
   scope :unread,  lambda {|participant|
-    joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s,'mailboxer_mails.read' => false)
+    joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s,'mailboxer_mails.read' => false).order("mailboxer_conversations.updated_at DESC")
   }
   
   class << self

data/lib/generators/mailboxer/templates/migration.rb

@@ -3,14 +3,17 @@ class CreateMailboxer < ActiveRecord::Migration
     create_table :mailboxer_conversations do |t|
       t.column :subject, :string, :default => ""
       t.column :created_at, :datetime, :null => false
+      t.column :updated_at, :datetime, :null => false
     end    
     create_table :mailboxer_mails do |t|
       t.references :receiver, :polymorphic => true
       t.column :mailboxer_message_id, :integer, :null => false
       t.column :read, :boolean, :default => false
       t.column :trashed, :boolean, :default => false
+      t.column :deleted, :boolean, :default => false
       t.column :mailbox_type, :string, :limit => 25
       t.column :created_at, :datetime, :null => false
+      t.column :updated_at, :datetime, :null => false
     end    
     create_table :mailboxer_messages do |t|
       t.column :body, :text
@@ -19,6 +22,9 @@ class CreateMailboxer < ActiveRecord::Migration
       t.references :sender, :polymorphic => true
       t.column :mailboxer_conversation_id, :integer
       t.column :sent, :boolean, :default => false
+      t.column :draft, :boolean, :default => false
+      t.column :system, :boolean, :default => false
+      t.column :updated_at, :datetime, :null => false
       t.column :created_at, :datetime, :null => false
     end    
   end

data/lib/mailboxer/models/messageable.rb

@@ -34,6 +34,7 @@ module Mailboxer
         
         def reply(conversation, recipients, reply_body, subject = nil)
           return nil if(reply_body.blank?)
+          conversation.update_attribute(:updated_at, Time.now)
           subject = subject || "RE: #{conversation.subject}"
           response = MailboxerMessage.create({:sender => self, :mailboxer_conversation => conversation, :body => reply_body, :subject => subject})
           response.recipients = recipients.is_a?(Array) ? recipients : [recipients]

data/mailboxer.gemspec

@@ -1,11 +1,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mailboxer"
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eduardo Casanova Cuesta"]
-  s.date = %q{2011-03-17}
+  s.date = %q{2011-03-22}
   s.description = %q{A Rails engine that allows any model to act as messageable, permitting it interchange messages with any other messageable model. }
   s.email = %q{ecasanovac@gmail.com}
   s.extra_rdoc_files = [

data/spec/dummy/db/migrate/{20110303122122_create_mailboxer.rb → 20110321231559_create_mailboxer.rb}

@@ -3,14 +3,17 @@ class CreateMailboxer < ActiveRecord::Migration
     create_table :mailboxer_conversations do |t|
       t.column :subject, :string, :default => ""
       t.column :created_at, :datetime, :null => false
+      t.column :updated_at, :datetime, :null => false
     end    
     create_table :mailboxer_mails do |t|
       t.references :receiver, :polymorphic => true
       t.column :mailboxer_message_id, :integer, :null => false
       t.column :read, :boolean, :default => false
       t.column :trashed, :boolean, :default => false
+      t.column :deleted, :boolean, :default => false
       t.column :mailbox_type, :string, :limit => 25
       t.column :created_at, :datetime, :null => false
+      t.column :updated_at, :datetime, :null => false
     end    
     create_table :mailboxer_messages do |t|
       t.column :body, :text
@@ -19,6 +22,9 @@ class CreateMailboxer < ActiveRecord::Migration
       t.references :sender, :polymorphic => true
       t.column :mailboxer_conversation_id, :integer
       t.column :sent, :boolean, :default => false
+      t.column :draft, :boolean, :default => false
+      t.column :system, :boolean, :default => false
+      t.column :updated_at, :datetime, :null => false
       t.column :created_at, :datetime, :null => false
     end    
   end

data/spec/dummy/db/schema.rb

@@ -10,38 +10,18 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110306002940) do
+ActiveRecord::Schema.define(:version => 20110306015107) do
 
-  create_table "ducks", :force => true do |t|
+  create_table "cylons", :force => true do |t|
     t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "mailboxer_conversations", :force => true do |t|
-    t.string   "subject",    :default => ""
-    t.datetime "created_at",                 :null => false
-  end
-
-  create_table "mailboxer_mails", :force => true do |t|
-    t.integer  "receiver_id"
-    t.string   "receiver_type"
-    t.integer  "mailboxer_message_id",                                  :null => false
-    t.boolean  "read",                               :default => false
-    t.boolean  "trashed",                            :default => false
-    t.string   "mailbox_type",         :limit => 25
-    t.datetime "created_at",                                            :null => false
-  end
-
-  create_table "mailboxer_messages", :force => true do |t|
-    t.text     "body"
-    t.string   "subject",                   :default => ""
-    t.text     "headers"
-    t.integer  "sender_id"
-    t.string   "sender_type"
-    t.integer  "mailboxer_conversation_id"
-    t.boolean  "sent",                      :default => false
-    t.datetime "created_at",                                   :null => false
+  create_table "ducks", :force => true do |t|
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   create_table "users", :force => true do |t|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mailboxer
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Eduardo Casanova Cuesta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 +01:00
+date: 2011-03-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -229,9 +229,9 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20110228120600_create_users.rb
-- spec/dummy/db/migrate/20110303122122_create_mailboxer.rb
 - spec/dummy/db/migrate/20110306002940_create_ducks.rb
 - spec/dummy/db/migrate/20110306015107_create_cylons.rb
+- spec/dummy/db/migrate/20110321231559_create_mailboxer.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html