elasticsearch-dsl 0.1.6 → 0.1.10

data/lib/elasticsearch/dsl/search/query.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.
+
 module Elasticsearch
   module DSL
     module Search
@@ -8,7 +25,7 @@ module Elasticsearch
 
       # Wraps the `query` part of a search definition
       #
-      # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html
       #
       class Query
         def initialize(*args, &block)
@@ -23,8 +40,10 @@ module Elasticsearch
           klass = Utils.__camelize(name)
           if Queries.const_defined? klass
             @value = Queries.const_get(klass).new *args, &block
+          elsif @block
+           @block.binding.eval('self').send(name, *args, &block)
           else
-            raise NoMethodError, "undefined method '#{name}' for #{self}"
+            super
           end
         end
 

data/lib/elasticsearch/dsl/search/sort.rb

@@ -1,10 +1,27 @@
+# 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.
+
 module Elasticsearch
   module DSL
     module Search
 
       # Wraps the `sort` part of a search definition
       #
-      # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-sort.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-sort.html
       #
       class Sort
         include BaseComponent

data/lib/elasticsearch/dsl/search/suggest.rb

@@ -1,10 +1,27 @@
+# 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.
+
 module Elasticsearch
   module DSL
     module Search
 
       # Wraps the `suggest` part of a search definition
       #
-      # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-suggesters.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters.html
       #
       class Suggest
         include BaseComponent

data/lib/elasticsearch/dsl/search.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.
+
 module Elasticsearch
   module DSL
 
@@ -15,16 +32,18 @@ module Elasticsearch
       #         match title: 'test'
       #       end
       #     end
+      #     definition.to_hash
+      #     => {:query=>{:match=>{:title=>"test"}}}
       #
       # @example Using the class imperatively
       #
       #     definition = Search.new
-      #     query = Query.new
+      #     query = Queries::Match.new title: 'test'
       #     definition.query query
       #     definition.to_hash
-      #     # => => {:query=>{:match=>{:title=>"Test"}}}
+      #     # => {:query=>{:match=>{:title=>"test"}}}
       #
-      # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search.html
       #
       def search(*args, &block)
         Search.new(*args, &block)
@@ -39,7 +58,8 @@ module Elasticsearch
 
         def initialize(*args, &block)
           @options = Options.new *args
-          block.arity < 1 ? self.instance_eval(&block) : block.call(self) if block
+          @block = block
+          @block.arity < 1 ? self.instance_eval(&@block) : @block.call(self) if @block
         end
 
         # DSL method for building or accessing the `query` part of a search definition
@@ -146,6 +166,19 @@ module Elasticsearch
           end
         end
 
+        # DSL method for building the `collapse` part of a search definition
+        #
+        # @return [self, Collapse]
+        #
+        def collapse(*args, &block)
+          if !args.empty? || block
+            @collapse = Collapse.new(*args, &block)
+            self
+          else
+            @collapse
+          end
+        end
+
         # DSL method for building the `sort` part of a search definition
         #
         # @return [self]
@@ -159,6 +192,12 @@ module Elasticsearch
           end
         end
 
+        # Set the sort part of a search definition
+        #
+        def sort=(value)
+          @sort = value
+        end
+
         # DSL method for building the `stored_fields` part of a search definition
         #
         # @return [self]
@@ -225,6 +264,8 @@ module Elasticsearch
           if @options.respond_to? name
             @options.__send__ name, *args, &block
             self
+          elsif @block
+            @block.binding.eval('self').send(name, *args, &block)
           else
             super
           end
@@ -246,6 +287,7 @@ module Elasticsearch
           hash.update(from: @from) if @from
           hash.update(suggest: @suggest.reduce({}) { |sum,item| sum.update item.last.to_hash }) if @suggest
           hash.update(highlight: @highlight.to_hash) if @highlight
+          hash.update(collapse: @collapse.to_hash) if @collapse
           hash.update(@options) unless @options.empty?
           hash
         end

data/lib/elasticsearch/dsl/utils.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.
+
 module Elasticsearch
   module DSL
 

data/lib/elasticsearch/dsl/version.rb

@@ -1,5 +1,22 @@
+# 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.
+
 module Elasticsearch
   module DSL
-    VERSION = "0.1.6"
+    VERSION = "0.1.10"
   end
 end

data/lib/elasticsearch/dsl.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 'elasticsearch/dsl/version'
 
 require 'elasticsearch/dsl/utils'
@@ -5,6 +22,7 @@ require 'elasticsearch/dsl/search/base_component'
 require 'elasticsearch/dsl/search/base_compound_filter_component'
 require 'elasticsearch/dsl/search/base_aggregation_component'
 require 'elasticsearch/dsl/search/query'
+require 'elasticsearch/dsl/search/collapse'
 require 'elasticsearch/dsl/search/filter'
 require 'elasticsearch/dsl/search/aggregation'
 require 'elasticsearch/dsl/search/highlight'
@@ -37,7 +55,7 @@ module Elasticsearch
   #     # => { query: { match: { title: "test"} } }
   #
   # @see Search
-  # @see http://www.elasticsearch.org/guide/en/elasticsearch/guide/current/query-dsl-intro.html
+  # @see https://www.elastic.co/guide/en/elasticsearch/guide/current/query-dsl-intro.html
   #
   module DSL
     def self.included(base)

data/lib/elasticsearch-dsl.rb

@@ -1 +1,18 @@
+# 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/dsl'

data/spec/elasticsearch/dsl/search/aggregations/avg_spec.rb

@@ -0,0 +1,43 @@
+# 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::Aggregations::Avg do
+
+  let(:search) do
+    described_class.new
+  end
+
+  describe '#to_hash' do
+
+    it 'can be converted to a hash' do
+      expect(search.to_hash).to eq(avg: {})
+    end
+  end
+
+  context '#initialize' do
+
+    let(:search) do
+      described_class.new(foo: 'bar')
+    end
+
+    it 'takes a hash' do
+      expect(search.to_hash).to eq(avg: { foo: 'bar' })
+    end
+  end
+end

data/spec/elasticsearch/dsl/search/aggregations/cardinality_spec.rb

@@ -0,0 +1,110 @@
+# 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::Aggregations::Cardinality do
+
+  let(:search) do
+    described_class.new
+  end
+
+  describe '#to_hash' do
+
+    it 'can be converted to a hash' do
+      expect(search.to_hash).to eq(cardinality: {})
+    end
+  end
+
+  context 'when options methods are called' do
+
+    let(:search) do
+      described_class.new(:foo)
+    end
+
+    describe '#field' do
+
+      before do
+        search.field('bar')
+      end
+
+      it 'applies the option' do
+        expect(search.to_hash[:cardinality][:foo][:field]).to eq('bar')
+      end
+    end
+
+    describe '#precision_threshold' do
+
+      before do
+        search.precision_threshold('bar')
+      end
+
+      it 'applies the option' do
+        expect(search.to_hash[:cardinality][:foo][:precision_threshold]).to eq('bar')
+      end
+    end
+
+    describe '#rehash' do
+
+      before do
+        search.rehash('skip')
+      end
+
+      it 'applies the option' do
+        expect(search.to_hash[:cardinality][:foo][:rehash]).to eq('skip')
+      end
+    end
+
+    describe '#script' do
+
+      before do
+        search.script('bar')
+      end
+
+      it 'applies the option' do
+        expect(search.to_hash[:cardinality][:foo][:script]).to eq('bar')
+      end
+    end
+
+    describe '#params' do
+
+      before do
+        search.params('bar')
+      end
+
+      it 'applies the option' do
+        expect(search.to_hash[:cardinality][:foo][:params]).to eq('bar')
+      end
+    end
+  end
+
+  describe '#initialize' do
+
+    context 'when a block is provided' do
+
+      let(:search) do
+        described_class.new(:foo) do
+          field 'bar'
+        end
+      end
+
+      it 'executes the block' do
+        expect(search.to_hash).to eq({ cardinality: { foo: { field: 'bar' } } })
+      end
+    end
+  end
+end

data/spec/elasticsearch/dsl/search/aggregations/children_spec.rb

@@ -0,0 +1,66 @@
+# 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::Aggregations::Children do
+
+  let(:search) do
+    described_class.new
+  end
+
+  describe '#to_hash' do
+
+    it 'can be converted to a hash' do
+      expect(search.to_hash).to eq(children: {})
+    end
+  end
+
+  context 'when options methods are called' do
+
+    let(:search) do
+      described_class.new(:foo)
+    end
+
+    describe '#type' do
+
+      before do
+        search.type('bar')
+      end
+
+      it 'applies the option' do
+        expect(search.to_hash[:children][:foo][:type]).to eq('bar')
+      end
+    end
+  end
+
+  describe '#initialize' do
+
+    context 'when a block is provided' do
+
+      let(:search) do
+        described_class.new(:foo) do
+          type 'bar'
+        end
+      end
+
+      it 'executes the block' do
+        expect(search.to_hash).to eq({ children: { foo: { type: 'bar' } } })
+      end
+    end
+  end
+end

data/spec/elasticsearch/dsl/search/aggregations/composite_spec.rb

@@ -0,0 +1,99 @@
+# 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::Aggregations::Composite do
+
+  let(:search) do
+    described_class.new
+  end
+
+  describe '#to_hash' do
+
+    it 'can be converted to a hash' do
+      expect(search.to_hash).to eq(composite: {})
+    end
+  end
+
+  context 'when options methods are called' do
+
+    let(:search) do
+      described_class.new(:foo)
+    end
+
+    describe '#size' do
+
+      before do
+        search.size(2_000)
+      end
+
+      it 'applies the option' do
+        expect(search.to_hash[:composite][:foo][:size]).to eq(2_000)
+      end
+    end
+
+    describe '#sources' do
+
+      before do
+        search.sources('bar')
+      end
+
+      it 'applies the option' do
+        expect(search.to_hash[:composite][:foo][:sources]).to eq('bar')
+      end
+    end
+
+    describe '#after' do
+      context 'when after is not given' do
+        before do
+          search.size(2_000)
+        end
+
+        it 'applies the option' do
+          expect(search.to_hash[:composite][:foo].keys).not_to include(:after)
+        end
+      end
+
+      context 'when after is given' do
+        before do
+          search.after('fake_after_key')
+        end
+
+        it 'applies the option' do
+          expect(search.to_hash[:composite][:foo][:after]).to eq('fake_after_key')
+        end
+      end
+    end
+  end
+
+  describe '#initialize' do
+
+    context 'when a block is provided' do
+
+      let(:search) do
+        described_class.new(:foo) do
+          size 2_000
+        end
+      end
+
+      it 'executes the block' do
+        expect(search.to_hash).to eq({ composite: { foo: { size: 2_000 } } })
+      end
+    end
+  end
+end