elasticsearch-transport 5.0.5 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9141220bdecbb5cd5fe9eef893010d24419a62a6
-  data.tar.gz: e2a2ad61469a9398e749b4004909ec2234360262
+  metadata.gz: be60395711be8973daf97621fdcb1b88f3724ad4
+  data.tar.gz: 534bf35af741369ce1fc4e13d049b3937f4dc8a5
 SHA512:
-  metadata.gz: 47916a61140347aba5eb71728587d4c611f0219e8f03d3584405fde93d10fe991f38652b5125e073ad37f16cedd72fe452faea82197f892b539c95809db5cf74
-  data.tar.gz: 9130c01c4a9d7687f42fa57848c3dac0ae7382972e1c68776319c829b079307ccda469846f6231e2e64c783225c43a75386d35b6de8f3d5614516266d24e80c8
+  metadata.gz: c935fbe7e202f16c699d00c0755928a04e9c439a378cd5891673d20d8ff894d56b3a167e2ffa0071f7c997ccdb6916b960e028c1246c8f28f9f8ef09a503c3fc
+  data.tar.gz: 2c918059b5b6237b81827b68b703543119ec2d6d1788e4a2c82d205aaf1832b5a0ff1ae7a82b1ad9698d78432427e1ea1fc48dec28b9307ae081c1f685e2ec65

data/Rakefile

@@ -8,39 +8,26 @@ task :test    => 'test:unit'
 
 require 'rake/testtask'
 namespace :test do
-  task :ci_reporter do
-    ENV['CI_REPORTS'] ||= 'tmp/reports'
-    if defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
-      require 'ci/reporter/rake/test_unit'
-      Rake::Task['ci:setup:testunit'].invoke
-    else
-      require 'ci/reporter/rake/minitest'
-      Rake::Task['ci:setup:minitest'].invoke
-    end
-  end
-
   Rake::TestTask.new(:unit) do |test|
-    Rake::Task['test:ci_reporter'].invoke if ENV['CI']
     test.libs << 'lib' << 'test'
     test.test_files = FileList["test/unit/**/*_test.rb"]
-    # test.verbose = true
-    # test.warning = true
+    test.verbose = false
+    test.warning = false
   end
 
   Rake::TestTask.new(:integration) do |test|
-    Rake::Task['test:ci_reporter'].invoke if ENV['CI']
     test.libs << 'lib' << 'test'
     test.test_files = FileList["test/integration/**/*_test.rb"]
+    test.verbose = false
+    test.warning = false
   end
 
   Rake::TestTask.new(:all) do |test|
-    Rake::Task['test:ci_reporter'].invoke if ENV['CI']
     test.libs << 'lib' << 'test'
     test.test_files = FileList["test/unit/**/*_test.rb", "test/integration/**/*_test.rb"]
   end
 
   Rake::TestTask.new(:profile) do |test|
-    Rake::Task['test:ci_reporter'].invoke if ENV['CI']
     test.libs << 'lib' << 'test'
     test.test_files = FileList["test/profile/**/*_test.rb"]
   end

data/elasticsearch-transport.gemspec

@@ -45,7 +45,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "turn"
   s.add_development_dependency "yard"
   s.add_development_dependency "pry"
-  s.add_development_dependency "ci_reporter", "~> 1.9"
 
   # Gems for testing integrations
   s.add_development_dependency "curb"   unless defined? JRUBY_VERSION

data/lib/elasticsearch/transport/client.rb

@@ -181,9 +181,6 @@ module Elasticsearch
             @arguments[:http][k] ||= v
           end
 
-          # Remove the trailing slash
-          host_parts[:path].chomp!('/') if host_parts[:path]
-
           host_parts
         end
 

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

@@ -129,7 +129,7 @@ module Elasticsearch
           Connections::Collection.new \
             :connections => hosts.map { |host|
               host[:protocol] = host[:scheme] || options[:scheme] || options[:http][:scheme] || DEFAULT_PROTOCOL
-              host[:port] ||= options[:port] || options[:http][:scheme] || DEFAULT_PORT
+              host[:port] ||= options[:port] || options[:http][:port] || DEFAULT_PORT
               if (options[:user] || options[:http][:user]) && !host[:user]
                 host[:user] ||= options[:user] || options[:http][:user]
                 host[:password] ||= options[:password] || options[:http][:password]

data/lib/elasticsearch/transport/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Transport
-    VERSION = "5.0.5"
+    VERSION = "6.0.0"
   end
 end

data/test/integration/client_test.rb

@@ -54,11 +54,11 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
     end
 
     should "ignore specified response codes" do
-      response = @client.perform_request 'GET', '/_foobar', ignore: 400
+      response = @client.perform_request 'PUT', '_foobar', ignore: 400
       assert_equal 400, response.status
 
       assert_instance_of Hash, response.body
-      assert_match /illegal_argument_exception/, response.body.inspect
+      assert_match /invalid_index_name_exception/, response.body.inspect
     end
 
     should "pass options to the transport" do
@@ -177,7 +177,7 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
           .times(4)
 
         assert_raise Elasticsearch::Transport::Transport::Errors::BadRequest do
-          @client.perform_request 'GET', '_foobar'
+          @client.perform_request 'PUT', '_foobar'
         end
       end
     end

data/test/profile/client_benchmark_test.rb

@@ -9,15 +9,15 @@ class Elasticsearch::Transport::ClientProfilingTest < Elasticsearch::Test::Profi
     setup do
       @port = (ENV['TEST_CLUSTER_PORT'] || 9250).to_i
       client = Elasticsearch::Client.new host: "localhost:#{@port}", adapter: ::Faraday.default_adapter
-      client.perform_request 'DELETE', '/ruby_test_benchmark/' rescue nil
-      client.perform_request 'POST',   '/ruby_test_benchmark/', {index: {number_of_shards: 1, number_of_replicas: 0}}
-      100.times do client.perform_request 'POST',   '/ruby_test_benchmark_search/test/', {}, {foo: 'bar'}; end
-      client.perform_request 'POST',   '/ruby_test_benchmark_search/_refresh'
+      client.perform_request 'DELETE', 'ruby_test_benchmark' rescue nil
+      client.perform_request 'PUT',   'ruby_test_benchmark', {}, {settings: {index: {number_of_shards: 1, number_of_replicas: 0}}}
+      100.times do client.perform_request 'POST',   'ruby_test_benchmark_search/test', {}, {foo: 'bar'}; end
+      client.perform_request 'POST',   'ruby_test_benchmark_search/_refresh'
     end
     teardown do
       client = Elasticsearch::Client.new host: "localhost:#{@port}"
-      client.perform_request 'DELETE', '/ruby_test_benchmark/'
-      client.perform_request 'DELETE', '/ruby_test_benchmark_search/'
+      client.perform_request 'DELETE', 'ruby_test_benchmark' rescue nil
+      client.perform_request 'DELETE', 'ruby_test_benchmark_search' rescue nil
     end
 
     context "with a single-node cluster and the default adapter" do
@@ -30,11 +30,11 @@ class Elasticsearch::Transport::ClientProfilingTest < Elasticsearch::Test::Profi
       end
 
       measure "index a document" do
-        @client.perform_request 'POST', '/ruby_test_benchmark/test/', {}, {foo: 'bar'}
+        @client.perform_request 'POST', 'ruby_test_benchmark/test', {}, {foo: 'bar'}
       end
 
       measure "search" do
-        @client.perform_request 'POST', '/ruby_test_benchmark_search/test/_search', {}, {query: {match: {foo: 'bar'}}}
+        @client.perform_request 'GET', 'ruby_test_benchmark_search/test/_search', {}, {query: {match: {foo: 'bar'}}}
       end
     end
 
@@ -48,11 +48,11 @@ class Elasticsearch::Transport::ClientProfilingTest < Elasticsearch::Test::Profi
       end
 
       measure "index a document"do
-        @client.perform_request 'POST', '/ruby_test_benchmark/test/', {}, {foo: 'bar'}
+        @client.perform_request 'POST', 'ruby_test_benchmark/test', {}, {foo: 'bar'}
       end
 
       measure "search" do
-        @client.perform_request 'POST', '/ruby_test_benchmark_search/test/_search', {}, {query: {match: {foo: 'bar'}}}
+        @client.perform_request 'GET', 'ruby_test_benchmark_search/test/_search', {}, {query: {match: {foo: 'bar'}}}
       end
     end
 
@@ -69,25 +69,19 @@ class Elasticsearch::Transport::ClientProfilingTest < Elasticsearch::Test::Profi
       end
 
       measure "index a document" do
-        @client.perform_request 'POST', '/ruby_test_benchmark/test/', {}, {foo: 'bar'}
+        @client.perform_request 'POST', 'ruby_test_benchmark/test', {}, {foo: 'bar'}
       end
 
       measure "search" do
-        @client.perform_request 'POST', '/ruby_test_benchmark_search/test/_search', {}, {query: {match: {foo: 'bar'}}}
+        @client.perform_request 'GET', 'ruby_test_benchmark_search/test/_search', {}, {query: {match: {foo: 'bar'}}}
       end
     end
 
     context "with a single-node cluster and the Typhoeus client" do
-      require 'typhoeus'
-      require 'typhoeus/adapters/faraday'
-
       setup do
-        transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new \
-          :hosts => [ { :host => 'localhost', :port => @port } ] do |f|
-            f.adapter  :typhoeus
-          end
-
-        @client = Elasticsearch::Client.new transport: transport
+        require 'typhoeus'
+        require 'typhoeus/adapters/faraday'
+        @client = Elasticsearch::Client.new host: "localhost:#{@port}", adapter: :typhoeus
       end
 
       measure "get the cluster info", count: 1_000 do
@@ -95,11 +89,11 @@ class Elasticsearch::Transport::ClientProfilingTest < Elasticsearch::Test::Profi
       end
 
       measure "index a document" do
-        @client.perform_request 'POST', '/ruby_test_benchmark/test/', {}, {foo: 'bar'}
+        @client.perform_request 'POST', 'ruby_test_benchmark/test', {}, {foo: 'bar'}
       end
 
       measure "search" do
-        @client.perform_request 'POST', '/ruby_test_benchmark_search/test/_search', {}, {query: {match: {foo: 'bar'}}}
+        @client.perform_request 'GET', 'ruby_test_benchmark_search/test/_search', {}, {query: {match: {foo: 'bar'}}}
       end
     end
 
@@ -114,11 +108,11 @@ class Elasticsearch::Transport::ClientProfilingTest < Elasticsearch::Test::Profi
       end
 
       measure "index a document" do
-        @client.perform_request 'POST', '/ruby_test_benchmark/test/', {}, {foo: 'bar'}
+        @client.perform_request 'POST', 'ruby_test_benchmark/test', {}, {foo: 'bar'}
       end
 
       measure "search" do
-        @client.perform_request 'POST', '/ruby_test_benchmark_search/test/_search', {}, {query: {match: {foo: 'bar'}}}
+        @client.perform_request 'GET', 'ruby_test_benchmark_search/test/_search', {}, {query: {match: {foo: 'bar'}}}
       end
     end
   end

data/test/unit/client_test.rb

@@ -228,14 +228,6 @@ class Elasticsearch::Transport::ClientTest < Test::Unit::TestCase
         assert_equal 'bar', hosts[1][:host]
       end
 
-      should "remove trailing slash from URL path" do
-        hosts = @client.__extract_hosts 'http://myhost/'
-        assert_equal '', hosts[0][:path]
-
-        hosts = @client.__extract_hosts 'http://myhost/foo/bar/'
-        assert_equal '/foo/bar', hosts[0][:path]
-      end
-
       should "raise error for incompatible argument" do
         assert_raise ArgumentError do
           @client.__extract_hosts 123

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 5.0.5
+  version: 6.0.0
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -164,20 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ci_reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
@@ -415,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby client for Elasticsearch.