eson-http 0.7.0 → 0.8.0

data/README.md

@@ -7,7 +7,7 @@ It tries to keep the language of the ES API as intact as possible.
 ## Usage
 
     require 'eson-http'
-
+    
     c = Eson::HTTP::Client.new(:server => 'http://localhost:9200')
     
     doc = {
@@ -15,24 +15,53 @@ It tries to keep the language of the ES API as intact as possible.
       :post_date => "2009-11-15T14:12:12",
       :message => "trying out Elastic Search"
     }
-
+    
     c.index :index    => "twitter",
             :type     => "tweet",
             :id       => 1,
             :document => doc
-
+    
     c.get :type => "tweet", :id => 1 # returns the document
-
+    
     c.search :q => "message:trying"
-
+    
     c.count :q => "*"
 
+## Default parameters
+
+All parameters can be set to default values by using `#with`. `#with` returns a new client that has the default parameters set.
+
+    require 'eson-http'
+
+    c = Eson::HTTP::Client.new(:server => 'http://localhost:9200')
+        .with(:index => "twitter", :type => "tweet")
+
+    doc = {
+      :user => "kimchy",
+      :post_date => "2009-11-15T14:12:12",
+      :message => "trying out Elastic Search"
+    }
+
+    c.index :id => 1, :doc => doc
+
+    c.get :id => 1
+
+    c.search :q => "message:trying" # this searches tweets/tweet/_search !!!
+
+    c.count :q => "*" # same here
+
+`#with` also has a block form that passes the new client as a parameter:
+
+    c.with(:index => "twitter", :type => "tweet") do |modified_client|
+      modified_client.get :id => 1
+    end
+
 ## Building requests by hand
 
 The client has an additional mode that does not call elasticsearch  immediately, but returns the request object instead.
 
     require 'echolon/http'
-
+    
     c = Eson::HTTP::Client.new(:server => 'http://localhost:9200',
                                :auto_call => false)
     
@@ -41,27 +70,27 @@ The client has an additional mode that does not call elasticsearch  immediately,
       :post_date => "2009-11-15T14:12:12",
       :message => "trying out Elastic Search"
     }
-
+    
     index_request = c.index
     index_request.index = "twitter"
     index_request.type  = "tweet"
     index_request.id    = 1
     index_request.doc   = doc
-
+    
     index_request.call
-
+    
     # or:
-
+    
     index_request = c.index
-    index_request.params = {
+    index_request.parameters = {
       :index => "twitter",
       :type  => "tweet"
       :id    => 1,
       :doc   => doc
     }
-
+    
     # or:
-
+    
     index_request = c.index :index => "twitter",
                             :type  => "tweet"
                             :id    => 1,
@@ -72,19 +101,17 @@ The client has an additional mode that does not call elasticsearch  immediately,
 `bulk` and `msearch` requests can be constructed by calling the respective client methods on them:
 
 
-```
-c.bulk do |b|
-  b.index :index => "default",
-          :type => "bar"
-          :doc => {"foo" => "bar"}
-  b.delete :index => "default",
-           :id => '134'
-end
-
-c.msearch do |s|
-  s.search #....
-end
-```
+    c.bulk do |b|
+      b.index :index => "default",
+              :type => "bar"
+              :doc => {"foo" => "bar"}
+      b.delete :index => "default",
+               :id => '134'
+    end
+    
+    c.msearch do |s|
+      s.search #....
+    end
 
 ## The shell
 
@@ -104,7 +131,6 @@ Eson-HTTP comes with a quick-and-dirty shell, if you have pry installed:
 ## TODO
 
 * Test suite needs to be reordered. Its the oldest part of the project and a bit messy.
-* Filters in aliases are not supported
 
 ## See also
 

data/Rakefile

@@ -1,5 +1,5 @@
 require 'rake/testtask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rake/testtask'
 
 def gemspec
@@ -14,7 +14,7 @@ task :gemspec do
   gemspec.validate
 end
 
-Rake::GemPackageTask.new(gemspec) do |pkg|
+Gem::PackageTask.new(gemspec) do |pkg|
   pkg.gem_spec = gemspec
 end
 

data/bin/elshell

@@ -1,20 +1,12 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH << File.join(File.dirname(File.dirname(__FILE__)), "lib")
-
-require 'echolon-http'
-require 'echolon-search'
-
-require 'elsearch-node'
-
-require 'node/external'
-
-require 'rest-client'
-require 'addressable/template'
-
+require 'eson-core'
+require 'eson-http'
+require 'eson-dsl'
+require 'logger'
 require 'pry'
 
 c = Eson::HTTP::Client.new(:server => ARGV.first || 'http://localhost:9200',
-                                    :logger => Logger.new($stdout))
+                           :logger => Logger.new($stdout))
 
-c.pry
+c.pry

data/eson-http.gemspec

@@ -4,7 +4,8 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "eson-http"
-  s.version     = "0.7.0" #Echolon::VERSION
+  s.version     = "0.8.0"
+
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Florian Gilcher"]
   s.email       = ["florian.gilcher@asquera.de"]
@@ -20,7 +21,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   #s.add_dependency "typhoeus"
-  s.add_dependency "faraday", "~> 0.7.0"
+  s.add_dependency "faraday", "~> 0.8.0"
+  s.add_dependency "net-http-persistent"
   s.add_dependency "addressable"
   s.add_dependency "eson-core"
   s.add_development_dependency "elasticsearch-node"

data/lib/eson-http.rb

@@ -20,9 +20,13 @@ require 'eson/http/core/count'
 require 'eson/http/core/bulk'
 require 'eson/http/core/percolate'
 require 'eson/http/core/simple_search'
+require 'eson/http/core/update'
 require 'eson/http/core/more_like_this'
 require 'eson/http/core/msearch'
 require 'eson/http/core/mget'
+require 'eson/http/core/scroll'
+require 'eson/http/core/validate'
+require 'eson/http/core/explain'
 
 require 'eson/http/cluster/health'
 require 'eson/http/cluster/state'
@@ -31,6 +35,7 @@ require 'eson/http/cluster/stats'
 require 'eson/http/cluster/shutdown'
 
 require 'eson/http/indices/aliases'
+require 'eson/http/indices/get_aliases'
 require 'eson/http/indices/analyze'
 require 'eson/http/indices/clear_cache'
 require 'eson/http/indices/close_index'

data/lib/eson/http.rb

@@ -1,16 +1,6 @@
 module Eson
+  # @api internal
   module HTTP
-    def self.logger=(logger)
-      if String === logger
-        require 'logger'
-        @logger = Logger.new(logger)
-      else
-        @logger = logger
-      end
-    end
 
-    def self.logger
-      @logger
-    end
   end
 end

data/lib/eson/http/api.rb

@@ -1,8 +1,14 @@
 module Eson
   module HTTP
+    # HTTP::Api is like {Eson::Api}, but allows to define a request method
+    # as well. All HTTP::Api objects also have to define `#path` as a method
+    # to return the endpoint path as a url template.
     module API
       include Eson::API
-      
+
+      # DSL method to indicate the request method.
+      #
+      # @param [symbol] method The http method verb to use.
       def request_method(method)
         define_method :request_method do
           @request_method || method

data/lib/eson/http/client.rb

@@ -1,16 +1,23 @@
 module Eson
   module HTTP
+    # This client is a convenience subclass of {Eson::Client}. It sets sane
+    # default parameters and adds the following plugins: {Eson::StatusHandler}
+    # for handling response status, {Eson::ResponseParser} to parse JSON
+    # responses and return Hashes and {Eson::QueryPlugin} to use the Query DSL
+    # directly.
     class Client < Eson::Client
+      # Default settings
       DEFAULT_OPTS = {
                        :server => "http://localhost:9200",
                        :protocol => Eson::HTTP
                      }
 
+      # @see Eson::Client
       def initialize(opts = {})
         opts = DEFAULT_OPTS.merge(:plugins => default_plugins).merge(opts)
         super(opts)
       end
-      
+
       private
         def default_plugins
           [Eson::StatusHandler, Eson::ResponseParser].tap do |plugins|

data/lib/eson/http/cluster/health.rb

@@ -7,7 +7,7 @@ module Eson
       request_method :get
              
       def path
-        '/_cluster/health/{-list|,|indices}'
+        '/_cluster/health/{indices}'
       end
       
     end

data/lib/eson/http/cluster/nodes.rb

@@ -7,7 +7,7 @@ module Eson
       request_method :get
     
       def path
-        '/_cluster/nodes/{-list|,|nodes}'
+        '/_cluster/nodes/{nodes}'
       end
     end
   end

data/lib/eson/http/cluster/shutdown.rb

@@ -8,7 +8,7 @@ module Eson
       request_method :post
       
       def path
-        '/_cluster/nodes/{-list|,|nodes}/_shutdown'
+        '/_cluster/nodes/{nodes}/_shutdown'
       end
     end
   end

data/lib/eson/http/cluster/stats.rb

@@ -10,7 +10,7 @@ module Eson
         if nodes.empty?
           '/_cluster/nodes/stats'
         else
-          '/_cluster/nodes/{-list|,|nodes}/stats'
+          '/_cluster/nodes/{nodes}/stats'
         end
       end
     end

data/lib/eson/http/core/bulk.rb

@@ -1,6 +1,10 @@
 module Eson
   module HTTP
     module Bulk
+      FIELD_MAPPING = [:index, :type, :id, :parent, :ttl, :timestamp, :routing].map do |field|
+        [field, "_#{field}"]
+      end
+
       include Shared::Bulk
       extend API
       
@@ -26,7 +30,12 @@ module Eson
       end
       
       def to_params_hash(r)
-        { "_index" => r.index, "_type" => r.type, "_id" => r.id }
+        FIELD_MAPPING.inject({}) do |params, (field, serialized_field)|
+          if r.respond_to?(field) && val = r.send(field)
+            params[serialized_field] = val
+          end
+          params
+        end
       end
     end
   end

data/lib/eson/http/core/count.rb

@@ -8,9 +8,9 @@ module Eson
       
       def bare_path
         unless types.empty?
-          path = "{-list|,|indices}/{-list|,|types}/"
+          path = "{indices}/{types}/"
         else
-          path = "{-list|,|indices}/"
+          path = "{indices}/"
         end
       end
       

data/lib/eson/http/core/delete_by_query.rb

@@ -8,9 +8,9 @@ module Eson
 
       def bare_path
         unless types.empty?
-          path = "{-list|,|indices}/{-list|,|types}/"
+          path = "{indices}/{types}/"
         else
-          path = "{-list|,|indices}/"
+          path = "{indices}/"
         end
       end
 

data/lib/eson/http/core/explain.rb

@@ -0,0 +1,14 @@
+module Eson
+  module HTTP
+    module Explain
+      include Shared::Explain
+      extend API
+      
+      request_method :get
+
+      def path
+        "/{index}/{type}/{id}/_explain"
+      end
+    end
+  end
+end

data/lib/eson/http/core/msearch.rb

@@ -35,9 +35,9 @@ module Eson
 
       def path
         unless types.empty?
-          path = "{-list|,|indices}/{-list|,|types}/"
+          path = "{indices}/{types}/"
         else
-          path = "{-list|,|indices}/"
+          path = "{indices}/"
         end
 
         path << "_msearch"

data/lib/eson/http/core/scroll.rb

@@ -0,0 +1,14 @@
+module Eson
+  module HTTP
+    module Scroll
+      include Shared::Scroll
+      extend API
+      
+      request_method :get
+      
+      def path
+        "_search/scroll"
+      end
+    end
+  end
+end

data/lib/eson/http/core/search.rb

@@ -8,22 +8,15 @@ module Eson
       
       def bare_path
         unless types.empty?
-          path = "{-list|,|indices}/{-list|,|types}/"
+          path = "{indices}/{types}/"
         else
-          path = "{-list|,|indices}/"
+          path = "{indices}/"
         end
       end
       
       def path
-        path = bare_path + "_search"
-        
-        if scroll
-          path << "/scroll"
-        end
-        
-        path
+        bare_path + "_search"
       end
-      
     end
   end
 end

data/lib/eson/http/core/simple_search.rb

@@ -8,9 +8,9 @@ module Eson
       
       def path
         unless types.empty?
-          "{-list|,|indices}/{-list|,|types}/_search"
+          "{indices}/{types}/_search"
         else
-          "{-list|,|indices}/_search"
+          "{indices}/_search"
         end
       end
     end

data/lib/eson/http/core/update.rb

@@ -0,0 +1,14 @@
+module Eson
+  module HTTP
+    module Update
+      include Shared::Update
+      extend API
+      
+      request_method :post
+
+      def path
+        "/{index}/{type}/{id}/_update"
+      end
+    end
+  end
+end

data/lib/eson/http/core/validate.rb

@@ -0,0 +1,18 @@
+module Eson
+  module HTTP
+    module Validate
+      include Shared::Validate
+      extend API
+      
+      request_method :get
+
+      def path
+        if type
+          "/{index}/{type}/_validate/query"
+        else
+          "/{index}/_validate/query"
+        end
+      end
+    end
+  end
+end

data/lib/eson/http/indices/clear_cache.rb

@@ -8,7 +8,7 @@ module Eson
       
       def path
         if index
-          "/{-list|,|indices}/_cache/clear"
+          "/{indices}/_cache/clear"
         else
           "/_cache/clear"
         end

data/lib/eson/http/indices/close_index.rb

@@ -7,7 +7,7 @@ module Eson
       request_method :post
       
       def path
-        "/{-list|,|indices}/_close"
+        "/{indices}/_close"
       end
     end
   end

data/lib/eson/http/indices/delete_index.rb

@@ -7,7 +7,7 @@ module Eson
       request_method :delete
       
       def path
-        "/{-list|,|indices}"
+        "/{indices}"
       end
     end
   end

data/lib/eson/http/indices/delete_mapping.rb

@@ -9,7 +9,7 @@ module Eson
       
       def path
         if type && !indices.empty?
-          "/{-list|,|indices}/{type}"        
+          "/{indices}/{type}"        
         end
       end
     end

data/lib/eson/http/indices/exists.rb

@@ -7,7 +7,7 @@ module Eson
       request_method :head
       
       def path
-        "/{-list|,|indices}"
+        "/{indices}"
       end 
     end
   end

data/lib/eson/http/indices/flush.rb

@@ -8,7 +8,7 @@ module Eson
             
       def path
         unless indices.empty?
-          "/{-list|,|indices}/_flush"
+          "/{indices}/_flush"
         else
           "/_flush"
         end

data/lib/eson/http/indices/get_aliases.rb

@@ -0,0 +1,14 @@
+module Eson
+  module HTTP
+    module GetAliases
+      include Shared::GetAliases
+      extend API
+      
+      request_method :get
+      
+      def path
+        "/_aliases"
+      end
+    end
+  end
+end

data/lib/eson/http/indices/get_mapping.rb

@@ -8,9 +8,9 @@ module Eson
       
       def path
         if !types.empty? && !indices.empty?
-          "/{-list|,|indices}/{-list|,|types}/_mapping"
+          "/{indices}/{types}/_mapping"
         elsif !indices.empty?
-          "/{-list|,|indices}/_mapping"
+          "/{indices}/_mapping"
         else
           "/_mapping"
         end

data/lib/eson/http/indices/get_settings.rb

@@ -8,7 +8,7 @@ module Eson
       
       def path
         if index
-          "/{-list|,|indices}/_settings"
+          "/{indices}/_settings"
         else
           "/_settings"
         end

data/lib/eson/http/indices/open_index.rb

@@ -7,7 +7,7 @@ module Eson
       request_method :post
       
       def path
-        "/{-list|,|indices}/_open"
+        "/{indices}/_open"
       end
     end
   end

data/lib/eson/http/indices/optimize.rb

@@ -8,7 +8,7 @@ module Eson
       
       def path
         if index
-          "/{-list|,|indices}/_refresh"
+          "/{indices}/_refresh"
         else
           "/_refresh"
         end

data/lib/eson/http/indices/put_mapping.rb

@@ -8,7 +8,7 @@ module Eson
       
       def path
         if type && !indices.empty?
-          "/{-list|,|indices}/{type}/_mapping"
+          "/{indices}/{type}/_mapping"
         end
       end
     end

data/lib/eson/http/indices/refresh.rb

@@ -8,7 +8,7 @@ module Eson
       
       def path
         if index
-          "/{-list|,|indices}/_refresh"
+          "/{indices}/_refresh"
         else
           "/_refresh"
         end

data/lib/eson/http/indices/segments.rb

@@ -8,7 +8,7 @@ module Eson
           
       def path
         unless indices.empty?
-          "/{-list|,|indices}/_segments"
+          "/{indices}/_segments"
         else
           "/_segments"
         end

data/lib/eson/http/indices/snapshot.rb

@@ -8,7 +8,7 @@ module Eson
           
       def path
         unless indices.empty?
-          "/{-list|,|indices}/_gateway/snapshot"
+          "/{indices}/_gateway/snapshot"
         else
           "/_gateway/snapshot"
         end

data/lib/eson/http/indices/stats.rb

@@ -8,7 +8,7 @@ module Eson
           
       def path
         unless indices.empty?
-          "/{-list|,|indices}/_stats"
+          "/{indices}/_stats"
         else
           "/_stats"
         end

data/lib/eson/http/indices/status.rb

@@ -8,7 +8,7 @@ module Eson
           
       def path
         if !indices.empty?
-          "/{-list|,|indices}/_status"
+          "/{indices}/_status"
         else
           "/_status"
         end

data/lib/eson/http/indices/update_settings.rb

@@ -8,7 +8,7 @@ module Eson
       
       def path
         unless indices.empty?
-          "/{-list|,|indices}/_settings"
+          "/{indices}/_settings"
         else
           "/_settings"
         end

data/lib/eson/http/request.rb

@@ -2,12 +2,16 @@ require 'faraday'
 
 module Eson
   module HTTP
+    # This is the HTTP specific subclass of Eson::Request that encodes all
+    # HTTP interactions.
     class Request < Eson::Request
       # This middleware circumvents faradays detection of
       # :get as special and emits a generic request - which
       # can have a body...
       # This is mostly due to ElasticSearchs reliance of
       # Bodys on get and delete.
+      #
+      # @api interal
       class GetHackMiddleware < Faraday::Middleware
         def call(env)
           env[:method] = "get" if env[:method] == :get
@@ -16,20 +20,26 @@ module Eson
         end
       end
 
-      attr_accessor :request_method
-
+      # Constructs the base resource to send requests to.
+      #
+      # @api internal
+      # @return [Faraday::Connection] the connection
       def base_resource
         conn = Faraday.new(:url => client.node) do |builder|
-          builder.use Faraday::Response::Logger, Eson::HTTP.logger
+          builder.use Faraday::Response::Logger, client.logger
           builder.use GetHackMiddleware
 
-          builder.adapter :net_http
+          builder.adapter :net_http_persistent
         end
 
         conn.basic_auth(*client.auth) if client.auth?
         conn
       end
 
+      # Emits a HTTP request based on the parameters and API information.
+      #
+      # @api internal
+      # @return [Faraday::Response] the response
       def call
         resource = base_resource
 
@@ -54,29 +64,37 @@ module Eson
         
         response
       end
-      
+
+      # Fills in the blanks in the path by using {Addressable::Template}.
+      #
+      # @api internal
+      # @return [String] the full uri
       def fill
         template = Addressable::Template.new(path)
-        
+
         template_keys = template.keys.map(&:to_sym)
         expansions = {}
         query_values = {}
-        
+
         url_params.each do |p|
           val = self.send(p)
-          
+
           if template_keys.include? p
             expansions[p] = val if val
           else
             query_values[p] = val if val
           end
         end
-        
+
         uri = template.expand(expansions)
         uri.query_values = query_values unless query_values.empty?
         uri
       end
-      
+
+      # The parameters that are passed in the url. These are all params
+      # without the source params.
+      #
+      # @return [Array] the url parameters
       def url_params
         if self.respond_to? :source_param
           source_params = Array(source_param)
@@ -87,6 +105,10 @@ module Eson
         (parameters - source_params)
       end
 
+      # Returns the request method. If none is given, it is assumed to be
+      # `:get`.
+      #
+      # @return [Symbol] The request method.
       def request_method
         @request_method || :get
       end

data/lib/eson/modules/response_parser.rb

@@ -1,13 +1,26 @@
 module Eson
+  # A plugins that parses HTTP responses as json and returns the json
   module ResponseParser
+    # This exception subclass representds parse errors. In addition to saving
+    # the response, it also saves the JSON source in a special field.
     class JSONParseError < Eson::Error
       attr_accessor :source
     end
-    
+
+    # Evaluate the plugin.
+    #
+    # @param [Array<Object>] args Any number of args used for calling the endpoint.
+    # @return [Hash, Array] the parsed json
+    # @raise [JSONParseError] ES returned invalid JSON
     def call(*args)
       parse(super)
     end
-    
+
+    # Parse the response.
+    #
+    # @param [#body] response The response
+    # @return [Hash, Array] the parsed json
+    # @raise [JSONParseError] ES returned invalid JSON
     def parse(response)
       begin
         MultiJson.decode(response.body) if response.body
@@ -16,7 +29,6 @@ module Eson
         error.source = response.body
         raise error
       end
-      
     end
   end
 end

data/lib/eson/modules/status_handler.rb

@@ -1,9 +1,15 @@
 module Eson
+  # A plugin to handle status codes.
   module StatusHandler
     def call(*args)
       handle(super)
     end
 
+    # Handle the response status.
+    #
+    # @raise [Eson::IndexNotFoundError] if the index is missing
+    # @raise [Eson::NotFoundError] if the document is missing
+    # @raise [Eson::Error] otherwise
     def handle(response)
       case response.status
       when 404

data/test/http/client_test.rb

@@ -9,6 +9,13 @@ context "HTTP client" do
                            :auto_call => false)
   end
   
-  asserts("too many params") { client.index.params = {:foo => :bar} }.raises(NoMethodError)
-
+  asserts("too many params") { client.index.parameters = {:foo => :bar} }.raises(NoMethodError)
+  
+  asserts("#with allows parameter change") {
+    req = client.with :index => :foo do |other_client|
+      other_client.search :q => "*"
+    end
+    
+    req.index
+  }.equals(:foo)
 end

data/test/http/cluster_test.rb

@@ -13,7 +13,7 @@ context 'HTTP client cluster api' do
       client.health
     end
     
-    asserts("returns cluster info") { topic["cluster_name"]}.equals("elasticsearch")
+    asserts("returns cluster info") { topic["cluster_name"]}.equals("eson-test")
   end
   
   context "cluster state" do

data/test/http/index_test.rb

@@ -37,6 +37,19 @@ context 'HTTP client quick api' do
       asserts("ok") { topic["ok"] }
     end
     
+    if ElasticSearch::Node.version > "0.19.0"
+      context "update" do
+        setup do
+          client.update :type => "bar",
+                        :id => 600,
+                        :script => "ctx._source.test = value",
+                        :params => { :value => "foo" },
+                        :refresh => true
+        end
+        
+        asserts("ok") { topic["ok"] }
+      end
+    end
   end
   
   context "percolate" do
@@ -83,7 +96,27 @@ context 'HTTP client quick api' do
     asserts("number of docs") { topic["docs"].length }.equals(2)
   end
 
-  unless ENV["ES_VERSION"] && ENV["ES_VERSION"] < "0.19.0"
+  unless ElasticSearch::Node.version < "0.19.0"
+    context "#explain" do
+      setup do
+        client.explain :index => "explain", :type => "bar", :id => 1,
+                       :query => {:match_all => { }}
+      end
+
+      asserts("explanation output") { topic["explanation"] }.kind_of Hash
+    end
+
+    context "#validate" do
+      setup do
+        client.validate :index => "explain", :type => "bar",
+                        :query => { :match_all => { } },
+                        :explain => true
+      end
+
+      asserts("valid") { topic["valid"] }
+    end
+
+
     context "delete_by_query" do
       setup do
         client.index :index => "delete_by_query",
@@ -93,11 +126,11 @@ context 'HTTP client quick api' do
                      :type => "foo",
                      :doc => {:foo => :bar}
         client.refresh :index => "delete_by_query"
-    
+
         client.delete_by_query :index => "delete_by_query",
                                :query => { :match_all => {} }
       end
-    
+
       asserts("no doc left") { client.search(:index => "delete_by_query")["hits"]["total"] }.equals(0)
     end
   end

data/test/http/indices/basics_test.rb

@@ -129,16 +129,23 @@ context 'HTTP client' do
     setup do
       client.create_index :index => "abc"
       client.create_index :index => "def"
+      client.create_index :index => "ghi"
+      client.create_index :index => "jkl"
       client.aliases do |r|
         r.add "abc", "alias"
         r.add "def", "alias"
+        r.add "ghi", "alias", :routing => 1
+        r.add "jkl", "alias", :filter => { "term" => { "user" => "kimchy" } }
       end
     end
     
     asserts("ok") { topic["ok"] }
     asserts("can be queried") do
       client.status :index => "alias"
-    end    
+    end
+    asserts("can be retrieved") do
+      client.get_aliases
+    end
   end
   
   context "refresh" do
@@ -231,11 +238,7 @@ context 'HTTP client' do
   end
   
   context "exists?" do
-    setup do
-      client.exists? :index => 'does_not_exist_at_all'
-    end
-
-    asserts { topic }.equals(false)
+    denies { client.exists? :index => 'does_not_exist_at_all' }
   end
   
   context "index stats" do
@@ -247,11 +250,11 @@ context 'HTTP client' do
   end
   
   context "index segments" do
-     setup do
-       client.segments :index => 'default'
-     end
-
-     asserts { topic["ok"] }.equals(true)
-   end
+    setup do
+      client.segments :index => 'default'
+    end
+  
+    asserts { topic["ok"] }.equals(true)
+  end
 
 end

data/test/seeds/seeds.rb

@@ -28,3 +28,6 @@ c.open_index :index => "for_closing" rescue nil
 c.delete_index :index => "for_closing" rescue nil
 c.delete_index :index => "for_reopening" rescue nil
 c.delete_index :index => "mappings" rescue nil
+
+c.index :index => "explain", :type => "bar", :id => 1,
+        :doc => { :foo => :bar }

data/test/test_config.rb

@@ -18,7 +18,7 @@ module Node
   module External
     def self.instance
       @node ||= begin
-        node = ElasticSearch::Node::External.new("gateway.type" => "none")
+        node = ElasticSearch::Node::External.new("gateway.type" => "none", "cluster.name" => "eson-test")
         at_exit do
           node.close
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eson-http
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-10 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -118,14 +134,18 @@ files:
 - lib/eson/http/core/count.rb
 - lib/eson/http/core/delete.rb
 - lib/eson/http/core/delete_by_query.rb
+- lib/eson/http/core/explain.rb
 - lib/eson/http/core/get.rb
 - lib/eson/http/core/index.rb
 - lib/eson/http/core/mget.rb
 - lib/eson/http/core/more_like_this.rb
 - lib/eson/http/core/msearch.rb
 - lib/eson/http/core/percolate.rb
+- lib/eson/http/core/scroll.rb
 - lib/eson/http/core/search.rb
 - lib/eson/http/core/simple_search.rb
+- lib/eson/http/core/update.rb
+- lib/eson/http/core/validate.rb
 - lib/eson/http/indices/aliases.rb
 - lib/eson/http/indices/analyze.rb
 - lib/eson/http/indices/clear_cache.rb
@@ -136,6 +156,7 @@ files:
 - lib/eson/http/indices/delete_template.rb
 - lib/eson/http/indices/exists.rb
 - lib/eson/http/indices/flush.rb
+- lib/eson/http/indices/get_aliases.rb
 - lib/eson/http/indices/get_mapping.rb
 - lib/eson/http/indices/get_settings.rb
 - lib/eson/http/indices/get_template.rb
@@ -173,18 +194,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3355220238060799392
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3355220238060799392
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21