thinking-sphinx 3.4.2 → 4.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (333) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +20 -18
  3. data/Appraisals +28 -16
  4. data/CHANGELOG.markdown +538 -0
  5. data/Gemfile +9 -11
  6. data/README.textile +23 -31
  7. data/Rakefile +2 -0
  8. data/bin/console +2 -1
  9. data/bin/loadsphinx +29 -2
  10. data/lib/thinking-sphinx.rb +2 -0
  11. data/lib/thinking/sphinx.rb +2 -0
  12. data/lib/thinking_sphinx.rb +24 -13
  13. data/lib/thinking_sphinx/active_record.rb +10 -1
  14. data/lib/thinking_sphinx/active_record/association.rb +2 -0
  15. data/lib/thinking_sphinx/active_record/association_proxy.rb +2 -0
  16. data/lib/thinking_sphinx/active_record/association_proxy/attribute_finder.rb +2 -0
  17. data/lib/thinking_sphinx/active_record/association_proxy/attribute_matcher.rb +2 -0
  18. data/lib/thinking_sphinx/active_record/attribute.rb +2 -0
  19. data/lib/thinking_sphinx/active_record/attribute/sphinx_presenter.rb +2 -0
  20. data/lib/thinking_sphinx/active_record/attribute/type.rb +2 -0
  21. data/lib/thinking_sphinx/active_record/attribute/values.rb +2 -0
  22. data/lib/thinking_sphinx/active_record/base.rb +2 -0
  23. data/lib/thinking_sphinx/active_record/callbacks/delete_callbacks.rb +2 -0
  24. data/lib/thinking_sphinx/active_record/callbacks/delta_callbacks.rb +2 -0
  25. data/lib/thinking_sphinx/active_record/callbacks/update_callbacks.rb +2 -0
  26. data/lib/thinking_sphinx/active_record/column.rb +2 -0
  27. data/lib/thinking_sphinx/active_record/column_sql_presenter.rb +2 -0
  28. data/lib/thinking_sphinx/active_record/database_adapters.rb +2 -0
  29. data/lib/thinking_sphinx/active_record/database_adapters/abstract_adapter.rb +2 -0
  30. data/lib/thinking_sphinx/active_record/database_adapters/mysql_adapter.rb +2 -0
  31. data/lib/thinking_sphinx/active_record/database_adapters/postgresql_adapter.rb +2 -0
  32. data/lib/thinking_sphinx/active_record/depolymorph/association_reflection.rb +32 -0
  33. data/lib/thinking_sphinx/active_record/depolymorph/base_reflection.rb +32 -0
  34. data/lib/thinking_sphinx/active_record/depolymorph/conditions_reflection.rb +40 -0
  35. data/lib/thinking_sphinx/active_record/depolymorph/overridden_reflection.rb +35 -0
  36. data/lib/thinking_sphinx/active_record/depolymorph/scoped_reflection.rb +26 -0
  37. data/lib/thinking_sphinx/active_record/field.rb +2 -0
  38. data/lib/thinking_sphinx/active_record/filter_reflection.rb +13 -71
  39. data/lib/thinking_sphinx/active_record/index.rb +2 -0
  40. data/lib/thinking_sphinx/active_record/interpreter.rb +2 -0
  41. data/lib/thinking_sphinx/active_record/join_association.rb +2 -0
  42. data/lib/thinking_sphinx/active_record/log_subscriber.rb +2 -0
  43. data/lib/thinking_sphinx/active_record/polymorpher.rb +2 -0
  44. data/lib/thinking_sphinx/active_record/property.rb +2 -0
  45. data/lib/thinking_sphinx/active_record/property_query.rb +2 -0
  46. data/lib/thinking_sphinx/active_record/property_sql_presenter.rb +2 -0
  47. data/lib/thinking_sphinx/active_record/simple_many_query.rb +2 -0
  48. data/lib/thinking_sphinx/active_record/source_joins.rb +2 -0
  49. data/lib/thinking_sphinx/active_record/sql_builder.rb +2 -0
  50. data/lib/thinking_sphinx/active_record/sql_builder/clause_builder.rb +2 -0
  51. data/lib/thinking_sphinx/active_record/sql_builder/query.rb +2 -0
  52. data/lib/thinking_sphinx/active_record/sql_builder/statement.rb +2 -0
  53. data/lib/thinking_sphinx/active_record/sql_source.rb +15 -3
  54. data/lib/thinking_sphinx/active_record/sql_source/template.rb +2 -0
  55. data/lib/thinking_sphinx/attribute_types.rb +2 -0
  56. data/lib/thinking_sphinx/batched_search.rb +2 -0
  57. data/lib/thinking_sphinx/callbacks.rb +2 -0
  58. data/lib/thinking_sphinx/capistrano.rb +2 -0
  59. data/lib/thinking_sphinx/capistrano/v2.rb +2 -0
  60. data/lib/thinking_sphinx/capistrano/v3.rb +2 -0
  61. data/lib/thinking_sphinx/commander.rb +27 -0
  62. data/lib/thinking_sphinx/commands.rb +20 -0
  63. data/lib/thinking_sphinx/commands/base.rb +9 -1
  64. data/lib/thinking_sphinx/commands/clear_real_time.rb +22 -0
  65. data/lib/thinking_sphinx/commands/clear_sql.rb +18 -0
  66. data/lib/thinking_sphinx/commands/configure.rb +2 -0
  67. data/lib/thinking_sphinx/commands/index_real_time.rb +17 -0
  68. data/lib/thinking_sphinx/commands/index_sql.rb +25 -0
  69. data/lib/thinking_sphinx/commands/merge.rb +27 -0
  70. data/lib/thinking_sphinx/commands/merge_and_update.rb +57 -0
  71. data/lib/thinking_sphinx/commands/prepare.rb +13 -0
  72. data/lib/thinking_sphinx/commands/rotate.rb +13 -0
  73. data/lib/thinking_sphinx/commands/running.rb +13 -0
  74. data/lib/thinking_sphinx/commands/start_attached.rb +2 -0
  75. data/lib/thinking_sphinx/commands/start_detached.rb +3 -1
  76. data/lib/thinking_sphinx/commands/stop.rb +4 -2
  77. data/lib/thinking_sphinx/configuration.rb +28 -47
  78. data/lib/thinking_sphinx/configuration/consistent_ids.rb +2 -0
  79. data/lib/thinking_sphinx/configuration/defaults.rb +2 -0
  80. data/lib/thinking_sphinx/configuration/distributed_indices.rb +2 -0
  81. data/lib/thinking_sphinx/configuration/duplicate_names.rb +2 -0
  82. data/lib/thinking_sphinx/configuration/minimum_fields.rb +2 -0
  83. data/lib/thinking_sphinx/connection.rb +4 -5
  84. data/lib/thinking_sphinx/connection/client.rb +21 -0
  85. data/lib/thinking_sphinx/connection/jruby.rb +7 -2
  86. data/lib/thinking_sphinx/connection/mri.rb +2 -4
  87. data/lib/thinking_sphinx/core.rb +2 -0
  88. data/lib/thinking_sphinx/core/field.rb +2 -0
  89. data/lib/thinking_sphinx/core/index.rb +4 -1
  90. data/lib/thinking_sphinx/core/interpreter.rb +2 -0
  91. data/lib/thinking_sphinx/core/property.rb +2 -0
  92. data/lib/thinking_sphinx/core/settings.rb +2 -0
  93. data/lib/thinking_sphinx/deletion.rb +2 -0
  94. data/lib/thinking_sphinx/deltas.rb +2 -0
  95. data/lib/thinking_sphinx/deltas/default_delta.rb +2 -0
  96. data/lib/thinking_sphinx/deltas/delete_job.rb +2 -0
  97. data/lib/thinking_sphinx/deltas/index_job.rb +9 -1
  98. data/lib/thinking_sphinx/distributed.rb +2 -0
  99. data/lib/thinking_sphinx/distributed/index.rb +2 -0
  100. data/lib/thinking_sphinx/errors.rb +9 -0
  101. data/lib/thinking_sphinx/excerpter.rb +2 -0
  102. data/lib/thinking_sphinx/facet.rb +4 -3
  103. data/lib/thinking_sphinx/facet_search.rb +4 -2
  104. data/lib/thinking_sphinx/float_formatter.rb +2 -0
  105. data/lib/thinking_sphinx/frameworks.rb +2 -0
  106. data/lib/thinking_sphinx/frameworks/plain.rb +2 -0
  107. data/lib/thinking_sphinx/frameworks/rails.rb +2 -0
  108. data/lib/thinking_sphinx/guard.rb +3 -0
  109. data/lib/thinking_sphinx/guard/file.rb +2 -0
  110. data/lib/thinking_sphinx/guard/files.rb +2 -0
  111. data/lib/thinking_sphinx/guard/none.rb +7 -0
  112. data/lib/thinking_sphinx/hooks/guard_presence.rb +34 -0
  113. data/lib/thinking_sphinx/index.rb +2 -0
  114. data/lib/thinking_sphinx/index_set.rb +2 -0
  115. data/lib/thinking_sphinx/indexing_strategies/all_at_once.rb +2 -0
  116. data/lib/thinking_sphinx/indexing_strategies/one_at_a_time.rb +2 -0
  117. data/lib/thinking_sphinx/interfaces.rb +10 -0
  118. data/lib/thinking_sphinx/interfaces/base.rb +13 -0
  119. data/lib/thinking_sphinx/interfaces/daemon.rb +6 -11
  120. data/lib/thinking_sphinx/interfaces/real_time.rb +19 -14
  121. data/lib/thinking_sphinx/interfaces/sql.rb +22 -10
  122. data/lib/thinking_sphinx/logger.rb +2 -0
  123. data/lib/thinking_sphinx/masks.rb +2 -0
  124. data/lib/thinking_sphinx/masks/group_enumerators_mask.rb +6 -4
  125. data/lib/thinking_sphinx/masks/pagination_mask.rb +2 -0
  126. data/lib/thinking_sphinx/masks/scopes_mask.rb +2 -0
  127. data/lib/thinking_sphinx/masks/weight_enumerator_mask.rb +3 -1
  128. data/lib/thinking_sphinx/middlewares.rb +5 -3
  129. data/lib/thinking_sphinx/middlewares/active_record_translator.rb +2 -0
  130. data/lib/thinking_sphinx/middlewares/geographer.rb +2 -0
  131. data/lib/thinking_sphinx/middlewares/glazier.rb +2 -0
  132. data/lib/thinking_sphinx/middlewares/ids_only.rb +2 -0
  133. data/lib/thinking_sphinx/middlewares/inquirer.rb +2 -0
  134. data/lib/thinking_sphinx/middlewares/middleware.rb +2 -0
  135. data/lib/thinking_sphinx/middlewares/sphinxql.rb +4 -2
  136. data/lib/thinking_sphinx/middlewares/stale_id_checker.rb +2 -0
  137. data/lib/thinking_sphinx/middlewares/stale_id_filter.rb +2 -0
  138. data/lib/thinking_sphinx/middlewares/valid_options.rb +2 -0
  139. data/lib/thinking_sphinx/panes.rb +2 -0
  140. data/lib/thinking_sphinx/panes/attributes_pane.rb +2 -0
  141. data/lib/thinking_sphinx/panes/distance_pane.rb +2 -0
  142. data/lib/thinking_sphinx/panes/excerpts_pane.rb +2 -0
  143. data/lib/thinking_sphinx/panes/weight_pane.rb +3 -1
  144. data/lib/thinking_sphinx/query.rb +2 -0
  145. data/lib/thinking_sphinx/railtie.rb +2 -0
  146. data/lib/thinking_sphinx/rake_interface.rb +3 -1
  147. data/lib/thinking_sphinx/real_time.rb +3 -0
  148. data/lib/thinking_sphinx/real_time/attribute.rb +2 -0
  149. data/lib/thinking_sphinx/real_time/callbacks/real_time_callbacks.rb +2 -0
  150. data/lib/thinking_sphinx/real_time/field.rb +2 -0
  151. data/lib/thinking_sphinx/real_time/index.rb +2 -0
  152. data/lib/thinking_sphinx/real_time/index/template.rb +2 -0
  153. data/lib/thinking_sphinx/real_time/interpreter.rb +2 -0
  154. data/lib/thinking_sphinx/real_time/populator.rb +2 -1
  155. data/lib/thinking_sphinx/real_time/property.rb +2 -0
  156. data/lib/thinking_sphinx/real_time/transcribe_instance.rb +38 -0
  157. data/lib/thinking_sphinx/real_time/transcriber.rb +18 -27
  158. data/lib/thinking_sphinx/real_time/translator.rb +3 -1
  159. data/lib/thinking_sphinx/scopes.rb +2 -0
  160. data/lib/thinking_sphinx/search.rb +2 -0
  161. data/lib/thinking_sphinx/search/batch_inquirer.rb +2 -0
  162. data/lib/thinking_sphinx/search/context.rb +2 -0
  163. data/lib/thinking_sphinx/search/glaze.rb +2 -0
  164. data/lib/thinking_sphinx/search/merger.rb +2 -0
  165. data/lib/thinking_sphinx/search/query.rb +2 -0
  166. data/lib/thinking_sphinx/search/stale_ids_exception.rb +2 -0
  167. data/lib/thinking_sphinx/settings.rb +110 -0
  168. data/lib/thinking_sphinx/sinatra.rb +2 -0
  169. data/lib/thinking_sphinx/subscribers/populator_subscriber.rb +18 -0
  170. data/lib/thinking_sphinx/tasks.rb +13 -46
  171. data/lib/thinking_sphinx/test.rb +2 -0
  172. data/lib/thinking_sphinx/utf8.rb +2 -0
  173. data/lib/thinking_sphinx/wildcard.rb +2 -0
  174. data/lib/thinking_sphinx/with_output.rb +2 -0
  175. data/spec/acceptance/association_scoping_spec.rb +2 -0
  176. data/spec/acceptance/attribute_access_spec.rb +4 -4
  177. data/spec/acceptance/attribute_updates_spec.rb +2 -0
  178. data/spec/acceptance/batch_searching_spec.rb +2 -0
  179. data/spec/acceptance/big_integers_spec.rb +2 -0
  180. data/spec/acceptance/connection_spec.rb +2 -0
  181. data/spec/acceptance/excerpts_spec.rb +1 -0
  182. data/spec/acceptance/facets_spec.rb +2 -3
  183. data/spec/acceptance/geosearching_spec.rb +3 -1
  184. data/spec/acceptance/grouping_by_attributes_spec.rb +2 -0
  185. data/spec/acceptance/index_options_spec.rb +2 -0
  186. data/spec/acceptance/indexing_spec.rb +2 -0
  187. data/spec/acceptance/merging_spec.rb +90 -0
  188. data/spec/acceptance/paginating_search_results_spec.rb +2 -0
  189. data/spec/acceptance/real_time_updates_spec.rb +2 -0
  190. data/spec/acceptance/remove_deleted_records_spec.rb +2 -0
  191. data/spec/acceptance/search_counts_spec.rb +2 -0
  192. data/spec/acceptance/search_for_just_ids_spec.rb +2 -0
  193. data/spec/acceptance/searching_across_models_spec.rb +2 -0
  194. data/spec/acceptance/searching_across_schemas_spec.rb +2 -0
  195. data/spec/acceptance/searching_on_fields_spec.rb +2 -0
  196. data/spec/acceptance/searching_with_filters_spec.rb +2 -0
  197. data/spec/acceptance/searching_with_sti_spec.rb +2 -0
  198. data/spec/acceptance/searching_within_a_model_spec.rb +2 -0
  199. data/spec/acceptance/sorting_search_results_spec.rb +2 -0
  200. data/spec/acceptance/spec_helper.rb +2 -13
  201. data/spec/acceptance/specifying_sql_spec.rb +2 -0
  202. data/spec/acceptance/sphinx_scopes_spec.rb +2 -0
  203. data/spec/acceptance/sql_deltas_spec.rb +2 -0
  204. data/spec/acceptance/support/database_cleaner.rb +2 -0
  205. data/spec/acceptance/support/sphinx_controller.rb +16 -5
  206. data/spec/acceptance/support/sphinx_helpers.rb +11 -0
  207. data/spec/acceptance/suspended_deltas_spec.rb +2 -0
  208. data/spec/internal/app/indices/admin_person_index.rb +2 -0
  209. data/spec/internal/app/indices/album_index.rb +2 -0
  210. data/spec/internal/app/indices/animal_index.rb +2 -0
  211. data/spec/internal/app/indices/article_index.rb +2 -0
  212. data/spec/internal/app/indices/bird_index.rb +2 -0
  213. data/spec/internal/app/indices/book_index.rb +2 -0
  214. data/spec/internal/app/indices/car_index.rb +2 -0
  215. data/spec/internal/app/indices/city_index.rb +2 -0
  216. data/spec/internal/app/indices/product_index.rb +2 -0
  217. data/spec/internal/app/indices/tee_index.rb +2 -0
  218. data/spec/internal/app/indices/user_index.rb +2 -0
  219. data/spec/internal/app/models/admin/person.rb +2 -0
  220. data/spec/internal/app/models/album.rb +2 -0
  221. data/spec/internal/app/models/animal.rb +2 -0
  222. data/spec/internal/app/models/article.rb +2 -0
  223. data/spec/internal/app/models/bird.rb +2 -0
  224. data/spec/internal/app/models/book.rb +2 -0
  225. data/spec/internal/app/models/car.rb +2 -0
  226. data/spec/internal/app/models/categorisation.rb +2 -0
  227. data/spec/internal/app/models/category.rb +2 -0
  228. data/spec/internal/app/models/city.rb +2 -0
  229. data/spec/internal/app/models/colour.rb +2 -0
  230. data/spec/internal/app/models/event.rb +2 -0
  231. data/spec/internal/app/models/flightless_bird.rb +2 -0
  232. data/spec/internal/app/models/genre.rb +2 -0
  233. data/spec/internal/app/models/hardcover.rb +2 -0
  234. data/spec/internal/app/models/mammal.rb +2 -0
  235. data/spec/internal/app/models/manufacturer.rb +2 -0
  236. data/spec/internal/app/models/product.rb +2 -0
  237. data/spec/internal/app/models/tag.rb +2 -0
  238. data/spec/internal/app/models/tagging.rb +2 -0
  239. data/spec/internal/app/models/tee.rb +2 -0
  240. data/spec/internal/app/models/tweet.rb +2 -0
  241. data/spec/internal/app/models/user.rb +2 -0
  242. data/spec/internal/db/schema.rb +2 -0
  243. data/spec/spec_helper.rb +4 -1
  244. data/spec/support/json_column.rb +3 -5
  245. data/spec/support/multi_schema.rb +2 -0
  246. data/spec/support/mysql.rb +25 -0
  247. data/spec/support/sphinx_yaml_helpers.rb +2 -0
  248. data/spec/thinking_sphinx/active_record/association_spec.rb +2 -0
  249. data/spec/thinking_sphinx/active_record/attribute/type_spec.rb +2 -0
  250. data/spec/thinking_sphinx/active_record/base_spec.rb +2 -0
  251. data/spec/thinking_sphinx/active_record/callbacks/delete_callbacks_spec.rb +2 -0
  252. data/spec/thinking_sphinx/active_record/callbacks/delta_callbacks_spec.rb +2 -0
  253. data/spec/thinking_sphinx/active_record/callbacks/update_callbacks_spec.rb +2 -0
  254. data/spec/thinking_sphinx/active_record/column_spec.rb +2 -0
  255. data/spec/thinking_sphinx/active_record/column_sql_presenter_spec.rb +2 -0
  256. data/spec/thinking_sphinx/active_record/database_adapters/abstract_adapter_spec.rb +2 -0
  257. data/spec/thinking_sphinx/active_record/database_adapters/mysql_adapter_spec.rb +2 -0
  258. data/spec/thinking_sphinx/active_record/database_adapters/postgresql_adapter_spec.rb +2 -0
  259. data/spec/thinking_sphinx/active_record/database_adapters_spec.rb +2 -0
  260. data/spec/thinking_sphinx/active_record/field_spec.rb +2 -0
  261. data/spec/thinking_sphinx/active_record/filter_reflection_spec.rb +100 -79
  262. data/spec/thinking_sphinx/active_record/index_spec.rb +16 -1
  263. data/spec/thinking_sphinx/active_record/interpreter_spec.rb +2 -0
  264. data/spec/thinking_sphinx/active_record/polymorpher_spec.rb +2 -0
  265. data/spec/thinking_sphinx/active_record/property_sql_presenter_spec.rb +2 -0
  266. data/spec/thinking_sphinx/active_record/sql_builder_spec.rb +2 -0
  267. data/spec/thinking_sphinx/active_record/sql_source_spec.rb +2 -0
  268. data/spec/thinking_sphinx/attribute_types_spec.rb +2 -0
  269. data/spec/thinking_sphinx/commands/clear_real_time_spec.rb +46 -0
  270. data/spec/thinking_sphinx/commands/clear_sql_spec.rb +52 -0
  271. data/spec/thinking_sphinx/commands/configure_spec.rb +2 -0
  272. data/spec/thinking_sphinx/commands/index_real_time_spec.rb +33 -0
  273. data/spec/thinking_sphinx/commands/index_sql_spec.rb +86 -0
  274. data/spec/thinking_sphinx/commands/merge_and_update_spec.rb +106 -0
  275. data/spec/thinking_sphinx/commands/merge_spec.rb +48 -0
  276. data/spec/thinking_sphinx/commands/prepare_spec.rb +23 -0
  277. data/spec/thinking_sphinx/commands/start_detached_spec.rb +2 -0
  278. data/spec/thinking_sphinx/commands/stop_spec.rb +13 -4
  279. data/spec/thinking_sphinx/configuration/minimum_fields_spec.rb +2 -0
  280. data/spec/thinking_sphinx/configuration_spec.rb +132 -6
  281. data/spec/thinking_sphinx/connection_spec.rb +2 -0
  282. data/spec/thinking_sphinx/deletion_spec.rb +2 -0
  283. data/spec/thinking_sphinx/deltas/default_delta_spec.rb +8 -1
  284. data/spec/thinking_sphinx/deltas_spec.rb +2 -0
  285. data/spec/thinking_sphinx/errors_spec.rb +2 -0
  286. data/spec/thinking_sphinx/excerpter_spec.rb +2 -0
  287. data/spec/thinking_sphinx/facet_search_spec.rb +8 -6
  288. data/spec/thinking_sphinx/hooks/guard_presence_spec.rb +30 -0
  289. data/spec/thinking_sphinx/index_set_spec.rb +2 -0
  290. data/spec/thinking_sphinx/index_spec.rb +2 -0
  291. data/spec/thinking_sphinx/interfaces/daemon_spec.rb +19 -11
  292. data/spec/thinking_sphinx/interfaces/real_time_spec.rb +43 -43
  293. data/spec/thinking_sphinx/interfaces/sql_spec.rb +76 -52
  294. data/spec/thinking_sphinx/masks/pagination_mask_spec.rb +2 -0
  295. data/spec/thinking_sphinx/masks/scopes_mask_spec.rb +2 -0
  296. data/spec/thinking_sphinx/middlewares/active_record_translator_spec.rb +2 -0
  297. data/spec/thinking_sphinx/middlewares/geographer_spec.rb +2 -0
  298. data/spec/thinking_sphinx/middlewares/glazier_spec.rb +2 -0
  299. data/spec/thinking_sphinx/middlewares/inquirer_spec.rb +2 -0
  300. data/spec/thinking_sphinx/middlewares/sphinxql_spec.rb +2 -1
  301. data/spec/thinking_sphinx/middlewares/stale_id_checker_spec.rb +2 -0
  302. data/spec/thinking_sphinx/middlewares/stale_id_filter_spec.rb +2 -0
  303. data/spec/thinking_sphinx/middlewares/valid_options_spec.rb +2 -0
  304. data/spec/thinking_sphinx/panes/attributes_pane_spec.rb +2 -0
  305. data/spec/thinking_sphinx/panes/distance_pane_spec.rb +2 -0
  306. data/spec/thinking_sphinx/panes/excerpts_pane_spec.rb +2 -0
  307. data/spec/thinking_sphinx/panes/weight_pane_spec.rb +3 -1
  308. data/spec/thinking_sphinx/rake_interface_spec.rb +10 -8
  309. data/spec/thinking_sphinx/real_time/attribute_spec.rb +2 -0
  310. data/spec/thinking_sphinx/real_time/callbacks/real_time_callbacks_spec.rb +2 -0
  311. data/spec/thinking_sphinx/real_time/field_spec.rb +2 -0
  312. data/spec/thinking_sphinx/real_time/index_spec.rb +14 -0
  313. data/spec/thinking_sphinx/real_time/interpreter_spec.rb +2 -0
  314. data/spec/thinking_sphinx/real_time/transcribe_instance_spec.rb +35 -0
  315. data/spec/thinking_sphinx/real_time/transcriber_spec.rb +101 -0
  316. data/spec/thinking_sphinx/real_time/translator_spec.rb +17 -0
  317. data/spec/thinking_sphinx/scopes_spec.rb +2 -0
  318. data/spec/thinking_sphinx/search/glaze_spec.rb +2 -0
  319. data/spec/thinking_sphinx/search/query_spec.rb +2 -0
  320. data/spec/thinking_sphinx/search_spec.rb +2 -0
  321. data/spec/thinking_sphinx/wildcard_spec.rb +2 -0
  322. data/spec/thinking_sphinx_spec.rb +2 -0
  323. data/thinking-sphinx.gemspec +7 -5
  324. metadata +62 -25
  325. data/HISTORY +0 -326
  326. data/bin/literals +0 -9
  327. data/lib/thinking_sphinx/commands/index.rb +0 -11
  328. data/lib/thinking_sphinx/controller.rb +0 -12
  329. data/lib/thinking_sphinx/middlewares/attribute_typer.rb +0 -48
  330. data/lib/thinking_sphinx/middlewares/utf8.rb +0 -27
  331. data/lib/thinking_sphinx/sphinxql.rb +0 -23
  332. data/spec/thinking_sphinx/commands/index_spec.rb +0 -26
  333. data/spec/thinking_sphinx/middlewares/attribute_typer_spec.rb +0 -42
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  require 'spec_helper'
2
4
 
3
5
  describe ThinkingSphinx::ActiveRecord::Index do
@@ -10,7 +12,8 @@ describe ThinkingSphinx::ActiveRecord::Index do
10
12
  end
11
13
 
12
14
  describe '#append_source' do
13
- let(:model) { double('model', :primary_key => :id) }
15
+ let(:model) { double('model', :primary_key => :id,
16
+ :table_exists? => true) }
14
17
  let(:source) { double('source') }
15
18
 
16
19
  before :each do
@@ -91,6 +94,18 @@ describe ThinkingSphinx::ActiveRecord::Index do
91
94
  end
92
95
  end
93
96
 
97
+ describe '#docinfo' do
98
+ it "defaults to extern" do
99
+ expect(index.docinfo).to eq(:extern)
100
+ end
101
+
102
+ it "can be disabled" do
103
+ config.settings["skip_docinfo"] = true
104
+
105
+ expect(index.docinfo).to be_nil
106
+ end
107
+ end
108
+
94
109
  describe '#document_id_for_key' do
95
110
  it "calculates the document id based on offset and number of indices" do
96
111
  allow(config).to receive_message_chain(:indices, :count).and_return(5)
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  require 'spec_helper'
2
4
 
3
5
  describe ThinkingSphinx::ActiveRecord::Interpreter do
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  require 'spec_helper'
2
4
 
3
5
  describe ThinkingSphinx::ActiveRecord::Polymorpher do
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  require 'spec_helper'
2
4
 
3
5
  describe ThinkingSphinx::ActiveRecord::PropertySQLPresenter do
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  require 'spec_helper'
2
4
 
3
5
  describe ThinkingSphinx::ActiveRecord::SQLBuilder do
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  require 'spec_helper'
2
4
 
3
5
  describe ThinkingSphinx::ActiveRecord::SQLSource do
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  require 'spec_helper'
2
4
 
3
5
  RSpec.describe ThinkingSphinx::AttributeTypes do
@@ -0,0 +1,46 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'spec_helper'
4
+
5
+ RSpec.describe ThinkingSphinx::Commands::ClearRealTime do
6
+ let(:command) { ThinkingSphinx::Commands::ClearRealTime.new(
7
+ configuration, {:indices => [users_index, parts_index]}, stream
8
+ ) }
9
+ let(:configuration) { double 'configuration', :searchd => double(:binlog_path => '/path/to/binlog') }
10
+ let(:stream) { double :puts => nil }
11
+ let(:users_index) { double :path => '/path/to/my/index/users', :render => true }
12
+ let(:parts_index) { double :path => '/path/to/my/index/parts', :render => true }
13
+
14
+ before :each do
15
+ allow(Dir).to receive(:[]).with('/path/to/my/index/users.*').
16
+ and_return(['users.a', 'users.b'])
17
+ allow(Dir).to receive(:[]).with('/path/to/my/index/parts.*').
18
+ and_return(['parts.a', 'parts.b'])
19
+
20
+ allow(FileUtils).to receive_messages :rm_r => true,
21
+ :rm => true
22
+ allow(File).to receive_messages :exists? => true
23
+ end
24
+
25
+ it 'finds each file for real-time indices' do
26
+ expect(Dir).to receive(:[]).with('/path/to/my/index/users.*').
27
+ and_return([])
28
+
29
+ command.call
30
+ end
31
+
32
+ it "removes the directory for the binlog files" do
33
+ expect(FileUtils).to receive(:rm_r).with('/path/to/binlog')
34
+
35
+ command.call
36
+ end
37
+
38
+ it "removes each file for real-time indices" do
39
+ expect(FileUtils).to receive(:rm).with('users.a')
40
+ expect(FileUtils).to receive(:rm).with('users.b')
41
+ expect(FileUtils).to receive(:rm).with('parts.a')
42
+ expect(FileUtils).to receive(:rm).with('parts.b')
43
+
44
+ command.call
45
+ end
46
+ end
@@ -0,0 +1,52 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'spec_helper'
4
+
5
+ RSpec.describe ThinkingSphinx::Commands::ClearSQL do
6
+ let(:command) { ThinkingSphinx::Commands::ClearSQL.new(
7
+ configuration, {:indices => [users_index, parts_index]}, stream
8
+ ) }
9
+ let(:configuration) { double 'configuration', :preload_indices => true,
10
+ :render => true, :indices => [users_index, parts_index],
11
+ :indices_location => '/path/to/indices' }
12
+ let(:stream) { double :puts => nil }
13
+
14
+ let(:users_index) { double(:name => 'users', :type => 'plain',
15
+ :render => true, :path => '/path/to/my/index/users') }
16
+ let(:parts_index) { double(:name => 'users', :type => 'plain',
17
+ :render => true, :path => '/path/to/my/index/parts') }
18
+
19
+ before :each do
20
+ allow(Dir).to receive(:[]).with('/path/to/my/index/users.*').
21
+ and_return(['users.a', 'users.b'])
22
+ allow(Dir).to receive(:[]).with('/path/to/my/index/parts.*').
23
+ and_return(['parts.a', 'parts.b'])
24
+ allow(Dir).to receive(:[]).with('/path/to/indices/ts-*.tmp').
25
+ and_return(['/path/to/indices/ts-foo.tmp'])
26
+
27
+ allow(FileUtils).to receive_messages :rm_r => true, :rm => true
28
+ allow(File).to receive_messages :exists? => true
29
+ end
30
+
31
+ it 'finds each file for sql-backed indices' do
32
+ expect(Dir).to receive(:[]).with('/path/to/my/index/users.*').
33
+ and_return([])
34
+
35
+ command.call
36
+ end
37
+
38
+ it "removes each file for real-time indices" do
39
+ expect(FileUtils).to receive(:rm).with('users.a')
40
+ expect(FileUtils).to receive(:rm).with('users.b')
41
+ expect(FileUtils).to receive(:rm).with('parts.a')
42
+ expect(FileUtils).to receive(:rm).with('parts.b')
43
+
44
+ command.call
45
+ end
46
+
47
+ it "removes any indexing guard files" do
48
+ expect(FileUtils).to receive(:rm_r).with(["/path/to/indices/ts-foo.tmp"])
49
+
50
+ command.call
51
+ end
52
+ end
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  require 'spec_helper'
2
4
 
