elasticsearch-transport 1.0.0.rc1 → 1.0.0.rc2

data/Gemfile

@@ -3,6 +3,14 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in elasticsearch-transport.gemspec
 gemspec
 
+if File.exists? File.expand_path("../../elasticsearch-api/elasticsearch-api.gemspec", __FILE__)
+  gem 'elasticsearch-api', :path => File.expand_path("../../elasticsearch-api", __FILE__), :require => false
+end
+
 if File.exists? File.expand_path("../../elasticsearch-extensions", __FILE__)
-  gem 'elasticsearch-extensions', :path => File.expand_path("../../elasticsearch-extensions", __FILE__), :require => true
+  gem 'elasticsearch-extensions', :path => File.expand_path("../../elasticsearch-extensions", __FILE__), :require => false
+end
+
+if File.exists? File.expand_path("../../elasticsearch/elasticsearch.gemspec", __FILE__)
+  gem 'elasticsearch', :path => File.expand_path("../../elasticsearch", __FILE__), :require => false
 end

data/lib/elasticsearch/transport/client.rb

@@ -57,6 +57,8 @@ module Elasticsearch
       #
       # @option arguments [Boolean] :reload_on_failure Reload connections after failure (false by default)
       #
+      # @option arguments [Hash] :transport_options Options to be passed to the `Faraday::Connection` constructor
+      #
       # @option arguments [Constant] :transport_class  A specific transport class to use, will be initialized by
       #                                                the client and passed hosts and all arguments
       #

data/lib/elasticsearch/transport/transport/base.rb

@@ -177,7 +177,13 @@ module Elasticsearch
           begin
             tries     += 1
             connection = get_connection or raise Error.new("Cannot get new connection from pool.")
+
+            if connection.connection.respond_to?(:params) && connection.connection.params.respond_to?(:to_hash)
+              params = connection.connection.params.merge(params.to_hash)
+            end
+
             url        = connection.full_url(path, params)
+
             response   = block.call(connection, url)
 
             connection.healthy! if connection.failures > 0

data/lib/elasticsearch/transport/transport/http/curb.rb

@@ -28,7 +28,12 @@ module Elasticsearch
 
               connection.connection.http(method.to_sym)
 
-              Response.new connection.connection.response_code, connection.connection.body_str
+              headers = {}
+              headers['content-type'] = 'application/json' if connection.connection.header_str =~ /\/json/
+
+              Response.new connection.connection.response_code,
+                           connection.connection.body_str,
+                           headers
             end
           end
 

data/lib/elasticsearch/transport/transport/http/faraday.rb

@@ -39,7 +39,7 @@ module Elasticsearch
 
                 Connections::Connection.new \
                   :host => host,
-                  :connection => ::Faraday::Connection.new( :url => url, &@block )
+                  :connection => ::Faraday::Connection.new(url, options[:transport_options], &@block )
               },
               :selector_class => options[:selector_class],
               :selector => options[:selector]

data/lib/elasticsearch/transport/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Transport
-    VERSION = "1.0.0.rc1"
+    VERSION = "1.0.0.rc2"
   end
 end

data/test/integration/transport_test.rb

@@ -32,6 +32,20 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
       client.perform_request 'GET', ''
     end
 
+    should "allow to define connection parameters and pass them" do
+      transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new \
+                    :hosts => [ { :host => 'localhost', :port => @port } ],
+                    :options => { :transport_options => {
+                                    :params => { :format => 'yaml' }
+                                  }
+                                }
+
+      client = Elasticsearch::Transport::Client.new transport: transport
+      response = client.perform_request 'GET', ''
+
+      assert response.body.start_with?("---\n"), "Response body should be YAML: #{response.body.inspect}"
+    end
+
     should "use the Curb client" do
       require 'curb'
       require 'elasticsearch/transport/transport/http/curb'
@@ -44,6 +58,23 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
       client = Elasticsearch::Transport::Client.new transport: transport
       client.perform_request 'GET', ''
     end unless JRUBY
+
+    should "deserialize JSON responses in the Curb client" do
+      require 'curb'
+      require 'elasticsearch/transport/transport/http/curb'
+
+      transport = Elasticsearch::Transport::Transport::HTTP::Curb.new \
+        :hosts => [ { :host => 'localhost', :port => @port } ] do |curl|
+          curl.verbose = true
+        end
+
+      client = Elasticsearch::Transport::Client.new transport: transport
+      response = client.perform_request 'GET', ''
+
+      assert_respond_to(response.body, :to_hash)
+      assert_equal 200, response.body['status']
+      assert_equal 'application/json', response.headers['content-type']
+    end unless JRUBY
   end
 
 end

data/test/profile/client_benchmark_test.rb

@@ -78,6 +78,16 @@ class Elasticsearch::Transport::ClientProfilingTest < Elasticsearch::Test::Profi
     end
 
     context "with a single-node cluster and the Typhoeus client" do
+      # Fix for incompatibility of the Typhoeus adapter
+      # Related commit: elasticsearch/elasticsearch-ruby@adc4810227fad03ae5cabfbb2a0905fb75bfb331
+      # Related: lostisland/faraday/pull/323, lostisland/faraday/pull/335
+      #
+      class ::Faraday::Adapter::Typhoeus
+        def configure_ssl(req, env)
+          # noop
+        end
+      end
+
       setup do
         require 'typhoeus'
         require 'typhoeus/adapters/faraday'

data/test/unit/transport_base_test.rb

@@ -270,10 +270,14 @@ class Elasticsearch::Transport::Transport::BaseTest < Test::Unit::TestCase
   context "logging" do
     setup do
       @transport = DummyTransportPerformer.new :options => { :logger => Logger.new('/dev/null') }
-      @transport.stubs(:get_connection).returns  stub :full_url => 'localhost:9200/_search?size=1',
-                                                      :host     => 'localhost',
-                                                      :failures  => 0,
-                                                      :healthy! => true
+
+      fake_connection = stub :full_url => 'localhost:9200/_search?size=1',
+                             :host     => 'localhost',
+                             :connection => stub_everything,
+                             :failures => 0,
+                             :healthy! => true
+
+      @transport.stubs(:get_connection).returns(fake_connection)
       @transport.serializer.stubs(:load).returns 'foo' => 'bar'
       @transport.serializer.stubs(:dump).returns '{"foo":"bar"}'
     end
@@ -314,10 +318,14 @@ class Elasticsearch::Transport::Transport::BaseTest < Test::Unit::TestCase
   context "tracing" do
     setup do
       @transport = DummyTransportPerformer.new :options => { :tracer => Logger.new('/dev/null') }
-      @transport.stubs(:get_connection).returns  stub :full_url => 'localhost:9200/_search?size=1',
-                                                     :host      => 'localhost',
-                                                     :failures  => 0,
-                                                     :healthy!  => true
+
+      fake_connection = stub :full_url => 'localhost:9200/_search?size=1',
+                             :host     => 'localhost',
+                             :connection => stub_everything,
+                             :failures => 0,
+                             :healthy! => true
+
+      @transport.stubs(:get_connection).returns(fake_connection)
       @transport.serializer.stubs(:load).returns 'foo' => 'bar'
       @transport.serializer.stubs(:dump).returns <<-JSON.gsub(/^      /, '')
       {

data/test/unit/transport_curb_test.rb

@@ -1,10 +1,10 @@
+require 'test_helper'
+
 if JRUBY
   puts "'#{File.basename(__FILE__)}' not supported on JRuby #{RUBY_VERSION}"
   exit(0)
 end
 
-
-require 'test_helper'
 require 'elasticsearch/transport/transport/http/curb'
 require 'curb'
 
@@ -53,6 +53,16 @@ class Elasticsearch::Transport::Transport::HTTP::FaradayTest < Test::Unit::TestC
       @transport.perform_request 'POST', '/', {}, '{"foo":"bar"}'
     end
 
+    should "set application/json header" do
+      @transport.connections.first.connection.expects(:http).with(:GET).returns(stub_everything)
+      @transport.connections.first.connection.expects(:body_str).returns('{"foo":"bar"}')
+      @transport.connections.first.connection.expects(:header_str).returns('HTTP/1.1 200 OK\r\nContent-Type: application/json; charset=UTF-8\r\nContent-Length: 311\r\n\r\n')
+
+      response = @transport.perform_request 'GET', '/'
+
+      assert_equal 'application/json', response.headers['content-type']
+    end
+
     should "handle HTTP methods" do
       @transport.connections.first.connection.expects(:http).with(:HEAD).returns(stub_everything)
       @transport.connections.first.connection.expects(:http).with(:GET).returns(stub_everything)

data/test/unit/transport_faraday_test.rb

@@ -58,15 +58,71 @@ class Elasticsearch::Transport::Transport::HTTP::FaradayTest < Test::Unit::TestC
                          @transport.connections.selector
     end
 
-    should "allow to set options for Faraday" do
+    should "pass a configuration block to the Faraday constructor" do
       config_block = lambda do |f|
         f.response :logger
+        f.path_prefix = '/moo'
       end
 
       transport = Faraday.new :hosts => [ { :host => 'foobar', :port => 1234 } ], &config_block
 
-      handlers = transport.connections.first.connection.instance_variable_get(:@builder).instance_variable_get(:@handlers)
-      assert handlers.include?(::Faraday::Response::Logger), "#{handlers.inspect} does not include <::Faraday::Adapter::Typhoeus>"
+      handlers = transport.connections.first.connection.builder.handlers
+
+      assert_equal 1, handlers.size
+      assert handlers.include?(::Faraday::Response::Logger), "#{handlers.inspect} does not include <::Faraday::Adapter::Logger>"
+
+      assert_equal '/moo',                   transport.connections.first.connection.path_prefix
+      assert_equal 'http://foobar:1234/moo', transport.connections.first.connection.url_prefix.to_s
+    end
+
+    should "pass transport_options to the Faraday constructor" do
+      transport = Faraday.new :hosts => [ { :host => 'foobar', :port => 1234 } ],
+                              :options => { :transport_options => {
+                                              :request => { :open_timeout => 1 },
+                                              :headers => { :foo_bar => 'bar'  },
+                                              :ssl     => { :verify => false }
+                                            }
+                                          }
+
+      assert_equal 1,     transport.connections.first.connection.options.open_timeout
+      assert_equal 'bar', transport.connections.first.connection.headers['Foo-Bar']
+      assert_equal false, transport.connections.first.connection.ssl.verify?
+    end
+
+    should "merge in parameters defined in the Faraday connection parameters" do
+      transport = Faraday.new :hosts => [ { :host => 'foobar', :port => 1234 } ],
+                              :options => { :transport_options => {
+                                              :params => { :format => 'yaml' }
+                                            }
+                                          }
+      # transport.logger = Logger.new(STDERR)
+
+      transport.connections.first.connection.expects(:run_request).
+        with do |method, url, params, body|
+          assert_match /\?format=yaml/, url
+          true
+        end.
+        returns(stub_everything)
+
+      transport.perform_request 'GET', ''
+    end
+
+    should "not overwrite request parameters with the Faraday connection parameters" do
+      transport = Faraday.new :hosts => [ { :host => 'foobar', :port => 1234 } ],
+                              :options => { :transport_options => {
+                                              :params => { :format => 'yaml' }
+                                            }
+                                          }
+      # transport.logger = Logger.new(STDERR)
+
+      transport.connections.first.connection.expects(:run_request).
+        with do |method, url, params, body|
+          assert_match /\?format=json/, url
+          true
+        end.
+        returns(stub_everything)
+
+      transport.perform_request 'GET', '', { :format => 'json' }
     end
 
     should "set the credentials if passed" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json