private_mail 0.0.1 → 0.0.2

data/lib/generators/private_mail/install/install_generator.rb

@@ -22,11 +22,11 @@ module PrivateMail
         migration_template "create_conversations.rb", "db/migrate/create_conversations.rb"
         migration_template "create_messages.rb", "db/migrate/create_messages.rb"
         migration_template "create_messages_recipients.rb", "db/migrate/create_messages_recipients.rb"
-        migration_template "create_mail.rb", "db/migrate/create_mail.rb"
+        migration_template "create_mail_items.rb", "db/migrate/create_mail_items.rb"
       end
 
       def copy_models
-          copy_file "../models/mail.rb", "app/models/mail.rb"
+          copy_file "../models/mail_item.rb", "app/models/mail_item.rb"
           copy_file "../models/message.rb", "app/models/message.rb"
           copy_file "../models/conversation.rb", "app/models/conversation.rb"
       end

data/lib/generators/private_mail/install/models/conversation.rb

@@ -1,7 +1,7 @@
 class Conversation < ActiveRecord::Base
   attr_reader :originator, :original_message, :last_sender, :last_message, :users
   has_many :messages
-  has_many :mails
+  has_many :mail_items
   before_create :clean
   #looks like shit but isnt too bad
   #has_many :users, :through :messages, :source => :recipients, :uniq => true doesnt work due to recipients being a habtm association

data/lib/generators/private_mail/install/models/{mail.rb → mail_item.rb}

@@ -1,5 +1,4 @@
-class Mail < ActiveRecord::Base
-  self.table_name = "mail"
+class MailItem < ActiveRecord::Base
   belongs_to :message
   belongs_to :user
   belongs_to :conversation

data/lib/generators/private_mail/install/templates/{create_mail.rb → create_mail_items.rb}

@@ -1,6 +1,6 @@
-class CreateMail < ActiveRecord::Migration
+class CreateMailItems < ActiveRecord::Migration
   def self.up
-    create_table :mail do |t|
+    create_table :mail_items do |t|
       t.column :user_id, :integer, :null => false
       t.column :message_id, :integer, :null => false
       t.column :conversation_id, :integer
@@ -13,6 +13,6 @@ class CreateMail < ActiveRecord::Migration
   end
 
   def self.down
-    drop_table :mail
+    drop_table :mail_items
   end
 end

data/lib/mailbox.rb

@@ -38,9 +38,9 @@ module PrivateMail
     #   phil.mailbox[:inbox].mail_count(:unread)
     #
     def mail_count(filter = :all, options = {})
-      default_options = {:conditions => ["mail.user_id = ?", @user.id]}
+      default_options = {:conditions => ["mail_items.user_id = ?", @user.id]}
       add_mailbox_condition!(default_options, @type)
-      add_conditions!(default_options, "mail.read = ?", filter == :read) unless filter == :all
+      add_conditions!(default_options, "mail_items.read = ?", filter == :read) unless filter == :all
       return count_mail(default_options, options)
     end
 
@@ -49,7 +49,7 @@ module PrivateMail
     #====params:
     #options:: all valid find options are accepted as well as an additional conversation option.
     #* :conversation - Conversation object to filter mail only belonging to this conversation.
-    #* :conditions - same as find conditions however the array version of conditions will not work, i.e., :conditions => ['mail.read = ?', false] will not work here.
+    #* :conditions - same as find conditions however the array version of conditions will not work, i.e., :conditions => ['mail_items.read = ?', false] will not work here.
     #* all other find options will work as expected.
     # 
     #====returns:
@@ -65,7 +65,7 @@ module PrivateMail
     #   phil.mailbox[:inbox].mail(:conversation => Conversation.find(23)) 
     #
     #   #get all unread mail messages belonging to phil associated with conversation 23
-    #   phil.mailbox.mail(:conversation => Conversation.find(23), :conditions => 'mail.read = false')
+    #   phil.mailbox.mail(:conversation => Conversation.find(23), :conditions => 'mail_items.read = false')
     #
     def mail(options = {})
       default_options = {}
@@ -88,7 +88,7 @@ module PrivateMail
     #   phil.mailbox[:inbox].unread_mail
     #
     def unread_mail(options = {})
-      default_options = {:conditions => ["mail.read = ?", false]}
+      default_options = {:conditions => ["mail_items.read = ?", false]}
       add_mailbox_condition!(default_options, @type)
       return get_mail(default_options, options)
     end
@@ -108,7 +108,7 @@ module PrivateMail
     #   phil.mailbox[:inbox].read_mail
     #
     def read_mail(options = {})
-      default_options = {:conditions => ["mail.read = ?", true]}
+      default_options = {:conditions => ["mail_items.read = ?", true]}
       add_mailbox_condition!(default_options, @type)
       return get_mail(default_options, options)
     end
@@ -148,8 +148,8 @@ module PrivateMail
       attributes = {:message => msg, :conversation => msg.conversation}
       attributes[:mailbox] = @type.to_s unless @type == :all
       attributes[:read] = msg.sender.id == @user.id
-      mail_msg = Mail.new(attributes)
-      @user.mail << mail_msg
+      mail_msg = MailItem.new(attributes)
+      @user.mail_items << mail_msg
       return mail_msg
     end
 
@@ -170,7 +170,7 @@ module PrivateMail
     def mark_as_read(options = {})
       default_options = {}
       add_mailbox_condition!(default_options, @type)
-      return update_mail("mail.read = true", default_options, options)
+      return update_mail("mail_items.read = true", default_options, options)
     end
 
     #marks all the mail messages matched by the options and type as unread, except for sent messages.
@@ -188,9 +188,9 @@ module PrivateMail
     #   phil.mailbox[:inbox].mark_as_unread()
     #
     def mark_as_unread(options = {})
-      default_options = {:conditions => ["mail.mailbox != ?",@user.mailbox_types[:sent].to_s]}
+      default_options = {:conditions => ["mail_items.mailbox != ?",@user.mailbox_types[:sent].to_s]}
       add_mailbox_condition!(default_options, @type)
-      return update_mail("mail.read = false", default_options, options)
+      return update_mail("mail_items.read = false", default_options, options)
     end
 
     #moves all mail matched by the options to the given mailbox. sent messages stay in the sentbox.
@@ -206,13 +206,13 @@ module PrivateMail
       add_mailbox_condition!(default_options, @type)
       if(!trash)
         #conditional update because sentmail is always sentmail - I believe case if the most widely supported conditional, mysql also has an if which would work as well but i think mysql is the only one to support it
