elasticsearch-api 1.0.6 → 1.0.7

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

@@ -19,7 +19,7 @@ module Elasticsearch
           :version,
           :version_type ]
 
-        method = 'DELETE'
+        method = HTTP_DELETE
         path   = "_scripts/#{arguments.delete(:lang)}/#{arguments[:id]}"
         params = Utils.__validate_and_extract_params arguments, valid_params
         body   = nil

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

@@ -9,7 +9,7 @@ module Elasticsearch
       # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-template.html
       #
       def delete_template(arguments={})
-        method = 'DELETE'
+        method = HTTP_DELETE
         path   = "_search/template/#{arguments[:id]}"
         params = {}
         body   = nil

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

@@ -23,7 +23,7 @@ module Elasticsearch
       def exists(arguments={})
         raise ArgumentError, "Required argument 'id' missing"    unless arguments[:id]
         raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
-        arguments[:type] ||= '_all'
+        arguments[:type] ||= UNDERSCORE_ALL
 
         valid_params = [
           :parent,
@@ -32,7 +32,7 @@ module Elasticsearch
           :refresh,
           :routing ]
 
-        method = 'HEAD'
+        method = HTTP_HEAD
         path   = Utils.__pathify Utils.__escape(arguments[:index]),
                                  Utils.__escape(arguments[:type]),
                                  Utils.__escape(arguments[:id])
@@ -48,6 +48,8 @@ module Elasticsearch
             raise e
           end
       end
+
+      alias_method :exists?, :exists
     end
   end
 end

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

@@ -64,7 +64,7 @@ module Elasticsearch
           :_source_include,
           :_source_exclude ]
 
-        method = 'GET'
+        method = HTTP_GET
         path   = Utils.__pathify Utils.__escape(arguments[:index]),
                                  Utils.__escape(arguments[:type]),
                                  Utils.__escape(arguments[:id]),

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

@@ -34,7 +34,7 @@ module Elasticsearch
       def get(arguments={})
         raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
         raise ArgumentError, "Required argument 'id' missing"    unless arguments[:id]
-        arguments[:type] ||= '_all'
+        arguments[:type] ||= UNDERSCORE_ALL
 
         valid_params = [
           :fields,
@@ -49,7 +49,7 @@ module Elasticsearch
           :_source_include,
           :_source_exclude ]
 
-        method = 'GET'
+        method = HTTP_GET
         path   = Utils.__pathify Utils.__escape(arguments[:index]),
                                  Utils.__escape(arguments[:type]),
                                  Utils.__escape(arguments[:id])

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

@@ -12,7 +12,7 @@ module Elasticsearch
       def get_script(arguments={})
         raise ArgumentError, "Required argument 'id' missing"   unless arguments[:id]
         raise ArgumentError, "Required argument 'lang' missing" unless arguments[:lang]
-        method = 'GET'
+        method = HTTP_GET
         path   = "_scripts/#{arguments[:lang]}/#{arguments[:id]}"
         params = {}
         body   = nil

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

@@ -34,7 +34,7 @@ module Elasticsearch
       def get_source(arguments={})
         raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
         raise ArgumentError, "Required argument 'id' missing"    unless arguments[:id]
-        arguments[:type] ||= '_all'
+        arguments[:type] ||= UNDERSCORE_ALL
 
         valid_params = [
           :fields,
@@ -47,7 +47,7 @@ module Elasticsearch
           :_source_include,
           :_source_exclude ]
 
-        method = 'GET'
+        method = HTTP_GET
         path   = Utils.__pathify Utils.__escape(arguments[:index]),
                                  Utils.__escape(arguments[:type]),
                                  Utils.__escape(arguments[:id]),

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

@@ -11,7 +11,7 @@ module Elasticsearch
       #
       def get_template(arguments={})
         raise ArgumentError, "Required argument 'id' missing" unless arguments[:id]
-        method = 'GET'
+        method = HTTP_GET
         path   = "_search/template/#{arguments[:id]}"
         params = {}
         body   = arguments[:body]

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

@@ -88,7 +88,7 @@ module Elasticsearch
           :version,
           :version_type ]
 
-        method = arguments[:id] ? 'PUT' : 'POST'
+        method = arguments[:id] ? HTTP_PUT : HTTP_POST
         path   = Utils.__pathify Utils.__escape(arguments[:index]),
                                  Utils.__escape(arguments[:type]),
                                  Utils.__escape(arguments[:id])

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

@@ -15,12 +15,14 @@ module Elasticsearch
         #
         # @example Analyze text "Quick Brown Jumping Fox" with a custom tokenizer and filter chain
         #
-        #     client.indices.analyze text: 'The Quick Brown Jumping Fox',
+        #     client.indices.analyze body: 'The Quick Brown Jumping Fox',
         #                            tokenizer: 'whitespace',
         #                            filters: ['lowercase','stop']
         #
+        # @note If your text for analysis is longer than 4096 bytes then you should use the :body argument, rather than :text, to avoid HTTP transport errors
+        #
         # @option arguments [String] :index The name of the index to scope the operation
