mailboxer 0.10.3 → 0.11.0

data/spec/models/conversation_spec.rb

@@ -37,6 +37,12 @@ describe Conversation do
     @conversation.recipients.count(@entity2).should==1
   end
 
+  it "should be able to be marked as deleted" do
+    @conversation.move_to_trash(@entity1)
+    @conversation.mark_as_deleted(@entity1)
+    @conversation.should be_is_deleted(@entity1)
+  end
+
   it "should be able to be marked as read" do
     #@conversation.move_to_trash(@entity1)
     @conversation.mark_as_read(@entity1)
@@ -49,6 +55,22 @@ describe Conversation do
     @conversation.should be_is_unread(@entity1)
   end
 
+  it "should be able to add a new participant" do
+    new_user = FactoryGirl.create(:user)
+    @conversation.add_participant(new_user)
+    @conversation.participants.count.should == 3
+    @conversation.participants.should include(new_user, @entity1, @entity2)
+    @conversation.receipts_for(new_user).count.should == @conversation.receipts_for(@entity1).count
+  end
+
+  it "should deliver messages to new participants" do
+    new_user = FactoryGirl.create(:user)
+    @conversation.add_participant(new_user)
+    expect{
+      receipt5 = @entity1.reply_to_all(@receipt4,"Reply body 4")
+    }.to change{ @conversation.receipts_for(new_user).count }.by 1
+  end
+
   describe "scopes" do
     let(:participant) { FactoryGirl.create(:user) }
     let!(:inbox_conversation) { @entity1.send_message(participant, "Body", "Subject").notification.conversation }

data/spec/models/mailbox_spec.rb

@@ -103,6 +103,42 @@ describe Mailbox do
     @entity2.mailbox.receipts.trash.count.should==0    
   end
 
+  it "should deleted messages are not shown in inbox" do
+    assert @entity1.mailbox.receipts.inbox
+    @entity1.mailbox.inbox.count.should==2
+    @entity1.mailbox.receipts.inbox[0].should==Receipt.recipient(@entity1).inbox.conversation(@conversation)[0]
+    @entity1.mailbox.receipts.inbox[1].should==Receipt.recipient(@entity1).inbox.conversation(@conversation)[1]
+
+    assert @entity1.mailbox.receipts.inbox.mark_as_deleted
+    @entity1.mailbox.inbox.count.should==0
+  end
+
+  it "should deleted messages are not shown in sentbox" do
+    assert @entity1.mailbox.receipts.inbox
+    @entity1.mailbox.receipts.sentbox.count.should==2
+    @entity1.mailbox.receipts.sentbox[0].should==@receipt1
+    @entity1.mailbox.receipts.sentbox[1].should==@receipt3
+
+    assert @entity1.mailbox.receipts.sentbox.mark_as_deleted
+    @entity1.mailbox.sentbox.count.should==0
+  end
+
+  it "should reply for deleted messages return to inbox" do
+    assert @entity1.mailbox.receipts.inbox
+    @entity1.mailbox.inbox.count.should==2
+    @entity1.mailbox.receipts.inbox[0].should==Receipt.recipient(@entity1).inbox.conversation(@conversation)[0]
+    @entity1.mailbox.receipts.inbox[1].should==Receipt.recipient(@entity1).inbox.conversation(@conversation)[1]
+
+    assert @entity1.mailbox.receipts.inbox.mark_as_deleted
+    @entity1.mailbox.inbox.count.should==0
+
+    @entity2.reply_to_all(@receipt1,"Reply body 1")
+    @entity1.mailbox.inbox.count.should==1
+
+    @entity2.reply_to_all(@receipt3,"Reply body 3")
+    @entity1.mailbox.inbox.count.should==2
+  end
+
   context "STI models" do
     before do
       @sti_entity1 = FactoryGirl.create(:user)

data/spec/models/mailboxer_models_messageable_spec.rb

@@ -304,12 +304,15 @@ describe "Mailboxer::Models::Messageable through User" do
   end
   
   it "should be the same message time as passed" do
-    message_time = 5.days.ago.to_time
+    message_time = 5.days.ago
     receipt = @entity1.send_message(@entity2, "Body", "Subject", nil, nil, message_time)
-    receipt.message.created_at.should eql(message_time)
-    receipt.message.updated_at.should eql(message_time)
-    receipt.message.conversation.created_at.should eql(message_time)
-    receipt.message.conversation.updated_at.should eql(message_time)
+    # We're going to compare the string representation, because ActiveSupport::TimeWithZone
+    # has microsecond precision in ruby, but some databases don't support this level of precision.
+    expected = message_time.utc.to_s
+    receipt.message.created_at.utc.to_s.should == expected
+    receipt.message.updated_at.utc.to_s.should == expected
+    receipt.message.conversation.created_at.utc.to_s.should == expected
+    receipt.message.conversation.updated_at.utc.to_s.should == expected
   end
 
 end

data/spec/models/message_spec.rb

@@ -20,5 +20,11 @@ describe Message do
   	@receipt3.notification.recipients.count.should==2
   	@receipt4.notification.recipients.count.should==2      
   end
+
+  it "should be able to be marked as deleted" do
+    @receipt1.deleted.should==false
+    @message1.mark_as_deleted @entity1
+    @message1.is_deleted?(@entity1).should==true
+  end
     
 end

data/spec/models/receipt_spec.rb

@@ -28,7 +28,19 @@ describe Receipt do
     @mail1.mark_as_read
     @mail1.is_read.should==true    
   end
-  
+
+  it "should be able to be marked as deleted" do
+    @mail1.deleted.should==false
+    @mail1.mark_as_deleted
+    @mail1.deleted.should==true
+  end
+
+  it "should be able to be marked as not deleted" do
+    @mail1.deleted=true
+    @mail1.mark_as_not_deleted
+    @mail1.deleted.should==false
+  end
+
   context "STI models" do
     before do
       @entity3 = FactoryGirl.create(:user)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailboxer
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Eduardo Casanova Cuesta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreigner
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !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: '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
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.9
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -137,6 +151,7 @@ files:
 - .rspec
 - .travis.yml
 - .yardopts
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -162,6 +177,10 @@ files:
 - 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
+- gemfiles/rails3.2.gemfile
+- gemfiles/rails4.0.gemfile
 - lib/generators/mailboxer/install_generator.rb
 - lib/generators/mailboxer/templates/initializer.rb
 - lib/generators/mailboxer/views_generator.rb
@@ -236,7 +255,8 @@ files:
 - spec/spec_helper.rb
 - spec/testfile.txt
 homepage: https://github.com/ging/mailboxer
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -254,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Messaging system for rails apps.