elastomer-client 2.2.0 → 2.3.0

data/test/client/template_test.rb

@@ -33,15 +33,6 @@ describe Elastomer::Client::Cluster do
     template = @template.get
     assert_equal [@name], template.keys
     assert_equal "test-elastomer*", template[@name]["template"]
-
-    if es_version_1_x?
-      assert_equal "3", template[@name]["settings"]["index.number_of_shards"]
-
-    elsif es_version_2_x?
-      assert_equal "3", template[@name]["settings"]["index"]["number_of_shards"]
-
-    else
-      assert false, "Unsupported Elasticsearch version #{$client.semantic_version}"
-    end
+    assert_equal "3", template[@name]["settings"]["index"]["number_of_shards"]
   end
 end

data/test/client_test.rb

@@ -28,13 +28,7 @@ describe Elastomer::Client do
       assert false, "exception was not raised when it should have been"
     rescue Elastomer::Client::Error => err
       assert_equal 404, err.status
-      if es_version_1_x?
-        assert_equal "IndexMissingException[[non-existent-index] missing]", err.message
-      elsif es_version_2_x?
-        assert_match %r/index_not_found_exception/, err.message
-      else
-        fail "Elasticserch #{$client.version} is not supported"
-      end
+      assert_match %r/index_not_found_exception/, err.message
     end
   end
 

data/test/middleware/encode_json_test.rb

@@ -3,8 +3,8 @@ require File.expand_path("../../test_helper", __FILE__)
 describe Elastomer::Middleware::EncodeJson do
   let(:middleware) { Elastomer::Middleware::EncodeJson.new(lambda {|env| env})}
 
-  def process(body, content_type = nil)
-    env = { :body => body, :request_headers => Faraday::Utils::Headers.new }
+  def process(body, content_type: nil, method: :post)
+    env = { :body => body, :request_headers => Faraday::Utils::Headers.new, method: method }
     env[:request_headers]["content-type"] = content_type if content_type
     middleware.call(env)
   end
@@ -12,12 +12,20 @@ describe Elastomer::Middleware::EncodeJson do
   it "handles no body" do
     result = process(nil)
     assert_nil result[:body]
+    assert_equal "application/json", result[:request_headers]["content-type"]
+
+    result = process(nil, method: :get)
+    assert_nil result[:body]
     assert_nil result[:request_headers]["content-type"]
   end
 
   it "handles empty body" do
     result = process("")
     assert_empty result[:body]
+    assert_equal "application/json", result[:request_headers]["content-type"]
+
+    result = process("", method: :get)
+    assert_empty result[:body]
     assert_nil result[:request_headers]["content-type"]
   end
 
@@ -40,13 +48,13 @@ describe Elastomer::Middleware::EncodeJson do
   end
 
   it "handles object body with json type" do
-    result = process({:a => 1}, "application/json; charset=utf-8")
+    result = process({:a => 1}, content_type: "application/json; charset=utf-8")
     assert_equal '{"a":1}', result[:body]
     assert_equal "application/json; charset=utf-8", result[:request_headers]["content-type"]
   end
 
   it "handles object body with incompatible type" do
-    result = process({:a => 1}, "application/xml; charset=utf-8")
+    result = process({:a => 1}, content_type: "application/xml; charset=utf-8")
     assert_equal({:a => 1}, result[:body])
     assert_equal "application/xml; charset=utf-8", result[:request_headers]["content-type"]
   end

data/test/notifications_test.rb

@@ -46,10 +46,10 @@ describe Elastomer::Notifications do
 
   it "instruments index actions" do
     @index.exists?; assert_action_event("index.exists")
-    @index.create("number_of_replicas" => 0)
+    @index.create(default_index_settings)
     assert_action_event("index.create")
     @index.get_settings; assert_action_event("index.get_settings")
-    @index.update_settings("number_of_replicas" => 0)
+    @index.update_settings(number_of_replicas: 0)
     assert_action_event("index.get_settings")
     @index.close; assert_action_event("index.close")
     @index.open; assert_action_event("index.open")
@@ -57,13 +57,13 @@ describe Elastomer::Notifications do
   end
 
   it "includes the response body in the payload" do
