chewy 0.8.4 → 5.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (303) hide show
  1. checksums.yaml +5 -5
  2. data/.gitignore +1 -0
  3. data/.rubocop.yml +56 -0
  4. data/.rubocop_todo.yml +44 -0
  5. data/.travis.yml +36 -67
  6. data/.yardopts +5 -0
  7. data/Appraisals +63 -58
  8. data/CHANGELOG.md +168 -11
  9. data/Gemfile +16 -9
  10. data/Guardfile +5 -5
  11. data/LEGACY_DSL.md +497 -0
  12. data/README.md +403 -470
  13. data/Rakefile +11 -1
  14. data/chewy.gemspec +12 -15
  15. data/gemfiles/rails.4.0.activerecord.gemfile +9 -9
  16. data/gemfiles/rails.4.1.activerecord.gemfile +9 -9
  17. data/gemfiles/rails.4.2.activerecord.gemfile +8 -8
  18. data/gemfiles/rails.4.2.mongoid.5.2.gemfile +16 -0
  19. data/gemfiles/rails.5.0.activerecord.gemfile +16 -0
  20. data/gemfiles/rails.5.0.mongoid.6.1.gemfile +16 -0
  21. data/gemfiles/rails.5.1.activerecord.gemfile +16 -0
  22. data/gemfiles/rails.5.1.mongoid.6.3.gemfile +16 -0
  23. data/gemfiles/rails.5.2.activerecord.gemfile +16 -0
  24. data/gemfiles/sequel.4.45.gemfile +11 -0
  25. data/lib/chewy/backports/deep_dup.rb +1 -1
  26. data/lib/chewy/backports/duplicable.rb +1 -0
  27. data/lib/chewy/config.rb +53 -21
  28. data/lib/chewy/errors.rb +6 -6
  29. data/lib/chewy/fields/base.rb +59 -29
  30. data/lib/chewy/fields/root.rb +49 -14
  31. data/lib/chewy/index/actions.rb +95 -36
  32. data/lib/chewy/index/aliases.rb +2 -1
  33. data/lib/chewy/index/settings.rb +10 -5
  34. data/lib/chewy/index/specification.rb +60 -0
  35. data/lib/chewy/index.rb +239 -138
  36. data/lib/chewy/journal.rb +55 -0
  37. data/lib/chewy/log_subscriber.rb +8 -8
  38. data/lib/chewy/minitest/helpers.rb +77 -0
  39. data/lib/chewy/minitest/search_index_receiver.rb +80 -0
  40. data/lib/chewy/minitest.rb +1 -0
  41. data/lib/chewy/query/compose.rb +18 -19
  42. data/lib/chewy/query/criteria.rb +34 -24
  43. data/lib/chewy/query/filters.rb +28 -11
  44. data/lib/chewy/query/loading.rb +3 -4
  45. data/lib/chewy/query/nodes/and.rb +1 -1
  46. data/lib/chewy/query/nodes/base.rb +1 -1
  47. data/lib/chewy/query/nodes/bool.rb +6 -4
  48. data/lib/chewy/query/nodes/equal.rb +4 -4
  49. data/lib/chewy/query/nodes/exists.rb +1 -1
  50. data/lib/chewy/query/nodes/expr.rb +2 -2
  51. data/lib/chewy/query/nodes/field.rb +35 -31
  52. data/lib/chewy/query/nodes/has_child.rb +1 -0
  53. data/lib/chewy/query/nodes/has_parent.rb +1 -0
  54. data/lib/chewy/query/nodes/has_relation.rb +10 -12
  55. data/lib/chewy/query/nodes/missing.rb +1 -1
  56. data/lib/chewy/query/nodes/not.rb +1 -1
  57. data/lib/chewy/query/nodes/or.rb +1 -1
  58. data/lib/chewy/query/nodes/prefix.rb +3 -2
  59. data/lib/chewy/query/nodes/query.rb +1 -1
  60. data/lib/chewy/query/nodes/range.rb +9 -9
  61. data/lib/chewy/query/nodes/raw.rb +1 -1
  62. data/lib/chewy/query/nodes/regexp.rb +13 -9
  63. data/lib/chewy/query/nodes/script.rb +4 -4
  64. data/lib/chewy/query/pagination.rb +10 -1
  65. data/lib/chewy/query.rb +286 -170
  66. data/lib/chewy/railtie.rb +7 -6
  67. data/lib/chewy/rake_helper.rb +275 -37
  68. data/lib/chewy/repository.rb +2 -2
  69. data/lib/chewy/rspec/update_index.rb +70 -65
  70. data/lib/chewy/rspec.rb +1 -1
  71. data/lib/chewy/runtime/version.rb +4 -4
  72. data/lib/chewy/search/loader.rb +83 -0
  73. data/lib/chewy/{query → search}/pagination/kaminari.rb +13 -5
  74. data/lib/chewy/search/pagination/will_paginate.rb +43 -0
  75. data/lib/chewy/search/parameters/aggs.rb +16 -0
  76. data/lib/chewy/search/parameters/allow_partial_search_results.rb +27 -0
  77. data/lib/chewy/search/parameters/concerns/bool_storage.rb +24 -0
  78. data/lib/chewy/search/parameters/concerns/hash_storage.rb +23 -0
  79. data/lib/chewy/search/parameters/concerns/integer_storage.rb +14 -0
  80. data/lib/chewy/search/parameters/concerns/query_storage.rb +238 -0
  81. data/lib/chewy/search/parameters/concerns/string_array_storage.rb +23 -0
  82. data/lib/chewy/search/parameters/concerns/string_storage.rb +14 -0
  83. data/lib/chewy/search/parameters/docvalue_fields.rb +12 -0
  84. data/lib/chewy/search/parameters/explain.rb +16 -0
  85. data/lib/chewy/search/parameters/filter.rb +47 -0
  86. data/lib/chewy/search/parameters/highlight.rb +16 -0
  87. data/lib/chewy/search/parameters/indices.rb +123 -0
  88. data/lib/chewy/search/parameters/indices_boost.rb +52 -0
  89. data/lib/chewy/search/parameters/limit.rb +17 -0
  90. data/lib/chewy/search/parameters/load.rb +32 -0
  91. data/lib/chewy/search/parameters/min_score.rb +16 -0
  92. data/lib/chewy/search/parameters/none.rb +27 -0
  93. data/lib/chewy/search/parameters/offset.rb +17 -0
  94. data/lib/chewy/search/parameters/order.rb +64 -0
  95. data/lib/chewy/search/parameters/post_filter.rb +19 -0
  96. data/lib/chewy/search/parameters/preference.rb +16 -0
  97. data/lib/chewy/search/parameters/profile.rb +16 -0
  98. data/lib/chewy/search/parameters/query.rb +19 -0
  99. data/lib/chewy/search/parameters/request_cache.rb +27 -0
  100. data/lib/chewy/search/parameters/rescore.rb +29 -0
  101. data/lib/chewy/search/parameters/script_fields.rb +16 -0
  102. data/lib/chewy/search/parameters/search_after.rb +20 -0
  103. data/lib/chewy/search/parameters/search_type.rb +16 -0
  104. data/lib/chewy/search/parameters/source.rb +73 -0
  105. data/lib/chewy/search/parameters/storage.rb +95 -0
  106. data/lib/chewy/search/parameters/stored_fields.rb +63 -0
  107. data/lib/chewy/search/parameters/suggest.rb +16 -0
  108. data/lib/chewy/search/parameters/terminate_after.rb +16 -0
  109. data/lib/chewy/search/parameters/timeout.rb +16 -0
  110. data/lib/chewy/search/parameters/track_scores.rb +16 -0
  111. data/lib/chewy/search/parameters/types.rb +20 -0
  112. data/lib/chewy/search/parameters/version.rb +16 -0
  113. data/lib/chewy/search/parameters.rb +167 -0
  114. data/lib/chewy/search/query_proxy.rb +257 -0
  115. data/lib/chewy/search/request.rb +1045 -0
  116. data/lib/chewy/search/response.rb +119 -0
  117. data/lib/chewy/search/scoping.rb +50 -0
  118. data/lib/chewy/search/scrolling.rb +134 -0
  119. data/lib/chewy/search.rb +81 -26
  120. data/lib/chewy/stash.rb +79 -0
  121. data/lib/chewy/strategy/active_job.rb +1 -0
  122. data/lib/chewy/strategy/atomic.rb +2 -4
  123. data/lib/chewy/strategy/base.rb +4 -4
  124. data/lib/chewy/strategy/bypass.rb +1 -2
  125. data/lib/chewy/strategy/resque.rb +1 -0
  126. data/lib/chewy/strategy/shoryuken.rb +40 -0
  127. data/lib/chewy/strategy/sidekiq.rb +13 -1
  128. data/lib/chewy/strategy/urgent.rb +1 -1
  129. data/lib/chewy/strategy.rb +19 -10
  130. data/lib/chewy/type/actions.rb +26 -2
  131. data/lib/chewy/type/adapter/active_record.rb +50 -24
  132. data/lib/chewy/type/adapter/base.rb +29 -9
  133. data/lib/chewy/type/adapter/mongoid.rb +19 -10
  134. data/lib/chewy/type/adapter/object.rb +195 -31
  135. data/lib/chewy/type/adapter/orm.rb +69 -33
  136. data/lib/chewy/type/adapter/sequel.rb +37 -19
  137. data/lib/chewy/type/crutch.rb +5 -4
  138. data/lib/chewy/type/import/bulk_builder.rb +122 -0
  139. data/lib/chewy/type/import/bulk_request.rb +78 -0
  140. data/lib/chewy/type/import/journal_builder.rb +45 -0
  141. data/lib/chewy/type/import/routine.rb +138 -0
  142. data/lib/chewy/type/import.rb +150 -176
  143. data/lib/chewy/type/mapping.rb +58 -42
  144. data/lib/chewy/type/observe.rb +21 -15
  145. data/lib/chewy/type/syncer.rb +222 -0
  146. data/lib/chewy/type/witchcraft.rb +89 -34
  147. data/lib/chewy/type/wrapper.rb +48 -16
  148. data/lib/chewy/type.rb +77 -49
  149. data/lib/chewy/version.rb +1 -1
  150. data/lib/chewy.rb +95 -52
  151. data/lib/generators/chewy/install_generator.rb +3 -3
  152. data/lib/sequel/plugins/chewy_observe.rb +4 -19
  153. data/lib/tasks/chewy.rake +91 -28
  154. data/spec/chewy/config_spec.rb +130 -12
  155. data/spec/chewy/fields/base_spec.rb +194 -172
  156. data/spec/chewy/fields/root_spec.rb +123 -17
  157. data/spec/chewy/fields/time_fields_spec.rb +10 -9
  158. data/spec/chewy/index/actions_spec.rb +228 -43
  159. data/spec/chewy/index/aliases_spec.rb +2 -2
  160. data/spec/chewy/index/settings_spec.rb +100 -49
  161. data/spec/chewy/index/specification_spec.rb +169 -0
  162. data/spec/chewy/index_spec.rb +159 -63
  163. data/spec/chewy/journal_spec.rb +268 -0
  164. data/spec/chewy/minitest/helpers_spec.rb +90 -0
  165. data/spec/chewy/minitest/search_index_receiver_spec.rb +120 -0
  166. data/spec/chewy/query/criteria_spec.rb +503 -236
  167. data/spec/chewy/query/filters_spec.rb +96 -68
  168. data/spec/chewy/query/loading_spec.rb +80 -42
  169. data/spec/chewy/query/nodes/and_spec.rb +3 -7
  170. data/spec/chewy/query/nodes/bool_spec.rb +5 -13
  171. data/spec/chewy/query/nodes/equal_spec.rb +20 -20
  172. data/spec/chewy/query/nodes/exists_spec.rb +7 -7
  173. data/spec/chewy/query/nodes/has_child_spec.rb +42 -23
  174. data/spec/chewy/query/nodes/has_parent_spec.rb +42 -23
  175. data/spec/chewy/query/nodes/match_all_spec.rb +2 -2
  176. data/spec/chewy/query/nodes/missing_spec.rb +6 -5
  177. data/spec/chewy/query/nodes/not_spec.rb +5 -7
  178. data/spec/chewy/query/nodes/or_spec.rb +3 -7
  179. data/spec/chewy/query/nodes/prefix_spec.rb +6 -6
  180. data/spec/chewy/query/nodes/query_spec.rb +3 -3
  181. data/spec/chewy/query/nodes/range_spec.rb +19 -19
  182. data/spec/chewy/query/nodes/raw_spec.rb +2 -2
  183. data/spec/chewy/query/nodes/regexp_spec.rb +31 -19
  184. data/spec/chewy/query/nodes/script_spec.rb +5 -5
  185. data/spec/chewy/query/pagination/kaminari_spec.rb +3 -55
  186. data/spec/chewy/query/pagination/will_paginate_spec.rb +5 -0
  187. data/spec/chewy/query/pagination_spec.rb +25 -22
  188. data/spec/chewy/query_spec.rb +510 -505
  189. data/spec/chewy/rake_helper_spec.rb +381 -0
  190. data/spec/chewy/repository_spec.rb +8 -8
  191. data/spec/chewy/rspec/update_index_spec.rb +215 -113
  192. data/spec/chewy/runtime_spec.rb +2 -2
  193. data/spec/chewy/search/loader_spec.rb +117 -0
  194. data/spec/chewy/search/pagination/kaminari_examples.rb +71 -0
  195. data/spec/chewy/search/pagination/kaminari_spec.rb +21 -0
  196. data/spec/chewy/search/pagination/will_paginate_examples.rb +63 -0
  197. data/spec/chewy/search/pagination/will_paginate_spec.rb +23 -0
  198. data/spec/chewy/search/parameters/aggs_spec.rb +5 -0
  199. data/spec/chewy/search/parameters/bool_storage_examples.rb +53 -0
  200. data/spec/chewy/search/parameters/docvalue_fields_spec.rb +5 -0
  201. data/spec/chewy/search/parameters/explain_spec.rb +5 -0
  202. data/spec/chewy/search/parameters/filter_spec.rb +5 -0
  203. data/spec/chewy/search/parameters/hash_storage_examples.rb +59 -0
  204. data/spec/chewy/search/parameters/highlight_spec.rb +5 -0
  205. data/spec/chewy/search/parameters/indices_spec.rb +191 -0
  206. data/spec/chewy/search/parameters/integer_storage_examples.rb +32 -0
  207. data/spec/chewy/search/parameters/limit_spec.rb +5 -0
  208. data/spec/chewy/search/parameters/load_spec.rb +60 -0
  209. data/spec/chewy/search/parameters/min_score_spec.rb +32 -0
  210. data/spec/chewy/search/parameters/none_spec.rb +5 -0
  211. data/spec/chewy/search/parameters/offset_spec.rb +5 -0
  212. data/spec/chewy/search/parameters/order_spec.rb +65 -0
  213. data/spec/chewy/search/parameters/post_filter_spec.rb +5 -0
  214. data/spec/chewy/search/parameters/preference_spec.rb +5 -0
  215. data/spec/chewy/search/parameters/profile_spec.rb +5 -0
  216. data/spec/chewy/search/parameters/query_spec.rb +5 -0
  217. data/spec/chewy/search/parameters/query_storage_examples.rb +388 -0
  218. data/spec/chewy/search/parameters/request_cache_spec.rb +67 -0
  219. data/spec/chewy/search/parameters/rescore_spec.rb +62 -0
  220. data/spec/chewy/search/parameters/script_fields_spec.rb +5 -0
  221. data/spec/chewy/search/parameters/search_after_spec.rb +32 -0
  222. data/spec/chewy/search/parameters/search_type_spec.rb +5 -0
  223. data/spec/chewy/search/parameters/source_spec.rb +156 -0
  224. data/spec/chewy/search/parameters/storage_spec.rb +60 -0
  225. data/spec/chewy/search/parameters/stored_fields_spec.rb +126 -0
  226. data/spec/chewy/search/parameters/string_array_storage_examples.rb +63 -0
  227. data/spec/chewy/search/parameters/string_storage_examples.rb +32 -0
  228. data/spec/chewy/search/parameters/suggest_spec.rb +5 -0
  229. data/spec/chewy/search/parameters/terminate_after_spec.rb +5 -0
  230. data/spec/chewy/search/parameters/timeout_spec.rb +5 -0
  231. data/spec/chewy/search/parameters/track_scores_spec.rb +5 -0
  232. data/spec/chewy/search/parameters/types_spec.rb +5 -0
  233. data/spec/chewy/search/parameters/version_spec.rb +5 -0
  234. data/spec/chewy/search/parameters_spec.rb +145 -0
  235. data/spec/chewy/search/query_proxy_spec.rb +68 -0
  236. data/spec/chewy/search/request_spec.rb +685 -0
  237. data/spec/chewy/search/response_spec.rb +192 -0
  238. data/spec/chewy/search/scrolling_spec.rb +169 -0
  239. data/spec/chewy/search_spec.rb +37 -20
  240. data/spec/chewy/stash_spec.rb +95 -0
  241. data/spec/chewy/strategy/active_job_spec.rb +8 -2
  242. data/spec/chewy/strategy/atomic_spec.rb +4 -1
  243. data/spec/chewy/strategy/resque_spec.rb +8 -2
  244. data/spec/chewy/strategy/shoryuken_spec.rb +66 -0
  245. data/spec/chewy/strategy/sidekiq_spec.rb +10 -2
  246. data/spec/chewy/strategy_spec.rb +6 -6
  247. data/spec/chewy/type/actions_spec.rb +29 -10
  248. data/spec/chewy/type/adapter/active_record_spec.rb +357 -139
  249. data/spec/chewy/type/adapter/mongoid_spec.rb +220 -101
  250. data/spec/chewy/type/adapter/object_spec.rb +129 -40
  251. data/spec/chewy/type/adapter/sequel_spec.rb +304 -152
  252. data/spec/chewy/type/import/bulk_builder_spec.rb +279 -0
  253. data/spec/chewy/type/import/bulk_request_spec.rb +102 -0
  254. data/spec/chewy/type/import/journal_builder_spec.rb +95 -0
  255. data/spec/chewy/type/import/routine_spec.rb +110 -0
  256. data/spec/chewy/type/import_spec.rb +360 -244
  257. data/spec/chewy/type/mapping_spec.rb +96 -29
  258. data/spec/chewy/type/observe_spec.rb +25 -15
  259. data/spec/chewy/type/syncer_spec.rb +123 -0
  260. data/spec/chewy/type/witchcraft_spec.rb +122 -44
  261. data/spec/chewy/type/wrapper_spec.rb +63 -23
  262. data/spec/chewy/type_spec.rb +32 -10
  263. data/spec/chewy_spec.rb +82 -12
  264. data/spec/spec_helper.rb +16 -2
  265. data/spec/support/active_record.rb +6 -2
  266. data/spec/support/class_helpers.rb +4 -19
  267. data/spec/support/mongoid.rb +17 -5
  268. data/spec/support/sequel.rb +6 -1
  269. metadata +250 -57
  270. data/gemfiles/rails.3.2.activerecord.gemfile +0 -15
  271. data/gemfiles/rails.3.2.activerecord.kaminari.gemfile +0 -14
  272. data/gemfiles/rails.3.2.activerecord.will_paginate.gemfile +0 -14
  273. data/gemfiles/rails.4.0.activerecord.kaminari.gemfile +0 -14
  274. data/gemfiles/rails.4.0.activerecord.will_paginate.gemfile +0 -14
  275. data/gemfiles/rails.4.0.mongoid.4.0.0.gemfile +0 -15
  276. data/gemfiles/rails.4.0.mongoid.4.0.0.kaminari.gemfile +0 -14
  277. data/gemfiles/rails.4.0.mongoid.4.0.0.will_paginate.gemfile +0 -14
  278. data/gemfiles/rails.4.0.mongoid.5.1.0.gemfile +0 -15
  279. data/gemfiles/rails.4.0.mongoid.5.1.0.kaminari.gemfile +0 -14
  280. data/gemfiles/rails.4.0.mongoid.5.1.0.will_paginate.gemfile +0 -14
  281. data/gemfiles/rails.4.1.activerecord.kaminari.gemfile +0 -14
  282. data/gemfiles/rails.4.1.activerecord.will_paginate.gemfile +0 -14
  283. data/gemfiles/rails.4.1.mongoid.4.0.0.gemfile +0 -15
  284. data/gemfiles/rails.4.1.mongoid.4.0.0.kaminari.gemfile +0 -14
  285. data/gemfiles/rails.4.1.mongoid.4.0.0.will_paginate.gemfile +0 -14
  286. data/gemfiles/rails.4.1.mongoid.5.1.0.gemfile +0 -15
  287. data/gemfiles/rails.4.1.mongoid.5.1.0.kaminari.gemfile +0 -14
  288. data/gemfiles/rails.4.1.mongoid.5.1.0.will_paginate.gemfile +0 -14
  289. data/gemfiles/rails.4.2.activerecord.kaminari.gemfile +0 -15
  290. data/gemfiles/rails.4.2.activerecord.will_paginate.gemfile +0 -15
  291. data/gemfiles/rails.4.2.mongoid.4.0.0.gemfile +0 -15
  292. data/gemfiles/rails.4.2.mongoid.4.0.0.kaminari.gemfile +0 -14
  293. data/gemfiles/rails.4.2.mongoid.4.0.0.will_paginate.gemfile +0 -14
  294. data/gemfiles/rails.4.2.mongoid.5.1.0.gemfile +0 -15
  295. data/gemfiles/rails.4.2.mongoid.5.1.0.kaminari.gemfile +0 -14
  296. data/gemfiles/rails.4.2.mongoid.5.1.0.will_paginate.gemfile +0 -14
  297. data/gemfiles/rails.5.0.0.beta3.activerecord.gemfile +0 -16
  298. data/gemfiles/rails.5.0.0.beta3.activerecord.kaminari.gemfile +0 -16
  299. data/gemfiles/rails.5.0.0.beta3.activerecord.will_paginate.gemfile +0 -15
  300. data/gemfiles/sequel.4.31.gemfile +0 -13
  301. data/lib/chewy/query/pagination/will_paginate.rb +0 -27
  302. data/lib/chewy/query/scoping.rb +0 -20
  303. data/spec/chewy/query/pagination/will_paginage_spec.rb +0 -60
