elasticsearch-dsl 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f1f7538a8ba72fb494c08161eaeea00b841efb6053eb9b640916082380e44d1
-  data.tar.gz: 8952342319cc9f742c8ad7c2be57d1b78a9025535a590f1b4b464a4e77f4cc4b
+  metadata.gz: 2c06f16111c1a5a433b67c1b7b3ea96fc1da1b7b06ef3d33a32c36d01a5f6313
+  data.tar.gz: bef717306ff360a26a3b9c3c84b5beb9821452404547f0af834c383c4a0d1d9f
 SHA512:
-  metadata.gz: e845c2c5a586e8de9d7ef256305b4a9635c8f5278fbac3f22b3b512560366a25edefac398f9fdc8eba7fda84e6c67e79ce337e46b22a7f0491c486b00e62dfc2
-  data.tar.gz: 89628d179337835661ce4d671b4e7fcd56ee8cf92af8155a3a18bdbf8c3901e1791c9cfc427a55a1814b0c656598aca873a122c32a0fa423ea595ea6c86e3acf
+  metadata.gz: b0b7a267f4c43c0cf9f095132f46a54c7d2a6e515e8868e343e003245e27e1e086ae6fb44314eb42c8ee93a4454385c2dbf7ec158bd224f510c908440452cea9
+  data.tar.gz: 0ba1b777aa2145ec8b1aa5aafa7ab2e06a90374c461d26dea09653d8878321af6687c0bd6171ebdcf9fc7f3380500a784e2fa947c2a7ab673b1232c7c50da22a

data/Gemfile

@@ -1,19 +1,6 @@
-# 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.
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
 
 source 'https://rubygems.org'
 

data/README.md

@@ -239,6 +239,56 @@ NOTE: You have to enable dynamic scripting to be able to execute the `function_s
 
 **Please see the extensive RDoc examples in the source code and the integration tests.**
 
+## Accessing methods outside DSL blocks' scopes
+
+Methods can be defined and called from within a block. This can be done for values like a `Hash`,
+`String`, `Array`, etc. For example:
+
+```ruby
+def match_criteria
+  { title: 'test' }
+end
+
+s = search do
+  query do
+    match match_criteria
+  end
+end
+
+s.to_hash
+# => { query: { match: { title: 'test' } } }
+
+```
+
+To define subqueries in other methods, `self` must be passed to the method and the subquery must be defined in a block
+passed to `instance_eval` called on the object argument. Otherwise, the subquery does not have access to the scope of 
+the block from which the method was called. For example:
+
+```ruby
+def not_clause(obj)
+  obj.instance_eval do
+    _not do
+      term color: 'red'
+    end
+  end
+end
+
+s = search do
+  query do
+    filtered do
+      filter do
+        not_clause(self)
+      end
+    end
+  end
+end
+
+s.to_hash
+# => { query: { filtered: { filter: { not: { term: { color: 'red' } } } } } }
+
+```
+
+
 ## Development
 
 To work on the code, clone the repository and install the dependencies:
@@ -261,21 +311,4 @@ see instructions in the main [README](../README.md#development).
 
 ## License
 
-This software is licensed under the Apache 2 license, quoted below.
-
-    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.
+This software is licensed under the [Apache 2 license](./LICENSE).

data/Rakefile

@@ -1,19 +1,6 @@
-# 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.
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
 
 require "bundler/gem_tasks"
 
@@ -122,7 +109,7 @@ namespace :generate do
       hits     = JSON.load(response)['hits']['hits']
 
       if hit = hits.first
-        doc_url = ("http://elasticsearch.org" + hit['fields']['url']).gsub(/#.+$/, '') if hit['_score'] > 0.2
+        doc_url = ("https://www.elastic.co" + hit['fields']['url']).gsub(/#.+$/, '') if hit['_score'] > 0.2
       end
     rescue Exception => e
       puts "[!] ERROR: #{e.inspect}"

data/elasticsearch-dsl.gemspec

@@ -1,19 +1,6 @@
-# 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.
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
 
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)

data/lib/elasticsearch-dsl.rb

@@ -1,18 +1,5 @@
-# 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.
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
 
 require 'elasticsearch/dsl'

data/lib/elasticsearch/dsl.rb

@@ -1,19 +1,6 @@
-# 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.
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
 
 require 'elasticsearch/dsl/version'
 
@@ -22,6 +9,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'

data/lib/elasticsearch/dsl/search.rb

@@ -1,19 +1,6 @@
-# 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.
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
 
 module Elasticsearch
   module DSL
@@ -58,7 +45,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
@@ -165,6 +153,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]
@@ -178,6 +179,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]
@@ -244,6 +251,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
@@ -265,6 +274,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/search/aggregation.rb

@@ -1,19 +1,6 @@
-# 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.
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
 
 module Elasticsearch
   module DSL
@@ -46,8 +33,10 @@ module Elasticsearch
           klass = Utils.__camelize(name)
           if Aggregations.const_defined? klass
             @value = Aggregations.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/aggregations/avg.rb

@@ -1,19 +1,6 @@
-# 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.
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
 
 module Elasticsearch
   module DSL
@@ -30,7 +17,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://elasticsearch.org/guide/en/elasticsearch/reference/current/search-aggregations-metrics-avg-aggregation.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-avg-aggregation.html
         #
         class Avg
           include BaseComponent

data/lib/elasticsearch/dsl/search/aggregations/cardinality.rb

@@ -1,19 +1,6 @@
-# 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.
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
 
 module Elasticsearch
   module DSL
@@ -31,7 +18,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://elasticsearch.org/guide/en/elasticsearch/reference/current/search-aggregations-metrics-cardinality-aggregation.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-cardinality-aggregation.html
         #
         class Cardinality
           include BaseComponent

data/lib/elasticsearch/dsl/search/aggregations/children.rb

@@ -1,19 +1,6 @@
-# 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.
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
 
 module Elasticsearch
   module DSL
@@ -42,7 +29,7 @@ module Elasticsearch
         #
         # See the integration test for a full example.
         #
-        # @see http://elasticsearch.org/guide/en/elasticsearch/reference/current/search-aggregations-bucket-children-aggregation.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-children-aggregation.html
         #
         class Children
           include BaseAggregationComponent

data/lib/elasticsearch/dsl/search/aggregations/composite.rb

@@ -1,19 +1,6 @@
-# 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.
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
 
 module Elasticsearch
   module DSL