amistad 0.9.1 → 0.9.2
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile.lock +3 -3
- data/README.markdown +1 -1
- data/amistad.gemspec +2 -1
- data/lib/amistad/active_record_friend_model.rb +1 -4
- data/lib/amistad/mongoid_friend_model.rb +0 -8
- data/lib/amistad/version.rb +1 -1
- metadata +19 -20
- data/CHANGELOG +0 -62
data/Gemfile.lock
CHANGED
@@ -1,7 +1,8 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
amistad (0.9.
|
4
|
+
amistad (0.9.2)
|
5
|
+
squeel
|
5
6
|
|
6
7
|
GEM
|
7
8
|
remote: http://rubygems.org/
|
@@ -62,7 +63,7 @@ GEM
|
|
62
63
|
rspec-mocks (2.11.3)
|
63
64
|
ruby-progressbar (1.0.2)
|
64
65
|
sqlite3 (1.3.6)
|
65
|
-
squeel (1.0.
|
66
|
+
squeel (1.0.13)
|
66
67
|
activerecord (~> 3.0)
|
67
68
|
activesupport (~> 3.0)
|
68
69
|
polyamorous (~> 0.5.0)
|
@@ -86,4 +87,3 @@ DEPENDENCIES
|
|
86
87
|
rake
|
87
88
|
rspec
|
88
89
|
sqlite3
|
89
|
-
squeel
|
data/README.markdown
CHANGED
data/amistad.gemspec
CHANGED
@@ -14,6 +14,8 @@ Gem::Specification.new do |s|
|
|
14
14
|
|
15
15
|
s.rubyforge_project = "amistad"
|
16
16
|
|
17
|
+
s.add_dependency 'squeel'
|
18
|
+
|
17
19
|
s.add_development_dependency "bundler"
|
18
20
|
s.add_development_dependency "rake"
|
19
21
|
s.add_development_dependency "rspec"
|
@@ -27,7 +29,6 @@ Gem::Specification.new do |s|
|
|
27
29
|
s.add_development_dependency "fuubar"
|
28
30
|
s.add_development_dependency "awesome_print"
|
29
31
|
s.add_development_dependency "mongo_mapper"
|
30
|
-
s.add_development_dependency "squeel"
|
31
32
|
|
32
33
|
s.files = `git ls-files`.split("\n")
|
33
34
|
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
|
@@ -94,13 +94,10 @@ module Amistad
|
|
94
94
|
( blocker_id == nil )
|
95
95
|
}
|
96
96
|
|
97
|
-
|
97
|
+
self.class.where{
|
98
98
|
( id.in(approved_friendships.select{friend_id}) ) |
|
99
99
|
( id.in(approved_inverse_friendships.select{friendable_id}) )
|
100
100
|
}
|
101
|
-
|
102
|
-
# puts predicate.to_sql
|
103
|
-
predicate
|
104
101
|
end
|
105
102
|
|
106
103
|
# total # of invited and invited_by without association loading
|
@@ -45,14 +45,6 @@ module Amistad
|
|
45
45
|
:blocked_pending_friend_ids,
|
46
46
|
:blocked_pending_inverse_friend_ids,
|
47
47
|
)
|
48
|
-
|
49
|
-
%w(friend_ids inverse_friend_ids pending_friend_ids pending_inverse_friend_ids blocked_friend_ids blocked_inverse_friend_ids blocked_pending_friend_ids blocked_pending_inverse_friend_ids).each do |attribute|
|
50
|
-
define_method(attribute.to_sym) do
|
51
|
-
value = read_attribute(attribute)
|
52
|
-
write_attribute(attribute, value = []) if value.nil?
|
53
|
-
value
|
54
|
-
end
|
55
|
-
end
|
56
48
|
end
|
57
49
|
end
|
58
50
|
end
|
data/lib/amistad/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: amistad
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.9.
|
4
|
+
version: 0.9.2
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,17 +9,17 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-11-
|
12
|
+
date: 2012-11-02 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
|
-
name:
|
15
|
+
name: squeel
|
16
16
|
requirement: !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
20
20
|
- !ruby/object:Gem::Version
|
21
21
|
version: '0'
|
22
|
-
type: :
|
22
|
+
type: :runtime
|
23
23
|
prerelease: false
|
24
24
|
version_requirements: !ruby/object:Gem::Requirement
|
25
25
|
none: false
|
@@ -28,7 +28,7 @@ dependencies:
|
|
28
28
|
- !ruby/object:Gem::Version
|
29
29
|
version: '0'
|
30
30
|
- !ruby/object:Gem::Dependency
|
31
|
-
name:
|
31
|
+
name: bundler
|
32
32
|
requirement: !ruby/object:Gem::Requirement
|
33
33
|
none: false
|
34
34
|
requirements:
|
@@ -44,7 +44,7 @@ dependencies:
|
|
44
44
|
- !ruby/object:Gem::Version
|
45
45
|
version: '0'
|
46
46
|
- !ruby/object:Gem::Dependency
|
47
|
-
name:
|
47
|
+
name: rake
|
48
48
|
requirement: !ruby/object:Gem::Requirement
|
49
49
|
none: false
|
50
50
|
requirements:
|
@@ -60,7 +60,7 @@ dependencies:
|
|
60
60
|
- !ruby/object:Gem::Version
|
61
61
|
version: '0'
|
62
62
|
- !ruby/object:Gem::Dependency
|
63
|
-
name:
|
63
|
+
name: rspec
|
64
64
|
requirement: !ruby/object:Gem::Requirement
|
65
65
|
none: false
|
66
66
|
requirements:
|
@@ -76,7 +76,7 @@ dependencies:
|
|
76
76
|
- !ruby/object:Gem::Version
|
77
77
|
version: '0'
|
78
78
|
- !ruby/object:Gem::Dependency
|
79
|
-
name:
|
79
|
+
name: activerecord
|
80
80
|
requirement: !ruby/object:Gem::Requirement
|
81
81
|
none: false
|
82
82
|
requirements:
|
@@ -92,7 +92,7 @@ dependencies:
|
|
92
92
|
- !ruby/object:Gem::Version
|
93
93
|
version: '0'
|
94
94
|
- !ruby/object:Gem::Dependency
|
95
|
-
name:
|
95
|
+
name: mysql2
|
96
96
|
requirement: !ruby/object:Gem::Requirement
|
97
97
|
none: false
|
98
98
|
requirements:
|
@@ -108,7 +108,7 @@ dependencies:
|
|
108
108
|
- !ruby/object:Gem::Version
|
109
109
|
version: '0'
|
110
110
|
- !ruby/object:Gem::Dependency
|
111
|
-
name:
|
111
|
+
name: pg
|
112
112
|
requirement: !ruby/object:Gem::Requirement
|
113
113
|
none: false
|
114
114
|
requirements:
|
@@ -124,7 +124,7 @@ dependencies:
|
|
124
124
|
- !ruby/object:Gem::Version
|
125
125
|
version: '0'
|
126
126
|
- !ruby/object:Gem::Dependency
|
127
|
-
name:
|
127
|
+
name: database_cleaner
|
128
128
|
requirement: !ruby/object:Gem::Requirement
|
129
129
|
none: false
|
130
130
|
requirements:
|
@@ -140,7 +140,7 @@ dependencies:
|
|
140
140
|
- !ruby/object:Gem::Version
|
141
141
|
version: '0'
|
142
142
|
- !ruby/object:Gem::Dependency
|
143
|
-
name:
|
143
|
+
name: sqlite3
|
144
144
|
requirement: !ruby/object:Gem::Requirement
|
145
145
|
none: false
|
146
146
|
requirements:
|
@@ -156,7 +156,7 @@ dependencies:
|
|
156
156
|
- !ruby/object:Gem::Version
|
157
157
|
version: '0'
|
158
158
|
- !ruby/object:Gem::Dependency
|
159
|
-
name:
|
159
|
+
name: mongoid
|
160
160
|
requirement: !ruby/object:Gem::Requirement
|
161
161
|
none: false
|
162
162
|
requirements:
|
@@ -172,7 +172,7 @@ dependencies:
|
|
172
172
|
- !ruby/object:Gem::Version
|
173
173
|
version: '0'
|
174
174
|
- !ruby/object:Gem::Dependency
|
175
|
-
name:
|
175
|
+
name: bson_ext
|
176
176
|
requirement: !ruby/object:Gem::Requirement
|
177
177
|
none: false
|
178
178
|
requirements:
|
@@ -188,7 +188,7 @@ dependencies:
|
|
188
188
|
- !ruby/object:Gem::Version
|
189
189
|
version: '0'
|
190
190
|
- !ruby/object:Gem::Dependency
|
191
|
-
name:
|
191
|
+
name: fuubar
|
192
192
|
requirement: !ruby/object:Gem::Requirement
|
193
193
|
none: false
|
194
194
|
requirements:
|
@@ -204,7 +204,7 @@ dependencies:
|
|
204
204
|
- !ruby/object:Gem::Version
|
205
205
|
version: '0'
|
206
206
|
- !ruby/object:Gem::Dependency
|
207
|
-
name:
|
207
|
+
name: awesome_print
|
208
208
|
requirement: !ruby/object:Gem::Requirement
|
209
209
|
none: false
|
210
210
|
requirements:
|
@@ -220,7 +220,7 @@ dependencies:
|
|
220
220
|
- !ruby/object:Gem::Version
|
221
221
|
version: '0'
|
222
222
|
- !ruby/object:Gem::Dependency
|
223
|
-
name:
|
223
|
+
name: mongo_mapper
|
224
224
|
requirement: !ruby/object:Gem::Requirement
|
225
225
|
none: false
|
226
226
|
requirements:
|
@@ -243,7 +243,6 @@ extensions: []
|
|
243
243
|
extra_rdoc_files: []
|
244
244
|
files:
|
245
245
|
- .gitignore
|
246
|
-
- CHANGELOG
|
247
246
|
- Gemfile
|
248
247
|
- Gemfile.lock
|
249
248
|
- LICENCE
|
@@ -293,7 +292,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
293
292
|
version: '0'
|
294
293
|
segments:
|
295
294
|
- 0
|
296
|
-
hash:
|
295
|
+
hash: 2475975757639508485
|
297
296
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
298
297
|
none: false
|
299
298
|
requirements:
|
@@ -302,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
302
301
|
version: '0'
|
303
302
|
segments:
|
304
303
|
- 0
|
305
|
-
hash:
|
304
|
+
hash: 2475975757639508485
|
306
305
|
requirements: []
|
307
306
|
rubyforge_project: amistad
|
308
307
|
rubygems_version: 1.8.23
|
data/CHANGELOG
DELETED
@@ -1,62 +0,0 @@
|
|
1
|
-
Version 0.7.5 (30.09.2011)
|
2
|
-
--------------------------
|
3
|
-
- Updated Rakefile to add default task that runs the ActiveRecord and Mongoid tests [David Czarnecki]
|
4
|
-
- Only load the relevant ORM classes depending on which is in use [David Czarnecki]
|
5
|
-
- Checked compatibilty with Rails 3.1
|
6
|
-
- Updated the dependencies versions
|
7
|
-
|
8
|
-
Version 0.7.4 (23.04.2011)
|
9
|
-
--------------------------
|
10
|
-
- Checked compatibilty with Mongoid 2.0 final release
|
11
|
-
- Updated the dependencies versions
|
12
|
-
|
13
|
-
Version 0.7.3 (19.02.2011)
|
14
|
-
--------------------------
|
15
|
-
- Fixed a bug occuring with mongoid when the users were created before amistad was activated in the user model (thanks to Drew Baumann for signaling this bug)
|
16
|
-
|
17
|
-
Version 0.7.2 (16.02.2011)
|
18
|
-
--------------------------
|
19
|
-
- Added total_friends() and total_blocked() which count friendships and blocks without loading associations (by David Czarnecki)
|
20
|
-
- Added namespaced rake tasks spec:activerecord and spec:mongoid (suggested by Adrian Dulić)
|
21
|
-
- Use fuubar
|
22
|
-
|
23
|
-
Version 0.7.1 (12.02.2011)
|
24
|
-
--------------------------
|
25
|
-
- Totally mess the previous relase. This one fix it.
|
26
|
-
|
27
|
-
Version 0.7.0 (12.02.2011)
|
28
|
-
--------------------------
|
29
|
-
- add mongoid support
|
30
|
-
- method remove changed to remove_friendship
|
31
|
-
|
32
|
-
Version 0.6.0 (06.01.2011)
|
33
|
-
--------------------------
|
34
|
-
- improved blocking and unblocking friends
|
35
|
-
- method is_friend_with? changed to friend_with?
|
36
|
-
- method is_connected_with? changed to connected_with?
|
37
|
-
- method was_invited_by? changed to invited_by?
|
38
|
-
- method has_invited? changed to invited?
|
39
|
-
- added method blocked?
|
40
|
-
|
41
|
-
Version 0.5.8 (08.12.2010)
|
42
|
-
--------------------------
|
43
|
-
- made find_any_friendship_with public
|
44
|
-
|
45
|
-
Version 0.5.7 (07.12.2010)
|
46
|
-
--------------------------
|
47
|
-
- fixed bug with invitation approving
|
48
|
-
- cleaned up the invite and approve methods
|
49
|
-
|
50
|
-
Version 0.5.6 (30.11.2010)
|
51
|
-
--------------------------
|
52
|
-
- added has_invited? method in FriendModel
|
53
|
-
- added is_connected_with? method in FriendModel
|
54
|
-
- improved was_invited_by?
|
55
|
-
|
56
|
-
Version 0.5.5 (29.11.2010)
|
57
|
-
--------------------------
|
58
|
-
- added unblock method in FriendModel
|
59
|
-
|
60
|
-
Version 0.5.2 (28.11.2010)
|
61
|
-
--------------------------
|
62
|
-
- Migrated gem to bundler
|