mailboxer 0.11.0 → 0.12.0.rc1

data/spec/models/receipt_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Receipt do
+describe Mailboxer::Receipt do
   
   before do
     @entity1 = FactoryGirl.create(:user)

data/spec/spec_helper.rb

@@ -25,6 +25,9 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 require 'factory_girl'
 Dir["#{File.dirname(__FILE__)}/factories/*.rb"].each {|f| require f}
 
+# Shoulda Matchers
+require 'shoulda/matchers'
+
 RSpec.configure do |config|
   # Remove this line if you don't want RSpec's should and should_not
   # methods or matchers

metadata

@@ -1,139 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: mailboxer
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0.rc1
 platform: ruby
 authors:
 - Eduardo Casanova Cuesta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2014-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreigner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.8
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.1
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: shoulda-matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: forgery
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.9
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Rails engine that allows any model to act as messageable, adding the
@@ -147,47 +161,48 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/mailers/message_mailer.rb
-- app/mailers/notification_mailer.rb
-- app/models/conversation.rb
-- app/models/mailbox.rb
-- app/models/message.rb
-- app/models/notification.rb
-- app/models/receipt.rb
+- app/mailers/mailboxer/base_mailer.rb
+- app/mailers/mailboxer/message_mailer.rb
+- app/mailers/mailboxer/notification_mailer.rb
+- app/models/mailboxer/conversation.rb
+- app/models/mailboxer/conversation/opt_out.rb
+- app/models/mailboxer/mailbox.rb
+- app/models/mailboxer/message.rb
+- app/models/mailboxer/notification.rb
+- app/models/mailboxer/receipt.rb
 - app/uploaders/attachment_uploader.rb
-- app/views/message_mailer/new_message_email.html.erb
-- app/views/message_mailer/new_message_email.text.erb
-- app/views/message_mailer/reply_message_email.html.erb
-- app/views/message_mailer/reply_message_email.text.erb
-- app/views/notification_mailer/new_notification_email.html.erb
-- app/views/notification_mailer/new_notification_email.text.erb
+- app/views/mailboxer/message_mailer/new_message_email.html.erb
+- app/views/mailboxer/message_mailer/new_message_email.text.erb
+- app/views/mailboxer/message_mailer/reply_message_email.html.erb
+- app/views/mailboxer/message_mailer/reply_message_email.text.erb
+- app/views/mailboxer/notification_mailer/new_notification_email.html.erb
+- app/views/mailboxer/notification_mailer/new_notification_email.text.erb
 - config/locales/en.yml
 - db/migrate/20110511145103_create_mailboxer.rb
-- db/migrate/20110719110700_add_notified_object.rb
-- db/migrate/20110912163911_add_notification_code.rb
-- db/migrate/20111204163911_add_attachments.rb
-- db/migrate/20120813110712_rename_receipts_read.rb
-- db/migrate/20130305144212_add_global_notification_support.rb
-- gemfiles/rails3.0.gemfile
-- gemfiles/rails3.1.gemfile
+- db/migrate/20131206080416_add_conversation_optout.rb
 - gemfiles/rails3.2.gemfile
 - gemfiles/rails4.0.gemfile
+- gemfiles/rails4.1.gemfile
 - lib/generators/mailboxer/install_generator.rb
+- lib/generators/mailboxer/namespacing_compatibility_generator.rb
 - lib/generators/mailboxer/templates/initializer.rb
+- lib/generators/mailboxer/templates/mailboxer_namespacing_compatibility.rb
 - lib/generators/mailboxer/views_generator.rb
 - lib/mailboxer.rb
-- lib/mailboxer/concerns/configurable_mailer.rb
+- lib/mailboxer/cleaner.rb
 - lib/mailboxer/engine.rb
+- lib/mailboxer/mail_dispatcher.rb
 - lib/mailboxer/models/messageable.rb
+- lib/mailboxer/version.rb
 - mailboxer.gemspec
 - spec/dummy/.gitignore
 - spec/dummy/Gemfile
@@ -223,11 +238,7 @@ files:
 - spec/dummy/db/migrate/20110306002940_create_ducks.rb
 - spec/dummy/db/migrate/20110306015107_create_cylons.rb
 - spec/dummy/db/migrate/20120305103200_create_mailboxer.rb
-- spec/dummy/db/migrate/20120305103201_add_notified_object.rb
-- spec/dummy/db/migrate/20120305103202_add_notification_code.rb
-- spec/dummy/db/migrate/20120305103203_add_attachments.rb
-- spec/dummy/db/migrate/20120813110712_rename_receipts_read.rb
-- spec/dummy/db/migrate/20130305144212_add_global_notification_support.rb
+- spec/dummy/db/migrate/20131206080416_add_conversation_optout.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -242,7 +253,7 @@ files:
 - spec/factories/user.rb
 - spec/integration/message_and_receipt_spec.rb
 - spec/integration/navigation_spec.rb
-- spec/mailboxer/concerns/configurable_mailer_spec.rb
+- spec/mailboxer/mail_dispatcher_spec.rb
 - spec/mailboxer_spec.rb
 - spec/mailers/message_mailer_spec.rb
 - spec/mailers/notification_mailer_spec.rb
@@ -264,17 +275,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Messaging system for rails apps.

data/app/mailers/notification_mailer.rb

