thinking-sphinx 1.4.4 → 1.4.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (29) hide show
  1. data/README.textile +5 -0
  2. data/VERSION +1 -1
  3. data/features/thinking_sphinx/models/developer.rb +0 -11
  4. data/lib/thinking_sphinx.rb +93 -40
  5. data/lib/thinking_sphinx/active_record.rb +11 -31
  6. data/lib/thinking_sphinx/active_record/delta.rb +27 -0
  7. data/lib/thinking_sphinx/auto_version.rb +18 -7
  8. data/lib/thinking_sphinx/configuration.rb +26 -10
  9. data/lib/thinking_sphinx/deploy/capistrano.rb +19 -19
  10. data/lib/thinking_sphinx/excerpter.rb +2 -1
  11. data/lib/thinking_sphinx/facet.rb +9 -10
  12. data/lib/thinking_sphinx/index/builder.rb +10 -0
  13. data/lib/thinking_sphinx/rails_additions.rb +31 -0
  14. data/lib/thinking_sphinx/search.rb +3 -3
  15. data/lib/thinking_sphinx/tasks.rb +4 -3
  16. data/spec/thinking_sphinx/active_record/delta_spec.rb +7 -7
  17. data/spec/thinking_sphinx/active_record_spec.rb +4 -0
  18. data/spec/thinking_sphinx/attribute_spec.rb +6 -3
  19. data/spec/thinking_sphinx/auto_version_spec.rb +12 -4
  20. data/spec/thinking_sphinx/configuration_spec.rb +1 -1
  21. data/spec/thinking_sphinx/context_spec.rb +1 -0
  22. data/spec/thinking_sphinx/facet_search_spec.rb +0 -8
  23. data/spec/thinking_sphinx/facet_spec.rb +12 -0
  24. data/spec/thinking_sphinx/field_spec.rb +6 -3
  25. data/spec/thinking_sphinx/index/builder_spec.rb +13 -0
  26. data/spec/thinking_sphinx/search_spec.rb +2 -1
  27. data/spec/thinking_sphinx_spec.rb +2 -3
  28. metadata +65 -159
  29. data/lib/thinking_sphinx/core/array.rb +0 -7
data/spec/thinking_sphinx_spec.rb CHANGED
@@ -23,7 +23,7 @@ describe ThinkingSphinx do
23
23
  ThinkingSphinx.reset_context!
24
24
  ThinkingSphinx.context.should_not == existing
25
25
 
26
- Thread.current[:thinking_sphinx_context] = existing
26
+ ThinkingSphinx.reset_context! existing
27
27
  end
28
28
  end
29
29
 
@@ -49,7 +49,6 @@ describe ThinkingSphinx do
49
49
 
50
50
  describe '.deltas_enabled?' do
51
51
  it "should index deltas by default" do
52
- ThinkingSphinx.deltas_enabled = nil
53
52
  ThinkingSphinx.deltas_enabled?.should be_true
54
53
  end
55
54
  end
@@ -134,7 +133,7 @@ describe ThinkingSphinx do
134
133
  :connection => @connection
135
134
  )
136
135
 
137
- Thread.current[:thinking_sphinx_use_group_by_shortcut] = nil
136
+ ThinkingSphinx.reset_use_group_by_shortcut
138
137
  end
139
138
 
140
139
  it "should return true if no ONLY_FULL_GROUP_BY" do
metadata CHANGED
@@ -1,13 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: thinking-sphinx
3
3
  version: !ruby/object:Gem::Version
4
- hash: 15
5
- prerelease: false
6
- segments:
7
- - 1
8
- - 4
9
- - 4
10
- version: 1.4.4
4
+ prerelease:
5
+ version: 1.4.5
11
6
  platform: ruby
12
7
  authors:
13
8
  - Pat Allan
@@ -15,273 +10,188 @@ autorequire:
15
10
  bindir: bin
16
11
  cert_chain: []
17
12
 
18
- date: 2011-04-03 00:00:00 +11:00
13
+ date: 2011-05-12 00:00:00 +10:00
19
14
  default_executable:
20
15
  dependencies:
21
16
  - !ruby/object:Gem::Dependency
22
- type: :runtime
23
- prerelease: false
24
17
  name: activerecord
25
- version_requirements: &id001 !ruby/object:Gem::Requirement
18
+ requirement: &id001 !ruby/object:Gem::Requirement
26
19
  none: false
27
20
  requirements:
28
- - - ">="
29
- - !ruby/object:Gem::Version
30
- hash: 39
31
- segments:
32
- - 1
33
- - 15
34
- - 6
35
- version: 1.15.6
36
21
  - - <
37
22
  - !ruby/object:Gem::Version
38
- hash: 7
39
- segments:
40
- - 3
41
- - 0
42
- - 0
43
23
  version: 3.0.0
44
- requirement: *id001
45
- - !ruby/object:Gem::Dependency
24
+ - - ">="
25
+ - !ruby/object:Gem::Version
26
+ version: 1.15.6
46
27
  type: :runtime
47
28
  prerelease: false
29
+ version_requirements: *id001
30
+ - !ruby/object:Gem::Dependency
48
31
  name: riddle
49
- version_requirements: &id002 !ruby/object:Gem::Requirement
32
+ requirement: &id002 !ruby/object:Gem::Requirement
50
33
  none: false
51
34
  requirements:
52
35
  - - ">="
53
36
  - !ruby/object:Gem::Version
54
- hash: 27
55
- segments:
56
- - 1
57
- - 2
58
- - 2
59
- version: 1.2.2
60
- requirement: *id002
61
- - !ruby/object:Gem::Dependency
37
+ version: 1.3.2
62
38
  type: :runtime
63
39
  prerelease: false
40
+ version_requirements: *id002
41
+ - !ruby/object:Gem::Dependency
64
42
  name: after_commit
65
- version_requirements: &id003 !ruby/object:Gem::Requirement
43
+ requirement: &id003 !ruby/object:Gem::Requirement
66
44
  none: false
67
45
  requirements:
68
46
  - - ">="
69
47
  - !ruby/object:Gem::Version
70
- hash: 25
71
- segments:
72
- - 1
73
- - 0
74
- - 7
75
48
  version: 1.0.7
76
- requirement: *id003
77
- - !ruby/object:Gem::Dependency
78
- type: :development
49
+ type: :runtime
79
50
  prerelease: false
51
+ version_requirements: *id003
52
+ - !ruby/object:Gem::Dependency
80
53
  name: mysql
81
- version_requirements: &id004 !ruby/object:Gem::Requirement
54
+ requirement: &id004 !ruby/object:Gem::Requirement
82
55
  none: false
83
56
  requirements:
84
57
  - - "="
85
58
  - !ruby/object:Gem::Version
86
- hash: 45
87
- segments:
88
- - 2
89
- - 8
90
- - 1
91
59
  version: 2.8.1
92
- requirement: *id004
93
- - !ruby/object:Gem::Dependency
94
60
  type: :development
95
61
  prerelease: false
62
+ version_requirements: *id004
63
+ - !ruby/object:Gem::Dependency
96
64
  name: pg
97
- version_requirements: &id005 !ruby/object:Gem::Requirement
65
+ requirement: &id005 !ruby/object:Gem::Requirement
98
66
  none: false
99
67
  requirements:
100
68
  - - "="
101
69
  - !ruby/object:Gem::Version
102
- hash: 59
103
- segments:
104
- - 0
105
- - 9
106
- - 0
107
70
  version: 0.9.0
108
- requirement: *id005
109
- - !ruby/object:Gem::Dependency
110
71
  type: :development
111
72
  prerelease: false
73
+ version_requirements: *id005
74
+ - !ruby/object:Gem::Dependency
112
75
  name: jeweler
113
- version_requirements: &id006 !ruby/object:Gem::Requirement
76
+ requirement: &id006 !ruby/object:Gem::Requirement
114
77
  none: false
115
78
  requirements:
116
79
  - - "="
117
80
  - !ruby/object:Gem::Version
118
- hash: 1
119
- segments:
120
- - 1
121
- - 5
122
- - 1
123
81
  version: 1.5.1
124
- requirement: *id006
125
- - !ruby/object:Gem::Dependency
126
82
  type: :development
127
83
  prerelease: false
84
+ version_requirements: *id006
85
+ - !ruby/object:Gem::Dependency
128
86
  name: yard
129
- version_requirements: &id007 !ruby/object:Gem::Requirement
87
+ requirement: &id007 !ruby/object:Gem::Requirement
130
88
  none: false
131
89
  requirements:
132
90
  - - "="
133
91
  - !ruby/object:Gem::Version
134
- hash: 5
135
- segments:
136
- - 0
137
- - 6
138
- - 1
139
- version: 0.6.1
140
- requirement: *id007
141
- - !ruby/object:Gem::Dependency
92
+ version: 0.6.8
142
93
  type: :development
143
94
  prerelease: false
95
+ version_requirements: *id007
96
+ - !ruby/object:Gem::Dependency
144
97
  name: rspec
145
- version_requirements: &id008 !ruby/object:Gem::Requirement
98
+ requirement: &id008 !ruby/object:Gem::Requirement
146
99
  none: false
147
100
  requirements:
148
101
  - - "="
149
102
  - !ruby/object:Gem::Version
150
- hash: 13
151
- segments:
152
- - 2
153
- - 0
154
- - 1
155
- version: 2.0.1
156
- requirement: *id008
157
- - !ruby/object:Gem::Dependency
103
+ version: 2.5.0
158
104
  type: :development
159
105
  prerelease: false
106
+ version_requirements: *id008
107
+ - !ruby/object:Gem::Dependency
160
108
  name: rspec-core
161
- version_requirements: &id009 !ruby/object:Gem::Requirement
109
+ requirement: &id009 !ruby/object:Gem::Requirement
162
110
  none: false
163
111
  requirements:
164
112
  - - "="
165
113
  - !ruby/object:Gem::Version
166
- hash: 13
167
- segments:
168
- - 2
169
- - 0
170
- - 1
171
- version: 2.0.1
172
- requirement: *id009
173
- - !ruby/object:Gem::Dependency
114
+ version: 2.5.0
174
115
  type: :development
175
116
  prerelease: false
117
+ version_requirements: *id009
118
+ - !ruby/object:Gem::Dependency
176
119
  name: rspec-expectations
177
- version_requirements: &id010 !ruby/object:Gem::Requirement
120
+ requirement: &id010 !ruby/object:Gem::Requirement
178
121
  none: false
179
122
  requirements:
180
123
  - - "="
181
124
  - !ruby/object:Gem::Version
182
- hash: 13
183
- segments:
184
- - 2
185
- - 0
186
- - 1
187
- version: 2.0.1
188
- requirement: *id010
189
- - !ruby/object:Gem::Dependency
125
+ version: 2.5.0
190
126
  type: :development
191
127
  prerelease: false
128
+ version_requirements: *id010
129
+ - !ruby/object:Gem::Dependency
192
130
  name: rspec-mocks
193
- version_requirements: &id011 !ruby/object:Gem::Requirement
131
+ requirement: &id011 !ruby/object:Gem::Requirement
194
132
  none: false
195
133
  requirements:
196
134
  - - "="
197
135
  - !ruby/object:Gem::Version
198
- hash: 13
199
- segments:
200
- - 2
201
- - 0
202
- - 1
203
- version: 2.0.1
204
- requirement: *id011
205
- - !ruby/object:Gem::Dependency
136
+ version: 2.5.0
206
137
  type: :development
207
138
  prerelease: false
139
+ version_requirements: *id011
140
+ - !ruby/object:Gem::Dependency
208
141
  name: rcov
209
- version_requirements: &id012 !ruby/object:Gem::Requirement
142
+ requirement: &id012 !ruby/object:Gem::Requirement
210
143
  none: false
211
144
  requirements:
212
145
  - - "="
213
146
  - !ruby/object:Gem::Version
214
- hash: 43
215
- segments:
216
- - 0
217
- - 9
218
- - 8
219
147
  version: 0.9.8
220
- requirement: *id012
221
- - !ruby/object:Gem::Dependency
222
148
  type: :development
223
149
  prerelease: false
150
+ version_requirements: *id012
151
+ - !ruby/object:Gem::Dependency
224
152
  name: cucumber
225
- version_requirements: &id013 !ruby/object:Gem::Requirement
153
+ requirement: &id013 !ruby/object:Gem::Requirement
226
154
  none: false
227
155
  requirements:
228
156
  - - "="
229
157
  - !ruby/object:Gem::Version
230
- hash: 51
231
- segments:
232
- - 0
233
- - 9
234
- - 4
235
- version: 0.9.4
236
- requirement: *id013
237
- - !ruby/object:Gem::Dependency
158
+ version: 0.10.2
238
159
  type: :development
239
160
  prerelease: false
161
+ version_requirements: *id013
162
+ - !ruby/object:Gem::Dependency
240
163
  name: will_paginate
241
- version_requirements: &id014 !ruby/object:Gem::Requirement
164
+ requirement: &id014 !ruby/object:Gem::Requirement
242
165
  none: false
243
166
  requirements:
244
167
  - - "="
245
168
  - !ruby/object:Gem::Version
246
- hash: 29
247
- segments:
248
- - 2
249
- - 3
250
- - 15
251
169
  version: 2.3.15
252
- requirement: *id014
253
- - !ruby/object:Gem::Dependency
254
170
  type: :development
255
171
  prerelease: false
172
+ version_requirements: *id014
173
+ - !ruby/object:Gem::Dependency
256
174
  name: ginger
257
- version_requirements: &id015 !ruby/object:Gem::Requirement
175
+ requirement: &id015 !ruby/object:Gem::Requirement
258
176
  none: false
259
177
  requirements:
260
178
  - - "="
261
179
  - !ruby/object:Gem::Version
262
- hash: 31
263
- segments:
264
- - 1
265
- - 2
266
- - 0
267
180
  version: 1.2.0
268
- requirement: *id015
269
- - !ruby/object:Gem::Dependency
270
181
  type: :development
271
182
  prerelease: false
183
+ version_requirements: *id015
184
+ - !ruby/object:Gem::Dependency
272
185
  name: faker
273
- version_requirements: &id016 !ruby/object:Gem::Requirement
186
+ requirement: &id016 !ruby/object:Gem::Requirement
274
187
  none: false
275
188
  requirements:
276
189
  - - "="
277
190
  - !ruby/object:Gem::Version
278
- hash: 17
279
- segments:
280
- - 0
281
- - 3
282
- - 1
283
191
  version: 0.3.1
284
- requirement: *id016
192
+ type: :development
193
+ prerelease: false
194
+ version_requirements: *id016
285
195
  description: A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching.
286
196
  email: pat@freelancing-gods.com
287
197
  executables: []
@@ -315,7 +225,6 @@ files:
315
225
  - lib/thinking_sphinx/class_facet.rb
316
226
  - lib/thinking_sphinx/configuration.rb
317
227
  - lib/thinking_sphinx/context.rb
318
- - lib/thinking_sphinx/core/array.rb
319
228
  - lib/thinking_sphinx/core/string.rb
320
229
  - lib/thinking_sphinx/deltas.rb
321
230
  - lib/thinking_sphinx/deltas/default_delta.rb
@@ -473,7 +382,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
473
382
  requirements:
474
383
  - - ">="
475
384
  - !ruby/object:Gem::Version
476
- hash: 3
385
+ hash: 1314985061244983665
477
386
  segments:
478
387
  - 0
479
388
  version: "0"
@@ -482,14 +391,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
482
391
  requirements:
483
392
  - - ">="
484
393
  - !ruby/object:Gem::Version
485
- hash: 3
486
- segments:
487
- - 0
488
394
  version: "0"
489
395
  requirements: []
490
396
 
491
397
  rubyforge_project:
492
- rubygems_version: 1.3.7
398
+ rubygems_version: 1.6.2
493
399
  signing_key:
494
400
  specification_version: 3
495
401
  summary: ActiveRecord/Rails Sphinx library
data/lib/thinking_sphinx/core/array.rb DELETED
@@ -1,7 +0,0 @@
1
- module SearchAsArray
2
- def ===(object)
3
- (ThinkingSphinx::Search === object) || super
4
- end
5
- end
6
-
7
- Array.extend SearchAsArray