-        return update_mail("mail.trashed = false, mail.mailbox = 
-        CASE mail.mailbox
-          WHEN '#{@user.mailbox_types[:sent].to_s}' THEN mail.mailbox
+        return update_mail("mail_items.trashed = false, mail_items.mailbox = 
+        CASE mail_items.mailbox
+          WHEN '#{@user.mailbox_types[:sent].to_s}' THEN mail_items.mailbox
           ELSE '#{mailbox.to_s}'
         END", default_options, options)
       end
-      return update_mail("mail.trashed = true", default_options, options)
+      return update_mail("mail_items.trashed = true", default_options, options)
     end
 
     #permanantly deletes all the mail messages matched by the options. Use move_to(:trash) instead if you want to send to user's trash without deleting.
@@ -221,7 +221,7 @@ module PrivateMail
     #options:: see mail for acceptable options.
     # 
     def delete(options = {})
-      default_options = {:conditions => ["mail.user_id = ?", @user.id]}
+      default_options = {:conditions => ["mail_items.user_id = ?", @user.id]}
       add_mailbox_condition!(default_options, @type)
       return delete_mail(default_options, options)
     end
@@ -237,7 +237,7 @@ module PrivateMail
     #options:: see mail for acceptable options.
     # 
     def empty_trash(options = {})
-      default_options = {:conditions => ["mail.user_id = ? AND mail.trashed = ?", @user.id, true]}
+      default_options = {:conditions => ["mail_items.user_id = ? AND mail_items.trashed = ?", @user.id, true]}
       add_mailbox_condition!(default_options, @type)
       return delete_mail(default_options, options)
     end
@@ -271,12 +271,12 @@ module PrivateMail
 
     def get_mail(default_options, options)
       build_options(default_options, options) unless options.empty?
-      return @user.mail.find(:all, default_options)
+      return @user.mail_items.find(:all, default_options)
     end
 
     def update_mail(updates, default_options, options)
       build_options(default_options, options) unless options.empty?
-      return @user.mail.update_all(updates, default_options[:conditions])
+      return @user.mail_items.update_all(updates, default_options[:conditions])
     end
 
     def delete_mail(default_options, options)
@@ -300,7 +300,7 @@ module PrivateMail
     def only_latest(mail)
       convos = []
       latest = []
-      mail.each do |m|
+      mail_items.each do |m|
         next if(convos.include?(m.conversation_id))
         convos << m.conversation_id
         latest << m
@@ -310,8 +310,8 @@ module PrivateMail
 
     def add_mailbox_condition!(options, mailbox_type)
       return if mailbox_type == :all
-      return add_conditions!(options, "mail.mailbox = ? AND mail.trashed = ?", mailbox_type.to_s, false) unless mailbox_type == @user.mailbox_types[:deleted]
-      return add_conditions!(options, "mail.trashed = ?", true)
+      return add_conditions!(options, "mail_items.mailbox = ? AND mail_items.trashed = ?", mailbox_type.to_s, false) unless mailbox_type == @user.mailbox_types[:deleted]
+      return add_conditions!(options, "mail_items.trashed = ?", true)
     end
 
     def add_conversation_condition!(options, conversation)

data/lib/private_mail.rb

@@ -27,7 +27,7 @@ module PrivateMail
     #   acts_as_messageable :received => :in, :sent => :sent, :deleted => :garbage
     def acts_as_messageable(options = {})
       cattr_accessor :mailbox_types
-      has_many :mail, :order => 'created_at DESC', :dependent => :delete_all
+      has_many :mail_items, :order => 'created_at DESC', :dependent => :delete_all
       
       self.mailbox_types = {
         :received => :inbox,

data/lib/private_mail/version.rb

@@ -1,3 +1,3 @@
 module PrivateMail
-  VERSION = "0.0.1" unless defined? PrivateMail::VERSION
+  VERSION = "0.0.2" unless defined? PrivateMail::VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: private_mail
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2170459640 !ruby/object:Gem::Requirement
+  requirement: &2169805040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2170459640
+  version_requirements: *2169805040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2170459220 !ruby/object:Gem::Requirement
+  requirement: &2169804620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,8 +32,9 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2170459220
-description: ''
+  version_requirements: *2169804620
+description: Enables User models in Rails 3.1+ apps to have simple private messaging
+  capabilites between them.
 email: john@mcdowall.info
 executables: []
 extensions: []
@@ -41,10 +42,10 @@ extra_rdoc_files: []
 files:
 - lib/generators/private_mail/install/install_generator.rb
 - lib/generators/private_mail/install/models/conversation.rb
-- lib/generators/private_mail/install/models/mail.rb
+- lib/generators/private_mail/install/models/mail_item.rb
 - lib/generators/private_mail/install/models/message.rb
 - lib/generators/private_mail/install/templates/create_conversations.rb
-- lib/generators/private_mail/install/templates/create_mail.rb
+- lib/generators/private_mail/install/templates/create_mail_items.rb
 - lib/generators/private_mail/install/templates/create_messages.rb
 - lib/generators/private_mail/install/templates/create_messages_recipients.rb
 - lib/mailbox.rb
@@ -64,7 +65,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1834868077319262402
+      hash: -3700018115756833954
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -76,5 +77,6 @@ rubyforge_project:
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: ''
+summary: This gem provides basic simple private messaging, based on the bondes of
+  acts_as_messageable.
 test_files: []