@@ -5,107 +5,121 @@ describe Chewy::Fields::Base do
5
5
  specify { expect(described_class.new('name', type: 'integer').options[:type]).to eq('integer') }
6
6
 
7
7
  describe '#compose' do
8
- let(:field) { described_class.new(:name, value: ->(o){ o.value }) }
8
+ let(:field) { described_class.new(:name, value: ->(o) { o.value }) }
9
9
 
10
- specify { expect(field.compose(double(value: 'hello'))).to eq({name: 'hello'}) }
11
- specify { expect(field.compose(double(value: ['hello', 'world']))).to eq({name: ['hello', 'world']}) }
12
-
13
- specify { expect(described_class.new(:name).compose(double(name: 'hello'))).to eq({name: 'hello'}) }
14
- specify { expect(described_class.new(:false_value).compose({false_value: false})).to eq({false_value: false}) }
15
- specify { expect(described_class.new(:true_value).compose({true_value: true})).to eq({true_value: true}) }
16
- specify { expect(described_class.new(:nil_value).compose({nil_value: nil})).to eq({nil_value: nil}) }
10
+ specify { expect(field.compose(double(value: 'hello'))).to eq(name: 'hello') }
11
+ specify { expect(field.compose(double(value: %w[hello world]))).to eq(name: %w[hello world]) }
17
12
 
