elasticsearch-transport 0.4.7 → 0.4.8

data/Gemfile

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

data/README.md

@@ -16,7 +16,7 @@ data serialization and transport.
 It does not handle calling the Elasticsearch API;
 see the [`elasticsearch-api`](https://github.com/elasticsearch/elasticsearch-ruby/tree/master/elasticsearch-api) library.
 
-The library is compatible with Ruby 1.8.7 or higher.
+The library is compatible with Ruby 1.8.7 or higher and with Elasticsearch 0.90 and 1.0.
 
 Features overview:
 

data/elasticsearch-transport.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "ci_reporter"
 
   # Gems for testing integrations
-  s.add_development_dependency "curb"
+  s.add_development_dependency "curb" unless defined? JRUBY_VERSION
   s.add_development_dependency "typhoeus", '~> 0.6'
 
   # Prevent unit test failures on Ruby 1.8
@@ -53,8 +53,9 @@ Gem::Specification.new do |s|
   end
 
   if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
-    s.add_development_dependency "ruby-prof"
+    s.add_development_dependency "ruby-prof" unless defined? JRUBY_VERSION
     s.add_development_dependency "simplecov"
+    s.add_development_dependency "simplecov-rcov"
     s.add_development_dependency "cane"
     s.add_development_dependency "require-prof"
     s.add_development_dependency "coveralls"

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

@@ -209,7 +209,7 @@ module Elasticsearch
             raise e
           end
 
-          json     = serializer.load(response.body) if response.body.to_s =~ /^\{/
+          json     = serializer.load(response.body) if response.headers && response.headers["content-type"] =~ /json/
           took     = (json['took'] ? sprintf('%.3fs', json['took']/1000.0) : 'n/a') rescue 'n/a' if logger || tracer
           duration = Time.now-start if logger || tracer
 

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

@@ -44,7 +44,7 @@ module Elasticsearch
 
                 client = ::Curl::Easy.new
                 client.resolve_mode = :ipv4
-                client.headers      = {'User-Agent' => "Curb #{Curl::CURB_VERSION}", 'Content-Type' => 'application/json' }
+                client.headers      = {'User-Agent' => "Curb #{Curl::CURB_VERSION}"}
                 client.url          = __full_url(host)
 
                 if host[:user]

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

@@ -22,7 +22,7 @@ module Elasticsearch
                 method.downcase.to_sym,
                 url,
                 ( body ? __convert_to_json(body) : nil ),
-                {'Content-Type' => 'application/json'}
+                {}
             end
           end
 

data/lib/elasticsearch/transport/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Transport
-    VERSION = "0.4.7"
+    VERSION = "0.4.8"
   end
 end

data/test/integration/transport_test.rb

@@ -14,6 +14,14 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
       require 'typhoeus'
       require 'typhoeus/adapters/faraday'
 
+      # Fix for unreleased Typhoeus version (https://github.com/typhoeus/typhoeus/commit/00da90f)
+      #
+      class ::Faraday::Adapter::Typhoeus
+        def configure_ssl(req, env)
+          # noop
+        end
+      end
+
       transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new \
         :hosts => [ { :host => 'localhost', :port => @port } ] do |f|
           f.response :logger
@@ -35,7 +43,7 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
 
       client = Elasticsearch::Transport::Client.new transport: transport
       client.perform_request 'GET', ''
-    end
+    end unless JRUBY
   end
 
 end

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 RUBY_1_8 = defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
+JRUBY    = defined?(JRUBY_VERSION)
 
 if RUBY_1_8 and not ENV['BUNDLE_GEMFILE']
   require 'rubygems'
@@ -7,7 +8,17 @@ end
 
 require 'rubygems' if RUBY_1_8
 
-require 'simplecov' and SimpleCov.start { add_filter "/test|test_/" } if ENV["COVERAGE"]
+if ENV['COVERAGE'] && ENV['CI'].nil? && !RUBY_1_8
+  require 'simplecov'
+  SimpleCov.start { add_filter "/test|test_/" }
+end
+
+if ENV['CI'] && !RUBY_1_8
+  require 'simplecov'
+  require 'simplecov-rcov'
+  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+  SimpleCov.start { add_filter "/test|test_" }
+end
 
 # Register `at_exit` handler for integration tests shutdown.
 # MUST be called before requiring `test/unit`.
@@ -30,7 +41,7 @@ RequireProf.print_timing_infos if ENV["REQUIRE_PROF"]
 if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
   require 'elasticsearch/extensions/test/cluster'
   require 'elasticsearch/extensions/test/startup_shutdown'
-  require 'elasticsearch/extensions/test/profiling'
+  require 'elasticsearch/extensions/test/profiling' unless JRUBY
 end
 
 class Test::Unit::TestCase
@@ -46,7 +57,7 @@ module Elasticsearch
     class IntegrationTestCase < ::Test::Unit::TestCase
       extend Elasticsearch::Extensions::Test::StartupShutdown
 
-      shutdown { Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] && started? }
+      shutdown { Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] && started? && Elasticsearch::Extensions::Test::Cluster.running? }
       context "IntegrationTest" do; should "noop on Ruby 1.8" do; end; end if RUBY_1_8
     end if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
   end
@@ -56,8 +67,8 @@ module Elasticsearch
       extend Elasticsearch::Extensions::Test::StartupShutdown
       extend Elasticsearch::Extensions::Test::Profiling
 
-      shutdown { Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] && started? }
+      shutdown { Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] && started? && Elasticsearch::Extensions::Test::Cluster.running? }
       context "IntegrationTest" do; should "noop on Ruby 1.8" do; end; end if RUBY_1_8
-    end if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
+    end unless RUBY_1_8 || JRUBY
   end
 end

data/test/unit/transport_base_test.rb

@@ -142,7 +142,7 @@ class Elasticsearch::Transport::Transport::BaseTest < Test::Unit::TestCase
       @transport.serializer.expects(:load).returns({'foo' => 'bar'})
 
       response = @transport.perform_request 'GET', '/' do
-                   Elasticsearch::Transport::Transport::Response.new 200, '{"foo":"bar"}'
+                   Elasticsearch::Transport::Transport::Response.new 200, '{"foo":"bar"}', {"content-type" => 'application/json'}
                  end
 
       assert_instance_of Elasticsearch::Transport::Transport::Response, response
@@ -153,7 +153,7 @@ class Elasticsearch::Transport::Transport::BaseTest < Test::Unit::TestCase
       @transport.expects(:get_connection).returns(stub_everything :failures => 1)
       @transport.serializer.expects(:load).never
       response = @transport.perform_request 'GET', '/' do
-                   Elasticsearch::Transport::Transport::Response.new 200, 'FOOBAR'
+                   Elasticsearch::Transport::Transport::Response.new 200, 'FOOBAR', {"content-type" => 'text/plain'}
                  end
 
       assert_instance_of Elasticsearch::Transport::Transport::Response, response

data/test/unit/transport_curb_test.rb

@@ -1,3 +1,9 @@
+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'
@@ -64,8 +70,7 @@ class Elasticsearch::Transport::Transport::HTTP::FaradayTest < Test::Unit::TestC
         curl.headers["User-Agent"] = "myapp-0.0"
       end
 
-      assert_equal( {"Content-Type"=>"application/json", "User-Agent"=>"myapp-0.0"},
-                    transport.connections.first.connection.headers )
+      assert_equal "myapp-0.0", transport.connections.first.connection.headers["User-Agent"]
     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: 0.4.7
+  version: 0.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -267,6 +267,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-rcov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement