acts-as-messageable 0.4.2 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/acts-as-messageable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "acts-as-messageable"
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Piotr Nielacny"]
-  s.date = "2011-11-19"
+  s.date = "2011-12-04"
   s.email = "piotr.nielacny@gmail.com"
   s.extra_rdoc_files = [
     "README.md"
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
     "spec/custom-class_spec.rb",
     "spec/custom-required_spec.rb",
     "spec/spec_helper.rb",
+    "spec/support/admin.rb",
     "spec/support/user.rb"
   ]
   s.homepage = "http://github.com/LTe/acts-as-messageable"

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

@@ -27,8 +27,8 @@ module ActsAsMessageable
 
     # Sample documentation for scope
     default_scope order(:created_at)
-    scope :are_from,          lambda { |*args| where("sent_messageable_id = :sender", :sender => args.first) }
-    scope :are_to,            lambda { |*args| where("received_messageable_id = :receiver", :receiver => args.first) }
+    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) }
 
     scope :connected_with,    lambda { |*args|  where("(sent_messageable_type = :sent_type and

data/spec/acts-as-messageable_spec.rb

@@ -160,4 +160,24 @@ describe "ActsAsMessageable" do
     send_message
     @bob.sent_messages.class.should == ActiveRecord::Relation
   end
+
+  describe "send messages between two different models (the same id)" do
+    it "should have the same id" do
+      @alice.id.should be_equal(@admin.id)
+    end
+
+    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(@admin).size.should be_equal(0)
+    end
+
+    it "admin send message to bob" do
+      @admin.send_message(@bob, "hello", "bob")
+      @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/spec_helper.rb

@@ -12,8 +12,9 @@ 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"
+    @alice = User.create :email   => "alice@example.com"
+    @bob   = User.create :email   => "bob@example.com"
+    @admin = Admin.create :email  => "admin@example.com"
   end
 
   config.after(:all) do
@@ -44,6 +45,10 @@ def create_database
     create_table :users do |t|
       t.string :email
     end
+
+    create_table :admins do |t|
+      t.string :email
+    end
   end
 end
 

data/spec/support/admin.rb

@@ -0,0 +1,3 @@
+class Admin < ActiveRecord::Base
+  acts_as_messageable
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-messageable
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-19 00:00:00.000000000Z
+date: 2011-12-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70019859513520 !ruby/object:Gem::Requirement
+  requirement: &70249729576820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70019859513520
+  version_requirements: *70249729576820
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70019859510340 !ruby/object:Gem::Requirement
+  requirement: &70249729576140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70019859510340
+  version_requirements: *70249729576140
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &70019859508340 !ruby/object:Gem::Requirement
+  requirement: &70249729575440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70019859508340
+  version_requirements: *70249729575440
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70019859506340 !ruby/object:Gem::Requirement
+  requirement: &70249729574540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70019859506340
+  version_requirements: *70249729574540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70019859505060 !ruby/object:Gem::Requirement
+  requirement: &70249729573820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70019859505060
+  version_requirements: *70249729573820
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70019859503360 !ruby/object:Gem::Requirement
+  requirement: &70249729572960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *70019859503360
+  version_requirements: *70249729572960
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70019859501840 !ruby/object:Gem::Requirement
+  requirement: &70249729572120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70019859501840
+  version_requirements: *70249729572120
 description: 
 email: piotr.nielacny@gmail.com
 executables: []
@@ -116,6 +116,7 @@ files:
 - spec/custom-class_spec.rb
 - spec/custom-required_spec.rb
 - spec/spec_helper.rb
+- spec/support/admin.rb
 - spec/support/user.rb
 homepage: http://github.com/LTe/acts-as-messageable
 licenses: []
@@ -131,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2282999855817855460
+      hash: -4338229032027904725
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: