elastomer-client 2.2.0 → 2.3.0

data/lib/elastomer/client/repository.rb

@@ -28,11 +28,11 @@ module Elastomer
       def exists?(params = {})
         response = client.get "/_snapshot{/repository}", update_params(params, :action => "repository.exists")
         response.success?
-      rescue Elastomer::Client::Error => exception
-        if exception.message =~ /RepositoryMissingException/
+      rescue Elastomer::Client::Error => err
+        if err.error && err.error.dig("root_cause", 0, "type") == "repository_missing_exception"
           false
         else
-          raise exception
+          raise err
         end
       end
       alias_method :exist?, :exists?

data/lib/elastomer/client/scroller.rb

@@ -102,8 +102,7 @@ module Elastomer
       response = get "/_search/scroll", :body => scroll_id, :scroll => scroll, :action => "search.scroll"
       response.body
     rescue RequestError => err
-      if err.error && err.error["caused_by"]["type"] == "search_context_missing_exception" \
-      || err.message =~ /SearchContextMissingException/
+      if err.error && err.error["caused_by"]["type"] == "search_context_missing_exception"
         raise SearchContextMissing, "No search context found for scroll ID #{scroll_id.inspect}"
       else
         raise err

data/lib/elastomer/client/snapshot.rb

@@ -37,11 +37,11 @@ module Elastomer
       def exists?(params = {})
         response = client.get "/_snapshot/{repository}/{snapshot}", update_params(params, :action => "snapshot.exists")
         response.success?
-      rescue Elastomer::Client::Error => exception
-        if exception.message =~ /SnapshotMissingException/
+      rescue Elastomer::Client::Error => err
+        if err.error && err.error.dig("root_cause", 0, "type") == "snapshot_missing_exception"
           false
         else
-          raise exception
+          raise err
         end
       end
       alias_method :exist?, :exists?

data/lib/elastomer/middleware/encode_json.rb

@@ -23,8 +23,8 @@ module Elastomer
       end
 
       def match_content_type(env)
+        add_content_type!(env)
         if process_request?(env)
-          env[:request_headers][CONTENT_TYPE] ||= MIME_TYPE
           yield env[:body] unless env[:body].respond_to?(:to_str)
         end
       end
@@ -43,6 +43,13 @@ module Elastomer
         type = type.split(";", 2).first if type.index(";")
         type
       end
+
+      def add_content_type!(env)
+        method = env[:method]
+        if method == :put || method == :post || has_body?(env)
+          env[:request_headers][CONTENT_TYPE] ||= MIME_TYPE
+        end
+      end
     end
   end
 end

data/lib/elastomer/version.rb

@@ -1,5 +1,5 @@
 module Elastomer
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 
   def self.version
     VERSION

data/script/cibuild

@@ -14,10 +14,14 @@ echo
 
 result=0
 
-export RBENV_VERSION="2.1.1-github"
+export RBENV_VERSION="2.3.3"
+if [ -d /usr/share/rbenv/shims ]; then
+    export PATH=/usr/share/rbenv/shims:$PATH
+fi
 ruby -v
+rm -f Gemfile.lock
 script/bootstrap
-script/test || result=$?
+bundle exec rake test || result=$?
 
 if [ $result -ne 0 ]; then
     exit $result

data/test/client/bulk_test.rb

@@ -87,10 +87,20 @@ describe Elastomer::Client::Bulk do
 
     assert_kind_of Integer, h["took"]
 
-    assert_bulk_index h["items"].first
-    assert_bulk_create h["items"].last
+    assert_equal 2, h["items"].length
+
+    if es_version_2_x?
+      assert_bulk_index h["items"].first
+      assert_bulk_create h["items"].last
+      book_id = items.last["create"]["_id"]
+    elsif es_version_5_x?
+      assert_bulk_index h["items"].first
+      assert_bulk_index h["items"].last
+      book_id = items.last["index"]["_id"]
+    else
+      fail "Unknown ES version!"
+    end
 
-    book_id = items.last["create"]["_id"]
     assert_match %r/^\S{20,22}$/, book_id
 
     @index.refresh
@@ -108,10 +118,22 @@ describe Elastomer::Client::Bulk do
     end
     items = h["items"]
 
-    assert_bulk_create h["items"].first, "expected to create a book"
-    assert_bulk_delete h["items"].last, "expected to delete a book"
+    assert_equal 2, h["items"].length
+
+    if es_version_2_x?
+      assert_bulk_create h["items"].first, "expected to create a book"
+      assert_bulk_delete h["items"].last, "expected to delete a book"
+
+      book_id2 = items.first["create"]["_id"]
+    elsif es_version_5_x?
+      assert_bulk_index h["items"].first, "expected to create a book"
+      assert_bulk_delete h["items"].last, "expected to delete a book"
+
+      book_id2 = items.first["index"]["_id"]
+    else
+      fail "Unknown ES version!"
+    end
 
-    book_id2 = items.first["create"]["_id"]
     assert_match %r/^\S{20,22}$/, book_id2
 
     @index.refresh

data/test/client/cluster_test.rb

@@ -27,19 +27,17 @@ describe Elastomer::Client::Cluster do
     assert_instance_of Hash, h["metadata"], "the metadata are returned"
   end
 
-  if es_version_1_x?
-    it "filters cluster state by metrics" do
-      h = @cluster.state(:metrics => "nodes")
-      refute h.key("metadata"), "expected only nodes state"
-      h = @cluster.state(:metrics => "metadata")
-      refute h.key("nodes"), "expected only metadata state"
-    end
+  it "filters cluster state by metrics" do
+    h = @cluster.state(metrics: "nodes")
+    refute h.key("metadata"), "expected only nodes state"
+    h = @cluster.state(metrics: "metadata")
+    refute h.key("nodes"), "expected only metadata state"
+  end
 
-    it "filters cluster state by indices" do
-      @index.create({}) unless @index.exists?
-      h = @cluster.state(:metrics => "metadata", :indices => @name)
-      assert [@name], h["metadata"]["indices"].keys
-    end
+  it "filters cluster state by indices" do
+    @index.create(default_index_settings) unless @index.exists?
+    h = @cluster.state(metrics: "metadata", indices: @name)
+    assert [@name], h["metadata"]["indices"].keys
   end
 
   it "gets the cluster settings" do
@@ -55,13 +53,13 @@ describe Elastomer::Client::Cluster do
   end
 
   it "updates the cluster settings" do
-    @cluster.update_settings :transient => { "indices.ttl.interval" => "30m" }
+    @cluster.update_settings transient: { "indices.ttl.interval" => "30m" }
     h = @cluster.settings
 
     value = h["transient"]["indices"]["ttl"]["interval"]
     assert_equal "30m", value
 
-    @cluster.update_settings :transient => { "indices.ttl.interval" => "60m" }
+    @cluster.update_settings transient: { "indices.ttl.interval" => "60m" }
     h = @cluster.settings
 
     value = h["transient"]["indices"]["ttl"]["interval"]
@@ -70,7 +68,9 @@ describe Elastomer::Client::Cluster do
 
   it "returns cluster stats" do
     h = @cluster.stats
-    assert_equal %w[cluster_name indices nodes status timestamp], h.keys.sort
+    expected = %w[cluster_name indices nodes status timestamp]
+    expected.unshift("_nodes") if es_version_5_x?
+    assert_equal expected, h.keys.sort
   end
 
   it "returns a list of pending tasks" do
@@ -80,7 +80,7 @@ describe Elastomer::Client::Cluster do
   end
 
   it "returns the list of indices in the cluster" do
-    @index.create({}) unless @index.exists?
+    @index.create(default_index_settings) unless @index.exists?
     indices = @cluster.indices
     assert !indices.empty?, "expected to see an index"
   end
@@ -94,7 +94,7 @@ describe Elastomer::Client::Cluster do
     before do
       @name = "elastomer-cluster-test"
       @index = $client.index @name
-      @index.create({}) unless @index.exists?
+      @index.create(default_index_settings) unless @index.exists?
       wait_for_index(@name)
     end
 
@@ -104,12 +104,10 @@ describe Elastomer::Client::Cluster do
 
     it "adds and gets an alias" do
       hash = @cluster.get_aliases
-      if es_version_always_returns_aliases?
-        assert_empty hash[@name]["aliases"]
-      end
+      assert_empty hash[@name]["aliases"]
 
       @cluster.update_aliases \
-        :add => {:index => @name, :alias => "elastomer-test-unikitty"}
+        add: {index: @name, alias: "elastomer-test-unikitty"}
 
       hash = @cluster.get_aliases
       assert_equal ["elastomer-test-unikitty"], hash[@name]["aliases"].keys
@@ -117,12 +115,10 @@ describe Elastomer::Client::Cluster do
 
     it "adds and gets an alias with .aliases" do
       hash = @cluster.aliases
-      if es_version_always_returns_aliases?
-        assert_empty hash[@name]["aliases"]
-      end
+      assert_empty hash[@name]["aliases"]
 
       @cluster.update_aliases \
-        :add => {:index => @name, :alias => "elastomer-test-unikitty"}
+        add: {index: @name, alias: "elastomer-test-unikitty"}
 
       hash = @cluster.aliases
       assert_equal ["elastomer-test-unikitty"], hash[@name]["aliases"].keys
