tire 0.4.0 → 0.4.1

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.
@@ -32,6 +32,20 @@ module Tire
32
32
  end
33
33
  end
34
34
 
35
+ should "have an 'id' method" do
36
+ a = Results::Item.new(:_id => 1)
37
+ b = Results::Item.new(:id => 1)
38
+ assert_equal 1, a.id
39
+ assert_equal 1, b.id
40
+ end
41
+
42
+ should "have a 'type' method" do
43
+ a = Results::Item.new(:_type => 'foo')
44
+ b = Results::Item.new(:type => 'foo')
45
+ assert_equal 'foo', a.type
46
+ assert_equal 'foo', b.type
47
+ end
48
+
35
49
  should "respond to :to_indexed_json" do
36
50
  assert_respond_to Results::Item.new, :to_indexed_json
37
51
  end
@@ -7,10 +7,11 @@ module Tire
7
7
  context "Hash" do
8
8
 
9
9
  context "with no to_json method provided" do
10
+
10
11
  setup do
11
12
  @hash = { :one => 1}
12
13
  # Undefine the `to_json` method...
13
- class Hash; undef_method(:to_json); end
14
+ ::Hash.class_eval { remove_method(:to_json) rescue nil }
14
15
  # ... and reload the extension, so it's added
15
16
  load 'tire/rubyext/hash.rb'
16
17
  end
@@ -20,6 +21,12 @@ module Tire
20
21
  assert_equal '{"one":1}', @hash.to_json
21
22
  end
22
23
 
24
+ should "allow to pass options to to_json for compatibility" do
25
+ assert_nothing_raised do
26
+ assert_equal '{"one":1}', @hash.to_json({})
27
+ end
28
+ end
29
+
23
30
  end
24
31
 
25
32
  should "have a to_json method from a JSON serialization library" do
@@ -0,0 +1,113 @@
1
+ require 'test_helper'
2
+
3
+ module Tire
4
+ module Search
5
+ class ScanTest < Test::Unit::TestCase
6
+
7
+ context "Scan" do
8
+ setup do
9
+ Configuration.reset
10
+ @results = {
11
+ "_scroll_id" => "abc123",
12
+ "took" => 3,
13
+ "hits" => {
14
+ "total" => 10,
15
+ "hits" => [
16
+ { "_id" => "1", "_source" => { "title" => "Test" } }
17
+ ]
18
+ }
19
+ }
20
+ @empty_results = @results.merge('hits' => {'hits' => []})
21
+ @default_response = mock_response @results.to_json, 200
22
+ end
23
+
24
+ should "initialize the search object with the indices" do
25
+ s = Scan.new(['index1', 'index2'])
26
+ assert_instance_of Tire::Search::Search, s.search
27
+ end
28
+
29
+ should "fetch the initial scroll ID" do
30
+ s = Scan.new('index1')
31
+ s.search.expects(:perform).
32
+ returns(stub :json => { '_scroll_id' => 'abc123' })
33
+
34
+ assert_equal 'abc123', s.scroll_id
35
+ end
36
+
37
+ should "perform the request lazily" do
38
+ s = Scan.new('dummy')
39
+
40
+ s.expects(:scroll_id).
41
+ returns('abc123').
42
+ at_least_once
43
+
44
+ Configuration.client.expects(:get).
45
+ with { |url,id| url =~ %r|_search/scroll.*search_type=scan| && id == 'abc123' }.
46
+ returns(@default_response).
47
+ once
48
+
49
+ assert_not_nil s.results
50
+ assert_not_nil s.response
51
+ assert_not_nil s.json
52
+ end
53
+
54
+ should "set the total and seen variables" do
55
+ s = Scan.new('dummy')
56
+ s.expects(:scroll_id).returns('abc123').at_least_once
57
+ Configuration.client.expects(:get).returns(@default_response).at_least_once
58
+
59
+ assert_equal 10, s.total
60
+ assert_equal 1, s.seen
61
+ end
62
+
63
+ should "log the request and response" do
64
+ Tire.configure { logger STDERR }
65
+
66
+ s = Scan.new('dummy')
67
+ s.expects(:scroll_id).returns('abc123').at_least_once
68
+ Configuration.client.expects(:get).returns(@default_response).at_least_once
69
+
70
+ Configuration.logger.expects(:log_request).
71
+ with { |(endpoint, params, curl)| endpoint == 'scroll' }
72
+
73
+ Configuration.logger.expects(:log_response).
74
+ with { |code, took, body| code == 200 && took == 3 && body == '1/10 (10.0%)' }
75
+
76
+ s.__perform
77
+ end
78
+
79
+ context "results" do
80
+ setup do
81
+ @search = Scan.new('dummy')
82
+ @search.expects(:results).
83
+ returns(Results::Collection.new @results).
84
+ then.
85
+ returns(Results::Collection.new @empty_results).
86
+ at_least_once
87
+ @search.results
88
+ end
89
+
90
+ should "be iterable" do
91
+ assert_respond_to @search, :each
92
+ assert_respond_to @search, :size
93
+
94
+ assert_nothing_raised do
95
+ @search.each { |batch| p batch; assert_equal 'Test', batch.first.title }
96
+ end
97
+ end
98
+
99
+ should "be iterable by individual documents" do
100
+ assert_respond_to @search, :each_document
101
+
102
+ assert_nothing_raised do
103
+ @search.each_document { |item| assert_equal 'Test', item.title }
104
+ end
105
+ end
106
+
107
+ end
108
+
109
+ end
110
+
111
+ end
112
+ end
113
+ end
@@ -64,6 +64,41 @@ module Tire
64
64
 