@@ -1,21 +0,0 @@
-class NotificationMailer < ActionMailer::Base
-  default :from => Mailboxer.default_from
-  #Sends and email for indicating a new notification to a receiver.
-  #It calls new_notification_email.
-  def send_email(notification,receiver)
-    new_notification_email(notification,receiver)
-  end
-
-  include ActionView::Helpers::SanitizeHelper
-
-  #Sends an email for indicating a new message for the receiver
-  def new_notification_email(notification,receiver)
-    @notification = notification
-    @receiver = receiver
-    subject = notification.subject.to_s
-    subject = strip_tags(subject) unless subject.html_safe?
-    mail :to => receiver.send(Mailboxer.email_method,notification),
-         :subject => t('mailboxer.notification_mailer.subject', :subject => subject),
-         :template_name => 'new_notification_email'
-  end
-end

data/app/models/conversation.rb

@@ -1,166 +0,0 @@
-class Conversation < ActiveRecord::Base
-  attr_accessible :subject if Mailboxer.protected_attributes?
-
-  has_many :messages, :dependent => :destroy
-  has_many :receipts, :through => :messages
-
-  validates_presence_of :subject
-
-  before_validation :clean
-
-  scope :participant, lambda {|participant|
-    select('DISTINCT conversations.*').
-      where('notifications.type'=> Message.name).
-      order("conversations.updated_at DESC").
-      joins(:receipts).merge(Receipt.recipient(participant))
-  }
-  scope :inbox, lambda {|participant|
-    participant(participant).merge(Receipt.inbox.not_trash.not_deleted)
-  }
-  scope :sentbox, lambda {|participant|
-    participant(participant).merge(Receipt.sentbox.not_trash.not_deleted)
-  }
-  scope :trash, lambda {|participant|
-    participant(participant).merge(Receipt.trash)
-  }
-  scope :unread,  lambda {|participant|
-    participant(participant).merge(Receipt.is_unread)
-  }
-  scope :not_trash,  lambda {|participant|
-    participant(participant).merge(Receipt.not_trash)
-  }
-
-  #Mark the conversation as read for one of the participants
-  def mark_as_read(participant)
-    return if participant.nil?
-    self.receipts_for(participant).mark_as_read
-  end
-
-  #Mark the conversation as unread for one of the participants
-  def mark_as_unread(participant)
-    return if participant.nil?
-    self.receipts_for(participant).mark_as_unread
-  end
-
-  #Move the conversation to the trash for one of the participants
-  def move_to_trash(participant)
-    return if participant.nil?
-    self.receipts_for(participant).move_to_trash
-  end
-
-  #Takes the conversation out of the trash for one of the participants
-  def untrash(participant)
-    return if participant.nil?
-    self.receipts_for(participant).untrash
-  end
-
-  #Mark the conversation as deleted for one of the participants
-  def mark_as_deleted(participant)
-    return if participant.nil?
-    return self.receipts_for(participant).mark_as_deleted
-  end
-
-  #Returns an array of participants
-  def recipients
-    if self.last_message
-      recps = self.last_message.recipients
-      recps = recps.is_a?(Array) ? recps : [recps]
-      recps
-    else
-      []
-    end
-  end
-
-  #Returns an array of participants
-  def participants
-    recipients
-  end
-
-  #Originator of the conversation.
-  def originator
-    @originator ||= self.original_message.sender
-  end
-
-  #First message of the conversation.
-  def original_message
-    @original_message ||= self.messages.order('created_at').first
-  end
-
-  #Sender of the last message.
-  def last_sender
-    @last_sender ||= self.last_message.sender
-  end
-
-  #Last message in the conversation.
-  def last_message
-    @last_message ||= self.messages.order('created_at DESC').first
-  end
-
-  #Returns the receipts of the conversation for one participants
-  def receipts_for(participant)
-    Receipt.conversation(self).recipient(participant)
-  end
-
-  #Returns the number of messages of the conversation
-  def count_messages
-    Message.conversation(self).count
-  end
-
-  #Returns true if the messageable is a participant of the conversation
-  def is_participant?(participant)
-    return false if participant.nil?
-    self.receipts_for(participant).count != 0
-  end
-
-	#Adds a new participant to the conversation
-	def add_participant(participant)
-		messages = self.messages
-		messages.each do |message|
-		  receipt = Receipt.new
-		  receipt.notification = message
-		  receipt.is_read = false
-		  receipt.receiver = participant
-		  receipt.mailbox_type = 'inbox'
-		  receipt.updated_at = message.updated_at
-		  receipt.created_at = message.created_at
-		  receipt.save
-		end
-	end
-
-  #Returns true if the participant has at least one trashed message of the conversation
-  def is_trashed?(participant)
-    return false if participant.nil?
-    self.receipts_for(participant).trash.count != 0
-  end
-
-  #Returns true if the participant has deleted the conversation
-  def is_deleted?(participant)
-    return false if participant.nil?
-    return self.receipts_for(participant).trash.count==0
-  end
-
-  #Returns true if the participant has trashed all the messages of the conversation
-  def is_completely_trashed?(participant)
-    return false if participant.nil?
-    self.receipts_for(participant).trash.count == self.receipts_for(participant).count
-  end
-
-  def is_read?(participant)
-    !self.is_unread?(participant)
-  end
-
-  #Returns true if the participant has at least one unread message of the conversation
-  def is_unread?(participant)
-    return false if participant.nil?
-    self.receipts_for(participant).not_trash.is_unread.count != 0
-  end
-
-  protected
-
-  include ActionView::Helpers::SanitizeHelper
-
-  #Use the default sanitize to clean the conversation subject
-  def clean
-    self.subject = sanitize self.subject
-  end
-end