13
+ specify { expect(described_class.new(:name, value: :last_name).compose(double(last_name: 'hello'))).to eq(name: 'hello') }
14
+ specify { expect(described_class.new(:name, value: :last_name).compose('last_name' => 'hello')).to eq(name: 'hello') }
15
+ specify { expect(described_class.new(:name).compose(double(name: 'hello'))).to eq(name: 'hello') }
16
+ specify { expect(described_class.new(:false_value).compose(false_value: false)).to eq(false_value: false) }
17
+ specify { expect(described_class.new(:true_value).compose(true_value: true)).to eq(true_value: true) }
18
+ specify { expect(described_class.new(:nil_value).compose(nil_value: nil)).to eq(nil_value: nil) }
18
19
 
19
20
  context 'nested fields' do
20
21
  before do
21
- field.children.push(described_class.new(:subname1, value: ->(o){ o.subvalue1 }))
22
- field.children.push(described_class.new(:subname2, value: ->{ subvalue2 }))
22
+ field.children.push(described_class.new(:subname1, value: ->(o) { o.subvalue1 }))
23
+ field.children.push(described_class.new(:subname2, value: -> { subvalue2 }))
23
24
  field.children.push(described_class.new(:subname3))
24
25
  end
25
26
 
26
- specify { expect(field.compose(double(value: double(subvalue1: 'hello', subvalue2: 'value', subname3: 'world'))))
27
- .to eq({name: {'subname1' => 'hello', 'subname2' => 'value', 'subname3' => 'world'}}) }
28
- specify { expect(field.compose(double(value: [
29
- double(subvalue1: 'hello1', subvalue2: 'value1', subname3: 'world1'),
30
- double(subvalue1: 'hello2', subvalue2: 'value2', subname3: 'world2')
31
- ]))).to eq({name: [
32
- {'subname1' => 'hello1', 'subname2' => 'value1', 'subname3' => 'world1'},
33
- {'subname1' => 'hello2', 'subname2' => 'value2', 'subname3' => 'world2'}
34
- ]}) }
27
+ specify do
28
+ expect(field.compose(double(value: double(subvalue1: 'hello', subvalue2: 'value', subname3: 'world'))))
29
+ .to eq(name: {subname1: 'hello', subname2: 'value', subname3: 'world'})
30
+ end
31
+ specify do
32
+ expect(field.compose(double(value: [
33
+ double(subvalue1: 'hello1', subvalue2: 'value1', subname3: 'world1'),
34
+ double(subvalue1: 'hello2', subvalue2: 'value2', subname3: 'world2')
35
+ ]))).to eq(name: [
36
+ {subname1: 'hello1', subname2: 'value1', subname3: 'world1'},
37
+ {subname1: 'hello2', subname2: 'value2', subname3: 'world2'}
38
+ ])
39
+ end
35
40
  end
36
41
 
37
42
  context 'parent objects' do
38
- let!(:country) { described_class.new(:name, value: ->(country){ country.cities }) }
39
- let!(:city) { described_class.new(:name, value: ->(city, country) { city.districts.map { |district| [district, country.name] } }) }
40
- let!(:district) { described_class.new(:name, value: ->(district, city, country) { [district, city.name, country.name] }) }
43
+ let!(:country) { described_class.new(:name, value: ->(country, crutches) { country.cities.map { |city| double(districts: city.districts, name: crutches.city_name) } }) }
44
+ let!(:city) { described_class.new(:name, value: ->(city, country, crutches) { city.districts.map { |district| [district, country.name, crutches.suffix] } }) }
45
+ let!(:district) { described_class.new(:name, value: ->(district, city, country, crutches) { [district, city.name, country.name, crutches] }) }
46
+ let(:crutches) { double(suffix: 'suffix', city_name: 'Bangkok') }
41
47
 
42
48
  before do
43
49
  country.children.push(city)
44
50
  city.children.push(district)
45
51
  end
46
52
 
47
- specify { expect(country.compose(double(name: 'Thailand', cities: [
48
- double(name: 'Bangkok', districts: ['First', 'Second'])
49
- ]))).to eq(name: [
50
- { 'name' => [
51
- { 'name' => [['First', 'Thailand'], 'Bangkok', 'Thailand'] },
52
- { 'name' => [['Second', 'Thailand'], 'Bangkok', 'Thailand'] }
53
- ] }
54
- ]) }
53
+ specify do
54
+ expect(country.compose(double(name: 'Thailand', cities: [
55
+ double(districts: %w[First Second])
56
+ ]), crutches)).to eq(name: [
57
+ {name: [
58
+ {name: [%w[First Thailand suffix], 'Bangkok', 'Thailand', crutches]},
59
+ {name: [%w[Second Thailand suffix], 'Bangkok', 'Thailand', crutches]}
60
+ ]}
61
+ ])
62
+ end
55
63
  end