65
65
  end
66
66
 
67
+ context "when scanning an index" do
68
+
69
+ should "initiate the scan" do
70
+ Search::Scan.expects(:new).with { |index,options| index == 'dummy' }
71
+
72
+ Tire.scan('dummy')
73
+ end
74
+
75
+ should "allow to pass the query as a block to scan" do
76
+ Search::Scan.expects(:new).with do |index,options|
77
+ index == 'dummy'
78
+ end
79
+
80
+ Tire.scan('dummy') { query { string 'foo' } }
81
+ end
82
+
83
+ should "allow to pass the query as a hash to scan" do
84
+ payload = { :query => { :query_string => { :query => 'foo' } } }
85
+ Search::Scan.expects(:new).with('dummy', payload)
86
+
87
+ Tire.scan 'dummy', payload
88
+ end
89
+ end
90
+
91
+ end
92
+
93
+ context "aliases" do
94
+
95
+ should "list all aliases" do
96
+ json = {'dummy' => {'aliases' => {'foo' => {}}}}.to_json
97
+ Configuration.client.expects(:get).returns(mock_response(json))
98
+
99
+ assert_equal({'dummy' => ['foo']}, Tire.aliases)
100
+ end
101
+
67
102
  end
68
103
 
69
104
  context "utils" do
data/tire.gemspec CHANGED
@@ -36,12 +36,12 @@ Gem::Specification.new do |s|
36
36
  # = Development dependencies
37
37
  #
38
38
  s.add_development_dependency "bundler", "~> 1.0"
39
- s.add_development_dependency "yajl-ruby", "~> 0.8.0"
39
+ s.add_development_dependency "yajl-ruby", "~> 1.0"
40
40
  s.add_development_dependency "shoulda"
41
41
  s.add_development_dependency "mocha"
42
42
  s.add_development_dependency "activerecord", ">= 3.0"
43
43
  s.add_development_dependency "sqlite3"
44
- s.add_development_dependency "mongoid", "~> 2.2.1"
44
+ s.add_development_dependency "mongoid", "~> 2.2"
45
45
  s.add_development_dependency "bson_ext"
46
46
  s.add_development_dependency "redis-persistence"
47
47
  s.add_development_dependency "curb"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tire
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.0
4
+ version: 0.4.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-03-28 00:00:00.000000000 Z
12
+ date: 2012-05-03 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake
16
- requirement: &70230644038360 !ruby/object:Gem::Requirement
16
+ requirement: &70192999444940 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70230644038360
24
+ version_requirements: *70192999444940
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rest-client
27
- requirement: &70230644037820 !ruby/object:Gem::Requirement
27
+ requirement: &70192999442960 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '1.6'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70230644037820
35
+ version_requirements: *70192999442960
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: multi_json
38
- requirement: &70230644037320 !ruby/object:Gem::Requirement
38
+ requirement: &70192999441940 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '1.0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70230644037320
46
+ version_requirements: *70192999441940
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: activemodel
49
- requirement: &70230644036860 !ruby/object:Gem::Requirement
49
+ requirement: &70192999441400 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '3.0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70230644036860
57
+ version_requirements: *70192999441400
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: hashr
60
- requirement: &70230644036400 !ruby/object:Gem::Requirement
60
+ requirement: &70192999440740 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 0.0.19
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70230644036400
68
+ version_requirements: *70192999440740
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: bundler
71
- requirement: &70230644035900 !ruby/object:Gem::Requirement
71
+ requirement: &70192999440040 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,21 +76,21 @@ dependencies:
76
76
  version: '1.0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70230644035900
79
+ version_requirements: *70192999440040
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: yajl-ruby
82
- requirement: &70230644035440 !ruby/object:Gem::Requirement
82
+ requirement: &70192999439360 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ~>
86
86
  - !ruby/object:Gem::Version