-        # @option arguments [Hash] :body The text on which the analysis should be performed
+        # @option arguments [String] :body The text on which the analysis should be performed
         # @option arguments [String] :analyzer The name of the analyzer to use
         # @option arguments [String] :field Use the analyzer configured for this field
         #                                   (instead of passing the analyzer name)
@@ -46,7 +48,7 @@ module Elasticsearch
             :tokenizer,
             :format ]
 
-          method = 'GET'
+          method = HTTP_GET
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_analyze'
 
           params = Utils.__validate_and_extract_params arguments, valid_params

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

@@ -63,7 +63,7 @@ module Elasticsearch
             :expand_wildcards,
             :recycler ]
 
-          method = 'POST'
+          method = HTTP_POST
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_cache/clear'
 
           params = Utils.__validate_and_extract_params arguments, valid_params

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

@@ -36,7 +36,7 @@ module Elasticsearch
             :timeout
           ]
 
-          method = 'POST'
+          method = HTTP_POST
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_close'
 
           params = Utils.__validate_and_extract_params arguments, valid_params

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

@@ -68,7 +68,7 @@ module Elasticsearch
           raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
           valid_params = [ :timeout ]
 
-          method = 'PUT'
+          method = HTTP_PUT
           path   = Utils.__pathify Utils.__escape(arguments[:index])
 
           params = Utils.__validate_and_extract_params arguments, valid_params

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

@@ -32,13 +32,19 @@ module Elasticsearch
         def delete(arguments={})
           valid_params = [ :timeout ]
 
-          method = 'DELETE'
+          method = HTTP_DELETE
           path   = Utils.__pathify Utils.__listify(arguments[:index])
 
           params = Utils.__validate_and_extract_params arguments, valid_params
           body   = nil
 
           perform_request(method, path, params, body).body
+
+        rescue Exception => e
+          # NOTE: Use exception name, not full class in Elasticsearch::Client to allow client plugability
+          if Array(arguments[:ignore]).include?(404) && e.class.to_s =~ /NotFound/; false
+          else raise(e)
+          end
         end
       end
     end

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

@@ -22,7 +22,7 @@ module Elasticsearch
           raise ArgumentError, "Required argument 'name' missing"  unless arguments[:name]
           valid_params = [ :timeout ]
 
-          method = 'DELETE'
+          method = HTTP_DELETE
           path   = Utils.__pathify Utils.__escape(arguments[:index]), '_alias', Utils.__escape(arguments[:name])
 
           params = Utils.__validate_and_extract_params arguments, valid_params

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

@@ -13,7 +13,7 @@ module Elasticsearch
         def delete_mapping(arguments={})
           raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
           raise ArgumentError, "Required argument 'type' missing"  unless arguments[:type]
-          method = 'DELETE'
+          method = HTTP_DELETE
           path   = Utils.__pathify Utils.__listify(arguments[:index]), Utils.__escape(arguments[:type])
           params = {}
           body   = nil

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

@@ -22,7 +22,7 @@ module Elasticsearch
           raise ArgumentError, "Required argument 'name' missing" unless arguments[:name]
           valid_params = [ :timeout ]
 
-          method = 'DELETE'
+          method = HTTP_DELETE
           path   = Utils.__pathify '_template', Utils.__escape(arguments[:name])
 
           params = Utils.__validate_and_extract_params arguments, valid_params

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

@@ -19,7 +19,7 @@ module Elasticsearch
         #
         def delete_warmer(arguments={})
           raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
-          method = 'DELETE'
+          method = HTTP_DELETE
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_warmer', Utils.__listify(arguments[:name])
           params = {}
           body = nil

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

@@ -37,7 +37,7 @@ module Elasticsearch
             :local
           ]
 
-          method = 'HEAD'
+          method = HTTP_HEAD
           path   = Utils.__listify(arguments[:index])
           params = Utils.__validate_and_extract_params arguments, valid_params
           body   = nil
@@ -50,6 +50,8 @@ module Elasticsearch
             raise e
           end
         end
+
+        alias_method :exists?, :exists
       end
     end
   end

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

@@ -34,7 +34,7 @@ module Elasticsearch
             :local
           ]
 
-          method = 'HEAD'
+          method = HTTP_HEAD
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_alias', Utils.__escape(arguments[:name])
 
           params = Utils.__validate_and_extract_params arguments, valid_params
@@ -48,6 +48,8 @@ module Elasticsearch
             raise e
           end
         end
+
+        alias_method :exists_alias?, :exists_alias
       end
     end
   end

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

@@ -7,14 +7,15 @@ module Elasticsearch
         #
         # @option arguments [String] :name The name of the template (*Required*)
         # @option arguments [Boolean] :local Return local information, do not retrieve the state from master node (default: false)
+        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
         #
         # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/indices-templates.html
         #
         def exists_template(arguments={})
           raise ArgumentError, "Required argument 'name' missing" unless arguments[:name]
-          valid_params = [ :local ]
+          valid_params = [ :local, :master_timeout ]
 
-          method = 'HEAD'
+          method = HTTP_HEAD
           path   = Utils.__pathify '_template', Utils.__escape(arguments[:name])
 
           params = Utils.__validate_and_extract_params arguments, valid_params

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

@@ -33,7 +33,7 @@ module Elasticsearch
             :local
           ]
 
-          method = 'HEAD'
+          method = HTTP_HEAD
           path   = Utils.__pathify Utils.__listify(arguments[:index]), Utils.__escape(arguments[:type])
 
           params = Utils.__validate_and_extract_params arguments, valid_params
@@ -47,6 +47,8 @@ module Elasticsearch
             raise e
           end
         end
+
+        alias_method :exists_type?, :exists_type
       end
     end
   end

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

@@ -38,7 +38,7 @@ module Elasticsearch
             :expand_wildcards,
             :refresh ]
 
-          method = 'POST'
+          method = HTTP_POST
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_flush'
 
           params = Utils.__validate_and_extract_params arguments, valid_params

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

@@ -26,7 +26,7 @@ module Elasticsearch
             :allow_no_indices,
             :expand_wildcards ]
 
-          method = 'GET'
+          method = HTTP_GET
 
           path   = Utils.__pathify Utils.__listify(arguments[:index]), Utils.__listify(arguments.delete(:feature))
 

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

@@ -38,7 +38,7 @@ module Elasticsearch
             :local
           ]
 
-          method = 'GET'
+          method = HTTP_GET
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_alias', Utils.__escape(arguments[:name])
 
           params = Utils.__validate_and_extract_params arguments, valid_params

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

@@ -20,7 +20,7 @@ module Elasticsearch
         def get_aliases(arguments={})
           valid_params = [ :timeout, :local ]
 
-          method = 'GET'
+          method = HTTP_GET
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_aliases', Utils.__listify(arguments[:name])
 
           params = Utils.__validate_and_extract_params arguments, valid_params

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

@@ -43,7 +43,7 @@ module Elasticsearch
             :expand_wildcards
           ]
 
-          method = 'GET'
+          method = HTTP_GET
           path   = Utils.__pathify(
                      Utils.__listify(arguments[:index]),
                      '_mapping',

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

@@ -42,7 +42,7 @@ module Elasticsearch
             :local
           ]
 
-          method = 'GET'
+          method = HTTP_GET
           path   = Utils.__pathify Utils.__listify(arguments[:index]),
                                    '_mapping',
                                    Utils.__listify(arguments[:type])

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

@@ -51,7 +51,7 @@ module Elasticsearch
             :local
           ]
 
-          method = 'GET'
+          method = HTTP_GET
           path   = Utils.__pathify Utils.__listify(arguments[:index]),
                                    Utils.__listify(arguments[:type]),
                                    arguments.delete(:prefix),

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

@@ -19,13 +19,14 @@ module Elasticsearch
         # @option arguments [Boolean] :flat_settings Return settings in flat format (default: false)
         # @option arguments [Boolean] :local Return local information, do not retrieve the state from master node
         #                                    (default: false)
+        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
         #
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-templates/
         #
         def get_template(arguments={})
-          valid_params = [ :flat_settings, :local ]
+          valid_params = [ :flat_settings, :local, :master_timeout ]
 
-          method = 'GET'
+          method = HTTP_GET
           path   = Utils.__pathify '_template', Utils.__escape(arguments[:name])
 
           params = Utils.__validate_and_extract_params arguments, valid_params

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

@@ -46,7 +46,7 @@ module Elasticsearch
             :expand_wildcards
           ]
 
-          method = 'GET'
+          method = HTTP_GET
           path   = Utils.__pathify( Utils.__listify(arguments[:index]), '_warmer', Utils.__escape(arguments[:name]) )
           params = {}
           body   = nil

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

@@ -34,7 +34,7 @@ module Elasticsearch
             :timeout
           ]
 
-          method = 'POST'
+          method = HTTP_POST
           path   = Utils.__pathify Utils.__escape(arguments[:index]), '_open'
 
           params = Utils.__validate_and_extract_params arguments, valid_params

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

@@ -58,7 +58,7 @@ module Elasticsearch
             :refresh,
             :wait_for_merge ]
 
-          method = 'POST'
+          method = HTTP_POST
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_optimize'
 
           params = Utils.__validate_and_extract_params arguments, valid_params

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

@@ -27,8 +27,8 @@ module Elasticsearch
           raise ArgumentError, "Required argument 'name' missing"  unless arguments[:name]
           valid_params = [ :timeout ]
 
-          method = 'PUT'
-          path   = Utils.__pathify Utils.__escape(arguments[:index]), '_alias', Utils.__escape(arguments[:name])
+          method = HTTP_PUT
+          path   = Utils.__pathify Utils.__listify(arguments[:index]), '_alias', Utils.__escape(arguments[:name])
 
           params = Utils.__validate_and_extract_params arguments, valid_params
           body   = arguments[:body]

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

@@ -59,7 +59,7 @@ module Elasticsearch
             :timeout
           ]
 
-          method = 'PUT'
+          method = HTTP_PUT
           path   = Utils.__pathify Utils.__listify(arguments[:index]), '_mapping', Utils.__escape(arguments[:type])
 
           params = Utils.__validate_and_extract_params arguments, valid_params