56
64
 
57
65
  context 'implicit values' do
58
- let(:field) { described_class.new(:name, type: 'string') }
66
+ let(:field) { described_class.new(:name, type: 'integer') }
59
67
  before do
60
68
  field.children.push(described_class.new(:name))
61
69
  field.children.push(described_class.new(:untouched))
62
70
  end
63
71
 
64
- specify { expect(field.compose(double(name: 'Alex'))).to eq({name: 'Alex'}) }
72
+ specify { expect(field.compose(double(name: 'Alex'))).to eq(name: 'Alex') }
65
73
  end
66
74
 
67
75
  context 'hash values' do
68
76
  let(:field) { described_class.new(:name, type: 'object') }
69
- let(:object) { double(name: { key1: 'value1', key2: 'value2'}) }
77
+ let(:object) { double(name: {key1: 'value1', key2: 'value2'}) }
70
78
 
71
79
  before do
72
- field.children.push(described_class.new(:key1, value: ->(h){ h[:key1] }))
73
- field.children.push(described_class.new(:key2, value: ->(h){ h[:key2] }))
80
+ field.children.push(described_class.new(:key1, value: ->(h) { h[:key1] }))
81
+ field.children.push(described_class.new(:key2, value: ->(h) { h[:key2] }))
74
82
  end
