elasticsearch-dsl 0.1.6 → 0.1.7

data/spec/elasticsearch/dsl/search/queries/wildcard_spec.rb

@@ -0,0 +1,81 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#	http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'spec_helper'
+
+describe Elasticsearch::DSL::Search::Queries::Wildcard do
+
+  describe '#to_hash' do
+
+    let(:search) do
+      described_class.new
+    end
+
+    it 'can be converted to a hash' do
+      expect(search.to_hash).to eq(wildcard: {})
+    end
+  end
+
+  context 'when options methods are called' do
+
+    let(:search) do
+      described_class.new
+    end
+
+    [ 'value',
+      'boost' ].each do |option|
+
+      describe "##{option}" do
+
+        before do
+          search.send(option, 'bar')
+        end
+
+        it 'applies the option' do
+          expect(search.to_hash[:wildcard][option.to_sym]).to eq('bar')
+        end
+      end
+    end
+  end
+
+  describe '#initialize' do
+
+    context 'when a hash is provided' do
+
+      let(:search) do
+        described_class.new(foo: 'bar')
+      end
+
+      it 'sets the value' do
+        expect(search.to_hash[:wildcard][:foo]).to eq('bar')
+      end
+    end
+
+    context 'when a block is provided' do
+
+      let(:search) do
+        described_class.new do
+          value 'bar'
+        end
+      end
+
+      it 'executes the block' do
+        expect(search.to_hash[:wildcard][:value]).to eq('bar')
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,24 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#	http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'elasticsearch'
+require 'elasticsearch-dsl'
+
+RSpec.configure do |config|
+  config.formatter = 'documentation'
+  config.color = true
+end

data/test/integration/search_aggregation_children_test.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#	http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'test_helper'
 
 module Elasticsearch
@@ -11,45 +28,41 @@ module Elasticsearch
         end
 
         setup do
-          @client.indices.create index: 'articles-test', body: {
+          @client.indices.create index: 'articles-and-comments', body: {
             mappings: {
-              article: {
+              _doc: {
                 properties: {
                   title:    { type: 'text' },
-                  category: { type: 'keyword' }
-                }
-              },
-              comment: {
-                _routing: { required: true },
-                _parent:  { type: 'article' },
-                properties: {
-                  author: { type: 'keyword' }
+                  category: { type: 'keyword' },
+                  join_field: { type: 'join', relations: { article: 'comment' } },
+                  author: { type: 'keyword'}
                 }
               }
             }
           }
-          @client.index index: 'articles-test', type: 'article', id: 1,
-                        body: { title: 'A', category: 'one'  }
-          @client.index index: 'articles-test', type: 'article', id: 2,
-                        body: { title: 'B', category: 'one'  }
-          @client.index index: 'articles-test', type: 'article', id: 3,
-                        body: { title: 'C', category: 'two'  }
 
-          @client.index index: 'articles-test', type: 'comment', parent: '1',
-                        body: { author: 'John' }
-          @client.index index: 'articles-test', type: 'comment', parent: '1',
-                        body: { author: 'Mary' }
-          @client.index index: 'articles-test', type: 'comment', parent: '2',
-                        body: { author: 'John' }
-          @client.index index: 'articles-test', type: 'comment', parent: '2',
-                        body: { author: 'Dave' }
-          @client.index index: 'articles-test', type: 'comment', parent: '3',
-                        body: { author: 'Ruth' }
-          @client.indices.refresh index: 'articles-test'
+          @client.index index: 'articles-and-comments', id: 1,
+                        body: { title: 'A', category: 'one', join_field: 'article' }
+          @client.index index: 'articles-and-comments', id: 2,
+                        body: { title: 'B', category: 'one', join_field: 'article' }
+          @client.index index: 'articles-and-comments', id: 3,
+                        body: { title: 'C', category: 'two', join_field: 'article' }
+
+          @client.index index: 'articles-and-comments', routing: '1',
+                        body: { author: 'John', join_field: { name: 'comment', parent: 1 } }
+          @client.index index: 'articles-and-comments', routing: '1',
+                        body: { author: 'Mary', join_field: { name: 'comment', parent: 1 } }
+          @client.index index: 'articles-and-comments', routing: '2',
+                        body: { author: 'John', join_field: { name: 'comment', parent: 2 } }
+          @client.index index: 'articles-and-comments', routing: '2',
+                        body: { author: 'Dave', join_field: { name: 'comment', parent: 2 } }
+          @client.index index: 'articles-and-comments', routing: '3',
+                        body: { author: 'Ruth', join_field: { name: 'comment', parent: 3 } }
+          @client.indices.refresh index: 'articles-and-comments'
         end
 
         should "return the top commenters per article category" do
-          response = @client.search index: 'articles-test', size: 0, body: search {
+          response = @client.search index: 'articles-and-comments', size: 0, body: search {
             aggregation :top_categories do
               terms field: 'category' do
                 aggregation :comments do

data/test/integration/search_aggregation_geo_test.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#	http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'test_helper'
 
 module Elasticsearch
@@ -55,7 +72,7 @@ module Elasticsearch
           assert_equal 1,       result['buckets'][0]['doc_count']
           assert_equal 'Pacha', result['buckets'][0]['top_venues']['hits']['hits'][0]['_source']['name']
 
-          assert_equal 2,       result['buckets'][1]['top_venues']['hits']['total']
+          assert_equal 2,       result['buckets'][1]['top_venues']['hits']['total']['value']
         end
 
         should "return the geohash grid distribution" do

data/test/integration/search_aggregation_nested_test.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#	http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'test_helper'
 
 module Elasticsearch

data/test/integration/search_aggregations_test.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#	http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'test_helper'
 
 module Elasticsearch
@@ -186,10 +203,10 @@ module Elasticsearch
             response = @client.search index: 'test', body: search {
               aggregation :clicks_for_one do
                 scripted_metric do
-                  init_script "params._agg.transactions = []"
-                  map_script  "if (doc['tags'].value.contains('one')) { params._agg.transactions.add(doc['clicks'].value) }"
-                  combine_script "double sum = 0; for (t in params._agg.transactions) { sum += t } return sum"
-                  reduce_script "double sum = 0; for (a in params._aggs) { sum += a } return sum"
+                  init_script "state.transactions = []"
+                  map_script  "if (doc['tags'].value.contains('one')) { state.transactions.add(doc['clicks'].value) }"
+                  combine_script "double sum = 0; for (t in state.transactions) { sum += t } return sum"
+                  reduce_script "double sum = 0; for (a in states) { sum += a } return sum"
                 end
               end
             }.to_hash

data/test/integration/search_filters_test.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#	http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # encoding: UTF-8
 
 require 'test_helper'
@@ -78,7 +95,7 @@ module Elasticsearch
               end
             }.to_hash
 
-            assert_equal 4, response['hits']['total']
+            assert_equal 4, response['hits']['total']['value']
             assert response['hits']['hits'].all? { |h| h['_source']['color'] == 'red'  }, response.inspect
           end
         end
@@ -95,7 +112,7 @@ module Elasticsearch
               end
             }.to_hash
 
-            assert_equal 7, response['hits']['total']
+            assert_equal 7, response['hits']['total']['value']
           end
         end
 

data/test/integration/search_options_test.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#	http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'test_helper'
 
 module Elasticsearch
@@ -19,7 +36,7 @@ module Elasticsearch
             explain true
           }.to_hash
 
-          assert_equal 1, response['hits']['total']
+          assert_equal 1, response['hits']['total']['value']
           assert_not_nil  response['hits']['hits'][0]['_explanation']
         end
       end

data/test/integration/search_query_test.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#	http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'test_helper'
 
 module Elasticsearch
@@ -21,7 +38,7 @@ module Elasticsearch
           should "find the document" do
             response = @client.search index: 'test', body: search { query { match title: 'test' } }.to_hash
 
-            assert_equal 1, response['hits']['total']
+            assert_equal 1, response['hits']['total']['value']
           end
         end
 
@@ -29,7 +46,7 @@ module Elasticsearch
           should "find the document" do
             response = @client.search index: 'test', body: search { query { match_phrase_prefix title: 'te' } }.to_hash
 
-            assert_equal 1, response['hits']['total']
+            assert_equal 1, response['hits']['total']['value']
           end
         end
 
@@ -37,7 +54,7 @@ module Elasticsearch
           should "find the document" do
             response = @client.search index: 'test', body: search { query { query_string { query 'te*' } } }.to_hash
 
-            assert_equal 1, response['hits']['total']
+            assert_equal 1, response['hits']['total']['value']
           end
         end
 
@@ -52,7 +69,7 @@ module Elasticsearch
                 end
               }.to_hash
 
-            assert_equal 2, response['hits']['total']
+            assert_equal 2, response['hits']['total']['value']
             assert_equal 'Test', response['hits']['hits'][0]['_source']['title']
           end
 
@@ -68,7 +85,7 @@ module Elasticsearch
                 end
               }.to_hash
 
-            assert_equal 1, response['hits']['total']
+            assert_equal 1, response['hits']['total']['value']
             assert_equal 'Rest', response['hits']['hits'][0]['_source']['title']
           end
         end

data/test/integration/search_size_from_test.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#	http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'test_helper'
 
 module Elasticsearch
@@ -21,19 +38,19 @@ module Elasticsearch
               size 15
             }.to_hash
 
-            assert_equal 25, response['hits']['total']
+            assert_equal 25, response['hits']['total']['value']
             assert_equal 15, response['hits']['hits'].size
           end
 
           should "move the offset" do
             response = @client.search index: 'test', body: search {
-              query { match(:title) { query 'test' and type 'phrase_prefix' } }
+              query { match(:title) { query 'test' } }
               size 5
               from 5
               sort { by 'title.keyword' }
             }.to_hash
 
-            assert_equal 25, response['hits']['total']
+            assert_equal 25, response['hits']['total']['value']
             assert_equal 5,  response['hits']['hits'].size
             assert_equal 'Test 005', response['hits']['hits'][0]['_source']['title']
             assert_equal 'Test 009', response['hits']['hits'][4]['_source']['title']