acts-as-messageable 0.2.1 → 0.3.0

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - rbx
+  - ree
+  - jruby

data/Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 
 gem "activerecord", "~> 3.0.0"
+gem "ancestry", "~> 1.2.4"
 
 group :development do
   gem "rspec", "~> 2.3.0"

data/README.rdoc

@@ -2,55 +2,88 @@
 = ActsAsMessageable
 The Acts As Messageable allows communication between the models.
 
+http://travis-ci.org/LTe/acts-as-messageable.png
+
+
 == Usage
 To use it, add it to your Gemfile:
 
-    gem 'acts-as-messageable'
+  gem 'acts-as-messageable'
 
 == Post instalation
 
-    rails g acts-as-messageable:migration [table_name] # default 'messages'
-    rake db:migrate
+  rails g acts-as-messageable:migration table_name # default 'messages'
+  rake db:migrate
 
 == Usage
 
-    class User < ActiveRecord::Base
-        acts_as_messageable :table_name => "table_with_messages", # default 'messages'
-                            :required   => :body                  # default [:topic, :body]
+  class User < ActiveRecord::Base
+    acts_as_messageable :table_name => "table_with_messages", # default 'messages'
+                        :required   => :body                  # default [:topic, :body]
     end
 
 == Send message
 
-    @alice = User.first
-    @bob   = User.last
+  @alice = User.first
+  @bob   = User.last
 
-    @alice.send_message(@bob, "Message topic", "Hi bob!")
-    @bob.send_message(@alice, "Re: Message topic", "Hi alice!")
+  @alice.send_message(@bob, "Message topic", "Hi bob!")
+  @bob.send_message(@alice, "Re: Message topic", "Hi alice!")
 
-== New API
+=== With hash
+
+  @alice.send_message(@bob, { :body => "Hash body", :topic => "Hash topic" })
+
+=== Custom required
+
+In User model
+  class User < ActiveRecord::Base
+    acts_as_messageable :required => :body
+  end
+
+  @alice.send_message(@bob, { :body => "Hash body" })
+or
+  @alice.send_message(@bob, "body")
+
+==== Required sequence
 
-    @alice.messages -- all messages connected with @alice (inbox/outbox)
-    @alice.received_messages -- @alice inbox
-    @alice.sent_messages -- @alice outbox
 
-    @alice.deleted_messages -- all messages connected with @alice (trash)
+  class User < ActiveRecord::Base
+    acts_as_messageable :required => [:body, :topic]
+  end
 
-    @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.unaded -- all unreaded @alice messages
+  @alice.send_message(@bob, "body", "topic")
 
-    You can use multiple filters at the same time
+== Conversation
+  @message = @alice.send_message(@bob, "Hello bob!", "How are you?")
+  @reply_message = @bob.reply_to(@message, "Re: Hello bob!", "I'm fine!")
 
-    @alice.messages.are_from(@bob).are_to(@alice).readed -- all message from @bob to @alice and readed
-    @alice.deleted_message.are_from(@bob) -- all deleted messages from @bob
+  @message.conversation #=> [@message, @reply_message]
+  @reply_message.conversation #=> [@message, @reply_message]
+
+== New API
+  @alice.messages # all messages connected with @alice (inbox/outbox)
+  @alice.received_messages # @alice inbox
+  @alice.sent_messages # @alice outbox
+
+  @alice.deleted_messages # all messages connected with @alice (trash)
+
+  @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.unaded # all unreaded @alice messages
+
+You can use multiple filters at the same time
+
+  @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
 
 === Delete message
 
-    @alice.messages.process do |message|
-        message.delete
-    end
+  @alice.messages.process do |message|
+      message.delete
+  end
 
 
 Copyright © 2011 Piotr Niełacny (http://ruby-blog.pl), released under the MIT license

data/Rakefile

@@ -16,7 +16,7 @@ Jeweler::Tasks.new do |gem|
   gem.name = "acts-as-messageable"
   gem.email = "piotr.nielacny@gmail.com"
   gem.summary = "Make user messageable!;-)"
-  gem.homepage = "http://github.com/LTe/acts_as_messageable"
+  gem.homepage = "http://github.com/LTe/acts-as-messageable"
   gem.authors = ["Piotr Nielacny"]
   # dependencies defined in Gemfile
 end

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/acts-as-messageable.gemspec

@@ -5,16 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts-as-messageable}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Piotr Nielacny"]
-  s.date = %q{2011-05-05}
+  s.date = %q{2011-05-31}
   s.email = %q{piotr.nielacny@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
+    ".travis.yml",
     "Gemfile",
     "MIT-LICENSE",
     "README.rdoc",
@@ -32,7 +33,7 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/support/user.rb"
   ]
