elastomer-client 0.9.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f92a7cb69e266a5d7d085d3ac4c2cb71689c30d
-  data.tar.gz: a87d3c6dd12b5b243061c9641c1baedb5ff3ae95
+  metadata.gz: d77143e192594473f269fc69f9b6552dd7c5b3d8
+  data.tar.gz: aa71ccdf91b2a0277b61595bcd2b34409c3bd02b
 SHA512:
-  metadata.gz: 483643b29967808319ce67e5b6b58458dc6034f9e6df78601a6f9264ad666205648c3117bb940b6f8b58a73086e1589302bf98c12575922c5ef434856b003fa6
-  data.tar.gz: 8e3b0f7bbf2c399d10efd7892d1d216ef6d64c41247c040eb246957162428c2324cbb5e68dcb167ede04a2618a5ab0ddb0584a53be63aad0bc14e968e6ec7886
+  metadata.gz: b7cb2962c8cdc9712989d9c2e127147e1126ca4f4dcca825c55b4a8f496626f01b236fd59097cb119f031849858f7f1acbe8eda4258e3f9dfa7d7e924533c011
+  data.tar.gz: d780635a018e9d178d28e279ee1051be21ecd522f6db0edcdb88ef53fbef49dc2b2de58433b9b96a1bb13fb773177830487a0f7bbc3e2cd439eb511af6e56268

data/.travis.yml

@@ -1,7 +1,13 @@
 language: ruby
 rvm:
   - 2.1.1
-  - 1.9.3
+
+addons:
+  apt:
+    sources:
+      elasticsearch-2.x
+    packages:
+      elasticsearch
 
 services:
   - elasticsearch

data/README.md

@@ -92,7 +92,7 @@ docs.index({
   :tweet  => 'announcing Elastomer, the stupid simple Elasticsearch client'
 })
 
-docs.search({:query => {:match_all => {}}}, :search_type => 'count')
+docs.search({:query => {:match_all => {}}}, :size => 0)
 ```
 
 #### Performance

data/docs/client.md

@@ -182,12 +182,12 @@ client.expand_path("{/index}{/type}/_search", {
 #=> "/twitter/tweet/_search?q=*:*"
 
 client.expand_path("{/index}{/type}/_search", {
-  :index       => "twitter",
-  :type        => ["tweet", "user"],
-  :q           => "*:*"
-  :search_type => "count"
+  :index => "twitter",
+  :type  => ["tweet", "user"],
+  :q     => "*:*"
+  :size  => 0
 })
-#=> "/twitter/tweet,user/_search?q=*:*&search_type=count"
+#=> "/twitter/tweet,user/_search?q=*:*&size=0"
 ```
 
 In the examples above the path elements are optional. We can force them to be

data/docs/docs.md

@@ -196,27 +196,19 @@ results["hits"]["total"]  #=> 1
 ```
 
 The search results always contain the total number of matched documents; even if
-the `:size` is set to zero or some other number. However this is very inefficient.
+the `:size` is set to zero or some other number.
 
 Elasticsearch provides specific methods for obtaining the number of documents
-that match a search. Instead we can specify a `:search_type` tailored for
-counting.
+that match a search. Using the count API endpoint is another way to get the
+number of documents.
 
 ```ruby
-results = client.docs("blog", "post").search \
-  :q => "title:nerd",
-  :search_type => "count"
+results = client.docs("blog", "post").count \
+  :q => "title:nerd"
 
-results["hits"]["total"]  #=> 1
+results["count"]  #=> 1
 ```
 
-The `"count"` search type is much more efficient then setting the size to zero.
-These count queries will return more quickly and consume less memory inside
-Elasticsearch.
-
-There is also a `count` API method, but the `:search_type` approach is even more
-efficient than the count API.
-
 #### Deleting
 
 Documents can be deleted directly given their document ID.

data/docs/notifications.md

@@ -14,7 +14,7 @@ The event namespace is `request.client.elastomer`.
   :action  => "docs.search",
   :context => nil,
   :body    => "{\"query\":{\"match_all\":{}}}",
-  :url     => #<URI::HTTP:0x007fb6f3e98b60 URL:http://localhost:19200/index-test/_search?search_type = count>,
+  :url     => #<URI::HTTP:0x007fb6f3e98b60 URL:http://localhost:19200/index-test/_search?size=0>,
   :method  => :get,
   :status  => 200
 }

data/lib/elastomer/client/bulk.rb

@@ -158,6 +158,7 @@ module Elastomer
     # immediately.
     #
     class Bulk
+      DEFAULT_REQUEST_SIZE = 10 * 2**20 # 10 MB
 
       # Create a new bulk client for handling some of the details of
       # accumulating documents to index and then formatting them properly for
@@ -174,7 +175,7 @@ module Elastomer
         @actions = []
         @current_request_size = 0
         @current_action_count = 0
-        self.request_size = params.delete(:request_size)
+        self.request_size = params.delete(:request_size) || DEFAULT_REQUEST_SIZE
         self.action_count = params.delete(:action_count)
       end
 

data/lib/elastomer/client/docs.rb

@@ -331,11 +331,11 @@ module Elastomer
 Percolate
 =end
 
-      # Search for documents similar to a specific document. The document
-      # :id is provided as part of the params hash. If the _all field is
-      # not enabled, :mlt_fields must be passed. A query cannot be present
-      # in the query body, but other fields like :size and :facets are
-      # allowed.
+      # Deprecated - use the More Like This query: https://www.elastic.co/guide/en/elasticsearch/reference/2.3/query-dsl-mlt-query.html
+      # Search for documents similar to a specific document. The
+      # document :id is provided as part of the params hash. If the _all field
+      # is not enabled, :mlt_fields must be passed. A query cannot be present in
+      # the query body, but other fields like :size and :facets are allowed.
       #
       # params - Parameters Hash
       #   :id - the ID of the document
@@ -504,7 +504,7 @@ Percolate
       # Examples
       #
       #   docs.multi_search do |m|
-      #     m.search({:query => {:match_all => {}}, :search_type => :count)
+      #     m.search({:query => {:match_all => {}}, :size => 0)
       #     m.search({:query => {:field => {"foo" => "bar"}}})
       #     ...
       #   end

data/lib/elastomer/client/errors.rb

@@ -17,6 +17,7 @@ module Elastomer
       #
       def initialize( *args )
         @status = nil
+        @error = nil
 
         case args.first
         when Exception
@@ -27,9 +28,11 @@ module Elastomer
         when Faraday::Response
           response = args.shift
           @status = response.status
+
           body = response.body
+          @error = body["error"] if body.is_a?(Hash) && body.key?("error")
 
-          message = body.is_a?(Hash) && body["error"] || body.to_s
+          message = @error || body.to_s
           super message
 
         else
@@ -41,6 +44,10 @@ module Elastomer
       # created with a response.
       attr_reader :status
 
+      # Returns the Elasticsearch error from the `response` or nil if the Error
+      # was not created with a response.
+      attr_reader :error
+
       # Indicates that the error is fatal. The request should not be tried
       # again.
       def fatal?

data/lib/elastomer/client/index.rb

@@ -150,6 +150,10 @@ module Elastomer
       end
       alias_method :put_mapping, :update_mapping
 
+      # DEPRECATED: It is no longer possible to delete the mapping for a type.
+      # Instead you should delete the index and recreate it with new mappings.
+      # See https://www.elastic.co/guide/en/elasticsearch/reference/2.3/indices-delete-mapping.html
+      #
       # Delete the mapping identified by `type`. This deletes all documents of
       # that type from the index.
       #
@@ -500,7 +504,7 @@ module Elastomer
       # Examples
       #
       #   index.multi_search do |m|
-      #     m.search({:query => {:match_all => {}}, :search_type => :count)
+      #     m.search({:query => {:match_all => {}}, :size => 0)
       #     m.search({:query => {:field => {"author" => "grantr"}}}, :type => 'tweet')
       #     ...
       #   end

data/lib/elastomer/client/multi_search.rb

@@ -25,7 +25,7 @@ module Elastomer
     #
     #   # block form
     #   multi_search(:index => 'default-index') do |m|
-    #     m.search({:query => {:match_all => {}}, :search_type => :count)
+    #     m.search({:query => {:match_all => {}}, :size => 0)
     #     m.search({:query => {:field => {"foo" => "bar"}}}, :type => 'default-type')
     #     ...
     #   end

data/lib/elastomer/client/scroller.rb

@@ -23,6 +23,8 @@ module Elastomer
       Scroller.new(self, query, opts)
     end
 
+    # DEPRECATED in ES 2.1.0 - use a Scroll query sorted by _doc: https://www.elastic.co/guide/en/elasticsearch/reference/2.3/search-request-search-type.html#scan
+    #
     # Create a new Scroller instance for scrolling all results from a `query`
     # via "scan" semantics.
     #
@@ -56,7 +58,7 @@ module Elastomer
     #   :type        - the document type to search
     #   :scroll      - the keep alive time of the scrolling request (5 minutes by default)
     #   :size        - the number of documents per shard to fetch per scroll
-    #   :search_type - set to 'scan' for scan semantics
+    #   :search_type - set to 'scan' for scan semantics  # DEPRECATED in ES 2.1.0 - use a Scroll query sorted by _doc: https://www.elastic.co/guide/en/elasticsearch/reference/2.3/search-request-search-type.html#scan
     #
     # Examples
     #
@@ -85,7 +87,7 @@ module Elastomer
     #
     # Examples
     #
-    #   scroll_id = client.start_scroll('{"query":{"match_all":{}}}', :index => 'test', :search_type => 'scan')['_scroll_id']
+    #   scroll_id = client.start_scroll('{"query":{"match_all":{}}}', :index => 'test')['_scroll_id']
     #
     #   h = client.continue_scroll scroll_id   # scroll to get the next set of results
     #   scroll_id = h['_scroll_id']            # and store the scroll_id to use later
@@ -123,11 +125,11 @@ module Elastomer
       #   :type        - the document type to search
       #   :scroll      - the keep alive time of the scrolling request (5 minutes by default)
       #   :size        - the number of documents per shard to fetch per scroll
-      #   :search_type - set to 'scan' for scan query semantics
+      #   :search_type - set to 'scan' for scan semantics  # DEPRECATED in ES 2.1.0 - use a Scroll query sorted by _doc: https://www.elastic.co/guide/en/elasticsearch/reference/2.3/search-request-search-type.html#scan
       #
       # Examples
       #
-      #   scan = Scroller.new(client, {:search_type => 'scan', :query => {:match_all => {}}}, :index => 'test-1')
+      #   scan = Scroller.new(client, {:query => {:match_all => {}}}, :index => 'test-1')
       #   scan.each_document { |doc|
       #     doc['_id']
       #     doc['_source']

data/lib/elastomer/version.rb

@@ -1,5 +1,5 @@
 module Elastomer
-  VERSION = "0.9.0"
+  VERSION = "2.0.0"
 
   def self.version
     VERSION

data/test/client/bulk_test.rb

@@ -188,7 +188,7 @@ describe Elastomer::Client::Bulk do
     ary.each { |a| a["items"].each { |b| assert_bulk_index(b) } }
 
     @index.refresh
-    h = @index.docs.search :q => "*:*", :search_type => "count"
+    h = @index.docs.search :q => "*:*", :size => 0
 
     assert_equal 10, h["hits"]["total"]
   end
@@ -219,7 +219,7 @@ describe Elastomer::Client::Bulk do
     ary.each { |a| a["items"].each { |b| assert_bulk_index(b) } }
 
     @index.refresh
-    h = @index.docs.search :q => "*:*", :search_type => "count"
+    h = @index.docs.search :q => "*:*", :size => 0
 
     assert_equal 10, h["hits"]["total"]
   end
@@ -314,7 +314,7 @@ describe Elastomer::Client::Bulk do
       [:index, { :message => "tweet 3" }, { :_id => 3, :_type => "book", :_index => @index.name }]
     ]
     items = []
-    stats = $client.bulk_stream_items(ops, { :action_count => 2 }) { |item| items << item }
+    $client.bulk_stream_items(ops, { :action_count => 2 }) { |item| items << item }
     assert_equal(3, items.length)
     assert_bulk_index(items[0])
     assert_bulk_index(items[1])

data/test/client/cluster_test.rb

@@ -55,26 +55,17 @@ describe Elastomer::Client::Cluster do
   end
 
   it "updates the cluster settings" do
-    @cluster.update_settings :transient => { "indices.ttl.interval" => "30" }
+    @cluster.update_settings :transient => { "indices.ttl.interval" => "30m" }
     h = @cluster.settings
 
-    #COMPATIBILITY
-    # ES 1.0 changed the default return format of cluster settings to always
-    # expand nested properties, e.g.
-    # {"indices.ttl.interval": "30"} changed to
-    # {"indices": {"ttl": {"interval":"30"}}}
+    value = h["transient"]["indices"]["ttl"]["interval"]
+    assert_equal "30m", value
 
-    # To support both versions, we check for either return format.
-    value = h["transient"]["indices.ttl.interval"] ||
-            h["transient"]["indices"]["ttl"]["interval"]
-    assert_equal "30", value
-
-    @cluster.update_settings :transient => { "indices.ttl.interval" => "60" }
+    @cluster.update_settings :transient => { "indices.ttl.interval" => "60m" }
     h = @cluster.settings
 
-    value = h["transient"]["indices.ttl.interval"] ||
-            h["transient"]["indices"]["ttl"]["interval"]
-    assert_equal "60", value
+    value = h["transient"]["indices"]["ttl"]["interval"]
+    assert_equal "60m", value
   end
 
   it "returns cluster stats" do

data/test/client/delete_by_query_test.rb

@@ -15,7 +15,7 @@ describe Elastomer::Client::DeleteByQuery do
   describe "when an index with documents exists" do
     before do
       @index.create(nil)
-      wait_for_index(@index_name)
+      wait_for_index(@index.name)
     end
 
     it "deletes by query" do

data/test/client/docs_test.rb

@@ -13,7 +13,7 @@ describe Elastomer::Client::Docs do
           :doc1 => {
             :_source => { :enabled => true }, :_all => { :enabled => false },
             :properties => {
-              :title  => { :type => "string", :analyzer => "standard" },
+              :title  => { :type => "string", :analyzer => "standard", :term_vector => "with_positions_offsets" },
               :author => { :type => "string", :index => "not_analyzed" }
             }
           },
@@ -233,25 +233,18 @@ describe Elastomer::Client::Docs do
     assert_found h["docs"][0]
     refute_found h["docs"][1]
 
-    #COMPATIBILITY
-    # ES 1.0 normalized all search APIs to use a :query top level element.
-    # This broke compatibility with the ES 0.90 delete_by_query api. Since
-    # the query hash version of this api never worked with 0.90 in the first
-    # place, only test it if running 1.0.
-    if es_version_1_x?
-      h = @docs.delete_by_query(
-            :query => {
-              :filtered => {
-                :query => {:match_all => {}},
-                :filter => {:term => {:author => "pea53"}}
-              }
+    h = @docs.delete_by_query(
+          :query => {
+            :filtered => {
+              :query => {:match_all => {}},
+              :filter => {:term => {:author => "pea53"}}
             }
-          )
-      @index.refresh
-      h = @docs.multi_get :ids => [1, 2]
-      refute_found h["docs"][0]
-      refute_found h["docs"][1]
-    end
+          }
+        )
+    @index.refresh
+    h = @docs.multi_get :ids => [1, 2]
+    refute_found h["docs"][0]
+    refute_found h["docs"][1]
   end
 
   it "searches for documents" do
@@ -301,66 +294,57 @@ describe Elastomer::Client::Docs do
     h = @docs.count :q => "*:*", :type => "doc1,doc2"
     assert_equal 4, h["count"]
 
-    #COMPATIBILITY
-    # ES 1.0 normalized all search APIs to use a :query top level element.
-    # This broke compatibility with the ES 0.90 count api.
-    if es_version_1_x?
-      h = @docs.count({
-        :query => {
-          :filtered => {
-            :query => {:match_all => {}},
-            :filter => {:term => {:author => "defunkt"}}
-          }
-        }
-      }, :type => %w[doc1 doc2] )
-    else
-      h = @docs.count({
+    h = @docs.count({
+      :query => {
         :filtered => {
           :query => {:match_all => {}},
           :filter => {:term => {:author => "defunkt"}}
         }
-      }, :type => %w[doc1 doc2] )
-    end
+      }
+    }, :type => %w[doc1 doc2] )
     assert_equal 1, h["count"]
   end
 
-  it "searches for more like this" do
-    populate!
+  # 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"
+      # 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
+      @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({
+        :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"
+      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"]
+      }, {
+        :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
@@ -385,26 +369,14 @@ describe Elastomer::Client::Docs do
     h = @docs.validate :q => "*:*"
     assert_equal true, h["valid"]
 
-    #COMPATIBILITY
-    # ES 1.0 normalized all search APIs to use a :query top level element.
-    # This broke compatibility with the ES 0.90 validate api.
-    if es_version_1_x?
-      h = @docs.validate({
-        :query => {
-          :filtered => {
-            :query => {:match_all => {}},
-            :filter => {:term => {:author => "defunkt"}}
-          }
-        }
-      }, :type => %w[doc1 doc2] )
-    else
-      h = @docs.validate({
+    h = @docs.validate({
+      :query => {
         :filtered => {
           :query => {:match_all => {}},
           :filter => {:term => {:author => "defunkt"}}
         }
-      }, :type => %w[doc1 doc2] )
-    end
+      }
+    }, :type => %w[doc1 doc2] )
     assert_equal true, h["valid"]
   end
 
@@ -454,144 +426,142 @@ describe Elastomer::Client::Docs do
     assert_equal "mojombo", response["_source"]["author"]
   end
 
-  if es_version_1_x?
-    it "provides access to term vector statistics" do
-      populate!
-
-      response = @docs.termvector :type => "doc2", :id => 1, :fields => "title"
+  it "provides access to term vector statistics" do
+    populate!
 
-      assert response["term_vectors"]["title"]
-      assert response["term_vectors"]["title"]["field_statistics"]
-      assert response["term_vectors"]["title"]["terms"]
-      assert_equal %w[author logging of the], response["term_vectors"]["title"]["terms"].keys
-    end
+    response = @docs.termvector :type => "doc2", :id => 1, :fields => "title"
 
-    it "provides access to term vector statistics with .termvectors" do
-      populate!
+    assert response["term_vectors"]["title"]
+    assert response["term_vectors"]["title"]["field_statistics"]
+    assert response["term_vectors"]["title"]["terms"]
+    assert_equal %w[author logging of the], response["term_vectors"]["title"]["terms"].keys
+  end
 
-      response = @docs.termvectors :type => "doc2", :id => 1, :fields => "title"
+  it "provides access to term vector statistics with .termvectors" do
+    populate!
 
-      assert response["term_vectors"]["title"]
-      assert response["term_vectors"]["title"]["field_statistics"]
-      assert response["term_vectors"]["title"]["terms"]
-      assert_equal %w[author logging of the], response["term_vectors"]["title"]["terms"].keys
-    end
+    response = @docs.termvectors :type => "doc2", :id => 1, :fields => "title"
 
-    it "provides access to term vector statistics with .term_vector" do
-      populate!
+    assert response["term_vectors"]["title"]
+    assert response["term_vectors"]["title"]["field_statistics"]
+    assert response["term_vectors"]["title"]["terms"]
+    assert_equal %w[author logging of the], response["term_vectors"]["title"]["terms"].keys
+  end
 
-      response = @docs.term_vector :type => "doc2", :id => 1, :fields => "title"
+  it "provides access to term vector statistics with .term_vector" do
+    populate!
 
-      assert response["term_vectors"]["title"]
-      assert response["term_vectors"]["title"]["field_statistics"]
-      assert response["term_vectors"]["title"]["terms"]
-      assert_equal %w[author logging of the], response["term_vectors"]["title"]["terms"].keys
-    end
+    response = @docs.term_vector :type => "doc2", :id => 1, :fields => "title"
 
-    it "provides access to term vector statistics with .term_vectors" do
-      populate!
+    assert response["term_vectors"]["title"]
+    assert response["term_vectors"]["title"]["field_statistics"]
+    assert response["term_vectors"]["title"]["terms"]
+    assert_equal %w[author logging of the], response["term_vectors"]["title"]["terms"].keys
+  end
 
-      response = @docs.term_vectors :type => "doc2", :id => 1, :fields => "title"
+  it "provides access to term vector statistics with .term_vectors" do
+    populate!
 
-      assert response["term_vectors"]["title"]
-      assert response["term_vectors"]["title"]["field_statistics"]
-      assert response["term_vectors"]["title"]["terms"]
-      assert_equal %w[author logging of the], response["term_vectors"]["title"]["terms"].keys
-    end
+    response = @docs.term_vectors :type => "doc2", :id => 1, :fields => "title"
 
-    it "provides access to multi term vector statistics" do
-      populate!
+    assert response["term_vectors"]["title"]
+    assert response["term_vectors"]["title"]["field_statistics"]
+    assert response["term_vectors"]["title"]["terms"]
+    assert_equal %w[author logging of the], response["term_vectors"]["title"]["terms"].keys
+  end
 
-      response = @docs.multi_termvectors({:ids => [1, 2]}, :type => "doc2", :fields => "title", :term_statistics => true)
-      docs = response["docs"]
+  it "provides access to multi term vector statistics" do
+    populate!
 
-      assert docs
-      assert_equal(%w[1 2], docs.map { |h| h["_id"] }.sort)
-    end
+    response = @docs.multi_termvectors({:ids => [1, 2]}, :type => "doc2", :fields => "title", :term_statistics => true)
+    docs = response["docs"]
 
-    it "provides access to multi term vector statistics with .multi_term_vectors" do
-      populate!
+    assert docs
+    assert_equal(%w[1 2], docs.map { |h| h["_id"] }.sort)
+  end
 
-      response = @docs.multi_term_vectors({:ids => [1, 2]}, :type => "doc2", :fields => "title", :term_statistics => true)
-      docs = response["docs"]
+  it "provides access to multi term vector statistics with .multi_term_vectors" do
+    populate!
 
-      assert docs
-      assert_equal(%w[1 2], docs.map { |h| h["_id"] }.sort)
-    end
+    response = @docs.multi_term_vectors({:ids => [1, 2]}, :type => "doc2", :fields => "title", :term_statistics => true)
+    docs = response["docs"]
 
-    it "percolates a given document" do
-      populate!
+    assert docs
+    assert_equal(%w[1 2], docs.map { |h| h["_id"] }.sort)
+  end
 
-      percolator1 = @index.percolator "1"
-      response = percolator1.create :query => { :match => { :author => "pea53" } }
-      assert response["created"], "Couldn't create the percolator query"
-      percolator2 = @index.percolator "2"
-      response = percolator2.create :query => { :match => { :author => "defunkt" } }
-      assert response["created"], "Couldn't create the percolator query"
+  it "percolates a given document" do
+    populate!
 
-      response = @index.docs("doc1").percolate(:doc => { :author => "pea53" })
-      assert_equal 1, response["matches"].length
-      assert_equal "1", response["matches"][0]["_id"]
-    end
+    percolator1 = @index.percolator "1"
+    response = percolator1.create :query => { :match => { :author => "pea53" } }
+    assert response["created"], "Couldn't create the percolator query"
+    percolator2 = @index.percolator "2"
+    response = percolator2.create :query => { :match => { :author => "defunkt" } }
+    assert response["created"], "Couldn't create the percolator query"
 
-    it "percolates an existing document" do
-      populate!
+    response = @index.docs("doc1").percolate(:doc => { :author => "pea53" })
+    assert_equal 1, response["matches"].length
+    assert_equal "1", response["matches"][0]["_id"]
+  end
 
-      percolator1 = @index.percolator "1"
-      response = percolator1.create :query => { :match => { :author => "pea53" } }
-      assert response["created"], "Couldn't create the percolator query"
-      percolator2 = @index.percolator "2"
-      response = percolator2.create :query => { :match => { :author => "defunkt" } }
-      assert response["created"], "Couldn't create the percolator query"
+  it "percolates an existing document" do
+    populate!
 
-      response = @index.docs("doc2").percolate(nil, :id => "1")
-      assert_equal 1, response["matches"].length
-      assert_equal "1", response["matches"][0]["_id"]
-    end
+    percolator1 = @index.percolator "1"
+    response = percolator1.create :query => { :match => { :author => "pea53" } }
+    assert response["created"], "Couldn't create the percolator query"
+    percolator2 = @index.percolator "2"
+    response = percolator2.create :query => { :match => { :author => "defunkt" } }
+    assert response["created"], "Couldn't create the percolator query"
 
-    it "counts the matches for percolating a given document" do
-      populate!
+    response = @index.docs("doc2").percolate(nil, :id => "1")
+    assert_equal 1, response["matches"].length
+    assert_equal "1", response["matches"][0]["_id"]
+  end
 
-      percolator1 = @index.percolator "1"
-      response = percolator1.create :query => { :match => { :author => "pea53" } }
-      assert response["created"], "Couldn't create the percolator query"
-      percolator2 = @index.percolator "2"
-      response = percolator2.create :query => { :match => { :author => "defunkt" } }
-      assert response["created"], "Couldn't create the percolator query"
+  it "counts the matches for percolating a given document" do
+    populate!
 
-      count = @index.docs("doc1").percolate_count :doc => { :author => "pea53" }
-      assert_equal 1, count
-    end
+    percolator1 = @index.percolator "1"
+    response = percolator1.create :query => { :match => { :author => "pea53" } }
+    assert response["created"], "Couldn't create the percolator query"
+    percolator2 = @index.percolator "2"
+    response = percolator2.create :query => { :match => { :author => "defunkt" } }
+    assert response["created"], "Couldn't create the percolator query"
 
-    it "counts the matches for percolating an existing document" do
-      populate!
+    count = @index.docs("doc1").percolate_count :doc => { :author => "pea53" }
+    assert_equal 1, count
+  end
 
-      percolator1 = @index.percolator "1"
-      response = percolator1.create :query => { :match => { :author => "pea53" } }
-      assert response["created"], "Couldn't create the percolator query"
-      percolator2 = @index.percolator "2"
-      response = percolator2.create :query => { :match => { :author => "defunkt" } }
-      assert response["created"], "Couldn't create the percolator query"
+  it "counts the matches for percolating an existing document" do
+    populate!
 
-      count = @index.docs("doc2").percolate_count(nil, :id => "1")
-      assert_equal 1, count
-    end
+    percolator1 = @index.percolator "1"
+    response = percolator1.create :query => { :match => { :author => "pea53" } }
+    assert response["created"], "Couldn't create the percolator query"
+    percolator2 = @index.percolator "2"
+    response = percolator2.create :query => { :match => { :author => "defunkt" } }
+    assert response["created"], "Couldn't create the percolator query"
 
-    it "performs multi percolate queries" do
-      @index.percolator("1").create :query => { :match_all => { } }
-      @index.percolator("2").create :query => { :match => { :author => "pea53" } }
+    count = @index.docs("doc2").percolate_count(nil, :id => "1")
+    assert_equal 1, count
+  end
 
-      h = @index.docs("doc2").multi_percolate do |m|
-        m.percolate :author => "pea53"
-        m.percolate :author => "grantr"
-        m.count({}, { :author => "grantr" })
-      end
+  it "performs multi percolate queries" do
+    @index.percolator("1").create :query => { :match_all => { } }
+    @index.percolator("2").create :query => { :match => { :author => "pea53" } }
 
-      response1, response2, response3 = h["responses"]
-      assert_equal ["1", "2"], response1["matches"].map { |match| match["_id"] }.sort
-      assert_equal ["1"], response2["matches"].map { |match| match["_id"] }.sort
-      assert_equal 1, response3["total"]
+    h = @index.docs("doc2").multi_percolate do |m|
+      m.percolate :author => "pea53"
+      m.percolate :author => "grantr"
+      m.count({}, { :author => "grantr" })
     end
+
+    response1, response2, response3 = h["responses"]
+    assert_equal ["1", "2"], response1["matches"].map { |match| match["_id"] }.sort
+    assert_equal ["1"], response2["matches"].map { |match| match["_id"] }.sort
+    assert_equal 1, response3["total"]
   end
 
   # Create/index multiple documents.

data/test/client/errors_test.rb

@@ -15,6 +15,29 @@ describe Elastomer::Client::Error do
     response = Faraday::Response.new(:body => {"error" => "IndexMissingException"})
     err = Elastomer::Client::Error.new(response)
     assert_equal "IndexMissingException", err.message
+    assert_equal "IndexMissingException", err.error
+
+    body = {
+      "error" => {
+        "index"         => "non-existent-index",
+        "reason"        => "no such index",
+        "resource.id"   => "non-existent-index",
+        "resource.type" => "index_or_alias",
+        "root_cause"=> [{
+          "index"         => "non-existent-index",
+          "reason"        => "no such index",
+          "resource.id"   => "non-existent-index",
+          "resource.type" => "index_or_alias",
+          "type"          => "index_not_found_exception"
+        }],
+       "type" => "index_not_found_exception"
+      },
+     "status" => 404
+    }
+    response = Faraday::Response.new(:body => body)
+    err = Elastomer::Client::Error.new(response)
+    assert_equal body["error"].to_s, err.message
+    assert_equal body["error"], err.error
   end
 
   it "is instantiated from another exception" do

data/test/client/index_test.rb

@@ -35,38 +35,16 @@ describe Elastomer::Client::Index do
       @index.create :settings => { :number_of_shards => 3, :number_of_replicas => 0 }
       settings = @index.get_settings[@name]["settings"]
 
-      # COMPATIBILITY
-      # ES 1.0 changed the default return format of index settings to always
-      # expand nested properties, e.g.
-      # {"index.number_of_replicas": "1"} changed to
-      # {"index": {"number_of_replicas":"1"}}
-
-      # To support both versions, we check for either return format.
-      value = settings["index.number_of_shards"] ||
-              settings["index"]["number_of_shards"]
-      assert_equal "3", value
-      value = settings["index.number_of_replicas"] ||
-              settings["index"]["number_of_replicas"]
-      assert_equal "0", value
+      assert_equal "3", settings["index"]["number_of_shards"]
+      assert_equal "0", settings["index"]["number_of_replicas"]
     end
 
     it "creates an index with settings with .settings" do
       @index.create :settings => { :number_of_shards => 3, :number_of_replicas => 0 }
       settings = @index.settings[@name]["settings"]
 
-      # COMPATIBILITY
-      # ES 1.0 changed the default return format of index settings to always
-      # expand nested properties, e.g.
-      # {"index.number_of_replicas": "1"} changed to
-      # {"index": {"number_of_replicas":"1"}}
-
-      # To support both versions, we check for either return format.
-      value = settings["index.number_of_shards"] ||
-              settings["index"]["number_of_shards"]
-      assert_equal "3", value
-      value = settings["index.number_of_replicas"] ||
-              settings["index"]["number_of_replicas"]
-      assert_equal "0", value
+      assert_equal "3", settings["index"]["number_of_shards"]
+      assert_equal "0", settings["index"]["number_of_replicas"]
     end
 
     it "adds mappings for document types" do
@@ -201,13 +179,22 @@ describe Elastomer::Client::Index do
     assert_mapping_exists @index.mapping[@name], "doco"
 
     response = @index.delete_mapping "doco"
-    assert_acknowledged response
 
-    mapping = @index.get_mapping
-    mapping = mapping[@name] if mapping.key? @name
-    mapping = mapping["mappings"] if mapping.key? "mappings"
+    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"
 
-    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
@@ -246,48 +233,45 @@ describe Elastomer::Client::Index do
     end
   end
 
-  # COMPATIBILITY ES 1.x removed English stopwords from the default analyzers,
-  # so create a custom one with the English stopwords added.
-  if es_version_1_x?
-    it "analyzes text and returns tokens" do
-      tokens = @index.analyze "Just a few words to analyze.", :analyzer => "standard", :index => nil
-      tokens = tokens["tokens"].map { |h| h["token"] }
-      assert_equal %w[just a few words to analyze], tokens
+  it "analyzes text and returns tokens" do
+    tokens = @index.analyze "Just a few words to analyze.", :analyzer => "standard", :index => nil
+    tokens = tokens["tokens"].map { |h| h["token"] }
+    assert_equal %w[just a few words to analyze], tokens
 
-      @index.create(
-        :settings => {
-          :number_of_shards => 1,
-          :number_of_replicas => 0,
-          :analysis => {
-            :analyzer => {
-              :english_standard => {
-                :type => :standard,
-                :stopwords => "_english_"
-              }
+    @index.create(
+      :settings => {
+        :number_of_shards => 1,
+        :number_of_replicas => 0,
+        :analysis => {
+          :analyzer => {
+            :english_standard => {
+              :type => :standard,
+              :stopwords => "_english_"
             }
           }
         }
-      )
-      wait_for_index(@name)
+      }
+    )
+    wait_for_index(@name)
 
-      tokens = @index.analyze "Just a few words to analyze.", :analyzer => "english_standard"
-      tokens = tokens["tokens"].map { |h| h["token"] }
-      assert_equal %w[just few words analyze], tokens
-    end
-  else
-    it "analyzes text and returns tokens" do
-      tokens = @index.analyze "Just a few words to analyze.", :index => nil
-      tokens = tokens["tokens"].map { |h| h["token"] }
-      assert_equal %w[just few words analyze], tokens
-
-      tokens = @index.analyze "Just a few words to analyze.", :analyzer => "simple", :index => nil
-      tokens = tokens["tokens"].map { |h| h["token"] }
-      assert_equal %w[just a few words to analyze], tokens
-    end
+    tokens = @index.analyze "Just a few words to analyze.", :analyzer => "english_standard"
+    tokens = tokens["tokens"].map { |h| h["token"] }
+    assert_equal %w[just few words analyze], tokens
   end
 
   describe "when an index exists" do
     before do
+      suggest = {
+        :type            => "completion",
+        :index_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 => {
@@ -297,12 +281,7 @@ describe Elastomer::Client::Index do
             :properties => {
               :title   => { :type => "string", :analyzer => "standard" },
               :author  => { :type => "string", :index => "not_analyzed" },
-              :suggest => {
-                :type            => "completion",
-                :index_analyzer  => "simple",
-                :search_analyzer => "simple",
-                :payloads        => false
-              }
+              :suggest => suggest
             }
           }
         }
@@ -349,11 +328,9 @@ describe Elastomer::Client::Index do
       end
     end
 
-    if es_version_1_x?
-      it "recovery" do
-        response = @index.recovery
-        assert_includes response, "elastomer-index-test"
-      end
+    it "recovery" do
+      response = @index.recovery
+      assert_includes response, "elastomer-index-test"
     end
 
     it "clears caches" do
@@ -370,9 +347,12 @@ describe Elastomer::Client::Index do
       end
     end
 
-    it "gets status" do
-      response = @index.status
-      assert_includes response["indices"], "elastomer-index-test"
+    # 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

data/test/client/multi_search_test.rb

@@ -40,7 +40,7 @@ describe Elastomer::Client::MultiSearch do
     populate!
 
     body = [
-      '{"index" : "elastomer-msearch-test", "search_type" : "count"}',
+      '{"index" : "elastomer-msearch-test", "size" : 0}',
       '{"query" : {"match_all" : {}}}',
       '{"index" : "elastomer-msearch-test", "type": "doc2"}',
       '{"query" : {"match": {"author" : "grantr"}}}',
@@ -69,7 +69,7 @@ describe Elastomer::Client::MultiSearch do
     populate!
 
     body = [
-      '{"index" : "elastomer-msearch-test", "search_type" : "count"}',
+      '{"index" : "elastomer-msearch-test", "size" : 0}',
       '{"query" : {"match_all" : {}}}',
       '{"index" : "elastomer-msearch-test", "type": "doc2"}',
       '{"query" : {"match": {"author" : "grantr"}}}',
@@ -98,7 +98,7 @@ describe Elastomer::Client::MultiSearch do
     populate!
 
     h = $client.multi_search do |m|
-      m.search({:query => { :match_all => {}}}, :index => @name, :search_type => :count)
+      m.search({:query => { :match_all => {}}}, :index => @name, :size => 0)
       m.search({:query => { :match => { "title" => "author" }}}, :index => @name, :type => "doc2")
     end
 
@@ -108,7 +108,7 @@ describe Elastomer::Client::MultiSearch do
     assert_equal 2, response2["hits"]["total"]
 
     h = @index.multi_search do |m|
-      m.search({:query => { :match_all => {}}}, :search_type => :count)
+      m.search({:query => { :match_all => {}}}, :size => 0)
       m.search({:query => { :match => { "title" => "author" }}}, :type => "doc2")
     end
 
@@ -118,7 +118,7 @@ describe Elastomer::Client::MultiSearch do
     assert_equal 2, response2["hits"]["total"]
 
     h = @index.docs("doc1").multi_search do |m|
-      m.search({:query => { :match_all => {}}}, :search_type => :count)
+      m.search({:query => { :match_all => {}}}, :size => 0)
       m.search({:query => { :match => { "title" => "logging" }}}, :type => "doc2")
     end
 

data/test/client/percolator_test.rb

@@ -46,7 +46,7 @@ describe Elastomer::Client::Percolator do
     end
 
     it "cannot delete all percolators by providing a nil id" do
-      assert_raises(ArgumentError) { percolator = @index.percolator nil }
+      assert_raises(ArgumentError) { @index.percolator nil }
     end
   end
 end

data/test/client/repository_test.rb

@@ -100,7 +100,7 @@ describe Elastomer::Client::Repository do
         response = repo.snapshot.get
         assert_equal ["test-snapshot"], response["snapshots"].collect { |info| info["snapshot"] }
 
-        snapshot2 = create_snapshot(repo, "test-snapshot2")
+        create_snapshot(repo, "test-snapshot2")
         response  = repo.snapshots.get
         snapshot_names = response["snapshots"].collect { |info| info["snapshot"] }
         assert_includes snapshot_names, "test-snapshot"

data/test/client/template_test.rb

@@ -33,7 +33,15 @@ describe Elastomer::Client::Cluster do
     template = @template.get
     assert_equal [@name], template.keys
     assert_equal "test-elastomer*", template[@name]["template"]
-    assert_equal "3", template[@name]["settings"]["index.number_of_shards"]
-  end
 
+    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
+  end
 end

data/test/client/warmer_test.rb

@@ -50,7 +50,7 @@ describe Elastomer::Client::Warmer do
     assert_equal false, @index.warmer("test1").exists?
     assert_equal false, @index.warmer("test1").exist?
 
-    h = @index.warmer("test1").create(:query => { :match_all => {}})
+    @index.warmer("test1").create(:query => { :match_all => {}})
     assert_equal true, @index.warmer("test1").exists?
   end
 end

data/test/client_test.rb

@@ -28,7 +28,13 @@ 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
-      assert_equal "IndexMissingException[[non-existent-index] missing]", err.message
+      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
     end
   end
 
@@ -140,11 +146,12 @@ describe Elastomer::Client do
     it "gets cluster info" do
       h = $client.info
       assert h.key?("name"), "expected cluster name to be returned"
-      assert h.key?("status"), "expected cluster info status to be returned"
+      assert h.key?("version"), "expected cluster version information to be returned"
+      assert h["version"].key?("number"), "expected cluster version number to be returned"
     end
 
     it "gets cluster version" do
-      assert_match /[\d\.]+/, $client.version
+      assert_match(/[\d\.]+/, $client.version)
     end
 
     it "gets semantic version" do

data/test/test_helper.rb

@@ -90,7 +90,18 @@ end
 #
 # Returns true if Elasticsearch version is 1.x.
 def es_version_1_x?
-  $client.semantic_version >= "1.0.0"
+  $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.
+#
+# Returns true if Elasticsearch version is 2.x.
+def es_version_2_x?
+  $client.semantic_version >= "2.0.0" &&
+  $client.semantic_version <  "3.0.0"
 end
 
 # Elasticsearch 1.4 changed the response body for interacting with index
@@ -135,7 +146,7 @@ def run_snapshot_tests?
     begin
       create_repo("elastomer-client-snapshot-test")
       $run_snapshot_tests = true
-    rescue Elastomer::Client::Error => e
+    rescue Elastomer::Client::Error
       puts "Could not create a snapshot repo. Snapshot tests will be disabled."
       puts "To enable snapshot tests, add a path.repo setting to your elasticsearch.yml file."
       $run_snapshot_tests = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastomer-client
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Tim Pease
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -267,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: A library for interacting with Elasticsearch