simple_messenger 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9be8fb4526ea8c8b980ad344683ace9a13820161
-  data.tar.gz: a9540232949c6ea7ba89d96970e8f27537112c2b
+  metadata.gz: 5fe0d377a2675102266813da475e011a40de331e
+  data.tar.gz: 2e0a0853a3c3120b6c02d52545307598c89bb237
 SHA512:
-  metadata.gz: efbbeb4bb1f4d07fb6286b96d0ce2b61dc2841b8f765c4643758a84ab9fe436e5a0b5669a9a597b0d132f1626851397e96087827a34655a23bfb2753ae09a3f8
-  data.tar.gz: 9fb2940ad41a46d1db92df22ce379837a31aff790a973e97d49770f54101f27f309b9639920127eb230d6bac24f72b33b25cbe9368497d6e0442f4fb32177a74
+  metadata.gz: a0ceea3798d57456c961a4947e00eae1f6b474847e8b246f166f42750a9a54029a75bf3badee2880e0c34311d5955f2ec066a1dee9cfb384945a82391f38a663
+  data.tar.gz: be6db5128e51d397e8c6bce4245e54eb24100599064ed1a9ce80c4853e13ce5aa9b191e0f205086e4d3acd01308469dea7d3aa030fb1ecd18506f132c5d2877a

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v0.0.5
+
+* Feature: sender/receiver type constraints when fetching messages
+
+## v0.0.4
+
+* Updated to rails 4
+
 ## v0.0.3
 
 * New methods 'received_messages_from(model) and sent_messages_to(model) added

data/lib/simple_messenger/messenger_additions.rb

@@ -21,8 +21,11 @@ module SimpleMessenger
     end
 
     module InstanceMethods
-      def messages
-        Message.all_for(self)
+      def messages(sender_type: nil, receiver_type: nil)
+        msgs = Message.all_for(self)
+        msgs = msgs.where(sender_type: sender_type.to_s.camelize) if sender_type
+        msgs = msgs.where(receiver_type: receiver_type.to_s.camelize) if receiver_type
+        msgs
       end
 
       def new_messages

data/lib/simple_messenger/version.rb

@@ -1,3 +1,3 @@
 module SimpleMessenger
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/messenger_spec.rb

@@ -3,16 +3,16 @@ require 'spec_helper'
 describe SimpleMessenger::MessengerAdditions do
   # puts ActiveRecord::Base.connection.execute("PRAGMA table_info(messages);")
   # Helper method to make messages quickly
-  def msg(uzer, recip = false, read = false)
+  def msg(uzer, recip: false, read: false, send_type: 'User', recip_type: 'User')
     if recip
       {
-        sender_id: 1234, sender_type: 'User', receiver_id: uzer.id,
-        receiver_type: 'User', content: 'Hello', viewed: read
+        sender_id: 1234, sender_type: send_type, receiver_id: uzer.id,
+        receiver_type: recip_type, content: 'Hello', viewed: read
       }
     else
       {
-        sender_id: uzer.id, sender_type: 'User', receiver_id: 1234,
-        receiver_type: 'User', content: 'Hello', viewed: read
+        sender_id: uzer.id, sender_type: send_type, receiver_id: 1234,
+        receiver_type: recip_type, content: 'Hello', viewed: read
       }
     end
   end
@@ -29,7 +29,7 @@ describe SimpleMessenger::MessengerAdditions do
     Message.create! msg(@user1)
     @user1.sent_messages.count.should eql 2
 
-    Message.create! msg(@user1, true)
+    Message.create! msg(@user1, recip: true)
     @user1.sent_messages.count.should eql 2
   end
 
@@ -39,27 +39,48 @@ describe SimpleMessenger::MessengerAdditions do
     Message.create! msg(@user1)
     @user1.received_messages.count.should eql 0
 
-    Message.create! msg(@user1, true)
+    Message.create! msg(@user1, recip: true)
     @user1.received_messages.count.should eql 1
   end
 
-  it "should return all messages" do
-    @user1.messages.count.should eql 1
+  context "all messages" do
+    it "should return all" do
+      @user1.messages.count.should eql 1
 
-    Message.create! msg(@user1)
-    @user1.messages.count.should eql 2
+      Message.create! msg(@user1)
+      @user1.messages.count.should eql 2
+
+      Message.create! msg(@user1, recip: true)
+      @user1.messages.count.should eql 3
+    end
 
-    Message.create! msg(@user1, true)
-    @user1.messages.count.should eql 3
+    it "should return all of a sender type" do
+      @user1.messages.count.should eql 1
+
+      Message.create! msg(@user1, recip_type: 'Foo')
+      @user1.messages.count.should eql 2
+      @user1.messages(receiver_type: :user).count.should eql 1
+      @user1.messages(receiver_type: :foo).count.should eql 1
+    end
+
+
+    it "should return all of a receiver type" do
+      @user1.messages.count.should eql 1
+
+      Message.create!(sender_id: 1234, sender_type: 'Foo', receiver: @user1, content: 'Hello')
+      @user1.messages.count.should eql 2
+      @user1.messages(sender_type: :user).count.should eql 1
+      @user1.messages(sender_type: :foo).count.should eql 1
+    end
   end
 
   it "should return all new messages" do
     @user1.new_messages.count.should eql 0
 
-    Message.create! msg(@user1, true)
+    Message.create! msg(@user1, recip: true)
     @user1.new_messages.count.should eql 1
 
-    Message.create! msg(@user1, true, true)
+    Message.create! msg(@user1, recip: true, read: true)
     @user1.new_messages.count.should eql 1
   end
 
@@ -82,7 +103,7 @@ describe SimpleMessenger::MessengerAdditions do
     Message.create!(msg(@user1)) # Different user
     @user1.received_messages_from(@user2).count.should eql 0
 
-    Message.create!(msg(@user1, true)) # Different user
+    Message.create!(msg(@user1, recip: true)) # Different user
     @user1.received_messages_from(@user2).count.should eql 0
   end
 
@@ -95,7 +116,7 @@ describe SimpleMessenger::MessengerAdditions do
     Message.create!(msg(@user1)) # Different user
     @user1.sent_messages_to(@user2).count.should eql 2
 
-    Message.create!(msg(@user1, true)) # Different user
+    Message.create!(msg(@user1, recip: true)) # Different user
     @user1.sent_messages_to(@user2).count.should eql 2
   end
 
@@ -109,7 +130,7 @@ describe SimpleMessenger::MessengerAdditions do
       Message.create!(msg(@user1)) # Different user
       @user2.received_messages_from(@user2).count.should eql 2
 
-      Message.create!(msg(@user1, true)) # Different user
+      Message.create!(msg(@user1, recip: true)) # Different user
       @user2.received_messages_from(@user2).count.should eql 2
     end
 
@@ -122,7 +143,7 @@ describe SimpleMessenger::MessengerAdditions do
       Message.create!(msg(@user2)) # Different user
       @user2.sent_messages_to(@user1).count.should eql 0
 
-      Message.create!(msg(@user2, true)) # Different user
+      Message.create!(msg(@user2, recip: true)) # Different user
       @user2.sent_messages_to(@user1).count.should eql 0
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_messenger
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Kainage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord