flying-sphinx 1.2.1 → 1.3.0

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 (37) hide show
  1. checksums.yaml +7 -0
  2. data/.gitignore +1 -0
  3. data/.travis.yml +11 -35
  4. data/Appraisals +23 -21
  5. data/Gemfile +5 -10
  6. data/README.textile +5 -3
  7. data/flying-sphinx.gemspec +7 -3
  8. data/lib/flying_sphinx.rb +8 -2
  9. data/lib/flying_sphinx/action.rb +1 -1
  10. data/lib/flying_sphinx/api.rb +6 -20
  11. data/lib/flying_sphinx/cli.rb +3 -1
  12. data/lib/flying_sphinx/configuration.rb +1 -1
  13. data/lib/flying_sphinx/configuration_options.rb +12 -15
  14. data/lib/flying_sphinx/configurer.rb +62 -0
  15. data/lib/flying_sphinx/controller.rb +26 -27
  16. data/lib/flying_sphinx/request/hmac.rb +20 -0
  17. data/lib/flying_sphinx/response/json.rb +2 -0
  18. data/lib/flying_sphinx/setting_files.rb +1 -1
  19. data/lib/flying_sphinx/version.rb +1 -1
  20. data/spec/acceptance/configuring_spec.rb +34 -0
  21. data/spec/acceptance/get_info_spec.rb +5 -4
  22. data/spec/acceptance/start_or_stop_sphinx_spec.rb +12 -2
  23. data/spec/flying_sphinx/action_spec.rb +1 -1
  24. data/spec/flying_sphinx/api_spec.rb +2 -22
  25. data/spec/flying_sphinx/configuration_spec.rb +1 -1
  26. data/spec/flying_sphinx/controller_spec.rb +33 -19
  27. data/spec/flying_sphinx/setting_files_spec.rb +16 -16
  28. data/spec/spec_helper.rb +1 -0
  29. data/spec/support/hmac.rb +23 -0
  30. data/spec/support/multipart.rb +56 -0
  31. data/spec/support/successful_action.rb +7 -1
  32. metadata +108 -73
  33. data/gemfiles/rails_2.3.gemfile +0 -21
  34. data/gemfiles/rails_3.0.gemfile +0 -21
  35. data/gemfiles/rails_3.2.gemfile +0 -18
  36. data/gemfiles/rails_4.0.gemfile +0 -18
  37. data/lib/flying_sphinx/gzipped_hash.rb +0 -36
data/spec/support/successful_action.rb CHANGED
@@ -9,12 +9,14 @@ class SuccessfulAction
9
9
  def matches?(block)
10
10
  pusher.start
11
11
  thread = Thread.new { call block }
12
- sleep 1.0
12
+ sleep 1.5
13
13
 
14
14
  pusher.send 'completion', 'id' => action_id
15
15
  thread.join
16
16
  pusher.stop
17
17
 
18
+ sleep 0.5
19
+
18
20
  result
19
21
  end
20
22
 
@@ -22,6 +24,10 @@ class SuccessfulAction
22
24
  "Action failed"
23
25
  end
24
26
 
27
+ def supports_block_expectations?
28
+ true
29
+ end
30
+
25
31
  private
26
32
 
27
33
  attr_reader :action_id, :result
metadata CHANGED
@@ -1,190 +1,223 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: flying-sphinx
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.1
5
- prerelease:
4
+ version: 1.3.0
6
5
  platform: ruby
7
6
  authors:
8
7
  - Pat Allan
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2017-09-28 00:00:00.000000000 Z
11
+ date: 2017-12-04 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
- name: thinking-sphinx
14
+ name: ey-hmac
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
- - - ! '>='
17
+ - - "~>"
20
18
  - !ruby/object:Gem::Version
21
- version: '0'
19
+ version: '2.2'
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
- - - ! '>='
24
+ - - "~>"
28
25
  - !ruby/object:Gem::Version
29
- version: '0'
26
+ version: '2.2'
30
27
  - !ruby/object:Gem::Dependency
31
- name: riddle
28
+ name: faraday
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
- - - ! '>='
31
+ - - ">="
36
32
  - !ruby/object:Gem::Version
37
- version: 1.5.6
33
+ version: '0.7'
38
34
  type: :runtime
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
- - - ! '>='
38
+ - - ">="
44
39
  - !ruby/object:Gem::Version
45
- version: 1.5.6
40
+ version: '0.7'
46
41
  - !ruby/object:Gem::Dependency
47
- name: multi_json
42
+ name: gzipped_tar
48
43
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
44
  requirements:
51
- - - ! '>='
45
+ - - "~>"
52
46
  - !ruby/object:Gem::Version
53
- version: 1.3.0
47
+ version: 0.0.3
54
48
  type: :runtime
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
51
  requirements:
59
- - - ! '>='
52
+ - - "~>"
60
53
  - !ruby/object:Gem::Version
61
- version: 1.3.0
54
+ version: 0.0.3
62
55
  - !ruby/object:Gem::Dependency
63
- name: faraday
56
+ name: multi_json
64
57
  requirement: !ruby/object:Gem::Requirement
65
- none: false
66
58
  requirements:
67
- - - ! '>='
59
+ - - ">="
68
60
  - !ruby/object:Gem::Version
69
- version: '0.7'
61
+ version: 1.3.0
70
62
  type: :runtime
71
63
  prerelease: false
72
64
  version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
65
  requirements:
75
- - - ! '>='
66
+ - - ">="
76
67
  - !ruby/object:Gem::Version
77
- version: '0.7'
68
+ version: 1.3.0
78
69
  - !ruby/object:Gem::Dependency
79
70
  name: pusher-client
80
71
  requirement: !ruby/object:Gem::Requirement
81
- none: false
82
72
  requirements:
83
- - - ~>
73
+ - - "~>"
84
74
  - !ruby/object:Gem::Version
85
75
  version: '0.3'
86
76
  type: :runtime
87
77
  prerelease: false
88
78
  version_requirements: !ruby/object:Gem::Requirement
89
- none: false
90
79
  requirements:
91
- - - ~>
80
+ - - "~>"
92
81
  - !ruby/object:Gem::Version
93
82
  version: '0.3'
83
+ - !ruby/object:Gem::Dependency
84
+ name: riddle
85
+ requirement: !ruby/object:Gem::Requirement
86
+ requirements:
87
+ - - ">="
88
+ - !ruby/object:Gem::Version
89
+ version: 1.5.6
90
+ type: :runtime
91
+ prerelease: false
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - ">="
95
+ - !ruby/object:Gem::Version
96
+ version: 1.5.6
97
+ - !ruby/object:Gem::Dependency
98
+ name: thinking-sphinx
99
+ requirement: !ruby/object:Gem::Requirement
100
+ requirements:
101
+ - - ">="
102
+ - !ruby/object:Gem::Version
103
+ version: 1.5.0
104
+ type: :runtime
105
+ prerelease: false
106
+ version_requirements: !ruby/object:Gem::Requirement
107
+ requirements:
108
+ - - ">="
109
+ - !ruby/object:Gem::Version
110
+ version: 1.5.0
111
+ - !ruby/object:Gem::Dependency
112
+ name: appraisal
113
+ requirement: !ruby/object:Gem::Requirement
114
+ requirements:
115
+ - - "~>"
116
+ - !ruby/object:Gem::Version
117
+ version: '2.2'
118
+ type: :development
119
+ prerelease: false
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ requirements:
122
+ - - "~>"
123
+ - !ruby/object:Gem::Version
124
+ version: '2.2'
94
125
  - !ruby/object:Gem::Dependency
95
126
  name: dotenv
96
127
  requirement: !ruby/object:Gem::Requirement
97
- none: false
98
128
  requirements:
99
- - - ~>
129
+ - - "~>"
100
130
  - !ruby/object:Gem::Version
101
131
  version: 0.11.1
102
132
  type: :development
103
133
  prerelease: false
104
134
  version_requirements: !ruby/object:Gem::Requirement
105
- none: false
106
135
  requirements:
107
- - - ~>
136
+ - - "~>"
108
137
  - !ruby/object:Gem::Version
109
138
  version: 0.11.1
110
139
  - !ruby/object:Gem::Dependency
111
140
  name: em-websocket
112
141
  requirement: !ruby/object:Gem::Requirement
113
- none: false
114
142
  requirements:
115
- - - ~>
143
+ - - "~>"
116
144
  - !ruby/object:Gem::Version
117
145
  version: 0.5.1
118
146
  type: :development
119
147
  prerelease: false
120
148
  version_requirements: !ruby/object:Gem::Requirement
121
- none: false
122
149
  requirements:
123
- - - ~>
150
+ - - "~>"
124
151
  - !ruby/object:Gem::Version
125
152
  version: 0.5.1
126
153
  - !ruby/object:Gem::Dependency
127
154
  name: mysql2
128
155
  requirement: !ruby/object:Gem::Requirement
129
- none: false
130
156
  requirements:
131
- - - ~>
157
+ - - "~>"
132
158
  - !ruby/object:Gem::Version
133
159
  version: 0.3.15
134
160
  type: :development
135
161
  prerelease: false
136
162
  version_requirements: !ruby/object:Gem::Requirement
137
- none: false
138
163
  requirements:
139
- - - ~>
164
+ - - "~>"
140
165
  - !ruby/object:Gem::Version
141
166
  version: 0.3.15
167
+ - !ruby/object:Gem::Dependency
168
+ name: rack
169
+ requirement: !ruby/object:Gem::Requirement
170
+ requirements:
171
+ - - ">="
172
+ - !ruby/object:Gem::Version
173
+ version: '0'
174
+ type: :development
175
+ prerelease: false
176
+ version_requirements: !ruby/object:Gem::Requirement
177
+ requirements:
178
+ - - ">="
179
+ - !ruby/object:Gem::Version
180
+ version: '0'
142
181
  - !ruby/object:Gem::Dependency
143
182
  name: rspec
144
183
  requirement: !ruby/object:Gem::Requirement
145
- none: false
146
184
  requirements:
147
- - - ~>
185
+ - - "~>"
148
186
  - !ruby/object:Gem::Version
149
187
  version: '2.14'
150
188
  type: :development
151
189
  prerelease: false
152
190
  version_requirements: !ruby/object:Gem::Requirement
153
- none: false
154
191
  requirements:
155
- - - ~>
192
+ - - "~>"
156
193
  - !ruby/object:Gem::Version
157
194
  version: '2.14'
158
195
  - !ruby/object:Gem::Dependency
159
196
  name: rspec-retry
160
197
  requirement: !ruby/object:Gem::Requirement
161
- none: false
162
198
  requirements:
163
- - - ~>
199
+ - - "~>"
164
200
  - !ruby/object:Gem::Version
165
201
  version: '0.4'
166
202
  type: :development
167
203
  prerelease: false
168
204
  version_requirements: !ruby/object:Gem::Requirement
169
- none: false
170
205
  requirements:
171
- - - ~>
206
+ - - "~>"
172
207
  - !ruby/object:Gem::Version
173
208
  version: '0.4'
174
209
  - !ruby/object:Gem::Dependency
175
210
  name: webmock
176
211
  requirement: !ruby/object:Gem::Requirement
177
- none: false
178
212
  requirements:
179
- - - ~>
213
+ - - "~>"
180
214
  - !ruby/object:Gem::Version
181
215
  version: 1.17.4
182
216
  type: :development
183
217
  prerelease: false
184
218
  version_requirements: !ruby/object:Gem::Requirement
185
- none: false
186
219
  requirements:
187
- - - ~>
220
+ - - "~>"
188
221
  - !ruby/object:Gem::Version
189
222
  version: 1.17.4
190
223
  description: Hooks Thinking Sphinx into the Flying Sphinx service
@@ -195,9 +228,9 @@ extensions: []
195
228
  extra_rdoc_files:
196
229
  - README.textile
197
230
  files:
198
- - .env.test
199
- - .gitignore
200
- - .travis.yml
231
+ - ".env.test"
232
+ - ".gitignore"
233
+ - ".travis.yml"
201
234
  - Appraisals
202
235
  - Gemfile
203
236
  - HISTORY
@@ -206,10 +239,6 @@ files:
206
239
  - Rakefile
207
240
  - bin/flying-sphinx
208
241
  - flying-sphinx.gemspec
209
- - gemfiles/rails_2.3.gemfile
210
- - gemfiles/rails_3.0.gemfile
211
- - gemfiles/rails_3.2.gemfile
212
- - gemfiles/rails_4.0.gemfile
213
242
  - keys/key
214
243
  - lib/flying-sphinx.rb
215
244
  - lib/flying_sphinx.rb
@@ -220,10 +249,11 @@ files:
220
249
  - lib/flying_sphinx/cli.rb
221
250
  - lib/flying_sphinx/configuration.rb
222
251
  - lib/flying_sphinx/configuration_options.rb
252
+ - lib/flying_sphinx/configurer.rb
223
253
  - lib/flying_sphinx/controller.rb
224
- - lib/flying_sphinx/gzipped_hash.rb
225
254
  - lib/flying_sphinx/rails.rb
226
255
  - lib/flying_sphinx/railtie.rb
256
+ - lib/flying_sphinx/request/hmac.rb
227
257
  - lib/flying_sphinx/response/invalid.rb
228
258
  - lib/flying_sphinx/response/json.rb
229
259
  - lib/flying_sphinx/response/logger.rb
@@ -233,6 +263,7 @@ files:
233
263
  - lib/flying_sphinx/sphinxql/translator.rb
234
264
  - lib/flying_sphinx/tasks.rb
235
265
  - lib/flying_sphinx/version.rb
266
+ - spec/acceptance/configuring_spec.rb
236
267
  - spec/acceptance/get_info_spec.rb
237
268
  - spec/acceptance/start_or_stop_sphinx_spec.rb
238
269
  - spec/flying_sphinx/action_spec.rb
@@ -241,33 +272,35 @@ files:
241
272
  - spec/flying_sphinx/controller_spec.rb
242
273
  - spec/flying_sphinx/setting_files_spec.rb
243
274
  - spec/spec_helper.rb
275
+ - spec/support/hmac.rb
244
276
  - spec/support/local_pusher.rb
277
+ - spec/support/multipart.rb
245
278
  - spec/support/successful_action.rb
246
279
  homepage: https://flying-sphinx.com
247
280
  licenses: []
281
+ metadata: {}
248
282
  post_install_message:
249
283
  rdoc_options: []
250
284
  require_paths:
251
285
  - lib
252
286
  required_ruby_version: !ruby/object:Gem::Requirement
253
- none: false
254
287
  requirements:
255
- - - ! '>='
288
+ - - ">="
256
289
  - !ruby/object:Gem::Version
257
290
  version: '0'
258
291
  required_rubygems_version: !ruby/object:Gem::Requirement
259
- none: false
260
292
  requirements:
261
- - - ! '>='
293
+ - - ">="
262
294
  - !ruby/object:Gem::Version
263
295
  version: '0'
264
296
  requirements: []
265
297
  rubyforge_project:
266
- rubygems_version: 1.8.30
298
+ rubygems_version: 2.5.2.1
267
299
  signing_key:
268
- specification_version: 3
300
+ specification_version: 4
269
301
  summary: Sphinx in the Cloud
270
302
  test_files:
303
+ - spec/acceptance/configuring_spec.rb
271
304
  - spec/acceptance/get_info_spec.rb
272
305
  - spec/acceptance/start_or_stop_sphinx_spec.rb
273
306
  - spec/flying_sphinx/action_spec.rb
@@ -276,5 +309,7 @@ test_files:
276
309
  - spec/flying_sphinx/controller_spec.rb
277
310
  - spec/flying_sphinx/setting_files_spec.rb
278
311
  - spec/spec_helper.rb
312
+ - spec/support/hmac.rb
279
313
  - spec/support/local_pusher.rb
314
+ - spec/support/multipart.rb
280
315
  - spec/support/successful_action.rb
data/gemfiles/rails_2.3.gemfile DELETED
@@ -1,21 +0,0 @@
1
- # This file was generated by Appraisal
2
-
3
- source "https://rubygems.org"
4
-
5
- gem "activesupport", "< 4.0.0"
6
- gem "appraisal", "~> 1.0.0", :ref => "bd6eef4b6a", :git => "git://github.com/thoughtbot/appraisal", :branch => "master"
7
- gem "rails", "~> 2.3.18"
8
- gem "faraday", "0.7.0"
9
- gem "websocket", "< 1.2.0"
10
- gem "riddle", "< 2.0.0"
11
- if RUBY_VERSION.to_f <= 1.8
12
- gem "public_suffix", "< 1.4.0"
13
- elsif RUBY_VERSION.to_f <= 1.9
14
- gem "public_suffix", "< 1.5.0"
15
- elsif RUBY_VERSION.to_f <= 2.0
16
- gem "public_suffix", "< 1.5.0"
17
- else
18
- gem "public_suffix"
19
- end
20
-
21
- gemspec :path => "../"
data/gemfiles/rails_3.0.gemfile DELETED
@@ -1,21 +0,0 @@
1
- # This file was generated by Appraisal
2
-
3
- source "https://rubygems.org"
4
-
5
- gem "activesupport", "< 4.0.0"
6
- gem "appraisal", "~> 1.0.0", :ref => "bd6eef4b6a", :git => "git://github.com/thoughtbot/appraisal", :branch => "master"
7
- gem "rails", "~> 3.0.20"
8
- gem "faraday", "~> 0.8.0"
9
- gem "websocket", "< 1.2.0"
10
- gem "riddle", "< 2.0.0"
11
- if RUBY_VERSION.to_f <= 1.8
12
- gem "public_suffix", "< 1.4.0"
13
- elsif RUBY_VERSION.to_f <= 1.9
14
- gem "public_suffix", "< 1.5.0"
15
- elsif RUBY_VERSION.to_f <= 2.0
16
- gem "public_suffix", "< 1.5.0"
17
- else
18
- gem "public_suffix"
19
- end
20
-
21
- gemspec :path => "../"
data/gemfiles/rails_3.2.gemfile DELETED
@@ -1,18 +0,0 @@
1
- # This file was generated by Appraisal
2
-
3
- source "https://rubygems.org"
4
-
5
- gem "appraisal", "~> 1.0.0", :git => "git://github.com/thoughtbot/appraisal", :branch => "master", :ref => "bd6eef4b6a"
6
- gem "rails", "~> 3.2.18"
7
- gem "faraday", "~> 0.8.0"
8
- if RUBY_VERSION.to_f <= 1.8
9
- gem "public_suffix", "< 1.4.0"
10
- elsif RUBY_VERSION.to_f <= 1.9
11
- gem "public_suffix", "< 1.5.0"
12
- elsif RUBY_VERSION.to_f <= 2.0
13
- gem "public_suffix", "< 1.5.0"
14
- else
15
- gem "public_suffix"
16
- end
17
-
18
- gemspec :path => "../"