elasticsearch-api 0.4.0 → 0.4.1

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

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

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

@@ -18,13 +18,12 @@ module Elasticsearch
         #
         def exists_alias(arguments={})
           raise ArgumentError, "Required argument 'name' missing" unless arguments[:name]
+          valid_params = [ :ignore_indices ]
+
           method = 'HEAD'
-          path   = Utils.__pathify( Utils.__listify(arguments[:index]), '_alias', arguments[:name] )
-          params = arguments.select do |k,v|
-            [ :ignore_indices ].include?(k)
-          end
-          # Normalize Ruby 1.8 and Ruby 1.9 Hash#select behaviour
-          params = Hash[params] unless params.is_a?(Hash)
+          path   = Utils.__pathify Utils.__listify(arguments[:index]), '_alias', Utils.__escape(arguments[:name])
+
+          params = Utils.__validate_and_extract_params arguments, valid_params
           body = nil
 
           perform_request(method, path, params, body).status == 200 ? true : false

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

@@ -16,13 +16,12 @@ module Elasticsearch
         def exists_type(arguments={})
           raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
           raise ArgumentError, "Required argument 'type' missing" unless arguments[:type]
+          valid_params = [ :ignore_indices ]
+
           method = 'HEAD'
-          path   = Utils.__pathify( Utils.__listify(arguments[:index]), arguments[:type] )
-          params = arguments.select do |k,v|
-            [ :ignore_indices ].include?(k)
-          end
-          # Normalize Ruby 1.8 and Ruby 1.9 Hash#select behaviour
-          params = Hash[params] unless params.is_a?(Hash)
+          path   = Utils.__pathify Utils.__listify(arguments[:index]), Utils.__escape(arguments[:type])
+
+          params = Utils.__validate_and_extract_params arguments, valid_params
           body = nil
 
           perform_request(method, path, params, body).status == 200 ? true : false

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

@@ -20,16 +20,16 @@ module Elasticsearch
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-flush/
         #
         def flush(arguments={})
+          valid_params = [
+            :force,
+            :full,
+            :ignore_indices,
+            :refresh ]
+
           method = 'POST'
-          path   = Utils.__pathify( Utils.__listify(arguments[:index]), '_flush' )
-          params = arguments.select do |k,v|
-            [ :force,
-              :full,
-              :ignore_indices,
-              :refresh ].include?(k)
-          end
-          # Normalize Ruby 1.8 and Ruby 1.9 Hash#select behaviour
-          params = Hash[params] unless params.is_a?(Hash)
+          path   = Utils.__pathify Utils.__listify(arguments[:index]), '_flush'
+
+          params = Utils.__validate_and_extract_params arguments, valid_params
           body = nil
 
           perform_request(method, path, params, body).body

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

@@ -24,13 +24,12 @@ module Elasticsearch
         #
         def get_alias(arguments={})
           raise ArgumentError, "Required argument 'name' missing" unless arguments[:name]
+          valid_params = [ :ignore_indices ]
+
           method = 'GET'
-          path   = Utils.__pathify( Utils.__listify(arguments[:index]), '_alias', arguments[:name] )
-          params = arguments.select do |k,v|
-            [ :ignore_indices ].include?(k)
-          end
-          # Normalize Ruby 1.8 and Ruby 1.9 Hash#select behaviour
-          params = Hash[params] unless params.is_a?(Hash)
+          path   = Utils.__pathify Utils.__listify(arguments[:index]), '_alias', Utils.__escape(arguments[:name])
+
+          params = Utils.__validate_and_extract_params arguments, valid_params
           body   = nil
 
           perform_request(method, path, params, body).body

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

@@ -15,13 +15,12 @@ module Elasticsearch
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-aliases/
         #
         def get_aliases(arguments={})
+          valid_params = [ :timeout ]
+
           method = 'GET'