75
83
 
76
- specify{ expect(field.compose(object)).to eq({ name: { 'key1' => 'value1', 'key2' => 'value2'} }) }
84
+ specify { expect(field.compose(object)).to eq(name: {key1: 'value1', key2: 'value2'}) }
77
85
  end
78
86
  end
79
87
 
80
88
  describe '#mappings_hash' do
81
89
  let(:field) { described_class.new(:name, type: :object) }
82
- let(:fields1) { 2.times.map { |i| described_class.new("name#{i+1}", type: "string#{i+1}") } }
83
- let(:fields2) { 2.times.map { |i| described_class.new("name#{i+3}", type: "string#{i+3}") } }
90
+ let(:fields1) { Array.new(2) { |i| described_class.new("name#{i + 1}", type: "integer#{i + 1}") } }
91
+ let(:fields2) { Array.new(2) { |i| described_class.new("name#{i + 3}", type: "integer#{i + 3}") } }
84
92
  before do
85
93
  fields1.each { |m| field.children.push(m) }
86
94
  fields2.each { |m| fields1[0].children.push(m) }
87
95
  end
88
96
 
89
- specify { expect(field.mappings_hash).to eq({name: {type: :object, properties: {
90
- name1: {type: 'string1', fields: {
91
- name3: {type: 'string3'}, name4: {type: 'string4'}
92
- }}, name2: {type: 'string2'}
93
- }}}) }
97
+ specify do
98
+ expect(field.mappings_hash).to eq(name: {type: :object, properties: {
99
+ name1: {type: 'integer1', fields: {
100
+ name3: {type: 'integer3'}, name4: {type: 'integer4'}
101
+ }}, name2: {type: 'integer2'}
102
+ }})
103
+ end
94
104
 
95
105
  context do
96
- let(:field) { described_class.new(:name, type: :string) }
97
- let(:fields1) { 2.times.map { |i| described_class.new("name#{i+1}") } }
98
-
99
- specify { expect(field.mappings_hash).to eq({name: {type: :string, fields: {
100
- name1: {type: 'object', properties: {
101
- name3: {type: 'string3'}, name4: {type: 'string4'}
102
- }}, name2: {type: 'string'}
103
- }}}) }
106
+ let(:field) { described_class.new(:name, type: :integer) }
107
+ let(:fields1) do
108
+ [described_class.new(:name1), described_class.new(:name2, type: 'integer')]
109
+ end
110
+
111
+ specify do
112
+ expect(field.mappings_hash).to eq(name: {type: :integer, fields: {
113
+ name1: {type: 'object', properties: {
114
+ name3: {type: 'integer3'}, name4: {type: 'integer4'}
115
+ }}, name2: {type: 'integer'}
116
+ }})
117
+ end
104
118
  end
105
119
  end
106
120
 
107
121
  context 'integration' do
108
- context 'objects, hashes and arrays' do
122
+ context 'default field type' do
109
123
  before do
110
124
  stub_index(:events) do
111
125
  define_type :event do
@@ -114,118 +128,132 @@ describe Chewy::Fields::Base do
114
128
  field :id
115
129
  field :licenses do
116
130
  field :id
117
- field :name
131
+ field :created_at, type: 'time'
118
132
  end
119
133
  end
120
134
  end
121
135
  end
122
136
  end
123
137
 
138
+ around do |example|
139
+ previous_type = Chewy.default_field_type
140
+ Chewy.default_field_type = 'integer'
141
+ example.run
142
+ Chewy.default_field_type = previous_type
143
+ end
144
+
124
145
  specify do
125
- expect(EventsIndex::Event.mappings_hash).to eq({ event: {
146
+ expect(EventsIndex::Event.mappings_hash).to eq(event: {
126
147
  properties: {
127
- id: { type: 'string' },
148
+ id: {type: 'integer'},
128
149
  category: {
129
150
  type: 'object',
130
151
  properties: {
131
- id: { type: 'string' },
152
+ id: {type: 'integer'},
132
153
  licenses: {
133
154
  type: 'object',
134
155
  properties: {
135
- id: { type: 'string' },
136
- name: { type: 'string' } } } } } } } })
156
+ id: {type: 'integer'},
157
+ created_at: {type: 'time'}
158
+ }
159
+ }
160
+ }
161
+ }
162
+ }
163
+ })
164
+ end
165
+ end
166
+
167
+ context 'objects, hashes and arrays' do
168
+ before do
169
+ stub_index(:events) do
170
+ define_type :event do
171
+ field :id
172
+ field :category do
173
+ field :id
174
+ field :licenses do
175
+ field :id
176
+ field :name
177
+ end
178
+ end
179
+ end
180
+ end
137
181
  end
138
182
 
139
183
  specify do
140
- expect(EventsIndex::Event.root_object.compose(
141
- id: 1, category: { id: 2, licenses: { id: 3, name: 'Name' } }
142
- )).to eq({
143
- event: { 'id' => 1, 'category' => { 'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name'}}}
144
- })
184
+ expect(EventsIndex::Event.root.compose(
185
+ id: 1, category: {id: 2, licenses: {id: 3, name: 'Name'}}
186
+ )).to eq('id' => 1, 'category' => {'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name'}})
145
187
  end
146
188
 
147
189
  specify do
148
- expect(EventsIndex::Event.root_object.compose(id: 1, category: [
149
- { id: 2, 'licenses' => { id: 3, name: 'Name1' } },
150
- { id: 4, licenses: nil}
151
- ])).to eq({
152
- event: { 'id' => 1, 'category' => [
153
- { 'id' => 2, 'licenses' => { 'id' => 3, 'name' => 'Name1' } },
154
- {'id' => 4, 'licenses' => nil.as_json }
155
- ] }
156
- })
190
+ expect(EventsIndex::Event.root.compose(id: 1, category: [
191
+ {id: 2, 'licenses' => {id: 3, name: 'Name1'}},
192
+ {id: 4, licenses: nil}
193
+ ])).to eq('id' => 1, 'category' => [
194
+ {'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name1'}},
195
+ {'id' => 4, 'licenses' => nil.as_json}
196
+ ])
157
197
  end