-    @index.create("number_of_replicas" => 0)
+    @index.create(default_index_settings)
     event = @events.detect { |e| e.payload[:action] == "index.create" }
     assert event.payload[:response_body]
   end
 
   it "includes the request body in the payload" do
-    @index.create("number_of_replicas" => 0)
+    @index.create(default_index_settings)
     event = @events.detect { |e| e.payload[:action] == "index.create" }
 
     payload = event.payload

data/test/test_helper.rb

@@ -25,7 +25,7 @@ require "elastomer/client"
 # we are going to use the same client instance everywhere!
 # the client should always be stateless
 $client_params = {
-  :port => 9200,
+  :port => ENV.fetch("ES_PORT", 9200),
   :read_timeout => 10,
   :open_timeout => 1,
   :opaque_id => false
@@ -84,16 +84,6 @@ def wait_for_index(name, status="yellow")
   )
 end
 
-# Elasticsearch 1.0 changed some request formats in a non-backward-compatible
-# way. Some tests need to know what version is running to structure requests
-# as expected.
-#
-# Returns true if Elasticsearch version is 1.x.
-def es_version_1_x?
-  $client.semantic_version >= "1.0.0" &&
-  $client.semantic_version <  "2.0.0"
-end
-
 # Elasticsearch 2.0 changed some request formats in a non-backward-compatible
 # way. Some tests need to know what version is running to structure requests
 # as expected.
@@ -104,41 +94,18 @@ def es_version_2_x?
   $client.semantic_version <  "3.0.0"
 end
 
-# Elasticsearch 1.4 changed the response body for interacting with index
-# aliases. If an index does not contain any aliases, then an "aliases" key is no
-# longer returned in the response.
-#
-# Returns `true` if the response contains an "aliases" key.
-def es_version_always_returns_aliases?
-  $client.semantic_version <  "1.4.0" ||
-  $client.semantic_version >= "1.4.3"
-end
-
-# Elasticsearch 1.3 added the `search_shards` API endpoint.
-def es_version_supports_search_shards?
-  $client.semantic_version >= "1.3.0"
-end
-
-# Elasticsearch 1.2 removed support for gateway snapshots.
-#
-# Returns true if Elasticsearch version supports gateway snapshots.
-def es_version_supports_gateway_snapshots?
-  $client.semantic_version <= "1.2.0"
-end
-
-# Elasticsearch 1.4.0 had a bug in its handling of the Mapping API where it
-# would not accept an Update request if the index had been created with the
-# _all field set to disabled. This bug was fixed in 1.4.1.
+# Elasticsearch 5.0 changed some request formats in a non-backward-compatible
+# way. Some tests need to know what version is running to structure requests
+# as expected.
 #
-# See: https://github.com/elastic/elasticsearch/pull/8426
-def es_version_supports_update_mapping_with__all_disabled?
-  $client.semantic_version != "1.4.0"
+# Returns true if Elasticsearch version is 5.x.
+def es_version_5_x?
+  $client.semantic_version >= "5.0.0" &&
+  $client.semantic_version <  "6.0.0"
 end
 
-# Elasticsearch 1.6 requires the repo.path setting when creating
-# FS repositories.
-def es_version_requires_repo_path?
-  $client.semantic_version >= "1.6.0"
+def default_index_settings
+  {settings: {index: {number_of_shards: 1, number_of_replicas: 0}}}
 end
 
 def run_snapshot_tests?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastomer-client
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Tim Pease
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-29 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -101,14 +101,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '5.10'
+- !ruby/object:Gem::Dependency
+  name: minitest-fail-fast
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +137,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -195,7 +223,6 @@ files:
 - script/bootstrap
 - script/cibuild
 - script/console
-- script/test
 - test/assertions.rb
 - test/client/bulk_test.rb
 - test/client/cluster_test.rb
@@ -240,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A library for interacting with Elasticsearch

data/script/test

@@ -1,6 +0,0 @@
-#!/bin/sh
-set -e
-cd "$(dirname "$0")/.."
-
-fn=${1:-"test/**/*_test.rb test/*_test.rb"}
-bundle exec testrb -Itest $fn $@