-  s.homepage = %q{http://github.com/LTe/acts_as_messageable}
+  s.homepage = %q{http://github.com/LTe/acts-as-messageable}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.6.2}
   s.summary = %q{Make user messageable!;-)}
@@ -42,6 +43,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.0"])
+      s.add_runtime_dependency(%q<ancestry>, ["~> 1.2.4"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
@@ -49,6 +51,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
+      s.add_dependency(%q<ancestry>, ["~> 1.2.4"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
@@ -57,6 +60,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
+    s.add_dependency(%q<ancestry>, ["~> 1.2.4"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.0"])

data/lib/acts-as-messageable.rb

@@ -1,6 +1,6 @@
 require "active_record"
-require 'acts-as-messageable/acts-as-messageable'
 require 'acts-as-messageable/message'
+require 'acts-as-messageable/acts-as-messageable'
 require 'acts-as-messageable/relation'
 
 if defined?(ActiveRecord::Base)

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

@@ -9,7 +9,6 @@ module ActsAsMessageable
       # Method make ActiveRecord::Base object messageable
       # @param [Symbol] :table_name - table name for messages
       def acts_as_messageable(options = {})
-      class_eval do
         has_many  :received_messages, 
                   :as => :received_messageable, 
                   :class_name => "ActsAsMessageable::Message", 
@@ -18,15 +17,13 @@ module ActsAsMessageable
                   :as => :sent_messageable,
                   :class_name => "ActsAsMessageable::Message", 
                   :dependent => :nullify
-      end
-      
-      table_name = %q{set_table_name "#{options[:table_name] || "messages"}"}
-      ActsAsMessageable::Message.class_eval(table_name)
 
-      validation = %q{validates_presence_of options[:required] || [:topic ,:body]}
-      ActsAsMessageable::Message.class_eval(validation)
 
-      include ActsAsMessageable::Model::InstanceMethods
+        ActsAsMessageable::Message.set_table_name(options[:table_name] || "messages")
+        ActsAsMessageable::Message.validates_presence_of(options[:required] || [:topic ,:body])
+        ActsAsMessageable::Message.required = options[:required] || [:topic, :body]
+
+        include ActsAsMessageable::Model::InstanceMethods
     end
 
     end
@@ -51,11 +48,31 @@ module ActsAsMessageable
       # @param [String] body
       #
       # @return [ActsAsMessageable::Message] the message object
-      def send_message(to, topic, body)
-        @message = ActsAsMessageable::Message.create!(:topic => topic, :body => body)
+      def send_message(to, *args)
+        case args.first
+          when String
+            message_attributes = {}
+            ActsAsMessageable::Message.required.each_with_index do |attribute, index|
+              message_attributes[attribute] = args[index]
+            end
+          when Hash
+            message_attributes = args.first
+        end
+
+        message = ActsAsMessageable::Message.create! message_attributes
+
+        self.sent_messages << message
+        to.received_messages << message
+
+        message
+      end
+
+      def reply_to(message, topic, body)
+        reply_message = send_message(self, topic, body)
+        reply_message.parent = message
+        reply_message.save
 
-        self.sent_messages << @message
-        to.received_messages << @message
+        reply_message
       end
 
       def delete_message(message)

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

@@ -1,5 +1,9 @@
+require 'ancestry'
+
 module ActsAsMessageable
   class Message < ::ActiveRecord::Base
+    has_ancestry
+
     belongs_to :received_messageable, :polymorphic => true
     belongs_to :sent_messageable,     :polymorphic => true
 
@@ -13,7 +17,9 @@ module ActsAsMessageable
                     :recipient_delete,
                     :sender_delete
 
-    attr_accessor :context, :removed
+    attr_accessor :removed
+    cattr_accessor :required
+
 
     # Sample documentation for scope
     scope :are_from,          lambda { |*args| where("sent_messageable_id = :sender", :sender => args.first) }
@@ -66,6 +72,10 @@ module ActsAsMessageable
       received_messageable
     end
 
+    def conversation
+      root.subtree
+    end
+
     def delete
       self.removed = true
     end

data/lib/generators/acts-as-messageable/migration/templates/migration.rb

@@ -6,12 +6,15 @@ class CreateMessagesTable < ActiveRecord::Migration
       t.references :received_messageable, :polymorphic => true
       t.references :sent_messageable, :polymorphic => true
       t.boolean :opened, :default => false
-      t.boolean :opened, :default => false
       t.boolean :recipient_delete, :default => false
       t.boolean :sender_delete, :default => false
+
+      # ancestry
+      t.string :ancestry
     end
 
     add_index :<%= table_name %>, [:sent_messageable_id, :received_messageable_id], :name => "acts_as_messageable_ids"
+    add_index :<%= table_name %>, :ancestry
   end
 
   def self.down

data/spec/acts-as-messageable_spec.rb

@@ -18,7 +18,7 @@ describe "ActsAsMessageable" do
   end
 
   it "bob should have one open message from alice" do
-    @alice.send_message(@bob, "Topic", "Message body")
+    @message =  @alice.send_message(@bob, "Topic", "Message body")
     @bob.messages.are_from(@alice).process do |m|
       m.open
     end
@@ -48,8 +48,8 @@ describe "ActsAsMessageable" do
   end
 
   it "should be in database message with id ..." do
-    message_id = @bob.send_message(@alice, "Topic", "Message body").first.id
-    @bob.messages.id(message_id).count.should == 1
+    message_id = @bob.send_message(@alice, "Topic", "Message body").id
+    @bob.messages.with_id(message_id).count.should == 1
   end
 
   it "message should have proper topic" do
@@ -58,4 +58,32 @@ describe "ActsAsMessageable" do
     @bob.messages.first.topic == "Topic"
     @bob.messages.first.body == "Message body"
   end
+
+  it "bob send message to alice, and alice reply to bob message and show proper tree" do
+    @message = @bob.send_message(@alice, "Topic", "Body")
+    @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"
+  end
+
+  it "bob send message to alice, alice answer, and bob answer for alice answer" do
+    @message = @bob.send_message(@alice, "Topic", "Body")
+    @reply_message =  @alice.reply_to(@message, "Re: Topic", "Body")
+    @reply_reply_message = @bob.reply_to(@reply_message, "Re: Re: Topic", "Body")
+
+    [@message, @reply_message, @reply_reply_message].each do |m|
+      m.conversation.size.should == 3
+    end
+
+    @message.conversation.last.should == @reply_reply_message
+    @reply_reply_message.conversation.last.should == @reply_reply_message
+  end
+
+  it "send message with hash" do
+    @message = @bob.send_message(@alice, {:body => "Body", :topic => "Topic"})
+    @message.topic.should == "Topic"
+    @message.body.should == "Body"
+  end
 end

data/spec/spec_helper.rb

@@ -33,13 +33,13 @@ def create_database
       t.references :received_messageable, :polymorphic => true
       t.references :sent_messageable, :polymorphic => true
       t.boolean :opened, :default => false
-      t.boolean :opened, :default => false
       t.boolean :recipient_delete, :default => false
       t.boolean :sender_delete, :default => false
+      t.string :ancestry
     end
 
     create_table :users do |t|
-      t.string   :email
+      t.string :email
     end
   end
 end

data/spec/support/user.rb

@@ -1,3 +1,6 @@
+require 'ancestry'
+
 class User < ActiveRecord::Base
   acts_as_messageable
-end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-messageable
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-05 00:00:00.000000000 +02:00
+date: 2011-05-31 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &14917040 !ruby/object:Gem::Requirement
+  requirement: &5338400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,21 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *14917040
+  version_requirements: *5338400
+- !ruby/object:Gem::Dependency
+  name: ancestry
+  requirement: &5337340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *5337340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14916280 !ruby/object:Gem::Requirement
+  requirement: &5335900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +44,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *14916280
+  version_requirements: *5335900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &14914600 !ruby/object:Gem::Requirement
+  requirement: &5334660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *14914600
+  version_requirements: *5334660
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &14912820 !ruby/object:Gem::Requirement
+  requirement: &5333300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +66,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *14912820
+  version_requirements: *5333300
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &14911500 !ruby/object:Gem::Requirement
+  requirement: &5331960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14911500
+  version_requirements: *5331960
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &14909060 !ruby/object:Gem::Requirement
+  requirement: &5251020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +88,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14909060
+  version_requirements: *5251020
 description: 
 email: piotr.nielacny@gmail.com
 executables: []
@@ -85,6 +96,7 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- .travis.yml
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
@@ -102,7 +114,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/user.rb
 has_rdoc: true
-homepage: http://github.com/LTe/acts_as_messageable
+homepage: http://github.com/LTe/acts-as-messageable
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -116,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4493248086086979425
+      hash: 4035680522358941194
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: