acts-as-messageable 0.4.5 → 0.4.6

data/.travis.yml

@@ -1,8 +1,11 @@
 rvm:
   - 1.8.7
   - 1.9.2
-  - rbx
+  - 1.9.3
+  - ruby-head
   - ree
+  - rbx-head
+  - rbx-head-d19
 gemfile:
   - Gemfile
   - gemfiles/Gemfile-3.0

data/Gemfile

@@ -2,11 +2,11 @@ source "http://rubygems.org"
 
 gem "activerecord", ">= 3.0.0"
 gem "activesupport", ">= 3.0.0"
-gem "ancestry", "~> 1.2.4"
+gem "ancestry", "~> 1.3.0"
 gem "railties", ">= 3.0.0"
 
 group :development do
-  gem "rspec", "~> 2.8.0"
-  gem "jeweler", "~> 1.7.0"
-  gem "sqlite3-ruby"
+  gem "rspec", "~> 2.11.0"
+  gem "jeweler", "~> 1.8.0"
+  gem "sqlite3"
 end

data/README.md

@@ -41,7 +41,8 @@ Usage
 class User < ActiveRecord::Base
   acts_as_messageable :table_name => "table_with_messages", # default 'messages'
                       :required   => :body                  # default [:topic, :body]
-                      :class_name => "CustomMessages"       # default "ActsAsMessageable::Message"
+                      :class_name => "CustomMessages"       # default "ActsAsMessageable::Message",
+                      :dependent  => :destroy               # default :nullify
 end
 ```
 
@@ -246,4 +247,19 @@ Message has been deleted **permanently**
 @alice.delete_message(@message) # @alice delete @message
 ```
 