87
- version: 0.8.0
87
+ version: '1.0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70230644035440
90
+ version_requirements: *70192999439360
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: shoulda
93
- requirement: &70230644035060 !ruby/object:Gem::Requirement
93
+ requirement: &70192999438620 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *70230644035060
101
+ version_requirements: *70192999438620
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: mocha
104
- requirement: &70230644034580 !ruby/object:Gem::Requirement
104
+ requirement: &70192999438160 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *70230644034580
112
+ version_requirements: *70192999438160
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: activerecord
115
- requirement: &70230644033980 !ruby/object:Gem::Requirement
115
+ requirement: &70192999437460 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '3.0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *70230644033980
123
+ version_requirements: *70192999437460
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: sqlite3
126
- requirement: &70230644033480 !ruby/object:Gem::Requirement
126
+ requirement: &70192999436980 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,21 +131,21 @@ dependencies:
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *70230644033480
134
+ version_requirements: *70192999436980
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: mongoid
137
- requirement: &70230644032700 !ruby/object:Gem::Requirement
137
+ requirement: &70192999436360 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ~>
141
141
  - !ruby/object:Gem::Version
142
- version: 2.2.1
142
+ version: '2.2'
143
143
  type: :development
144
144
  prerelease: false
145
- version_requirements: *70230644032700
145
+ version_requirements: *70192999436360
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: bson_ext
148
- requirement: &70230644031720 !ruby/object:Gem::Requirement
148
+ requirement: &70192999435800 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
153
153
  version: '0'
154
154
  type: :development
155
155
  prerelease: false
156
- version_requirements: *70230644031720
156
+ version_requirements: *70192999435800
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: redis-persistence
159
- requirement: &70230644047280 !ruby/object:Gem::Requirement
159
+ requirement: &70192999435140 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
164
164
  version: '0'
165
165
  type: :development
166
166
  prerelease: false
167
- version_requirements: *70230644047280
167
+ version_requirements: *70192999435140
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: curb
170
- requirement: &70230644046100 !ruby/object:Gem::Requirement
170
+ requirement: &70192999434360 !ruby/object:Gem::Requirement
171
171
  none: false
172
172
  requirements:
173
173
  - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
175
175
  version: '0'
176
176
  type: :development
177
177
  prerelease: false
178
- version_requirements: *70230644046100
178
+ version_requirements: *70192999434360
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: minitest
181
- requirement: &70230644044620 !ruby/object:Gem::Requirement
181
+ requirement: &70192999423380 !ruby/object:Gem::Requirement
182
182
  none: false
183
183
  requirements:
184
184
  - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
186
186
  version: '0'
187
187
  type: :development
188
188
  prerelease: false
189
- version_requirements: *70230644044620
189
+ version_requirements: *70192999423380
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: rdoc
192
- requirement: &70230644043680 !ruby/object:Gem::Requirement
192
+ requirement: &70192999422820 !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements:
195
195
  - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
197
197
  version: '0'
198
198
  type: :development
199
199
  prerelease: false
200
- version_requirements: *70230644043680
200
+ version_requirements: *70192999422820
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: turn
203
- requirement: &70230644042960 !ruby/object:Gem::Requirement
203
+ requirement: &70192999422100 !ruby/object:Gem::Requirement
204
204
  none: false
205
205
  requirements:
206
206
  - - ~>
@@ -208,7 +208,7 @@ dependencies:
208
208
  version: '0.9'
209
209
  type: :development
210
210
  prerelease: false
211
- version_requirements: *70230644042960
211
+ version_requirements: *70192999422100
212
212
  description: ! " Tire is a Ruby client for the ElasticSearch search engine/database.\n\n
213
213
  \ It provides Ruby-like API for fluent communication with the ElasticSearch server\n
214
214
  \ and blends with ActiveModel class for convenient usage in Rails applications.\n\n
@@ -261,6 +261,7 @@ files:
261
261
  - lib/tire/search/filter.rb
262
262
  - lib/tire/search/highlight.rb
263
263
  - lib/tire/search/query.rb
264
+ - lib/tire/search/scan.rb
264
265
  - lib/tire/search/sort.rb
265
266
  - lib/tire/tasks.rb
266
267
  - lib/tire/utils.rb
@@ -283,6 +284,7 @@ files:
283
284
  - test/integration/filters_test.rb
284
285
  - test/integration/fuzzy_queries_test.rb
285
286
  - test/integration/highlight_test.rb
287
+ - test/integration/index_aliases_test.rb
286
288
  - test/integration/index_mapping_test.rb
287
289
  - test/integration/index_store_test.rb
288
290
  - test/integration/mongoid_searchable_test.rb
@@ -291,7 +293,9 @@ files:
291
293
  - test/integration/query_return_version_test.rb
292
294
  - test/integration/query_string_test.rb
293
295
  - test/integration/range_queries_test.rb
296
+ - test/integration/reindex_test.rb
294
297
  - test/integration/results_test.rb
298
+ - test/integration/scan_test.rb
295
299
  - test/integration/sort_test.rb
296
300
  - test/integration/text_query_test.rb
297
301
  - test/models/active_model_article.rb
@@ -326,6 +330,7 @@ files:
326
330
  - test/unit/search_filter_test.rb
327
331
  - test/unit/search_highlight_test.rb
328
332
  - test/unit/search_query_test.rb
333
+ - test/unit/search_scan_test.rb
329
334
  - test/unit/search_sort_test.rb
330
335
  - test/unit/search_test.rb
331
336
  - test/unit/tire_test.rb
@@ -334,22 +339,12 @@ homepage: http://github.com/karmi/tire
334
339
  licenses: []
335
340
  post_install_message: ! "================================================================================\n\n
336
341
  \ Please check the documentation at <http://karmi.github.com/tire/>.\n\n--------------------------------------------------------------------------------\n\n
337
- \ IMPORTANT CHANGES LATELY:\n\n * Persistence supports property defaults and casting
338
- model properties as Ruby objects\n * Added Hashr (http://rubygems.org/gems/hashr)
339
- as dependency\n * Search in persistence models returns model instances, not Items\n
340
- \ * Fixed errors in the Curb client\n * Re-raise the RestClient::RequestTimeout
341
- and RestClient::ServerBrokeConnection exceptions\n * Index#bulk_store and Index#import
342
- support the `:raise` option to re-raise exceptions\n * Prefer ELASTICSEARCH_URL
343
- environment variable as the default URL, if present\n * Added the \"text\" search
344
- query\n * Deprecated the support for passing JSON strings to `Index#store`\n *
345
- ActiveModel mapping has the `:as` option dynamically set property value for serialization\n
346
- \ * ActiveModel supports any level of mappings in `mapping`\n * ActiveModel search
347
- can eagerly load records of multiple types/classes\n * ActiveModel integration
348
- now properly supports namespaced models\n * Added support for passing search params
349
- (`search_type`, `timeout`, etc.) to search requests\n * Added the \"tire:index:drop\"
350
- Rake task\n * Added the \"Filter\" facet type\n * Added the \"Fuzzy\" search query
351
- type\n * Various test suite refactorings and changes\n * Relaxed gem dependencies\n\n
352
- \ See the full changelog at <http://github.com/karmi/tire/commits/v0.4.0>.\n\n--------------------------------------------------------------------------------\n"
342
+ \ IMPORTANT CHANGES LATELY:\n\n * Added a Index#settings method to retrieve index
343
+ settings as a Hash\n * Added support for the \"scan\" search in the Ruby API\n
344
+ \ * Added support for reindexing the index documents into new index\n * Added basic
345
+ support for index aliases\n * Changed, that Index#bulk_store runs against an index
346
+ endpoint, not against `/_bulk`\n * Refactorings, fixes, Ruby 1.8 compatibility\n\n
347
+ \ See the full changelog at <http://github.com/karmi/tire/commits/v0.4.1>.\n\n--------------------------------------------------------------------------------\n"
353
348
  rdoc_options:
354
349
  - --charset=UTF-8
355
350
  require_paths:
@@ -391,6 +386,7 @@ test_files:
391
386
  - test/integration/filters_test.rb
392
387
  - test/integration/fuzzy_queries_test.rb
393
388
  - test/integration/highlight_test.rb
389
+ - test/integration/index_aliases_test.rb
394
390
  - test/integration/index_mapping_test.rb
395
391
  - test/integration/index_store_test.rb
396
392
  - test/integration/mongoid_searchable_test.rb
@@ -399,7 +395,9 @@ test_files:
399
395
  - test/integration/query_return_version_test.rb
400
396
  - test/integration/query_string_test.rb
401
397
  - test/integration/range_queries_test.rb
398
+ - test/integration/reindex_test.rb
402
399
  - test/integration/results_test.rb
400
+ - test/integration/scan_test.rb
403
401
  - test/integration/sort_test.rb
404
402
  - test/integration/text_query_test.rb
405
403
  - test/models/active_model_article.rb
@@ -434,6 +432,7 @@ test_files:
434
432
  - test/unit/search_filter_test.rb
435
433
  - test/unit/search_highlight_test.rb
436
434
  - test/unit/search_query_test.rb
435
+ - test/unit/search_scan_test.rb
437
436
  - test/unit/search_sort_test.rb
438
437
  - test/unit/search_test.rb
439
438
  - test/unit/tire_test.rb