acts-as-messageable 0.0.3 → 0.1.0

data/README.rdoc

@@ -17,23 +17,78 @@ To use it, add it to your Gemfile:
         acts_as_messageable
     end
 
-    @user1 = User.first
-    @user2 = User.last
+== Send message
 
     # user1 send message to user2
-    @user1.send_msg(@user2, "Message to user2", "Hi user 2!;-)")
-    @user2.send_msg(@user1, "Re: Message to user2", "Hi there!:)")
+    # user.send_message(another_user, topic, body)
+    @user1.send_message(@user2, "Message to user2", "Hi user 2!;-)")
+    @user2.send_message(@user1, "Re: Message to user2", "Hi there!:)")
+
+== Inbox/Outbox
 
     # Show inbox
-    @user1.recv
+    @user.received
+    # Show inbox trash
+    @user.received(:deleted => true)
+    # Show inbox with inbox trash
+    @user.received(:all => true)
+
     # Show outbox
-    @user1.sent
+    @user.sent
+    # Show outbox trash
+    @user.sent(:deleted => true)
+    # Show outbox with inbox trash
+    @user.sent(:all => true)
+
+    # Show trash
+    @user.messages(:deleted => true)
+    # Show all messages
+    @user.messages(:all => true)
+
+== Delete message
+
+    # Delete message with block
+    @user.messages do |message|
+        message.delete
+    end
+
+    @user.send do |message|
+        message.delete
+    end
+
+    @user.received do |message|
+        message.delete
+    end
+
+    @user.messages(:from => @another_user) do |message|
+        message.delete
+    end
+
+    @user.messages(:to => @another_user) do |message|
+        messsage.delete
+    end
+
+    @user.send(:id => 10) do |message|
+        message.delete
+    end
+
+
+    # Delete by hand
+    @user.delete_message(@user.messages(:id => 10))
+
+== Search
 
     # Search message
-    @user1.msg # all messages (in and out)
-    @user1.msg(:from => @user2) # all messages from @user2
-    @user1.msg(:to => @user2) # all messages to @user2
-    @user1.msg(:id => 2) # message where message.id = 2
+    @user.messages # all messages (in and out)
+    @user.messages(:from => @user2) # all messages from @user2
+    @user.messages(:to => @user2) # all messages to @user2
+    @user.messages(:id => 2) # message where message.id = 2
+
+== Blocks time ;-)
+
+    @user.messages do |messsage|
+        # message stuff...
+    end
 
-Copyright © 2010 Piotr Niełacny (http://ruby-blog.pl), released under the MIT license
+Copyright © 2011 Piotr Niełacny (http://ruby-blog.pl), released under the MIT license
     

data/Rakefile

@@ -1,3 +1,13 @@
+require 'rake'
+require 'rake/testtask'
+
+desc 'Test the acts-as-messageable plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
@@ -11,4 +21,4 @@ begin
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"
-end
+end

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/lib/acts-as-messageable.rb

@@ -8,5 +8,5 @@ require 'acts_as_messageable/message'
 $LOAD_PATH.shift
 
 if defined?(ActiveRecord::Base)
-  ActiveRecord::Base.send :include, ActsAsMessageable::User
+  ActiveRecord::Base.send :include, ActsAsMessageable::Model
 end

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

@@ -1,5 +1,5 @@
 module ActsAsMessageable
-  module User
+  module Model
 
     def self.included(base)
       base.extend ClassMethods
@@ -12,54 +12,83 @@ module ActsAsMessageable
         has_many :sent_messages, :as => :sent_messageable, :class_name => "ActsAsMessageable::Message"
       end
 
-      include ActsAsMessageable::User::InstanceMethods
+      include ActsAsMessageable::Model::InstanceMethods
     end
-      
+
     end
 
     module InstanceMethods
-      def msg(args = {})
-
-        all = self.recv + self.sent
+      def messages(options = {}, &block)
+        result = options.blank? ?  (self.received + self.sent) : ActsAsMessageable::Message.scoped
+        filter(result, options, &block)
+      end
 
-        if args[:from]
-          all.reject! do |m|
-            m.sent_messageable_id != args[:from].id
-          end
+      def received(options = {}, &block)
+        if options[:all]
+          result = self.received_messages
+        elsif options[:deleted]
+          result = self.received_messages.where(:recipient_delete => true)
+        else
+          result = self.received_messages.where(:recipient_delete => false)
         end
 
-        if args[:to]
-          all.reject! do |m|
-            m.received_messageable_id != args[:to].id
-          end
-        end
+        filter(result, options, &block)
+      end
 
-        if args[:id] != nil
-          all.reject! do |m|
-            m.id != args[:id]
-          end
+      def sent(options = {}, &block)
+        if options[:all]
+          result = self.sent_messages
+        elsif options[:deleted]
+          result = self.sent_messages.where(:sender_delete => true)
+        else
+          result = self.sent_messages.where(:sender_delete => false)
         end
 
-        all
+        filter(result, options, &block)
       end
 
-      def recv
-        self.received_messages
+      def send_message(to, topic, body)
+        @message = ActsAsMessageable::Message.create!(:topic => topic, :body => body)
+
+        self.sent_messages << @message
+        to.received_messages << @message
       end
 
-      def sent
-        self.sent_messages
+      def delete_message(message)
+        current_user = self
+
+        if message.received_messageable == current_user
+          message.update_attributes!(:recipient_delete => true)
+        elsif message.sent_messageable == current_user
+          message.update_attributes!(:sender_delete => true)
+        end
       end
 
-      def send_msg(to, topic, body)
-        @message = ActsAsMessageable::Message.create
-        @message.topic, @message.body = topic, body
+      private
 
-        self.sent_messages << @message
-        to.received_messages << @message 
+      def filter(result, options = {}, &block)
+        current_user = self
+
+        options.each do |key, value|
+          case key
+            when :from then
+              result = result.messages_from(value, current_user)
+            when :to then
+              result = result.messages_to(value, current_user)
+            when :id then
+              result = result.message_id(value)
+          end
+        end
+
+        result.each do |message|
+          block.call(message)
+          delete_message(message) if message.delete_message
+        end if block_given?
+
+        result
       end
 
     end
 
   end
-end
+end

data/lib/acts_as_messageable/message.rb

@@ -9,7 +9,17 @@ module ActsAsMessageable
                     :received_messageable_id,
                     :sent_messageable_type,
                     :sent_messageable_id,
-                    :opened
+                    :opened,
+                    :recipient_delete,
+                    :sender_delete
+
+    attr_accessor :delete_message
+
+    scope :messages_from, lambda { |*args| where("sent_messageable_id = :sender", :sender => args.first).
+                                           where("received_messageable_id = :receiver", :receiver => args.last) }
+    scope :messages_to,   lambda { |*args| where("received_messageable_id = :receiver", :receiver => args.first).
+                                           where("sent_messageable_id = :sender", :sender => args.last)}
+    scope :message_id,    lambda { |*args| where("id = :id", :id => args.first) }
 
     validates_presence_of :topic ,:body
 
@@ -18,7 +28,19 @@ module ActsAsMessageable
     end
 
     def open
-      self.opened = true
+      update_attributes!(:opened => true)
+    end
+
+    def mark_as_read
+      open
+    end
+
+    def close
+      update_attributes!(:opened => false)
+    end
+
+    def mark_as_unread
+      close
     end
 
     def from
@@ -29,5 +51,9 @@ module ActsAsMessageable
       "#{self.received_messageable_type}".constantize.find(self.received_messageable_id)
     end
 
+    def delete
+      self.delete_message = true
+    end
+
   end
 end

data/lib/generators/acts_as_messageable/migration/templates/migration.rb

@@ -2,13 +2,16 @@ class CreateMessagesTable < ActiveRecord::Migration
   def self.up
     create_table :messages do |t|
       t.string :topic
-      t.string :body
+      t.text :body
       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
     end
 
-    add_index :messages, [:sent_messageable_id, :received_messageable_id]
+    add_index :messages, [:sent_messageable_id, :received_messageable_id], :name => "acts_as_messageable_ids"
   end
 
   def self.down

data/test/message_test.rb

@@ -0,0 +1,114 @@
+require 'test/unit'
+require "rubygems"
+
+require File.expand_path('../../lib/acts-as-messageable.rb', __FILE__)
+
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+
+def create_db
+  ActiveRecord::Schema.define(:version => 1) do
+    create_table :messages do |t|
+      t.string :topic
+      t.text :body
+      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
+    end
+
+    create_table :users do |t|
+      t.string   :email
+    end
+  end
+
+
+end
+
+def drop_db
+  ActiveRecord::Base.connection.tables.each do |table|
+    ActiveRecord::Base.connection.drop_table(table)
+  end
+end
+
+class User < ActiveRecord::Base
+  acts_as_messageable
+end
+
+class MessageTest < Test::Unit::TestCase
+  def setup
+    create_db
+    User.create!(:email => "user1@users.com")
+    User.create!(:email => "user2@users.com")
+  end
+
+  def teardown
+    drop_db
+  end
+
+  def test_send_message
+    u1 = User.first
+    u2 = User.last
+
+    u1.send_message(u2, "Topic", "Body")
+    u2.send_message(u1, "Topic2", "Body2")
+
+    assert_equal ["Topic", "Topic2"], ActsAsMessageable::Message.find(:all).map(&:topic)
+    assert_equal ["Body", "Body2"], ActsAsMessageable::Message.find(:all).map(&:body)
+    assert_equal u1.id, ActsAsMessageable::Message.find(:first, :conditions => { :topic => "Topic" }).sent_messageable_id
+    assert_equal u2.id, ActsAsMessageable::Message.find(:first, :conditions => { :topic => "Topic" }).received_messageable_id
+
+    assert_equal u2.id, ActsAsMessageable::Message.find(:first, :conditions => { :topic => "Topic2" }).sent_messageable_id
+    assert_equal u1.id, ActsAsMessageable::Message.find(:first, :conditions => { :topic => "Topic2" }).received_messageable_id
+  end
+
+  def test_received
+    u1 = User.first
+    u2 = User.last
+
+    u1.send_message(u2, "Topic", "Body")
+    u1.send_message(u2, "Topic2", "Body2")
+
+    assert_equal ["Topic", "Topic2"], u2.received.map(&:topic)
+  end
+
+  def test_sent
+    u1 = User.first
+    u2 = User.last
+
+    u1.send_message(u2, "Topic", "Body")
+    u1.send_message(u2, "Topic2", "Body2")
+
+    assert_equal ["Topic", "Topic2"], u1.sent.map(&:topic)
+  end
+
+  def test_messages
+    u1 = User.first
+    u2 = User.last
+
+    u1.send_message(u2, "Topic", "Body")
+    u1.send_message(u2, "Topic2", "Body2")
+
+    assert_equal ["Topic", "Topic2"], u2.messages(:from => u1).map(&:topic)
+    assert_equal ["Topic", "Topic2"], u1.messages(:to => u2).map(&:topic)
+    assert_equal ["Topic"], u1.messages(:to => u2, :id => 1).map(&:topic)
+    assert_equal ["Topic2"], u1.messages(:id => 2).map(&:topic)
+  end
+
+  def test_delete_message
+    u1 = User.first
+    u2 = User.last
+
+    u1.send_message(u2, "Topic", "Body")
+    u1.send_message(u2, "Topic2", "Body2")
+
+    u1.messages do |m|
+      m.delete
+    end
+
+    assert_equal [], u1.messages
+    assert_equal ["Topic", "Topic2"], u2.messages.map(&:topic)
+  end
+
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-messageable
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Piotr Nielacny
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-04 00:00:00 +02:00
+date: 2011-02-17 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -37,13 +38,14 @@ files:
 - lib/generators/acts_as_messageable/migration/migration_generator.rb
 - lib/generators/acts_as_messageable/migration/templates/migration.rb
 - rails/init.rb
+- test/message_test.rb
 has_rdoc: true
 homepage: http://github.com/LTe/acts_as_messageable
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -51,6 +53,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -59,15 +62,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Make user messageable!;-)
-test_files: []
-
+test_files: 
+- test/message_test.rb