simple_messenger 0.0.4 → 0.0.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +8 -0
- data/lib/simple_messenger/messenger_additions.rb +5 -2
- data/lib/simple_messenger/version.rb +1 -1
- data/spec/messenger_spec.rb +40 -19
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5fe0d377a2675102266813da475e011a40de331e
|
4
|
+
data.tar.gz: 2e0a0853a3c3120b6c02d52545307598c89bb237
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a0ceea3798d57456c961a4947e00eae1f6b474847e8b246f166f42750a9a54029a75bf3badee2880e0c34311d5955f2ec066a1dee9cfb384945a82391f38a663
|
7
|
+
data.tar.gz: be6db5128e51d397e8c6bce4245e54eb24100599064ed1a9ce80c4853e13ce5aa9b191e0f205086e4d3acd01308469dea7d3aa030fb1ecd18506f132c5d2877a
|
data/CHANGELOG.md
CHANGED
@@ -21,8 +21,11 @@ module SimpleMessenger
|
|
21
21
|
end
|
22
22
|
|
23
23
|
module InstanceMethods
|
24
|
-
def messages
|
25
|
-
Message.all_for(self)
|
24
|
+
def messages(sender_type: nil, receiver_type: nil)
|
25
|
+
msgs = Message.all_for(self)
|
26
|
+
msgs = msgs.where(sender_type: sender_type.to_s.camelize) if sender_type
|
27
|
+
msgs = msgs.where(receiver_type: receiver_type.to_s.camelize) if receiver_type
|
28
|
+
msgs
|
26
29
|
end
|
27
30
|
|
28
31
|
def new_messages
|
data/spec/messenger_spec.rb
CHANGED
@@ -3,16 +3,16 @@ require 'spec_helper'
|
|
3
3
|
describe SimpleMessenger::MessengerAdditions do
|
4
4
|
# puts ActiveRecord::Base.connection.execute("PRAGMA table_info(messages);")
|
5
5
|
# Helper method to make messages quickly
|
6
|
-
def msg(uzer, recip
|
6
|
+
def msg(uzer, recip: false, read: false, send_type: 'User', recip_type: 'User')
|
7
7
|
if recip
|
8
8
|
{
|
9
|
-
sender_id: 1234, sender_type:
|
10
|
-
receiver_type:
|
9
|
+
sender_id: 1234, sender_type: send_type, receiver_id: uzer.id,
|
10
|
+
receiver_type: recip_type, content: 'Hello', viewed: read
|
11
11
|
}
|
12
12
|
else
|
13
13
|
{
|
14
|
-
sender_id: uzer.id, sender_type:
|
15
|
-
receiver_type:
|
14
|
+
sender_id: uzer.id, sender_type: send_type, receiver_id: 1234,
|
15
|
+
receiver_type: recip_type, content: 'Hello', viewed: read
|
16
16
|
}
|
17
17
|
end
|
18
18
|
end
|
@@ -29,7 +29,7 @@ describe SimpleMessenger::MessengerAdditions do
|
|
29
29
|
Message.create! msg(@user1)
|
30
30
|
@user1.sent_messages.count.should eql 2
|
31
31
|
|
32
|
-
Message.create! msg(@user1, true)
|
32
|
+
Message.create! msg(@user1, recip: true)
|
33
33
|
@user1.sent_messages.count.should eql 2
|
34
34
|
end
|
35
35
|
|
@@ -39,27 +39,48 @@ describe SimpleMessenger::MessengerAdditions do
|
|
39
39
|
Message.create! msg(@user1)
|
40
40
|
@user1.received_messages.count.should eql 0
|
41
41
|
|
42
|
-
Message.create! msg(@user1, true)
|
42
|
+
Message.create! msg(@user1, recip: true)
|
43
43
|
@user1.received_messages.count.should eql 1
|
44
44
|
end
|
45
45
|
|
46
|
-
|
47
|
-
|
46
|
+
context "all messages" do
|
47
|
+
it "should return all" do
|
48
|
+
@user1.messages.count.should eql 1
|
48
49
|
|
49
|
-
|
50
|
-
|
50
|
+
Message.create! msg(@user1)
|
51
|
+
@user1.messages.count.should eql 2
|
52
|
+
|
53
|
+
Message.create! msg(@user1, recip: true)
|
54
|
+
@user1.messages.count.should eql 3
|
55
|
+
end
|
51
56
|
|
52
|
-
|
53
|
-
|
57
|
+
it "should return all of a sender type" do
|
58
|
+
@user1.messages.count.should eql 1
|
59
|
+
|
60
|
+
Message.create! msg(@user1, recip_type: 'Foo')
|
61
|
+
@user1.messages.count.should eql 2
|
62
|
+
@user1.messages(receiver_type: :user).count.should eql 1
|
63
|
+
@user1.messages(receiver_type: :foo).count.should eql 1
|
64
|
+
end
|
65
|
+
|
66
|
+
|
67
|
+
it "should return all of a receiver type" do
|
68
|
+
@user1.messages.count.should eql 1
|
69
|
+
|
70
|
+
Message.create!(sender_id: 1234, sender_type: 'Foo', receiver: @user1, content: 'Hello')
|
71
|
+
@user1.messages.count.should eql 2
|
72
|
+
@user1.messages(sender_type: :user).count.should eql 1
|
73
|
+
@user1.messages(sender_type: :foo).count.should eql 1
|
74
|
+
end
|
54
75
|
end
|
55
76
|
|
56
77
|
it "should return all new messages" do
|
57
78
|
@user1.new_messages.count.should eql 0
|
58
79
|
|
59
|
-
Message.create! msg(@user1, true)
|
80
|
+
Message.create! msg(@user1, recip: true)
|
60
81
|
@user1.new_messages.count.should eql 1
|
61
82
|
|
62
|
-
Message.create! msg(@user1, true, true)
|
83
|
+
Message.create! msg(@user1, recip: true, read: true)
|
63
84
|
@user1.new_messages.count.should eql 1
|
64
85
|
end
|
65
86
|
|
@@ -82,7 +103,7 @@ describe SimpleMessenger::MessengerAdditions do
|
|
82
103
|
Message.create!(msg(@user1)) # Different user
|
83
104
|
@user1.received_messages_from(@user2).count.should eql 0
|
84
105
|
|
85
|
-
Message.create!(msg(@user1, true)) # Different user
|
106
|
+
Message.create!(msg(@user1, recip: true)) # Different user
|
86
107
|
@user1.received_messages_from(@user2).count.should eql 0
|
87
108
|
end
|
88
109
|
|
@@ -95,7 +116,7 @@ describe SimpleMessenger::MessengerAdditions do
|
|
95
116
|
Message.create!(msg(@user1)) # Different user
|
96
117
|
@user1.sent_messages_to(@user2).count.should eql 2
|
97
118
|
|
98
|
-
Message.create!(msg(@user1, true)) # Different user
|
119
|
+
Message.create!(msg(@user1, recip: true)) # Different user
|
99
120
|
@user1.sent_messages_to(@user2).count.should eql 2
|
100
121
|
end
|
101
122
|
|
@@ -109,7 +130,7 @@ describe SimpleMessenger::MessengerAdditions do
|
|
109
130
|
Message.create!(msg(@user1)) # Different user
|
110
131
|
@user2.received_messages_from(@user2).count.should eql 2
|
111
132
|
|
112
|
-
Message.create!(msg(@user1, true)) # Different user
|
133
|
+
Message.create!(msg(@user1, recip: true)) # Different user
|
113
134
|
@user2.received_messages_from(@user2).count.should eql 2
|
114
135
|
end
|
115
136
|
|
@@ -122,7 +143,7 @@ describe SimpleMessenger::MessengerAdditions do
|
|
122
143
|
Message.create!(msg(@user2)) # Different user
|
123
144
|
@user2.sent_messages_to(@user1).count.should eql 0
|
124
145
|
|
125
|
-
Message.create!(msg(@user2, true)) # Different user
|
146
|
+
Message.create!(msg(@user2, recip: true)) # Different user
|
126
147
|
@user2.sent_messages_to(@user1).count.should eql 0
|
127
148
|
end
|
128
149
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: simple_messenger
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Kainage
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-
|
11
|
+
date: 2013-08-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activerecord
|