3
5
  RSpec.describe ThinkingSphinx::Commands::Configure do
@@ -0,0 +1,33 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'spec_helper'
4
+
5
+ RSpec.describe ThinkingSphinx::Commands::IndexRealTime do
6
+ let(:command) { ThinkingSphinx::Commands::IndexRealTime.new(
7
+ configuration, {:indices => [users_index, parts_index]}, stream
8
+ ) }
9
+ let(:configuration) { double 'configuration', :controller => controller }
10
+ let(:controller) { double 'controller', :rotate => nil }
11
+ let(:stream) { double :puts => nil }
12
+ let(:users_index) { double(name: 'users') }
13
+ let(:parts_index) { double(name: 'parts') }
14
+
15
+ before :each do
16
+ allow(ThinkingSphinx::RealTime::Populator).to receive(:populate)
17
+ end
18
+
19
+ it 'populates each real-index' do
20
+ expect(ThinkingSphinx::RealTime::Populator).to receive(:populate).
21
+ with(users_index)
22
+ expect(ThinkingSphinx::RealTime::Populator).to receive(:populate).
23
+ with(parts_index)
24
+
25
+ command.call
26
+ end
27
+
28
+ it "rotates the daemon for each index" do
29
+ expect(controller).to receive(:rotate).twice
30
+
31
+ command.call
32
+ end
33
+ end
@@ -0,0 +1,86 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'spec_helper'
4
+
5
+ RSpec.describe ThinkingSphinx::Commands::IndexSQL do
6
+ let(:command) { ThinkingSphinx::Commands::IndexSQL.new(
7
+ configuration, {:verbose => true}, stream
8
+ ) }
9
+ let(:configuration) { double 'configuration', :controller => controller,
10
+ :indexing_strategy => indexing_strategy,
11
+ :guarding_strategy => guarding_strategy }
12
+ let(:controller) { double 'controller', :index => true }
13
+ let(:stream) { double :puts => nil }
14
+ let(:indexing_strategy) { Proc.new { |names, &block| block.call names } }
15
+ let(:guarding_strategy) { Proc.new { |names, &block| block.call names } }
16
+
17
+ before :each do
18
+ allow(ThinkingSphinx).to receive_messages :before_index_hooks => []
19
+ end
20
+
21
+ it "calls all registered hooks" do
22
+ called = false
23
+ ThinkingSphinx.before_index_hooks << Proc.new { called = true }
24
+
25
+ command.call
26
+
27
+ expect(called).to eq(true)
28
+ end
29
+
30
+ it "indexes all indices verbosely" do
31
+ expect(controller).to receive(:index).with(:verbose => true)
32
+
33
+ command.call
34
+ end
35
+
36
+ it "does not index verbosely if requested" do
37
+ command = ThinkingSphinx::Commands::IndexSQL.new(
38
+ configuration, {:verbose => false}, stream
39
+ )
40
+
41
+ expect(controller).to receive(:index).with(:verbose => false)
42
+
43
+ command.call
44
+ end
45
+
46
+ it "ignores a nil indices filter" do
47
+ command = ThinkingSphinx::Commands::IndexSQL.new(
48
+ configuration, {:verbose => false, :indices => nil}, stream
49
+ )
50
+
51
+ expect(controller).to receive(:index).with(:verbose => false)
52
+
53
+ command.call
54
+ end
55
+
56
+ it "ignores an empty indices filter" do
57
+ command = ThinkingSphinx::Commands::IndexSQL.new(
58
+ configuration, {:verbose => false, :indices => []}, stream
59
+ )
60
+
61
+ expect(controller).to receive(:index).with(:verbose => false)
62
+
63
+ command.call
64
+ end
65
+
66
+ it "uses filtered index names" do
67
+ command = ThinkingSphinx::Commands::IndexSQL.new(
68
+ configuration, {:verbose => false, :indices => ['foo_bar']}, stream
69
+ )
70
+
71
+ expect(controller).to receive(:index).with('foo_bar', :verbose => false)
72
+
73
+ command.call
74
+ end
75
+
76
+ it "does not call hooks when filtering by index" do
77
+ called = false
78
+ ThinkingSphinx.before_index_hooks << Proc.new { called = true }
79
+
80
+ ThinkingSphinx::Commands::IndexSQL.new(
81
+ configuration, {:verbose => false, :indices => ['foo_bar']}, stream
82
+ ).call
83
+
84
+ expect(called).to eq(false)
85
+ end
86
+ end
@@ -0,0 +1,106 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'spec_helper'
4
+
5
+ RSpec.describe ThinkingSphinx::Commands::MergeAndUpdate do
6
+ let(:command) { ThinkingSphinx::Commands::MergeAndUpdate.new(
7
+ configuration, {}, stream
8
+ ) }
9
+ let(:configuration) { double "configuration", :preload_indices => nil,
10
+ :render => "", :indices => [core_index_a, delta_index_a, rt_index,
11
+ plain_index, core_index_b, delta_index_b] }
12
+ let(:stream) { double :puts => nil }
13
+ let(:commander) { double :call => true }
14
+ let(:core_index_a) { double "index", :type => "plain", :options => {:delta_processor => true}, :delta? => false, :name => "index_a_core", :model => model_a, :path => "index_a_core" }
15
+ let(:delta_index_a) { double "index", :type => "plain", :options => {:delta_processor => true}, :delta? => true, :name => "index_a_delta", :path => "index_a_delta" }
16
+ let(:core_index_b) { double "index", :type => "plain", :options => {:delta_processor => true}, :delta? => false, :name => "index_b_core", :model => model_b, :path => "index_b_core" }
17
+ let(:delta_index_b) { double "index", :type => "plain", :options => {:delta_processor => true}, :delta? => true, :name => "index_b_delta", :path => "index_b_delta" }
18
+ let(:rt_index) { double "index", :type => "rt", :name => "rt_index" }
19
+ let(:plain_index) { double "index", :type => "plain", :name => "plain_index", :options => {:delta_processor => nil} }
20
+ let(:model_a) { double "model", :where => where_a }
21
+ let(:model_b) { double "model", :where => where_b }
22
+ let(:where_a) { double "where", :update_all => nil }
23
+ let(:where_b) { double "where", :update_all => nil }
24
+
25
+ before :each do
26
+ stub_const 'ThinkingSphinx::Commander', commander
27
+ end
28
+
29
+ it "merges core/delta pairs" do
30
+ expect(commander).to receive(:call).with(
31
+ :merge, configuration, hash_including(
32
+ :core_index => core_index_a,
33
+ :delta_index => delta_index_a,
34
+ :filters => {:sphinx_deleted => 0}
35
+ ), stream
36
+ )
37
+ expect(commander).to receive(:call).with(
38
+ :merge, configuration, hash_including(
39
+ :core_index => core_index_b,
40
+ :delta_index => delta_index_b,
41
+ :filters => {:sphinx_deleted => 0}
42
+ ), stream
43
+ )
44
+
45
+ command.call
46
+ end
47
+
48
+ it "unflags delta records" do
49
+ expect(model_a).to receive(:where).with(:delta => true).and_return(where_a)
50
+ expect(where_a).to receive(:update_all).with(:delta => false)
51
+
52
+ expect(model_b).to receive(:where).with(:delta => true).and_return(where_b)
53
+ expect(where_b).to receive(:update_all).with(:delta => false)
54
+
55
+ command.call
56
+ end
57
+
58
+ it "ignores real-time indices" do
59
+ expect(commander).to_not receive(:call).with(
60
+ :merge, configuration, hash_including(:core_index => rt_index), stream
61
+ )
62
+ expect(commander).to_not receive(:call).with(
63
+ :merge, configuration, hash_including(:delta_index => rt_index), stream
64
+ )
65
+
66
+ command.call
67
+ end
68
+
69
+ it "ignores non-delta SQL indices" do
70
+ expect(commander).to_not receive(:call).with(
71
+ :merge, configuration, hash_including(:core_index => plain_index),
72
+ stream
73
+ )
74
+ expect(commander).to_not receive(:call).with(
75
+ :merge, configuration, hash_including(:delta_index => plain_index),
76
+ stream
77
+ )
78
+
79
+ command.call
80
+ end
81
+
82
+ context "with index name filter" do
83
+ let(:command) { ThinkingSphinx::Commands::MergeAndUpdate.new(
84
+ configuration, {:index_names => ["index_a"]}, stream
85
+ ) }
86
+
87
+ it "only processes matching indices" do
88
+ expect(commander).to receive(:call).with(
89
+ :merge, configuration, hash_including(
90
+ :core_index => core_index_a,
91
+ :delta_index => delta_index_a,
92
+ :filters => {:sphinx_deleted => 0}
93
+ ), stream
94
+ )
95
+ expect(commander).to_not receive(:call).with(
96
+ :merge, configuration, hash_including(
97
+ :core_index => core_index_b,
98
+ :delta_index => delta_index_b,
99
+ :filters => {:sphinx_deleted => 0}
100
+ ), stream
101
+ )
102
+
103
+ command.call
104
+ end
105
+ end
106
+ end
@@ -0,0 +1,48 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'spec_helper'
4
+
5
+ RSpec.describe ThinkingSphinx::Commands::Merge do
6
+ let(:command) { ThinkingSphinx::Commands::Merge.new(
7
+ configuration, {:core_index => core_index, :delta_index => delta_index,
8
+ :filters => {:sphinx_deleted => 0}}, stream
9
+ ) }
10
+ let(:configuration) { double "configuration", :controller => controller }
11
+ let(:stream) { double :puts => nil }
12
+ let(:controller) { double "controller", :merge => nil }
13
+ let(:core_index) { double "index", :path => "index_a_core",
14
+ :name => "index_a_core" }
15
+ let(:delta_index) { double "index", :path => "index_a_delta",
16
+ :name => "index_a_delta" }
17
+
18
+ before :each do
19
+ allow(File).to receive(:exist?).and_return(true)
20
+ end
21
+
22
+ it "merges core/delta pairs" do
23
+ expect(controller).to receive(:merge).with(
24
+ "index_a_core",
25
+ "index_a_delta",
26
+ :filters => {:sphinx_deleted => 0},
27
+ :verbose => nil
28
+ )
29
+
30
+ command.call
31
+ end
32
+
33
+ it "does not merge if just the core does not exist" do
34
+ allow(File).to receive(:exist?).with("index_a_core.spi").and_return(false)
35
+
36
+ expect(controller).to_not receive(:merge)
37
+
38
+ command.call
39
+ end
40
+
41
+ it "does not merge if just the delta does not exist" do
42
+ allow(File).to receive(:exist?).with("index_a_delta.spi").and_return(false)
43
+
44
+ expect(controller).to_not receive(:merge)
45
+
46
+ command.call
47
+ end
48
+ end