@@ -130,14 +126,14 @@ describe Elastomer::Client::Cluster do
 
     it "removes an alias" do
       @cluster.update_aliases \
-        :add => {:index => @name, :alias => "elastomer-test-unikitty"}
+        add: {index: @name, alias: "elastomer-test-unikitty"}
 
       hash = @cluster.get_aliases
       assert_equal ["elastomer-test-unikitty"], hash[@name]["aliases"].keys
 
       @cluster.update_aliases([
-        {:add    => {:index => @name, :alias => "elastomer-test-SpongeBob-SquarePants"}},
-        {:remove => {:index => @name, :alias => "elastomer-test-unikitty"}}
+        {add:    {index: @name, alias: "elastomer-test-SpongeBob-SquarePants"}},
+        {remove: {index: @name, alias: "elastomer-test-unikitty"}}
       ])
 
       hash = @cluster.get_aliases
@@ -145,12 +141,12 @@ describe Elastomer::Client::Cluster do
     end
 
     it "accepts the full aliases actions hash" do
-      @cluster.update_aliases :actions => [
-        {:add => {:index => @name, :alias => "elastomer-test-He-Man"}},
-        {:add => {:index => @name, :alias => "elastomer-test-Skeletor"}}
+      @cluster.update_aliases actions: [
+        {add: {index: @name, alias: "elastomer-test-He-Man"}},
+        {add: {index: @name, alias: "elastomer-test-Skeletor"}}
       ]
 
-      hash = @cluster.get_aliases(:index => @name)
+      hash = @cluster.get_aliases(index: @name)
       assert_equal %w[elastomer-test-He-Man elastomer-test-Skeletor], hash[@name]["aliases"].keys.sort
     end
   end

data/test/client/docs_test.rb

@@ -270,13 +270,11 @@ describe Elastomer::Client::Docs do
   end
 
   it "supports the shards search API" do
-    if es_version_supports_search_shards?
-      h = @docs.search_shards(:type => "docs1")
+    h = @docs.search_shards(:type => "docs1")
 
-      assert h.key?("nodes"), "response contains \"nodes\" information"
-      assert h.key?("shards"), "response contains \"shards\" information"
-      assert h["shards"].is_a?(Array), "\"shards\" is an array"
-    end
+    assert h.key?("nodes"), "response contains \"nodes\" information"
+    assert h.key?("shards"), "response contains \"shards\" information"
+    assert h["shards"].is_a?(Array), "\"shards\" is an array"
   end
 
   it "generates QueryParsingError exceptions on bad input when searching" do
@@ -313,48 +311,6 @@ describe Elastomer::Client::Docs do
     assert_equal 1, h["count"]
   end
 
-  # The /_mlt endpoint has been removed from ES 2.X
-  if es_version_1_x?
-    it "searches for more like this" do
-      populate!
-
-      # for some reason, if there's no document indexed here all the mlt
-      # queries return zero results
-      @docs.index \
-        :_id    => 3,
-        :_type  => "doc1",
-        :title  => "the author of faraday",
-        :author => "technoweenie"
-
-      @index.refresh
-
-      h = @docs.more_like_this({
-        :type => "doc1",
-        :id   => 1,
-        :mlt_fields    => "title",
-        :min_term_freq => 1
-      })
-      assert_equal 2, h["hits"]["total"]
-
-      h = @docs.more_like_this({
-        :facets => {
-          "author" => {
-            :terms => {
-              :field => "author"
-            }
-          }
-        }
-      }, {
-        :type => "doc1",
-        :id   => 1,
-        :mlt_fields    => "title,author",
-        :min_term_freq => 1
-      })
-      assert_equal 2, h["hits"]["total"]
-      assert_equal 2, h["facets"]["author"]["total"]
-    end
-  end
-
   it "explains scoring" do
     populate!
 
@@ -427,7 +383,7 @@ describe Elastomer::Client::Docs do
       populate!(b)
     end
 
-    assert_instance_of Fixnum, response["took"]
+    assert_kind_of Integer, response["took"]
 
     response = @docs.get(:id => 1, :type => "doc1")
     assert_found response

data/test/client/index_test.rb

@@ -105,10 +105,6 @@ describe Elastomer::Client::Index do
   end
 
   it "updates document mappings" do
-    unless es_version_supports_update_mapping_with__all_disabled?
-      skip "Mapping Update API is broken in this ES version."
-    end
-
     @index.create(
       :mappings => {
         :doco => {
@@ -136,10 +132,6 @@ describe Elastomer::Client::Index do
   end
 
   it "updates document mappings with .put_mapping" do
-    unless es_version_supports_update_mapping_with__all_disabled?
-      skip "Mapping Update API is broken in this ES version."
-    end
-
     @index.create(
       :mappings => {
         :doco => {
@@ -166,71 +158,31 @@ describe Elastomer::Client::Index do
     assert_property_exists @index.mapping[@name], "mux_mool", "song"
   end
 
-  it "deletes document mappings" do
-    @index.create(
-      :mappings => {
-        :doco => {
-          :_source => { :enabled => false },
-          :_all    => { :enabled => false },
-          :properties => {:title  => { :type => "string", :analyzer => "standard" }}
-        }
-      }
-    )
-    assert_mapping_exists @index.mapping[@name], "doco"
-
-    response = @index.delete_mapping "doco"
-
-    if es_version_1_x?
-      assert_acknowledged response
-
-      mapping = @index.get_mapping
-      mapping = mapping[@name] if mapping.key? @name
-      mapping = mapping["mappings"] if mapping.key? "mappings"
-
-      assert_empty mapping, "no mappings are present"
-
-    elsif es_version_2_x?
-      assert_equal "No handler found for uri [/elastomer-index-test/doco] and method [DELETE]", response
-
-    else
-      assert false, "Unsupported Elasticsearch version #{$client.semantic_version}"
-    end
-  end
-
   it "lists all aliases to the index" do
     @index.create(nil)
-
-    if es_version_always_returns_aliases?
-      assert_equal({@name => {"aliases" => {}}}, @index.get_aliases)
-    else
-      assert_equal({@name => {}}, @index.get_aliases)
-    end
+    assert_equal({@name => {"aliases" => {}}}, @index.get_aliases)
 
     $client.cluster.update_aliases :add => {:index => @name, :alias => "foofaloo"}
     assert_equal({@name => {"aliases" => {"foofaloo" => {}}}}, @index.get_aliases)
 
-    if es_version_1_x?
-      assert_equal({@name => {"aliases" => {"foofaloo" => {}}}}, @index.get_alias("f*"))
-      assert_equal({}, @index.get_alias("r*"))
-    end
+    assert_equal({@name => {"aliases" => {"foofaloo" => {}}}}, @index.get_alias("f*"))
+    assert_equal({}, @index.get_alias("r*"))
   end
 
-  if es_version_1_x?
-    it "adds and deletes aliases to the index" do
-      @index.create(nil)
-      assert_empty @index.get_alias("*")
+  it "adds and deletes aliases to the index" do
+    @index.create(nil)
+    assert_empty @index.get_alias("*")
 
-      @index.add_alias "gondolin"
-      aliases = @index.get_alias("*")
-      assert_equal %w[gondolin], aliases[@name]["aliases"].keys.sort
+    @index.add_alias "gondolin"
+    aliases = @index.get_alias("*")
+    assert_equal %w[gondolin], aliases[@name]["aliases"].keys.sort
 
-      @index.add_alias "gondor"
-      aliases = @index.get_alias("*")
-      assert_equal %w[gondolin gondor], aliases[@name]["aliases"].keys.sort
+    @index.add_alias "gondor"
+    aliases = @index.get_alias("*")
+    assert_equal %w[gondolin gondor], aliases[@name]["aliases"].keys.sort
 
-      @index.delete_alias "gon*"
-      assert_empty @index.get_alias("*")
-    end
+    @index.delete_alias "gon*"
+    assert_empty @index.get_alias("*")
   end
 
   it "analyzes text and returns tokens" do
@@ -270,15 +222,11 @@ describe Elastomer::Client::Index do
     before do
       suggest = {
         :type            => "completion",
-        :index_analyzer  => "simple",
+        :analyzer        => "simple",
         :search_analyzer => "simple",
         :payloads        => false
       }
 
-      if es_version_2_x?
-        suggest[:analyzer] = suggest.delete(:index_analyzer)
-      end
-
       @index.create(
         :settings => { :number_of_shards => 1, :number_of_replicas => 0 },
         :mappings => {
@@ -327,14 +275,6 @@ describe Elastomer::Client::Index do
       assert_equal 0, response["_shards"]["failed"]
     end
 
-    # COMPATIBILITY ES 1.2 removed support for the gateway snapshot API.
-    if es_version_supports_gateway_snapshots?
-      it "snapshots" do
-        response = @index.snapshot
-        assert_equal 0, response["_shards"]["failed"]
-      end
-    end
-
     it "recovery" do
       response = @index.recovery
       assert_includes response, "elastomer-index-test"
@@ -354,14 +294,6 @@ describe Elastomer::Client::Index do
       end
     end
 
-    # The /<index>/_status endpoint has been removed in ES 2.X
-    if es_version_1_x?
-      it "gets status" do
-        response = @index.status
-        assert_includes response["indices"], "elastomer-index-test"
-      end
-    end
-
     it "gets segments" do
       @index.docs("foo").index("foo" => "bar")
       response = @index.segments