acts-as-messageable 0.4.3 → 0.4.4

data/Gemfile

@@ -6,7 +6,7 @@ gem "ancestry", "~> 1.2.4"
 gem "railties", ">= 3.0.0"
 
 group :development do
-  gem "rspec", "~> 2.6.0"
+  gem "rspec", "~> 2.7.0"
   gem "jeweler", "~> 1.6.0"
   gem "sqlite3-ruby"
 end

data/README.md

@@ -11,10 +11,15 @@ Usage
 
 To use it, add it to your Gemfile:
 
+**Rails 3**
 ```ruby
 gem 'acts-as-messageable'
 ```
 
+**Rails 2**
+Use this [fork](http://github.com/openfirmware/acts-as-messageable)
+Thanks for [@openfirmware](http://github.com/openfirmware)
+
 Post instalation
 ================
 
@@ -61,15 +66,14 @@ Send message
 @bob.send_message(@alice, "Re: Message topic", "Hi alice!")
 ```
 
-With hash
-=========
+## With hash
 
 ```ruby
 @alice.send_message(@bob, { :body => "Hash body", :topic => "Hash topic" })
 ```
 
-Custom required
-===============
+Custom required (validation)
+============================
 
 In User model
 
@@ -77,18 +81,21 @@ In User model
 class User < ActiveRecord::Base
   acts_as_messageable :required => :body
 end
+```
 
+## Normal
+
+```ruby
 @alice.send_message(@bob, { :body => "Hash body" })
 ```
 
-or
+## With hash
 
 ```ruby
 @alice.send_message(@bob, "body")
 ```
 
-Required sequence
-=================
+## Required sequence
 
 ```ruby
 class User < ActiveRecord::Base
@@ -98,61 +105,120 @@ end
 @alice.send_message(@bob, "body", "topic")
 ```
 
+## First topic
+
+```ruby
+class User < ActiveRecord::Base
+  acts_as_messageable :required => [:topic, :body]
+end
+
+@alice.send_message(@bob, "topic", "body")
+```
+
 Conversation
 ============
 
+```ruby
+@message = @alice.send_message(@bob, "Hello bob!", "How are you?")
+@message.reply("Re: Hello bob!", "I'm fine")
+```
+
+**Or in old style**
+
 ```ruby
 @message = @alice.send_message(@bob, "Hello bob!", "How are you?")
 @reply_message = @bob.reply_to(@message, "Re: Hello bob!", "I'm fine!")
-# or @bob.reply_to(@message, :topic => "Re: Hello bob!", :body => "I'm fine!")
+```
+
+## Get conversiation
 
-@message.conversation #=> [@message, @reply_message]
+```ruby
+@message.conversation       #=> [@message, @reply_message]
 @reply_message.conversation #=> [@message, @reply_message]
 ```
 
 Search
-===
+======
+
+### Inbox
+```ruby
+@alice.received_messages
+```
+
+### Outbox
+```ruby
+@alice.sent_messages
+```
+### Inbox + Outbox. All messages connected with __@alice__
+```ruby
+@alice.messages
+```
 
+### Trash
 ```ruby
-@alice.messages # all messages connected with @alice (inbox/outbox)
-@alice.received_messages # @alice inbox
-@alice.sent_messages # @alice outbox
+@alice.deleted_messages
+```
 
-@alice.deleted_messages # all messages connected with @alice (trash)
+## Filters
+==========
 
+```ruby
 @alice.messages.are_from(@bob) # all message form @bob
 @alice.messages.are_to(@bob) # all message to @bob
 @alice.messages.with_id(@id_of_message) # message with id id_of_message
 @alice.messages.readed # all readed @alice  messages
 @alice.messages.unread # all unreaded @alice messages
-
-@alice.received_messages.are_from(@bob) # all messages from bob (inbox)
-@alice.sent_messages.are_to(@bob) # all messages do bob (outbox)
 ```
 
-You can use multiple filters at the same time
+
+**You can use multiple filters at the same time**
 
 ```ruby
 @alice.messages.are_from(@bob).are_to(@alice).readed # all message from @bob to @alice and readed
 @alice.deleted_messages.are_from(@bob) # all deleted messages from @bob
 ```
 
+Read messages
+=============
+
+### Read message
+
+```ruby
+@message.open # open message
+@message.read
+@message.mark_as_read
+```
+
+### Unread message
+
+```ruby
+@message.close # unread message
+@message.mark_as_unread
+```
+
+
 Delete message
 ==============
 
+**__We must know who delete message. That why we use *.process* method to save context__**
+
 ```ruby
 @message = @alice.send_message(@bob, "Topic", "Body")
 
 @alice.messages.process do |message|
-    message.delete
+  message.delete # @alice delete message
 end
 ```
 
-Now we can find message in trash
+Now we can find message in **trash**
 
 ```ruby
 @alice.deleted_messages #=> [@message]
+```
 
+We can delete the message **permanently**
+
+```ruby
 @alice.deleted_messages.process do |message|
   message.delete
 end
@@ -160,6 +226,12 @@ end
 @alice.delete_message #=> []
 ```
 
-Message was permanent delete
+Message has been deleted **permanently**
+
+## Delete message without context
+
+```ruby
+@alice.delete_message(@message) # @alice delete @message
+```
 
 Copyright © 2011 Piotr Niełacny (http://ruby-blog.pl), released under the MIT license

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/acts-as-messageable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "acts-as-messageable"
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Piotr Nielacny"]
-  s.date = "2011-12-04"
+  s.date = "2012-01-04"
   s.email = "piotr.nielacny@gmail.com"
   s.extra_rdoc_files = [
     "README.md"
@@ -35,8 +35,10 @@ Gem::Specification.new do |s|
     "spec/acts-as-messageable_spec.rb",
     "spec/custom-class_spec.rb",
     "spec/custom-required_spec.rb",
+    "spec/inheritance_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/admin.rb",
+    "spec/support/send_message.rb",
     "spec/support/user.rb"
   ]
   s.homepage = "http://github.com/LTe/acts-as-messageable"
@@ -52,7 +54,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<ancestry>, ["~> 1.2.4"])
       s.add_runtime_dependency(%q<railties>, [">= 3.0.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.7.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
     else
@@ -60,7 +62,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_dependency(%q<ancestry>, ["~> 1.2.4"])
       s.add_dependency(%q<railties>, [">= 3.0.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.6.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.7.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     end
@@ -69,7 +71,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, [">= 3.0.0"])
     s.add_dependency(%q<ancestry>, ["~> 1.2.4"])
     s.add_dependency(%q<railties>, [">= 3.0.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.6.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.7.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
   end

data/lib/acts-as-messageable/message.rb

@@ -21,15 +21,15 @@ module ActsAsMessageable
                     :created_at,
                     :updated_at
 
-    attr_accessor :removed
-    cattr_accessor :required
+    attr_accessor   :removed
+    cattr_accessor  :required
 
 
     # Sample documentation for scope
-    default_scope order(:created_at)
-    scope :are_from,          lambda { |*args| where("sent_messageable_id = :sender AND sent_messageable_type = :sender_type", :sender => args.first, :sender_type => args.first.class.to_s) }
-    scope :are_to,            lambda { |*args| where("received_messageable_id = :receiver AND received_messageable_type = :receiver_type", :receiver => args.first, :receiver_type => args.first.class.to_s) }
-    scope :with_id,           lambda { |*args| where("id = :id", :id => args.first) }
+    default_scope order("created_at desc")
+    scope :are_from,          lambda { |*args| where(:sent_messageable_id => args.first, :sent_messageable_type => args.first.class.name) }
+    scope :are_to,            lambda { |*args| where(:received_messageable_id => args.first, :received_messageable_type => args.first.class.name) }
+    scope :with_id,           lambda { |*args| where(:id => args.first) }
 
     scope :connected_with,    lambda { |*args|  where("(sent_messageable_type = :sent_type and
                                                 sent_messageable_id = :sent_id and
@@ -37,19 +37,18 @@ module ActsAsMessageable
                                                 (received_messageable_type = :received_type and
                                                 received_messageable_id = :received_id and
                                                 recipient_delete = :r_delete and recipient_permanent_delete = :r_perm_delete)",
-                                                :sent_type      => args.first.class.name,
+                                                :sent_type      => args.first.class.resolve_active_record_ancestor.to_s,
                                                 :sent_id        => args.first.id,
-                                                :received_type  => args.first.class.name,
+                                                :received_type  => args.first.class.resolve_active_record_ancestor.to_s,
                                                 :received_id    => args.first.id,
                                                 :r_delete       => args.last,
                                                 :s_delete       => args.last,
                                                 :r_perm_delete  => false,
                                                 :s_perm_delete  => false)
                                      }
-    scope :readed,            lambda { where("opened = :opened", :opened => true)  }
-    scope :unread,            lambda { where("opened = :opened", :opened => false) }
-    scope :deleted,           lambda { where("recipient_delete = :r_delete AND sender_delete = :s_delete",
-                                              :r_delete => true, :s_delete => true)}
+    scope :readed,            lambda { where(:opened => true)  }
+    scope :unread,            lambda { where(:opened => false) }
+    scope :deleted,           lambda { where(:recipient_delete => true, :sender_delete => true) }
 
     def open?
       self.opened?
@@ -79,6 +78,10 @@ module ActsAsMessageable
       received_messageable
     end
 
+    def participant?(user)
+      (to == user) || (from == user)
+    end
+
     def conversation
       root.subtree
     end
@@ -86,6 +89,9 @@ module ActsAsMessageable
     def delete
       self.removed = true
     end
-
+    
+    def reply(*args)
+      to.reply_to(self, *args)
+    end
   end
 end

data/lib/acts-as-messageable/model.rb

@@ -35,6 +35,10 @@ module ActsAsMessageable
         include ActsAsMessageable::Model::InstanceMethods
     end
 
+    def resolve_active_record_ancestor
+      self.reflect_on_association(:received_messages_relation).active_record
+    end
+
     end
 
     module InstanceMethods
@@ -82,7 +86,7 @@ module ActsAsMessageable
             message_attributes = args.first
         end
 
-        message = self.class.messages_class_name.create! message_attributes
+        message = self.class.messages_class_name.create message_attributes
 
         self.sent_messages_relation << message
         to.received_messages_relation << message
@@ -91,11 +95,15 @@ module ActsAsMessageable
       end
 
       def reply_to(message, *args)
-        reply_message = send_message(message.from, *args)
-        reply_message.parent = message
-        reply_message.save
+        current_user = self
+        
+        if message.participant?(current_user)          
+          reply_message = send_message(message.from, *args)
+          reply_message.parent = message
+          reply_message.save
 
-        reply_message
+          reply_message
+        end
       end
 
       def delete_message(message)

data/spec/acts-as-messageable_spec.rb

@@ -4,10 +4,6 @@ class User < ActiveRecord::Base
   acts_as_messageable
 end
 
-def send_message(from=@bob, to=@alice, topic="Topic", body="Body")
-  from.send_message(to, topic, body)
-end
-
 describe "ActsAsMessageable" do
 
   before(:all) do
@@ -15,8 +11,8 @@ describe "ActsAsMessageable" do
   end
 
   describe "prepare for specs" do
-    it "should be two users in database" do
-      User.count.should == 2
+    it "should be 4 users in database" do
+      User.count.should == 4
     end
   end
 
@@ -47,6 +43,30 @@ describe "ActsAsMessageable" do
       @alice.messages.readed.count.should == 1
     end
   end
+  
+  describe "reply to messages" do
+    it "pat should not be able to reply to a message from bob to alice" do
+      @message = send_message
+      @reply_message =  @pat.reply_to(@message, "Re: Topic", "Body")
+      @reply_message.should be_nil
+    end
+    
+    it "alice should be able to reply to a message from bob to alice" do
+      @message = send_message
+      @reply_message =  @alice.reply_to(@message, "Re: Topic", "Body")
+      @reply_message.should_not be_nil
+      @bob.messages.are_from(@alice).count.should == 1      
+      @alice.sent_messages.are_to(@bob).count.should == 1      
+    end    
+
+    it "alice should be able to reply to a message using the message object" do
+      @message = send_message
+      @reply_message =  @message.reply("Re: Topic", "Body")
+      @reply_message.should_not be_nil      
+      @bob.messages.are_from(@alice).count.should == 1      
+      @alice.sent_messages.are_to(@bob).count.should == 1      
+    end
+  end
 
   describe "delete messages" do
     it "bob should have one deleted message from alice" do
@@ -119,8 +139,8 @@ describe "ActsAsMessageable" do
       @reply_message =  @alice.reply_to(@message, "Re: Topic", "Body")
 
       @reply_message.conversation.size.should == 2
-      @reply_message.conversation.first.topic.should == "Topic"
-      @reply_message.conversation.last.topic.should == "Re: Topic"
+      @reply_message.conversation.last.topic.should == "Topic"
+      @reply_message.conversation.first.topic.should == "Re: Topic"
     end
 
     it "bob send message to alice, alice answer, and bob answer for alice answer" do
@@ -132,8 +152,8 @@ describe "ActsAsMessageable" do
         m.conversation.size.should == 3
       end
 
-      @message.conversation.last.should == @reply_reply_message
-      @reply_reply_message.conversation.last.should == @reply_reply_message
+      @message.conversation.first.should == @reply_reply_message
+      @reply_reply_message.conversation.first.should == @reply_reply_message
     end
   end
 
@@ -148,7 +168,7 @@ describe "ActsAsMessageable" do
   it "messages should return in right order :created_at" do
     @message = send_message
     @message = send_message(@bob, @alice, "Example", "Example Body")
-    @alice.messages.first.body.should == "Body"
+    @alice.messages.last.body.should == "Body"
   end
 
   it "received_messages should return ActiveRecord::Relation" do

data/spec/inheritance_spec.rb

@@ -0,0 +1,23 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "inheritance models" do
+	it "men send message to alice" do
+    send_message(@men, @alice)
+    @men.sent_messages.size.should be_equal(1)
+    @alice.received_messages.size.should be_equal(1)
+  end
+
+  it "messages method should receive all messages connected with user" do
+    send_message(@men, @alice)
+    @men.messages.size.should be_equal(1)
+  end
+
+  it "men send message and receive from alice" do
+    send_message(@men, @alice)
+    send_message(@alice, @men)
+
+    @men.messages.size.should be_equal(2)
+    @men.sent_messages.size.should be_equal(1)
+    @men.received_messages.size.should be_equal(1)
+  end
+end

data/spec/spec_helper.rb

@@ -12,9 +12,11 @@ RSpec.configure do |config|
     ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
     create_database
 
-    @alice = User.create :email   => "alice@example.com"
-    @bob   = User.create :email   => "bob@example.com"
-    @admin = Admin.create :email  => "admin@example.com"
+    @alice = User.create 	:email  => "alice@example.com"
+    @bob   = User.create 	:email  => "bob@example.com"
+    @pat   = User.create 	:email  => "pat@example.com"
+    @admin = Admin.create :email 	=> "admin@example.com"
+    @men   = Men.create 	:email  => "men@example.com"
   end
 
   config.after(:all) do

data/spec/support/send_message.rb

@@ -0,0 +1,3 @@
+def send_message(from=@bob, to=@alice, topic="Topic", body="Body")
+  from.send_message(to, topic, body)
+end

data/spec/support/user.rb

@@ -2,3 +2,5 @@ class User < ActiveRecord::Base
   acts_as_messageable
 end
 
+class Men < User
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-messageable
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-04 00:00:00.000000000Z
+date: 2012-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70249729576820 !ruby/object:Gem::Requirement
+  requirement: &8607820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70249729576820
+  version_requirements: *8607820
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70249729576140 !ruby/object:Gem::Requirement
+  requirement: &8606800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70249729576140
+  version_requirements: *8606800
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &70249729575440 !ruby/object:Gem::Requirement
+  requirement: &8605940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70249729575440
+  version_requirements: *8605940
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70249729574540 !ruby/object:Gem::Requirement
+  requirement: &8604920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,21 +54,21 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70249729574540
+  version_requirements: *8604920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70249729573820 !ruby/object:Gem::Requirement
+  requirement: &8604220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70249729573820
+  version_requirements: *8604220
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70249729572960 !ruby/object:Gem::Requirement
+  requirement: &8619760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *70249729572960
+  version_requirements: *8619760
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70249729572120 !ruby/object:Gem::Requirement
+  requirement: &8618740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70249729572120
+  version_requirements: *8618740
 description: 
 email: piotr.nielacny@gmail.com
 executables: []
@@ -115,8 +115,10 @@ files:
 - spec/acts-as-messageable_spec.rb
 - spec/custom-class_spec.rb
 - spec/custom-required_spec.rb
+- spec/inheritance_spec.rb
 - spec/spec_helper.rb
 - spec/support/admin.rb
+- spec/support/send_message.rb
 - spec/support/user.rb
 homepage: http://github.com/LTe/acts-as-messageable
 licenses: []
@@ -132,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4338229032027904725
+      hash: -2807447506494176780
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: