elasticsearch-api 1.0.2 → 1.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGQwODMzZmNlYjgzMjE4OTQ4OGI4ZGIzM2VkYTA1NjAyZTYwZDI3ZQ==
+    NGU5ZjdkZWQ4MmQ3NDhiMzhmY2VjYjE4ZTk3N2NhNDkwMGJhOGMzMw==
   data.tar.gz: !binary |-
-    ZjY0YzIzZWUyOTA3YjFkYjFhZjc5NjNlN2UwMWM2NmFhZDViNzZkYw==
+    NWRmOGJjYTZlZDY3Zjk5ZWQ0NmFlOTI1M2NjNzczMzY2NDRkNWI3Yw==
 SHA512:
   metadata.gz: !binary |-
-    ZmQyYmNiYzI0ODI4MzFiYmExZDU3Njc1ZmVlOGNmMTZkNGUxMWJjNzE3Yzhi
-    ZjllODY2OTAzMjViZDBhZGJkYjU5OGRjNWNhYmE1NzYwM2JlNmM4NDZkZDRl
-    YmVhZDM0MmJkNjhmMzU2MjBlZmYyNjBjMTdmOGQ0NWI3YWRlY2M=
+    NDc5ZDcxNzhiNjJjNzcwNWQyZjEwMmFmMWY1NzA3OWUyNWVlNGYyNjRmMGEz
+    MGI5ZTQwZTI2OGJmNGJlNzQzZTY0ZTdjNTM0ZWU4MzI4NTJjNzkzOTA3N2My
+    YjI5MzAxMTlhOTg1OGFiMTZlZGU1Mzk5MDQ2MWRmMTI3YmFjOGU=
   data.tar.gz: !binary |-
-    ZDA5NzA2MjI5MDE1YjE1M2RlYzBjNmM0NTA2MDRjMzlmMTkwODA2M2MwNzc3
-    YjgyM2NkMDZjZTIxZDY2ODIxNzg5NDk3ZjczMDY0Yjg2ZDFhYzIyODI5OTgz
-    ZjcxNmQ3MTg0NTI3NzRjNjVhYTQ3MjYxYjYxODIwZTQ4NDg1Yzg=
+    YzZjODYyMWU1YTgxMmEwYTc3NDdjMjA3YWMyOGUyOGM0ZDE3ZDZjNTdiNmZh
+    OWM4NjA4MTE4ZmU5ZDdiMmUyYzY4NzBhMzlmMjRiYzExMTc4YTQ0MDNiYWRj
+    OGE4ZWZjNGMwNjY0YzYwMDI1OTFiZDAzNWU5NmNmZjUzYzgxZTk=

data/lib/elasticsearch/api/actions/indices/delete_template.rb

@@ -9,6 +9,10 @@ module Elasticsearch
         #
         #     client.indices.delete_template name: 'mytemplate'
         #
+        # @example Delete all templates
+        #
+        #     client.indices.delete_template name: '*'
+        #
         # @option arguments [String] :name The name of the template (*Required*)
         # @option arguments [Time] :timeout Explicit operation timeout
         #

data/lib/elasticsearch/api/actions/indices/put_template.rb

@@ -12,16 +12,19 @@ module Elasticsearch
         #
         # @option arguments [String] :name The name of the template (*Required*)
         # @option arguments [Hash] :body The template definition (*Required*)
+        # @option arguments [Boolean] :create Whether the index template should only be added for a new one, #                                     or can also replace an existing one (default: false)
         # @option arguments [Number] :order The order for this template when merging multiple matching ones
         #                                   (higher numbers are merged later, overriding the lower numbers)
         # @option arguments [Time] :timeout Explicit operation timeout
+        # @option arguments [Time] :master_timeout Specify timeout for connection to master
+        # @option arguments [Boolean] :flat_settings Return settings in flat format (default: false)
         #
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-templates/
         #
         def put_template(arguments={})
           raise ArgumentError, "Required argument 'name' missing" unless arguments[:name]
           raise ArgumentError, "Required argument 'body' missing" unless arguments[:body]
-          valid_params = [ :order, :timeout ]
+          valid_params = [ :create, :order, :timeout ]
 
           method = 'PUT'
           path   = Utils.__pathify '_template', Utils.__escape(arguments[:name])

data/lib/elasticsearch/api/actions/indices/stats.rb

@@ -48,8 +48,14 @@ module Elasticsearch
         # @option arguments [List] :index A comma-separated list of index names; use `_all` or empty string
         #                                 to perform the operation on all indices
         # @option arguments [Boolean] :indexing Return information about indexing operations
+        # @option arguments [String] :level Return stats aggregated at cluster, index or shard level
+        #                                   (Options: cluster, indices, shards)
         # @option arguments [List] :types A comma-separated list of document types to include in the `indexing` info
         # @option arguments [Boolean] :merge Return information about merge operations
+        # @option arguments [List] :metric Limit the information returned the specific metrics
+        #                                  (_all, completion, docs, fielddata, filter_cache, flush, get,
+        #                                  id_cache, indexing, merge, percolate, refresh, search, segments,
+        #                                  store, warmer, suggest)
         # @option arguments [Boolean] :refresh Return information about refresh operations
         # @option arguments [Boolean] :search Return information about search operations; use the `groups` parameter to
         #                                     include information for specific search groups
@@ -76,6 +82,7 @@ module Elasticsearch
             :get,
             :indexing,
             :merge,
+            :metric,
             :refresh,
             :search,
             :suggest,
@@ -87,6 +94,7 @@ module Elasticsearch
             :completion_fields,
             :fielddata_fields,
             :groups,
+            :level,
             :types,
             :ignore_indices,
             :ignore_unavailable,

data/lib/elasticsearch/api/actions/percolate.rb

@@ -67,6 +67,8 @@ module Elasticsearch
       # @option arguments [String] :expand_wildcards Whether to expand wildcard expression to concrete indices that are
       #                                              open, closed or both. (options: open, closed)
       # @option arguments [String] :percolate_index The index to percolate the document into. Defaults to passed `index`.
+      # @option arguments [String] :percolate_format Return an array of matching query IDs instead of objects.
+      #                                              (options: ids)
       # @option arguments [String] :percolate_type The type to percolate document into. Defaults to passed `type`.
       # @option arguments [Number] :version Explicit version number for concurrency control
       # @option arguments [String] :version_type Specific version type (options: internal, external, external_gte, force)
@@ -85,6 +87,7 @@ module Elasticsearch
           :expand_wildcards,
           :percolate_index,
           :percolate_type,
+          :percolate_format,
           :version,
           :version_type ]
 

data/lib/elasticsearch/api/utils.rb

@@ -147,7 +147,12 @@ module Elasticsearch
       # @api private
       #
       def __extract_parts(arguments, valid_parts=[])
-        parts  = arguments.keys.select { |a| valid_parts.include?(a) }.map { |a| a.to_s }.sort
+        # require 'pry'; binding.pry;
+        # parts  = arguments.keys.select { |a| valid_parts.include?(a) }.map { |a| a.to_s }.sort
+
+        parts = Hash[arguments.select { |k,v| valid_parts.include?(k) }]
+        parts = parts.reduce([]) { |sum, item| k, v = item; v.is_a?(TrueClass) ? sum << k.to_s : sum << v  }
+
         arguments.delete_if { |k,v| valid_parts.include? k }
         return parts
       end

data/lib/elasticsearch/api/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module API
-    VERSION = "1.0.2"
+    VERSION = "1.0.4"
   end
 end

data/test/integration/yaml_test_runner.rb

@@ -218,6 +218,7 @@ module Elasticsearch
 
       def skip?(actions)
         skip = actions.select { |a| a['skip'] }.first
+        $stderr.puts "SKIP: #{skip.inspect}" if ENV['DEBUG']
 
         # Skip version
         if skip && skip['skip']['version']
@@ -273,6 +274,7 @@ suites.each do |suite|
     #
     setup do
       $client.indices.delete index: '_all'
+      $client.indices.delete_template name: '*'
       $results = {}
       $stash   = {}
     end

data/test/unit/nodes/info_test.rb

@@ -40,7 +40,7 @@ module Elasticsearch
 
         should "properly pass URL parts" do
           subject.expects(:perform_request).with do |method, url, params, body|
-            assert_equal '_nodes/http,jvm', url
+            assert_same_elements ['http','jvm'], url.split('/').last.split(',')
             assert_nil   params[:jvm]
             assert_nil   params[:http]
             true

data/test/unit/utils_test.rb

@@ -168,8 +168,12 @@ module Elasticsearch
 
         context "__extract_parts" do
 
-          should "extract valid parts from a Hash" do
-            assert_equal( ['foo'], __extract_parts({ :foo => 'qux' }, [:foo, :bar]) )
+          should "extract parts with true value from a Hash" do
+            assert_equal( ['foo'], __extract_parts({ :foo => true, :moo => 'blah' }, [:foo, :bar]) )
+          end
+
+          should "extract parts with string value from a Hash" do
+            assert_equal( ['qux'], __extract_parts({ :foo => 'qux', :moo => 'blah' }, [:foo, :bar]) )
           end
 
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-api
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json