158
198
 
159
199
  specify do
160
- expect(EventsIndex::Event.root_object.compose('id' => 1, category: { id: 2, licenses: [
161
- { id: 3, name: 'Name1' }, { id: 4, name: 'Name2' }
162
- ] })).to eq({
163
- event: { 'id' => 1, 'category' => { 'id' => 2, 'licenses' => [
164
- {'id' => 3, 'name' => 'Name1'}, {'id' => 4, 'name' => 'Name2'}
165
- ] } }
166
- })
200
+ expect(EventsIndex::Event.root.compose('id' => 1, category: {id: 2, licenses: [
201
+ {id: 3, name: 'Name1'}, {id: 4, name: 'Name2'}
202
+ ]})).to eq('id' => 1, 'category' => {'id' => 2, 'licenses' => [
203
+ {'id' => 3, 'name' => 'Name1'}, {'id' => 4, 'name' => 'Name2'}
204
+ ]})
167
205
  end
168
206
 
169
207
  specify do
170
- expect(EventsIndex::Event.root_object.compose(id: 1, category: [
171
- { id: 2, licenses: [
172
- { id: 3, 'name' => 'Name1' }, { id: 4, name: 'Name2' }
173
- ] },
174
- { id: 5, licenses: [] }
175
- ])).to eq({
176
- event: { 'id' => 1, 'category' => [
177
- { 'id' => 2, 'licenses' => [
178
- { 'id' => 3, 'name' => 'Name1' }, { 'id' => 4, 'name' => 'Name2' }
179
- ] },
180
- {'id' => 5, 'licenses' => [] }
181
- ] }
182
- })
208
+ expect(EventsIndex::Event.root.compose(id: 1, category: [
209
+ {id: 2, licenses: [
210
+ {id: 3, 'name' => 'Name1'}, {id: 4, name: 'Name2'}
211
+ ]},
212
+ {id: 5, licenses: []}
213
+ ])).to eq('id' => 1, 'category' => [
214
+ {'id' => 2, 'licenses' => [
215
+ {'id' => 3, 'name' => 'Name1'}, {'id' => 4, 'name' => 'Name2'}
216
+ ]},
217
+ {'id' => 5, 'licenses' => []}
218
+ ])
183
219
  end
184
220
 
185
221
  specify do
186
- expect(EventsIndex::Event.root_object.compose(
187
- double(id: 1, category: double(id: 2, licenses: double(id: 3, name: 'Name')))
188
- )).to eq({
189
- event: { 'id' => 1, 'category' => { 'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name'}}}
190
- })
222
+ expect(EventsIndex::Event.root.compose(
223
+ double(id: 1, category: double(id: 2, licenses: double(id: 3, name: 'Name')))
224
+ )).to eq('id' => 1, 'category' => {'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name'}})
191
225
  end
192
226
 
193
227
  specify do
194
- expect(EventsIndex::Event.root_object.compose(double(id: 1, category: [
228
+ expect(EventsIndex::Event.root.compose(double(id: 1, category: [
195
229
  double(id: 2, licenses: double(id: 3, name: 'Name1')),
196
230
  double(id: 4, licenses: nil)
197
- ]))).to eq({
198
- event: { 'id' => 1, 'category' => [
199
- { 'id' => 2, 'licenses' => { 'id' => 3, 'name' => 'Name1' } },
200
- {'id' => 4, 'licenses' => nil.as_json }
201
- ] }
202
- })
231
+ ]))).to eq('id' => 1, 'category' => [
232
+ {'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name1'}},
233
+ {'id' => 4, 'licenses' => nil.as_json}
234
+ ])
203
235
  end
204
236
 
205
237
  specify do
206
- expect(EventsIndex::Event.root_object.compose(double(id: 1, category: double(id: 2, licenses: [
238
+ expect(EventsIndex::Event.root.compose(double(id: 1, category: double(id: 2, licenses: [
207
239
  double(id: 3, name: 'Name1'), double(id: 4, name: 'Name2')
208
- ])))).to eq({
209
- event: { 'id' => 1, 'category' => { 'id' => 2, 'licenses' => [
210
- {'id' => 3, 'name' => 'Name1'}, {'id' => 4, 'name' => 'Name2'}
211
- ] } }
212
- })
240
+ ])))).to eq('id' => 1, 'category' => {'id' => 2, 'licenses' => [
241
+ {'id' => 3, 'name' => 'Name1'}, {'id' => 4, 'name' => 'Name2'}
242
+ ]})
213
243
  end
214
244
 
215
245
  specify do
216
- expect(EventsIndex::Event.root_object.compose(double(id: 1, category: [
246
+ expect(EventsIndex::Event.root.compose(double(id: 1, category: [
217
247
  double(id: 2, licenses: [
218
248
  double(id: 3, name: 'Name1'), double(id: 4, name: 'Name2')
219
249
  ]),
220
250
  double(id: 5, licenses: [])
221
- ]))).to eq({
222
- event: { 'id' => 1, 'category' => [
223
- { 'id' => 2, 'licenses' => [
224
- { 'id' => 3, 'name' => 'Name1' }, { 'id' => 4, 'name' => 'Name2' }
225
- ] },
226
- {'id' => 5, 'licenses' => [] }
227
- ] }
228
- })
251
+ ]))).to eq('id' => 1, 'category' => [
252
+ {'id' => 2, 'licenses' => [
253
+ {'id' => 3, 'name' => 'Name1'}, {'id' => 4, 'name' => 'Name2'}
254
+ ]},
255
+ {'id' => 5, 'licenses' => []}
256
+ ])
229
257
  end
230
258
  end
231
259
 
@@ -233,11 +261,11 @@ describe Chewy::Fields::Base do
233
261
  before do
234
262
  stub_index(:events) do
235
263
  define_type :event do
236
- field :id
237
- field :category, value: ->{ categories } do
238
- field :id
239
- field :licenses, value: ->{ license } do
240
- field :id
264
+ field :id, type: 'integer'
265
+ field :category, value: -> { categories } do
266
+ field :id, type: 'integer'
267
+ field :licenses, value: -> { license } do
268
+ field :id, type: 'integer'
241
269
  field :name