+Restore message
+===============
+
+```ruby
+@alice.deleted_messages.process do |m|
+  m.restore # @alice restore 'm' message from trash
+end
+```
+
+## Restore message without context
+
+```ruby
+@alice.restore_message(@message) # @alice restore message from trash
+```
+
 Copyright © 2011 Piotr Niełacny (http://ruby-blog.pl), released under the MIT license

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/acts-as-messageable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "acts-as-messageable"
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Piotr Nielacny"]
-  s.date = "2012-02-08"
+  s.date = "2012-09-27"
   s.email = "piotr.nielacny@gmail.com"
   s.extra_rdoc_files = [
     "README.md"
@@ -27,18 +27,16 @@ Gem::Specification.new do |s|
     "gemfiles/Gemfile-3.1",
     "gemfiles/Gemfile-3.2",
     "lib/acts-as-messageable.rb",
-    "lib/acts-as-messageable/acts-as-messageable.rb",
     "lib/acts-as-messageable/message.rb",
     "lib/acts-as-messageable/model.rb",
+    "lib/acts-as-messageable/railtie.rb",
     "lib/acts-as-messageable/relation.rb",
     "lib/generators/acts-as-messageable/migration/migration_generator.rb",
     "lib/generators/acts-as-messageable/migration/templates/migration.rb",
     "lib/generators/acts-as-messageable/migration/templates/migration_permanent.rb",
-    "rails/init.rb",
     "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",
@@ -46,7 +44,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/LTe/acts-as-messageable"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.24"
   s.summary = "Make user messageable!;-)"
 
   if s.respond_to? :specification_version then
@@ -55,28 +53,28 @@ 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<activesupport>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<ancestry>, ["~> 1.2.4"])
+      s.add_runtime_dependency(%q<ancestry>, ["~> 1.3.0"])
       s.add_runtime_dependency(%q<railties>, [">= 3.0.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.7.0"])
-      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.11.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_dependency(%q<activesupport>, [">= 3.0.0"])
-      s.add_dependency(%q<ancestry>, ["~> 1.2.4"])
+      s.add_dependency(%q<ancestry>, ["~> 1.3.0"])
       s.add_dependency(%q<railties>, [">= 3.0.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.7.0"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.11.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 3.0.0"])
     s.add_dependency(%q<activesupport>, [">= 3.0.0"])
-    s.add_dependency(%q<ancestry>, ["~> 1.2.4"])
+    s.add_dependency(%q<ancestry>, ["~> 1.3.0"])
     s.add_dependency(%q<railties>, [">= 3.0.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.7.0"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.11.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
   end
 end
 

data/lib/acts-as-messageable.rb

@@ -4,4 +4,4 @@ module ActsAsMessageable
   autoload :Relation, 'acts-as-messageable/relation'
 end
 
-require 'acts-as-messageable/acts-as-messageable'
+require 'acts-as-messageable/railtie'

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

@@ -21,7 +21,7 @@ module ActsAsMessageable
                     :created_at,
                     :updated_at
 
-    attr_accessor   :removed
+    attr_accessor   :removed, :restored
     cattr_accessor  :required
 
 
@@ -29,7 +29,10 @@ module ActsAsMessageable
     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 :with_id,           lambda { |*args|
+      ActiveSupport::Deprecation.warn("Calling with_id is deprecated. Please use `find` instead.")
+      where(:id => args.first)
+    }
 
     scope :connected_with,    lambda { |*args|  where("(sent_messageable_type = :sent_type and
                                                 sent_messageable_id = :sent_id and
@@ -47,7 +50,7 @@ module ActsAsMessageable
                                                 :s_perm_delete  => false)
                                      }
     scope :readed,            lambda { where(:opened => true)  }
-    scope :unread,            lambda { where(:opened => false) }
+    scope :unreaded,          lambda { where(:opened => false) }
     scope :deleted,           lambda { where(:recipient_delete => true, :sender_delete => true) }
 
     def open?
@@ -57,26 +60,17 @@ module ActsAsMessageable
     def open
       update_attributes!(:opened => true)
     end
-
-    def mark_as_read
-      open
-    end
+    alias :mark_as_read :open
+    alias :read         :open
 
     def close
       update_attributes!(:opened => false)
     end
+    alias :mark_as_unread :close
+    alias :unread         :close
 
-    def mark_as_unread
-      close
-    end
-
-    def from
-      sent_messageable
-    end
-
-    def to
-      received_messageable
-    end
+    alias :from :sent_messageable
+    alias :to   :received_messageable
 
     def participant?(user)
       (to == user) || (from == user)
@@ -89,7 +83,11 @@ module ActsAsMessageable
     def delete
       self.removed = true
     end
-    
+
+    def restore
+      self.restored = true
+    end
+
     def reply(*args)
       to.reply_to(self, *args)
     end

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

@@ -10,15 +10,18 @@ module ActsAsMessageable
 
       # Method make ActiveRecord::Base object messageable
       # @param [Symbol] :table_name - table name for messages
+      # @param [String] :class_name - message class name
+      # @param [Array, Symbol] :required - required fields in message
+      # @param [Symbol] :dependent - dependent option from ActiveRecord has_many method
       def acts_as_messageable(options = {})
         has_many  :received_messages_relation, 
                   :as => :received_messageable, 
                   :class_name => options[:class_name] || "ActsAsMessageable::Message",
-                  :dependent => :nullify
+                  :dependent => options[:dependent] || :nullify
         has_many  :sent_messages_relation, 
                   :as => :sent_messageable,
                   :class_name => options[:class_name] || "ActsAsMessageable::Message",
-                  :dependent => :nullify
+                  :dependent => options[:dependent] || :nullify
 
         self.messages_class_name = (options[:class_name] || "ActsAsMessageable::Message").constantize
 
@@ -29,18 +32,14 @@ module ActsAsMessageable
           ActiveSupport::Deprecation.warn("Calling set_table_name is deprecated. Please use `self.table_name = 'the_name'` instead.")
         end
 
-        if options[:required].is_a? Symbol
-          self.messages_class_name.required = [options[:required]]
-        elsif options[:required].is_a? Array
-          self.messages_class_name.required = options[:required]
-        else
-          self.messages_class_name.required = [:topic, :body]
-        end
-
+        self.messages_class_name.required = Array.wrap(options[:required] || [:topic, :body])
         self.messages_class_name.validates_presence_of self.messages_class_name.required
+
         include ActsAsMessageable::Model::InstanceMethods
     end
 
+    # Method recognize real object class
+    # @return [ActiveRecord::Base] class or relation object
     def resolve_active_record_ancestor
       self.reflect_on_association(:received_messages_relation).active_record
     end
@@ -48,7 +47,6 @@ module ActsAsMessageable
     end
 
     module InstanceMethods
-      # Get all messages connected with user
       # @return [ActiveRecord::Relation] all messages connected with user
       def messages(trash = false)
         result = self.class.messages_class_name.connected_with(self, trash)
@@ -57,6 +55,7 @@ module ActsAsMessageable
         result
       end
 
+      # @return [ActiveRecord::Relation] returns all messages from inbox
       def received_messages
         result = received_messages_relation.scoped.where(:recipient_delete => false)
         result.relation_context = self
@@ -64,6 +63,7 @@ module ActsAsMessageable
         result
       end
 
+      # @return [ActiveRecord::Relation] returns all messages from outbox
       def sent_messages
         result = sent_messages_relation.scoped.where(:sender_delete => false)
         result.relation_context = self
@@ -71,6 +71,7 @@ module ActsAsMessageable
         result
       end
 
+      # @return [ActiveRecord::Relation] returns all messages from trash
       def deleted_messages
         messages true
       end
@@ -82,9 +83,10 @@ module ActsAsMessageable
       #
       # @return [ActsAsMessageable::Message] the message object
       def send_message(to, *args)
+        message_attributes = {}
+
         case args.first
           when String
-            message_attributes = {}
             self.class.messages_class_name.required.each_with_index do |attribute, index|
               message_attributes[attribute] = args[index]
             end
@@ -100,10 +102,16 @@ module ActsAsMessageable
         message
       end
 
+      # Reply to given message
+      # @param [ActsAsMessageable::Message] message
+      # @param [String] topic
+      # @param [String] body
+      #
+      # @return [ActsAsMessageable::Message] a message that is a response to a given message
       def reply_to(message, *args)
         current_user = self
-        
-        if message.participant?(current_user)          
+
+        if message.participant?(current_user)
           reply_message = send_message(message.from, *args)
           reply_message.parent = message
           reply_message.save
@@ -112,25 +120,37 @@ module ActsAsMessageable
         end
       end
 
+      # Mark message as deleted
       def delete_message(message)
         current_user = self
 
-        if message.received_messageable == current_user
-          unless message.recipient_delete
-            message.update_attributes!(:recipient_delete => true)
+        case current_user
+          when message.to
+            attribute = message.recipient_delete ? :recipient_permanent_delete : :recipient_delete
+          when message.from
+            attribute = message.sender_delete ? :sender_permanent_delete : :sender_delete
           else
-            message.update_attributes!(:recipient_permanent_delete => true)
-          end
-        elsif message.sent_messageable == current_user
-          unless message.sender_delete
-            message.update_attributes!(:sender_delete => true)
-          else
-            message.update_attributes!(:sender_permanent_delete => true)
-          end
+            raise "#{current_user} can't delete this message"
         end
+
+        message.update_attributes!(attribute => true)
       end
 
-    end
+      # Mark message as restored
+      def restore_message(message)
+        current_user = self
 
+        case current_user
+          when message.to
+            attribute = :recipient_delete
+          when message.from
+            attribute = :sender_delete
+          else
+            raise "#{current_user} can't delete this message"
+        end
+
+        message.update_attributes!(attribute => false)
+      end
+    end
   end
 end

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

@@ -5,8 +5,9 @@ module ActsAsMessageable
     def process(context = self.relation_context, &block)
       self.each do |message|
         block.call(message) if block_given?
-        context.delete_message(message) if message.removed
+        context.delete_message(message)   if message.removed
+        context.restore_message(message)  if message.restored
       end
     end
   end
-end
+end

data/spec/acts-as-messageable_spec.rb

@@ -1,76 +1,80 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-class User < ActiveRecord::Base
-  acts_as_messageable
-end
+require 'spec_helper'
 
 describe "ActsAsMessageable" do
-
-  before(:all) do
+  before do
     User.acts_as_messageable
-  end
-
-  describe "prepare for specs" do
-    it "should be 4 users in database" do
-      User.count.should == 4
-    end
+    @message = send_message
   end
 
   describe "send messages" do
     it "alice should have one message" do
-      send_message
       @alice.messages.count.should == 1
     end
 
     it "alice should have one message from bob" do
-      send_message
       @alice.messages.are_from(@bob).count.should == 1
     end
 
     it "bob should have one message" do
-      send_message
       @bob.messages.count.should == 1
     end
 
     it "bob should have one message to alice in outbox" do
-      send_message
       @bob.sent_messages.are_to(@alice).count.should == 1
     end
 
     it "bob should have one open message from alice" do
-      send_message
       @alice.messages.are_from(@bob).process { |m| m.open }
       @alice.messages.readed.count.should == 1
     end
   end
-  
+
+  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(2)
+    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
+
   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    
+      @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      
+      @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
-      send_message
       @bob.messages.process do |m|
         m.delete
       end
@@ -85,8 +89,6 @@ describe "ActsAsMessageable" do
     end
 
     it "received_messages and sent_messages should work with .process method" do
-      @message = send_message
-
       @bob.sent_messages.count.should == 1
       @alice.received_messages.count.should == 1
 
@@ -99,7 +101,6 @@ describe "ActsAsMessageable" do
     end
 
     it "message should permanent delete" do
-      @message = send_message
       @alice.messages.process { |m| m.delete }
       @alice.messages.count.should == 0
 
@@ -112,14 +113,47 @@ describe "ActsAsMessageable" do
 
       @bob.sent_messages.count.should == 1
     end
+
+    it "pat should not able to delete message" do
+      lambda { @pat.delete_message(@message) }.should raise_error
+    end
+  end
+
+  describe "restore message" do
+    it "alice should restore message" do
+      @alice.received_messages.process { |m| m.delete }
+      @alice.restore_message(@message.reload)
+      @alice.received_messages.count.should == 1
+    end
+
+    it "should works with relation" do
+      @alice.received_messages.process { |m| m.delete }
+      @alice.received_messages.count.should == 0
+      @alice.deleted_messages.process { |m| m.restore }
+      @alice.received_messages.count.should == 1
+    end
+
+    it "pat should not able to restore message" do
+      lambda { @pat.restore_message(@message) }.should raise_error
+    end
   end
 
   describe "read/unread feature" do
     it "alice should have one unread message from bob" do
-      send_message
-      @alice.messages.are_from(@bob).unread.count.should == 1
+      @alice.messages.are_from(@bob).unreaded.count.should == 1
       @alice.messages.are_from(@bob).readed.count.should == 0
     end
+
+    it "alice should able to read message from bob" do
+      @alice.messages.are_from(@bob).first.read
+      @alice.messages.are_from(@bob).unreaded.count.should == 0
+    end
+
+    it "alice should able to unread message from bob" do
+      @alice.messages.are_from(@bob).first.read
+      @alice.messages.are_from(@bob).first.unread
+      @alice.messages.are_from(@bob).unreaded.count.should == 1
+    end
   end
 
   it "should be in database message with id ..." do
@@ -127,15 +161,17 @@ describe "ActsAsMessageable" do
     @bob.messages.with_id(message_id).count.should == 1
   end
 
+  it "finds proper message" do
+    @bob.messages.find(@message.id) == @message
+  end
+
   it "message should have proper topic" do
-    send_message
     @bob.messages.count.should == 1
     @bob.messages.first.topic == "Topic"
   end
 
   describe "conversation" do
     it "bob send message to alice, and alice reply to bob message and show proper tree" do
-      @message = send_message
       @reply_message =  @alice.reply_to(@message, "Re: Topic", "Body")
 
       @reply_message.conversation.size.should == 2
@@ -144,7 +180,6 @@ describe "ActsAsMessageable" do
     end
 
     it "bob send message to alice, alice answer, and bob answer for alice answer" do
-      @message = send_message
       @reply_message = @alice.reply_to(@message, "Re: Topic", "Body")
       @reply_reply_message = @bob.reply_to(@reply_message, "Re: Re: Topic", "Body")
 
@@ -166,18 +201,15 @@ describe "ActsAsMessageable" do
   end
 
   it "messages should return in right order :created_at" do
-    @message = send_message
     @message = send_message(@bob, @alice, "Example", "Example Body")
     @alice.messages.last.body.should == "Body"
   end
 
   it "received_messages should return ActiveRecord::Relation" do
-    send_message
     @alice.received_messages.class.should == ActiveRecord::Relation
   end
 
   it "sent_messages should return ActiveRecord::Relation" do
-    send_message
     @bob.sent_messages.class.should == ActiveRecord::Relation
   end
 
@@ -188,7 +220,7 @@ describe "ActsAsMessageable" do
 
     it "bob send message to admin (different model) with the same id" do
       @bob.send_message(@alice, "hello", "alice")
-      @alice.messages.are_to(@alice).size.should be_equal(1)
+      @alice.messages.are_to(@alice).size.should be_equal(2)
       @alice.messages.are_to(@admin).size.should be_equal(0)
     end
 
@@ -197,7 +229,6 @@ describe "ActsAsMessageable" do
       @bob.messages.are_from(@admin).size.should be_equal(1)
       @bob.messages.are_from(@alice).size.should be_equal(0)
     end
-
   end
 
 end

data/spec/custom-class_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require "spec_helper"
 
 class CustomMessage < ActsAsMessageable::Message; end
 

data/spec/custom-required_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe "custom require" do
   before(:each) do
@@ -47,5 +47,4 @@ describe "custom require" do
       @alice.received_messages.first.body.should == "Hi Alice!"
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -12,11 +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"
-    @pat   = User.create 	:email  => "pat@example.com"
-    @admin = Admin.create :email 	=> "admin@example.com"
-    @men   = Men.create 	:email  => "men@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/user.rb

@@ -4,3 +4,4 @@ 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.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000 Z
+date: 2012-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &32872620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *32872620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &32872120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +37,31 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *32872120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &32871640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *32871640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &32871100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,32 +69,47 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *32871100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &32870560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *32870560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &32869960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *32869960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
-  requirement: &32869380 !ruby/object:Gem::Requirement
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +117,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *32869380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: piotr.nielacny@gmail.com
 executables: []
@@ -107,18 +142,16 @@ files:
 - gemfiles/Gemfile-3.1
 - gemfiles/Gemfile-3.2
 - lib/acts-as-messageable.rb
-- lib/acts-as-messageable/acts-as-messageable.rb
 - lib/acts-as-messageable/message.rb
 - lib/acts-as-messageable/model.rb
+- lib/acts-as-messageable/railtie.rb
 - lib/acts-as-messageable/relation.rb
 - lib/generators/acts-as-messageable/migration/migration_generator.rb
 - lib/generators/acts-as-messageable/migration/templates/migration.rb
 - lib/generators/acts-as-messageable/migration/templates/migration_permanent.rb
-- rails/init.rb
 - 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
@@ -137,7 +170,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1660593036637960416
+      hash: 2981709725326590203
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -146,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Make user messageable!;-)

data/rails/init.rb

@@ -1 +0,0 @@
-require 'acts-as-messageable'

data/spec/inheritance_spec.rb

@@ -1,23 +0,0 @@
-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