mailboxer 0.1.4 → 0.2.0

data/.gitignore

@@ -4,6 +4,7 @@ pkg/
 spec/dummy/db/*.sqlite3
 spec/dummy/log/*.log
 spec/dummy/tmp/
+spec/dummy/.project
 **.tmp_*
 Gemfile.lock
 .idea

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/app/models/conversation.rb

@@ -87,7 +87,7 @@ class Conversation < ActiveRecord::Base
 
   #Returns the receipts of the conversation for one participants
 	def receipts_for(participant)
-		return Receipt.conversation(self).receiver(participant)
+	  return Receipt.conversation(self).receiver(participant)
 	end
 
   #Returns the number of messages of the conversation

data/app/models/message.rb

@@ -3,7 +3,7 @@ class Message < Notification
   belongs_to :conversation, :validate => true, :autosave => true
   validates_presence_of :sender
 
-  class_inheritable_accessor :on_deliver_callback
+  class_attribute :on_deliver_callback
   protected :on_deliver_callback
   scope :conversation, lambda { |conversation|
     where(:conversation_id => conversation.id)

data/app/models/receipt.rb

@@ -1,93 +1,109 @@
 class Receipt < ActiveRecord::Base
-	belongs_to :notification, :validate => true, :autosave => true
-	belongs_to :receiver, :polymorphic => :true
-	belongs_to :message, :foreign_key => "notification_id" 
-	
-	validates_presence_of :receiver
+  belongs_to :notification, :validate => true, :autosave => true
+  belongs_to :receiver, :polymorphic => :true
+  belongs_to :message, :foreign_key => "notification_id"
 
-	scope :receiver, lambda { |receiver|
+  validates_presence_of :receiver
+
+  scope :receiver, lambda { |receiver|
     where(:receiver_id => receiver.id,:receiver_type => receiver.class.to_s)
   }
   #Notifications Scope checks type to be nil, not Notification because of STI behaviour
   #with the primary class (no type is saved)
   scope :notifications_receipts, joins(:notification).where('notifications.type' => nil)
   scope :messages_receipts, joins(:notification).where('notifications.type' => Message.to_s)
-	scope :notification, lambda { |notification|
+  scope :notification, lambda { |notification|
     where(:notification_id => notification.id)
   }
-	scope :conversation, lambda { |conversation|
-    joins(:notification).where('notifications.conversation_id' => conversation.id)
+  scope :conversation, lambda { |conversation|
+    joins(:message).where('notifications.conversation_id' => conversation.id)
   }
-	scope :sentbox, where(:mailbox_type => "sentbox")
-	scope :inbox, where(:mailbox_type => "inbox")
-	scope :trash, where(:trashed => true)
-	scope :not_trash, where(:trashed => false)
-	scope :read, where(:read => true)
-	scope :unread, where(:read => false)
-
-	after_validation :remove_duplicate_errors
-	class << self
-	  
+  scope :sentbox, where(:mailbox_type => "sentbox")
+  scope :inbox, where(:mailbox_type => "inbox")
+  scope :trash, where(:trashed => true)
+  scope :not_trash, where(:trashed => false)
+  scope :read, where(:read => true)
+  scope :unread, where(:read => false)
+
+  after_validation :remove_duplicate_errors
+  class << self
     #Marks all the receipts from the relation as read
-		def mark_as_read(options={})
-			where(options).update_all(:read => true)
-		end
+    def mark_as_read(options={})
+      update_receipts({:read => true}, options)
+    end
 
     #Marks all the receipts from the relation as unread
-		def mark_as_unread(options={})
-			where(options).update_all(:read => false)
-		end
+    def mark_as_unread(options={})
+      update_receipts({:read => false}, options)
+    end
 
     #Marks all the receipts from the relation as trashed
-		def move_to_trash(options={})
-			where(options).update_all(:trashed => true)
-		end
+    def move_to_trash(options={})
+      update_receipts({:trashed => true}, options)
+    end
 
     #Marks all the receipts from the relation as not trashed
-		def untrash(options={})
-			where(options).update_all(:trashed => false)
-		end
+    def untrash(options={})
+      update_receipts({:trashed => false}, options)
+    end
 
     #Moves all the receipts from the relation to inbox
-		def move_to_inbox(options={})
-			where(options).update_all(:mailbox_type => :inbox, :trashed => false)
-		end
+    def move_to_inbox(options={})
+      update_receipts({:mailbox_type => :inbox, :trashed => false}, options)
+    end
 
     #Moves all the receipts from the relation to sentbox
-		def move_to_sentbox(options={})
-			where(options).update_all(:mailbox_type => :sentbox, :trashed => false)
-		end
-	end
+    def move_to_sentbox(options={})
+      update_receipts({:mailbox_type => :sentbox, :trashed => false}, options)
+    end
+
+    #This methods helps to do a update_all with table joins, not currently supported by rails.
+    #Acording to the github ticket https://github.com/rails/rails/issues/522 it should be
+    #supported with 3.2. 
+    def update_receipts(updates,options={})
+      ids = Array.new
+      where(options).each do |rcp|
+        ids << rcp.id
+      end
+      temp_ids = ids.clone
+      condition = "id = ? "
+      temp_ids.drop(1).each do
+        condition << "OR id = ? "
+      end
+      conditions = [condition].concat(ids)
+      Receipt.except(:where).except(:joins).where(conditions).update_all(updates)
+    end
+  end
 
   #Marks the receipt as read
-	def mark_as_read
-		update_attributes(:read => true)
-	end
+  def mark_as_read
+    update_attributes(:read => true)
+  end
 
   #Marks the receipt as unread
-	def mark_as_unread
-		update_attributes(:read => false)
-	end
+  def mark_as_unread
+    update_attributes(:read => false)
+  end
 
   #Marks the receipt as trashed
-	def move_to_trash
-		update_attributes(:trashed => true)
-	end
+  def move_to_trash
+    update_attributes(:trashed => true)
+  end
 
   #Marks the receipt as not trashed
-	def untrash
-		update_attributes(:trashed => false)
-	end
+  def untrash
+    update_attributes(:trashed => false)
+  end
 
   #Moves the receipt to inbox
-	def move_to_inbox
-		update_attributes(:mailbox_type => :inbox, :trashed => false)
-	end
+  def move_to_inbox
+    update_attributes(:mailbox_type => :inbox, :trashed => false)
+  end
 
   #Moves the receipt to sentbox
-	def move_to_sentbox
-		update_attributes(:mailbox_type => :sentbox, :trashed => false)
-	end
+  def move_to_sentbox
+    update_attributes(:mailbox_type => :sentbox, :trashed => false)
+  end
 
   #Returns the conversation associated to the receipt if the notification is a Message
   def conversation
@@ -95,16 +111,16 @@ class Receipt < ActiveRecord::Base
     return nil
   end
 
-	protected
+  protected
 
   #Removes the duplicate error about not present subject from Conversation if it has been already
   #raised by Message
-	def remove_duplicate_errors
-		if self.errors["notification.conversation.subject"].present? and self.errors["notification.subject"].present?
-			self.errors["notification.conversation.subject"].each do |msg|
-				self.errors["notification.conversation.subject"].delete(msg)
-			end
-		end
-	end
+  def remove_duplicate_errors
+    if self.errors["notification.conversation.subject"].present? and self.errors["notification.subject"].present?
+      self.errors["notification.conversation.subject"].each do |msg|
+        self.errors["notification.conversation.subject"].delete(msg)
+      end
+    end
+  end
 
 end

data/lib/mailboxer/models/messageable.rb

@@ -20,21 +20,21 @@ module Mailboxer
         #Returning any kind of indentification you want for the model
         def name
           super
-        rescue
+        rescue NameError
           return "You should add method :name in your Messageable model"
           end
 
         #Returning the email address of the model
         def email
           super
-        rescue
+        rescue NameError
           return "define_email@on_your.model"
           end
 
         #Returning whether an email should be sent for this object (Message or Notification)
         def should_email?(object)
           super
-        rescue
+        rescue NameError
           return true
           end
 

data/mailboxer.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name = "mailboxer"
-	s.version = "0.1.4"
+	s.version = "0.2.0"
 	s.authors = ["Eduardo Casanova Cuesta"]
 	s.summary = "Messaging system for rails apps."
 	s.description = "A Rails engine that allows any model to act as messageable, permitting it interchange messages with any other messageable model." +  
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
 	# Development Gem dependencies
 	#
-	s.add_development_dependency('rails', '~> 3.0.5')
+  s.add_runtime_dependency('rails', '3.1.0.rc4')
 	# Testing database
 	s.add_development_dependency('sqlite3-ruby')
 	# Debugging
@@ -24,13 +24,12 @@ Gem::Specification.new do |s|
 		s.add_development_dependency('ruby-debug', '~> 0.10.3')
 	end
 	# Specs
-	s.add_development_dependency('rspec-rails', '~> 2.5.0')
+	s.add_development_dependency('rspec-rails', '~> 2.6.1')
 	# Fixtures
 	s.add_development_dependency('factory_girl', '~> 1.3.2')
 	# Population
 	s.add_development_dependency('forgery', '~> 0.3.6')
 	# Integration testing
 	s.add_development_dependency('capybara', '~> 0.3.9')
-
 end
 

data/spec/models/conversation_spec.rb

@@ -37,4 +37,13 @@ describe Conversation do
     @conversation.recipients.count(@entity2).should==1
   end
   
+    it "should be able to be marked as read" do
+    @conversation.move_to_trash(@entity1)
+  end
+  
+  it "should be able to be marked as unread" do
+    @conversation.move_to_trash(@entity1)
+    @conversation.untrash(@entity1)
+  end
+  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mailboxer
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Eduardo Casanova Cuesta
@@ -15,10 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 +02:00
+date: 2011-06-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,25 +33,27 @@ dependencies:
         version: 0.9.1
   type: :runtime
   name: foreigner
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 15424109
         segments: 
         - 3
+        - 1
         - 0
-        - 5
-        version: 3.0.5
-  type: :development
+        - rc
+        - 4
+        version: 3.1.0.rc4
+  type: :runtime
   name: rails
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,9 +65,9 @@ dependencies:
         version: "0"
   type: :development
   name: sqlite3-ruby
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,25 +81,25 @@ dependencies:
         version: 0.10.3
   type: :development
   name: ruby-debug
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 21
         segments: 
         - 2
-        - 5
-        - 0
-        version: 2.5.0
+        - 6
+        - 1
+        version: 2.6.1
   type: :development
   name: rspec-rails
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -110,9 +113,9 @@ dependencies:
         version: 1.3.2
   type: :development
   name: factory_girl
-  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -126,9 +129,9 @@ dependencies:
         version: 0.3.6
   type: :development
   name: forgery
-  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -142,7 +145,6 @@ dependencies:
         version: 0.3.9
   type: :development
   name: capybara
-  prerelease: false
   version_requirements: *id008
 description: A Rails engine that allows any model to act as messageable, permitting it interchange messages with any other messageable model.It also supports sending system notifications to messageable models.
 email: ecasanovac@gmail.com
@@ -181,7 +183,6 @@ files:
 - lib/mailboxer/exceptions.rb
 - lib/mailboxer/models/messageable.rb
 - mailboxer.gemspec
-- spec/dummy/.project
 - spec/dummy/Gemfile
 - spec/dummy/Gemfile.lock
 - spec/dummy/Rakefile
@@ -270,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Messaging system for rails apps.