242
270
  end
243
271
  end
@@ -246,11 +274,9 @@ describe Chewy::Fields::Base do
246
274
  end
247
275
 
248
276
  specify do
249
- expect(EventsIndex::Event.root_object.compose(
250
- double(id: 1, categories: double(id: 2, license: double(id: 3, name: 'Name')))
251
- )).to eq({
252
- event: { 'id' => 1, 'category' => { 'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name'}}}
253
- })
277
+ expect(EventsIndex::Event.root.compose(
278
+ double(id: 1, categories: double(id: 2, license: double(id: 3, name: 'Name')))
279
+ )).to eq('id' => 1, 'category' => {'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name'}})
254
280
  end
255
281
  end
256
282
 
@@ -258,8 +284,8 @@ describe Chewy::Fields::Base do
258
284
  before do
259
285
  stub_index(:events) do
260
286
  define_type :event do
261
- field :id
262
- field :name, type: 'string' do
287
+ field :id, type: 'integer'
288
+ field :name, type: 'integer' do
263
289
  field :raw, analyzer: 'my_own'
264
290
  end
265
291
  field :category, type: 'object'
@@ -268,48 +294,44 @@ describe Chewy::Fields::Base do
268
294
  end
269
295
 
270
296
  specify do
271
- expect(EventsIndex::Event.mappings_hash).to eq({ event: {
297
+ expect(EventsIndex::Event.mappings_hash).to eq(event: {
272
298
  properties: {
273
- id: { type: 'string' },
299
+ id: {type: 'integer'},
274
300
  name: {
275
- type: 'string',
301
+ type: 'integer',
276
302
  fields: {
277
- raw: { analyzer: 'my_own', type: 'string' }
303
+ raw: {analyzer: 'my_own', type: Chewy.default_field_type}
278
304
  }
279
305
  },
280
- category: { type: 'object' }
306
+ category: {type: 'object'}
281
307
  }
282
- } })
308
+ })
283
309
  end
284
310
 
285
311
  specify do
286
- expect(EventsIndex::Event.root_object.compose(
287
- double(id: 1, name: 'Jonny', category: double(id: 2, as_json: {name: 'Borogoves'}))
288
- )).to eq({
289
- event: {
290
- 'id' => 1,
291
- 'name' => 'Jonny',
292
- 'category' => { 'name' => 'Borogoves' }
293
- }
294
- })
312
+ expect(EventsIndex::Event.root.compose(
313
+ double(id: 1, name: 'Jonny', category: double(id: 2, as_json: {'name' => 'Borogoves'}))
314
+ )).to eq(
315
+ 'id' => 1,
316
+ 'name' => 'Jonny',
317
+ 'category' => {'name' => 'Borogoves'}
318
+ )
295
319
  end
296
320
 
297
321
  specify do
298
- expect(EventsIndex::Event.root_object.compose(
299
- double(id: 1, name: 'Jonny', category: [
300
- double(id: 2, as_json: { name: 'Borogoves1' }),
301
- double(id: 3, as_json: { name: 'Borogoves2' })
302
- ])
303
- )).to eq({
304
- event: {
305
- 'id' => 1,
306
- 'name' => 'Jonny',
307
- 'category' => [
308
- { 'name' => 'Borogoves1' },
309
- { 'name' => 'Borogoves2' }
310
- ]
311
- }
312
- })
322
+ expect(EventsIndex::Event.root.compose(
323
+ double(id: 1, name: 'Jonny', category: [
324
+ double(id: 2, as_json: {'name' => 'Borogoves1'}),
325
+ double(id: 3, as_json: {'name' => 'Borogoves2'})
326
+ ])
327
+ )).to eq(
328
+ 'id' => 1,
329
+ 'name' => 'Jonny',
330
+ 'category' => [
331
+ {'name' => 'Borogoves1'},
332
+ {'name' => 'Borogoves2'}
333
+ ]
334
+ )
313
335
  end
314
336
  end
315
337
 
@@ -327,7 +349,11 @@ describe Chewy::Fields::Base do
327
349
  Country.has_many :cities, order: :id
328
350
  end
329
351
  when :mongoid
330
- City.belongs_to :country
352
+ if Mongoid::VERSION.start_with?('6')
353
+ City.belongs_to :country, optional: true
354
+ else
355
+ City.belongs_to :country
356
+ end
331
357
  Country.has_many :cities, order: :id.asc
332
358
  when :sequel
333
359
  City.many_to_one :country
@@ -358,11 +384,9 @@ describe Chewy::Fields::Base do
358
384
  end
359
385
 
360
386
  specify do
361
- expect(CountriesIndex::Country.root_object.compose(country_with_cities)).to eq({
362
- country: { 'id' => 1, 'cities' => [
363
- { 'id' => 1, 'name' => 'City1' }, { 'id' => 2, 'name' => 'City2' }
364
- ] }
365
- })
387
+ expect(CountriesIndex::Country.root.compose(country_with_cities)).to eq('id' => 1, 'cities' => [
388
+ {'id' => 1, 'name' => 'City1'}, {'id' => 2, 'name' => 'City2'}
389
+ ])
366
390
  end
367
391
 
368
392
  context 'nested object' do
@@ -379,11 +403,9 @@ describe Chewy::Fields::Base do
379
403
  end
380
404
 
381
405
  specify do
382
- expect(CitiesIndex::City.root_object.compose(
383
- City.create!(id: 1, country: Country.create!(id: 1, name: 'Country'))
384
- )).to eq({
385
- city: { 'id' => 1, 'country' => { 'id' => 1, 'name' => 'Country' } }
386
- })
406
+ expect(CitiesIndex::City.root.compose(
407
+ City.create!(id: 1, country: Country.create!(id: 1, name: 'Country'))
408
+ )).to eq('id' => 1, 'country' => {'id' => 1, 'name' => 'Country'})
387
409
  end
388
410
  end
389
411
  end