-          path   = Utils.__pathify( Utils.__listify(arguments[:index]), '_aliases' )
-          params = arguments.select do |k,v|
-            [ :timeout ].include?(k)
-          end
-          # Normalize Ruby 1.8 and Ruby 1.9 Hash#select behaviour
-          params = Hash[params] unless params.is_a?(Hash)
+          path   = Utils.__pathify Utils.__listify(arguments[:index]), '_aliases'
+
+          params = Utils.__validate_and_extract_params arguments, valid_params
           body   = nil
 
           perform_request(method, path, params, body).body

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

@@ -24,7 +24,7 @@ module Elasticsearch
         #
         def get_mapping(arguments={})
           method = 'GET'
-          path   = Utils.__pathify( Utils.__listify(arguments[:index]), Utils.__listify(arguments[:type]), '_mapping' )
+          path   = Utils.__pathify Utils.__listify(arguments[:index]), Utils.__listify(arguments[:type]), '_mapping'
           params = {}
           body = nil
 

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

@@ -20,7 +20,7 @@ module Elasticsearch
         #
         def get_settings(arguments={})
           method = 'GET'
-          path   = Utils.__pathify( Utils.__listify(arguments[:index]), Utils.__listify(arguments[:type]), '_settings' )
+          path   = Utils.__pathify Utils.__listify(arguments[:index]), Utils.__listify(arguments[:type]), '_settings'
           params = {}
           body   = nil
 

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

@@ -16,9 +16,8 @@ module Elasticsearch
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-templates/
         #
         def get_template(arguments={})
-          raise ArgumentError, "Required argument 'name' missing" unless arguments[:name]
           method = 'GET'
-          path   = "_template/#{arguments[:name]}"
+          path   = Utils.__pathify '_template', Utils.__escape(arguments[:name])
           params = {}
           body = nil
 

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

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

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

@@ -16,13 +16,12 @@ module Elasticsearch
         #
         def open(arguments={})
           raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
+          valid_params = [ :timeout ]
+
           method = 'POST'
-          path   = "#{arguments[:index]}/_open"
-          params = arguments.select do |k,v|
-            [ :timeout ].include?(k)
-          end
-          # Normalize Ruby 1.8 and Ruby 1.9 Hash#select behaviour
-          params = Hash[params] unless params.is_a?(Hash)
+          path   = Utils.__pathify Utils.__escape(arguments[:index]), '_open'
+
+          params = Utils.__validate_and_extract_params arguments, valid_params
           body = nil
 
           perform_request(method, path, params, body).body

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

@@ -34,19 +34,19 @@ module Elasticsearch
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-optimize/
         #
         def optimize(arguments={})
+          valid_params = [
+            :flush,
+            :ignore_indices,
+            :max_num_segments,
+            :only_expunge_deletes,
+            :operation_threading,
+            :refresh,
+            :wait_for_merge ]
+
           method = 'POST'
-          path   = Utils.__pathify( Utils.__listify(arguments[:index]), '_optimize' )
-          params = arguments.select do |k,v|
-            [ :flush,
-              :ignore_indices,
-              :max_num_segments,
-              :only_expunge_deletes,
-              :operation_threading,
-              :refresh,
-              :wait_for_merge ].include?(k)
-          end
-          # Normalize Ruby 1.8 and Ruby 1.9 Hash#select behaviour
-          params = Hash[params] unless params.is_a?(Hash)
+          path   = Utils.__pathify Utils.__listify(arguments[:index]), '_optimize'
+
+          params = Utils.__validate_and_extract_params arguments, valid_params
           body = nil
 
           perform_request(method, path, params, body).body

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

@@ -26,13 +26,12 @@ module Elasticsearch
         def put_alias(arguments={})
           raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
           raise ArgumentError, "Required argument 'name' missing"  unless arguments[:name]
+          valid_params = [ :timeout ]
+
           method = 'PUT'
-          path   = "#{arguments[:index]}/_alias/#{arguments[:name]}"
-          params = arguments.select do |k,v|
-            [ :timeout ].include?(k)
-          end
-          # Normalize Ruby 1.8 and Ruby 1.9 Hash#select behaviour
-          params = Hash[params] unless params.is_a?(Hash)
+          path   = Utils.__pathify Utils.__escape(arguments[:index]), '_alias', Utils.__escape(arguments[:name])
+
+          params = Utils.__validate_and_extract_params arguments, valid_params
           body   = arguments[:body]
 
           perform_request(method, path, params, body).body

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

@@ -31,14 +31,12 @@ module Elasticsearch
           raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
           raise ArgumentError, "Required argument 'type' missing"  unless arguments[:type]
           raise ArgumentError, "Required argument 'body' missing"  unless arguments[:body]
+          valid_params = [ :ignore_conflicts, :timeout ]
+
           method = 'PUT'
-          path   = Utils.__pathify( Utils.__listify(arguments[:index]), arguments[:type], '_mapping' )
-          params = arguments.select do |k,v|
-            [ :ignore_conflicts,
-              :timeout ].include?(k)
-          end
-          # Normalize Ruby 1.8 and Ruby 1.9 Hash#select behaviour
-          params = Hash[params] unless params.is_a?(Hash)
+          path   = Utils.__pathify Utils.__listify(arguments[:index]), Utils.__escape(arguments[:type]), '_mapping'
+
+          params = Utils.__validate_and_extract_params arguments, valid_params
           body   = arguments[:body]
 
           perform_request(method, path, params, body).body

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

@@ -33,7 +33,7 @@ module Elasticsearch
         def put_settings(arguments={})
           raise ArgumentError, "Required argument 'body' missing" unless arguments[:body]
           method = 'PUT'
-          path   = Utils.__pathify( Utils.__listify(arguments[:index]), '_settings' )
+          path   = Utils.__pathify Utils.__listify(arguments[:index]), '_settings'
           params = {}
           body   = arguments[:body]
 

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

@@ -22,14 +22,12 @@ module Elasticsearch
         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 ]
+
           method = 'PUT'
-          path   = "_template/#{arguments[:name]}"
-          params = arguments.select do |k,v|
-            [ :order,
-              :timeout ].include?(k)
-          end
-          # Normalize Ruby 1.8 and Ruby 1.9 Hash#select behaviour
-          params = Hash[params] unless params.is_a?(Hash)
+          path   = Utils.__pathify '_template', Utils.__escape(arguments[:name])
+
+          params = Utils.__validate_and_extract_params arguments, valid_params
           body   = arguments[:body]
 
           perform_request(method, path, params, body).body

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

@@ -26,13 +26,12 @@ module Elasticsearch
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-refresh/
         #
         def refresh(arguments={})
+          valid_params = [ :ignore_indices ]
+
           method = 'POST'
-          path   = Utils.__pathify( Utils.__listify(arguments[:index]), '_refresh' )
-          params = arguments.select do |k,v|
-            [ :ignore_indices ].include?(k)
-          end
-          # Normalize Ruby 1.8 and Ruby 1.9 Hash#select behaviour
-          params = Hash[params] unless params.is_a?(Hash)
+          path   = Utils.__pathify Utils.__listify(arguments[:index]), '_refresh'
+
+          params = Utils.__validate_and_extract_params arguments, valid_params
           body   = nil
 
           perform_request(method, path, params, body).body

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

@@ -16,13 +16,12 @@ module Elasticsearch
         # @see http://elasticsearch.org/guide/reference/api/admin-indices-segments/
         #
         def segments(arguments={})
+          valid_params = [ :ignore_indices ]
+
           method = 'GET'
-          path   = Utils.__pathify( Utils.__listify(arguments[:index]), '_segments' )
-          params = arguments.select do |k,v|
-            [ :ignore_indices ].include?(k)
-          end
-          # Normalize Ruby 1.8 and Ruby 1.9 Hash#select behaviour
-          params = Hash[params] unless params.is_a?(Hash)
+          path   = Utils.__pathify Utils.__listify(arguments[:index]), '_segments'
+
+          params = Utils.__validate_and_extract_params arguments, valid_params
           body   = nil
 
           perform_request(method, path, params, body).body

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

@@ -15,13 +15,12 @@ module Elasticsearch
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-gateway-snapshot/
         #
         def snapshot_index(arguments={})
+          valid_params = [ :ignore_indices ]
+
           method = 'POST'
-          path   = Utils.__pathify( Utils.__listify(arguments[:index]), '_gateway/snapshot' )
-          params = arguments.select do |k,v|
-            [ :ignore_indices ].include?(k)
-          end
-          # Normalize Ruby 1.8 and Ruby 1.9 Hash#select behaviour
-          params = Hash[params] unless params.is_a?(Hash)
+          path   = Utils.__pathify Utils.__listify(arguments[:index]), '_gateway/snapshot'
+
+          params = Utils.__validate_and_extract_params arguments, valid_params
           body   = nil
 
           perform_request(method, path, params, body).body

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

@@ -60,34 +60,34 @@ module Elasticsearch
         # @see http://elasticsearch.org/guide/reference/api/admin-indices-stats/
         #
         def stats(arguments={})
+          valid_params = [
+            :all,
+            :clear,
+            :docs,
+            :fielddata,
+            :fields,
+            :filter_cache,
+            :flush,
+            :get,
+            :groups,
+            :id_cache,
+            :ignore_indices,
+            :indexing,
+            :merge,
+            :refresh,
+            :search,
+            :store,
+            :warmer ]
+
           method = 'GET'
-          path   = Utils.__pathify( Utils.__listify(arguments[:index]), '_stats' )
-          params = arguments.select do |k,v|
-            [ :all,
-              :clear,
-              :docs,
-              :fielddata,
-              :fields,
-              :filter_cache,
-              :flush,
-              :get,
-              :groups,
-              :id_cache,
-              :ignore_indices,
-              :indexing,
-              :merge,
-              :refresh,
-              :search,
-              :store,
-              :warmer ].include?(k)
-          end
-          # Normalize Ruby 1.8 and Ruby 1.9 Hash#select behaviour
-          params = Hash[params] unless params.is_a?(Hash)
-          body   = nil
+          path   = Utils.__pathify Utils.__listify(arguments[:index]), '_stats'
 
+          params = Utils.__validate_and_extract_params arguments, valid_params
           params[:fields] = Utils.__listify(params[:fields]) if params[:fields]
           params[:groups] = Utils.__listify(params[:groups]) if params[:groups]
 
+          body   = nil
+
           perform_request(method, path, params, body).body
         end
       end

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

@@ -27,15 +27,15 @@ module Elasticsearch
         # @see http://elasticsearch.org/guide/reference/api/admin-indices-status/
         #
         def status(arguments={})
+          valid_params = [
+            :ignore_indices,
+            :recovery,
+            :snapshot ]
+
           method = 'GET'
-          path   = Utils.__pathify( Utils.__listify(arguments[:index]), '_status' )
-          params = arguments.select do |k,v|
-            [ :ignore_indices,
-              :recovery,
-              :snapshot ].include?(k)
-          end
-          # Normalize Ruby 1.8 and Ruby 1.9 Hash#select behaviour
-          params = Hash[params] unless params.is_a?(Hash)
+          path   = Utils.__pathify Utils.__listify(arguments[:index]), '_status'
+
+          params = Utils.__validate_and_extract_params arguments, valid_params
           body   = nil
 
           perform_request(method, path, params, body).body

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

@@ -32,13 +32,12 @@ module Elasticsearch
         #
         def update_aliases(arguments={})
           raise ArgumentError, "Required argument 'body' missing" unless arguments[:body]
+          valid_params = [ :timeout ]
+
           method = 'POST'
           path   = "_aliases"
-          params = arguments.select do |k,v|
-            [ :timeout ].include?(k)
-          end
-          # Normalize Ruby 1.8 and Ruby 1.9 Hash#select behaviour
-          params = Hash[params] unless params.is_a?(Hash)
+
+          params = Utils.__validate_and_extract_params arguments, valid_params
           body   = arguments[:body]
 
           perform_request(method, path, params, body).body