acts-as-messageable 0.0.1 → 0.0.2

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2010 Piotr Niełacny Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -0,0 +1,39 @@
+= ActsAsMessageable
+The Acts As Messageable allows communication between the models.
+
+== Usage
+To use it, add it to your Gemfile:
+
+    gem 'acts-as-messageable'
+
+== Post instalation
+
+1. rails g acts_as_messageable:migration
+2. rake db:migrate
+
+== Usage
+
+    class User < ActiveRecord::Base
+        acts_as_messageable
+    end
+
+    @user1 = User.first
+    @user2 = User.last
+
+    # 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!:)")
+
+    # Show inbox
+    @user1.recv
+    # Show outbox
+    @user1.sent
+
+    # 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
+
+Copyright © 2010 Piotr Niełacny (http://ruby-blog.pl), released under the MIT license
+    

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

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

@@ -3,45 +3,60 @@ module ActsAsMessageable
 
     def self.included(base)
       base.extend ClassMethods
-      base.send :include, InstanceMethods
     end
 
     module ClassMethods
       def acts_as_messageable
       class_eval do
-        has_many :messages, :as => :messageable, :class_name => "ActsAsMessageable::Message"
+        has_many :received_messages, :as => :received_messageable, :class_name => "ActsAsMessageable::Message"
+        has_many :sent_messages, :as => :sent_messageable, :class_name => "ActsAsMessageable::Message"
       end
-    end
 
-    #include ActsAsMessageable::User::InstanceMethods
+      include InstanceMethods
+    end
+      
     end
 
     module InstanceMethods
-      def messages(args = {})
-        if args[:from] != nil && args[:to] == nil
-          base.where(%(#{ActsAsMessageable::Message.table_name}.from = ?), args[:from].id)
-        elsif args[:from] == nil && args[:to] != nil
-          base.where(%(#{ActsAsMessageable::Message.table_name}.to = ?), args[:to].id)
-        elsif args[:from] != nil && args[:to] != nil
-          base.where(%(#{ActsAsMessageable::Message.table_name}.from = ? AND
-                       #{ActsAsMessageable::Message.table_name}.to = ?),
-                       args[:from].id, args[:to].id)
-        else
-          self.messages
+      def msg(args = {})
+
+        all = self.recv + self.sent
+
+        if args[:from]
+          all.reject! do |m|
+            m.sent_messageable_id != args[:from].id
+          end
+        end
+
+        if args[:to]
+          all.reject! do |m|
+            m.received_messageable_id != args[:to].id
+          end
+        end
+
+        if args[:id] != nil
+          all.reject! do |m|
+            m.id != args[:id]
+          end
         end
+
+        all
       end
 
-      def send_message(to, topic, body)
-        @message = ActsAsMessageable::Message.new
-        @message.from, @message.to = self.id, to.id
-        @message.topic, @message.body = topic, body
+      def recv
+        self.received_messages
+      end
 
-        self.messages << @message
-        to.messages << @message
+      def sent
+        self.sent_messages
+      end
+
+      def send_msg(to, topic, body)
+        @message = ActsAsMessageable::Message.create
+        @message.topic, @message.body = topic, body
 
-        self.save
-        to.save
-        @message.save
+        self.sent_messages << @message
+        to.received_messages << @message 
       end
 
     end

data/lib/acts_as_messageable/message.rb

@@ -1,12 +1,22 @@
 module ActsAsMessageable
   class Message < ::ActiveRecord::Base
-    belongs_to :messageable, :polymorphic => true
+    belongs_to :received_messageable, :polymorphic => true
+    belongs_to :sent_messageable, :polymorphic => true
 
     attr_accessible :topic,
                     :body,
-                    :messageable_type,
-                    :messageable_id,
-                    :from,
-                    :to
+                    :received_messageable_type,
+                    :received_messageable_id,
+                    :sent_messageable_type,
+                    :sent_messageable_id,
+
+    def from
+      "#{self.sent_messageable_type}".constantize.find(self.sent_messageable_id)
+    end
+
+    def to
+      "#{self.received_messageable_type}".constantize.find(self.received_messageable_id)
+    end
+
   end
 end

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

@@ -4,8 +4,6 @@ module ActsAsMessageable
   class MigrationGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
 
-    desc "Generates migration for Tag and Tagging models"
-
     def self.source_root
           @source_root ||= File.join(File.dirname(__FILE__), 'templates')
     end

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

@@ -3,12 +3,11 @@ class CreateMessagesTable < ActiveRecord::Migration
     create_table :messages do |t|
       t.string :topic
       t.string :body
-      t.references :messageable, :polymorphic => true
-      t.integer :from
-      t.integer :to
+      t.references :received_messageable, :polymorphic => true
+      t.references :sent_messageable, :polymorphic => true
     end
 
-    add_index :messages, [:from, :to]
+    add_index :messages, [:sent_messageable_id, :received_messageable_id]
   end
 
   def self.down

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Piotr Nielacny
@@ -25,9 +25,10 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.rdoc
 files: 
-- README
+- MIT-LICENSE
+- README.rdoc
 - Rakefile
 - VERSION
 - lib/acts-as-messageable.rb