opensearch-api 1.0.0 → 2.2.0

data/lib/opensearch/api/actions/snapshot/create.rb

@@ -32,7 +32,8 @@ module OpenSearch
         #
         # @option arguments [String] :repository A repository name
         # @option arguments [String] :snapshot A snapshot name
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
+        # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
         # @option arguments [Boolean] :wait_for_completion Should this request wait until the operation has completed before returning
         # @option arguments [Hash] :headers Custom HTTP headers
         # @option arguments [Hash] :body The snapshot definition
@@ -63,6 +64,7 @@ module OpenSearch
         # @since 6.2.0
         ParamsRegistry.register(:create, [
           :master_timeout,
+          :cluster_manager_timeout,
           :wait_for_completion
         ].freeze)
       end

data/lib/opensearch/api/actions/snapshot/create_repository.rb

@@ -31,7 +31,8 @@ module OpenSearch
         # Creates a repository.
         #
         # @option arguments [String] :repository A repository name
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
+        # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
         # @option arguments [Time] :timeout Explicit operation timeout
         # @option arguments [Boolean] :verify Whether to verify the repository after creation
         # @option arguments [Hash] :headers Custom HTTP headers
@@ -61,6 +62,7 @@ module OpenSearch
         # @since 6.2.0
         ParamsRegistry.register(:create_repository, [
           :master_timeout,
+          :cluster_manager_timeout,
           :timeout,
           :verify
         ].freeze)

data/lib/opensearch/api/actions/snapshot/delete.rb

@@ -32,7 +32,8 @@ module OpenSearch
         #
         # @option arguments [String] :repository A repository name
         # @option arguments [String] :snapshot A snapshot name
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
+        # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
         # @option arguments [Hash] :headers Custom HTTP headers
         #
         #
@@ -64,7 +65,8 @@ module OpenSearch
         #
         # @since 6.2.0
         ParamsRegistry.register(:delete, [
-          :master_timeout
+          :master_timeout,
+          :cluster_manager_timeout
         ].freeze)
       end
     end

data/lib/opensearch/api/actions/snapshot/delete_repository.rb

@@ -31,7 +31,8 @@ module OpenSearch
         # Deletes a repository.
         #
         # @option arguments [List] :repository Name of the snapshot repository to unregister. Wildcard (`*`) patterns are supported.
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
+        # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
         # @option arguments [Time] :timeout Explicit operation timeout
         # @option arguments [Hash] :headers Custom HTTP headers
         #
@@ -62,6 +63,7 @@ module OpenSearch
         # @since 6.2.0
         ParamsRegistry.register(:delete_repository, [
           :master_timeout,
+          :cluster_manager_timeout,
           :timeout
         ].freeze)
       end

data/lib/opensearch/api/actions/snapshot/get.rb

@@ -32,7 +32,8 @@ module OpenSearch
         #
         # @option arguments [String] :repository A repository name
         # @option arguments [List] :snapshot A comma-separated list of snapshot names
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
+        # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
         # @option arguments [Boolean] :ignore_unavailable Whether to ignore unavailable snapshots, defaults to false which means a SnapshotMissingException is thrown
         # @option arguments [Boolean] :index_details Whether to include details of each index in the snapshot, if those details are available. Defaults to false.
         # @option arguments [Boolean] :include_repository Whether to include the repository name in the snapshot info. Defaults to true.
@@ -69,6 +70,7 @@ module OpenSearch
         # @since 6.2.0
         ParamsRegistry.register(:get, [
           :master_timeout,
+          :cluster_manager_timeout,
           :ignore_unavailable,
           :index_details,
           :include_repository,

data/lib/opensearch/api/actions/snapshot/get_features.rb

@@ -30,7 +30,8 @@ module OpenSearch
       module Actions
         # Returns a list of features which can be snapshotted in this cluster.
         #
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
+        # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
         # @option arguments [Hash] :headers Custom HTTP headers
         #
         #
@@ -51,7 +52,8 @@ module OpenSearch
         #
         # @since 6.2.0
         ParamsRegistry.register(:get_features, [
-          :master_timeout
+          :master_timeout,
+          :cluster_manager_timeout
         ].freeze)
       end
     end

data/lib/opensearch/api/actions/snapshot/get_repository.rb

@@ -31,8 +31,8 @@ module OpenSearch
         # Returns information about a repository.
         #
         # @option arguments [List] :repository A comma-separated list of repository names
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
-        # @option arguments [Boolean] :local Return local information, do not retrieve the state from master node (default: false)
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to cluster_manager node
+        # @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false)
         # @option arguments [Hash] :headers Custom HTTP headers
         #
         #
@@ -64,6 +64,7 @@ module OpenSearch
         # @since 6.2.0
         ParamsRegistry.register(:get_repository, [
           :master_timeout,
+          :cluster_manager_timeout,
           :local
         ].freeze)
       end

data/lib/opensearch/api/actions/snapshot/restore.rb

@@ -32,7 +32,8 @@ module OpenSearch
         #
         # @option arguments [String] :repository A repository name
         # @option arguments [String] :snapshot A snapshot name
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
+        # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
         # @option arguments [Boolean] :wait_for_completion Should this request wait until the operation has completed before returning
         # @option arguments [Hash] :headers Custom HTTP headers
         # @option arguments [Hash] :body Details of what to restore
@@ -63,6 +64,7 @@ module OpenSearch
         # @since 6.2.0
         ParamsRegistry.register(:restore, [
           :master_timeout,
+          :cluster_manager_timeout,
           :wait_for_completion
         ].freeze)
       end

data/lib/opensearch/api/actions/snapshot/status.rb

@@ -32,7 +32,8 @@ module OpenSearch
         #
         # @option arguments [String] :repository A repository name
         # @option arguments [List] :snapshot A comma-separated list of snapshot names
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
+        # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
         # @option arguments [Boolean] :ignore_unavailable Whether to ignore unavailable snapshots, defaults to false which means a SnapshotMissingException is thrown
         # @option arguments [Hash] :headers Custom HTTP headers
         #
@@ -69,6 +70,7 @@ module OpenSearch
         # @since 6.2.0
         ParamsRegistry.register(:status, [
           :master_timeout,
+          :cluster_manager_timeout,
           :ignore_unavailable
         ].freeze)
       end

data/lib/opensearch/api/actions/snapshot/verify_repository.rb

@@ -31,7 +31,8 @@ module OpenSearch
         # Verifies a repository.
         #
         # @option arguments [String] :repository A repository name
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
+        # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
         # @option arguments [Time] :timeout Explicit operation timeout
         # @option arguments [Hash] :headers Custom HTTP headers
         #
@@ -58,6 +59,7 @@ module OpenSearch
         # @since 6.2.0
         ParamsRegistry.register(:verify_repository, [
           :master_timeout,
+          :cluster_manager_timeout,
           :timeout
         ].freeze)
       end

data/lib/opensearch/api/actions/termvectors.rb

@@ -31,7 +31,6 @@ module OpenSearch
       #
       # @option arguments [String] :index The index in which the document resides. (*Required*)
       # @option arguments [String] :id The id of the document, when not specified a doc param should be supplied.
-      # @option arguments [String] :type The type of the document.
       # @option arguments [Boolean] :term_statistics Specifies if total term frequency and document frequency should be returned.
       # @option arguments [Boolean] :field_statistics Specifies if document count, sum of document frequencies and sum of total term frequencies should be returned.
       # @option arguments [List] :fields A comma-separated list of fields to return.
@@ -63,8 +62,6 @@ module OpenSearch
 
         _id = arguments.delete(:id)
 
-        _type = arguments.delete(:type)
-
         method = if arguments[:body]
                    OpenSearch::API::HTTP_POST
                  else
@@ -72,11 +69,7 @@ module OpenSearch
                  end
 
         endpoint = arguments.delete(:endpoint) || '_termvectors'
-        path = if _index && _type && _id
-                 "#{Utils.__listify(_index)}/#{Utils.__listify(_type)}/#{Utils.__listify(_id)}/#{endpoint}"
-               elsif _index && _type
-                 "#{Utils.__listify(_index)}/#{Utils.__listify(_type)}/#{endpoint}"
-               elsif _index && _id
+        path = if _index && _id
                  "#{Utils.__listify(_index)}/#{endpoint}/#{Utils.__listify(_id)}"
                else
                  "#{Utils.__listify(_index)}/#{endpoint}"

data/lib/opensearch/api/actions/update.rb

@@ -31,7 +31,6 @@ module OpenSearch
       #
       # @option arguments [String] :id Document ID
       # @option arguments [String] :index The name of the index
-      # @option arguments [String] :type The type of the document *Deprecated*
       # @option arguments [String] :wait_for_active_shards Sets the number of shard copies that must be active before proceeding with the update operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)
       # @option arguments [List] :_source True or false to return the _source field or not, or a list of fields to return
       # @option arguments [List] :_source_excludes A list of fields to exclude from the returned _source field
@@ -66,14 +65,8 @@ module OpenSearch
 
         _index = arguments.delete(:index)
 
-        _type = arguments.delete(:type)
-
         method = OpenSearch::API::HTTP_POST
-        path   = if _index && _type && _id
-                   "#{Utils.__listify(_index)}/#{Utils.__listify(_type)}/#{Utils.__listify(_id)}/_update"
-                 else
-                   "#{Utils.__listify(_index)}/_update/#{Utils.__listify(_id)}"
-                 end
+        path   = "#{Utils.__listify(_index)}/_update/#{Utils.__listify(_id)}"
         params = Utils.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
 
         body = arguments[:body]

data/lib/opensearch/api/actions/update_by_query.rb

@@ -31,7 +31,6 @@ module OpenSearch
       # for example to pick up a mapping change.
       #
       # @option arguments [List] :index A comma-separated list of index names to search; use `_all` or empty string to perform the operation on all indices (*Required*)
-      # @option arguments [List] :type A comma-separated list of document types to search; leave empty to perform the operation on all types
       # @option arguments [String] :analyzer The analyzer to use for the query string
       # @option arguments [Boolean] :analyze_wildcard Specify whether wildcard and prefix queries should be analyzed (default: false)
       # @option arguments [String] :default_operator The default operator for query string query (AND or OR) (options: AND, OR)
@@ -85,14 +84,8 @@ module OpenSearch
 
         _index = arguments.delete(:index)
 
-        _type = arguments.delete(:type)
-
         method = OpenSearch::API::HTTP_POST
-        path   = if _index && _type
-                   "#{Utils.__listify(_index)}/#{Utils.__listify(_type)}/_update_by_query"
-                 else
-                   "#{Utils.__listify(_index)}/_update_by_query"
-                 end
+        path   = "#{Utils.__listify(_index)}/_update_by_query"
         params = Utils.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
 
         body = arguments[:body]

data/lib/opensearch/api/utils.rb

@@ -40,7 +40,7 @@ module OpenSearch
       # @api private
       def __escape(string)
         return string if string == '*'
-        defined?(EscapeUtils) ? EscapeUtils.escape_url(string.to_s) : CGI.escape(string.to_s)
+        CGI.escape(string.to_s)
       end
 
       # Create a "list" of values from arguments, ignoring nil values and encoding special characters.
@@ -97,13 +97,13 @@ module OpenSearch
       # in a single item.
       #
       #     OpenSearch::API::Utils.__bulkify [
-      #       { :index =>  { :_index => 'myindexA', :_type => 'mytype', :_id => '1', :data => { :title => 'Test' } } },
-      #       { :update => { :_index => 'myindexB', :_type => 'mytype', :_id => '2', :data => { :doc => { :title => 'Update' } } } }
+      #       { :index =>  { :_index => 'myindexA', :_id => '1', :data => { :title => 'Test' } } },
+      #       { :update => { :_index => 'myindexB', :_id => '2', :data => { :doc => { :title => 'Update' } } } }
       #     ]
       #
-      #     # => {"index":{"_index":"myindexA","_type":"mytype","_id":"1"}}
+      #     # => {"index":{"_index":"myindexA","_id":"1"}}
       #     # => {"title":"Test"}
-      #     # => {"update":{"_index":"myindexB","_type":"mytype","_id":"2"}}
+      #     # => {"update":{"_index":"myindexB","_id":"2"}}
       #     # => {"doc":{"title":"Update"}}
       #
       def __bulkify(payload)

data/lib/opensearch/api/version.rb

@@ -26,6 +26,6 @@
 
 module OpenSearch
   module API
-    VERSION = '1.0.0'.freeze
+    VERSION = '2.2.0'.freeze
   end
 end

data/lib/opensearch/api.rb

@@ -42,7 +42,7 @@ module OpenSearch
 
     COMMON_PARAMS = [
       :ignore,                        # Client specific parameters
-      :index, :type, :id,             # :index/:type/:id
+      :index, :id,                    # :index/:id
       :body,                          # Request body
       :node_id,                       # Cluster
       :name,                          # Alias, template, settings, warmer, ...

data/opensearch-api.gemspec

@@ -64,7 +64,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'ansi'
   s.add_development_dependency 'bundler'
-  s.add_development_dependency 'opensearch'
+  s.add_development_dependency 'opensearch-ruby', '~> 2'
   s.add_development_dependency 'opensearch-transport'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'minitest-reporters'
@@ -79,7 +79,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'hashie'
 
   s.add_development_dependency 'cane'
-  s.add_development_dependency 'escape_utils' unless defined? JRUBY_VERSION
   s.add_development_dependency 'jbuilder'
   s.add_development_dependency 'require-prof' unless defined?(JRUBY_VERSION) || defined?(Rubinius)
   s.add_development_dependency 'simplecov'
@@ -87,6 +86,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'ruby-prof' unless defined?(JRUBY_VERSION) || defined?(Rubinius)
 
   s.description = <<-DESC.gsub(/^    /, '')
-    Ruby API for OpenSearch. See the `opensearch` gem for full integration.
+    Ruby API for OpenSearch. See the `opensearch-ruby` gem for full integration.
   DESC
 end

data/spec/opensearch/api/actions/bulk_spec.rb

@@ -47,22 +47,22 @@ describe 'client#bulk' do
 
     let(:body) do
       <<-PAYLOAD.gsub(/^\s+/, '')
-        {"index":{"_index":"myindexA","_type":"mytype","_id":"1"}}
+        {"index":{"_index":"myindexA","_id":"1"}}
         {"title":"Test"}
-        {"update":{"_index":"myindexB","_type":"mytype","_id":"2"}}
+        {"update":{"_index":"myindexB","_id":"2"}}
         {"doc":{"title":"Update"}}
-        {"delete":{"_index":"myindexC","_type":"mytypeC","_id":"3"}}
-        {"index":{"_index":"myindexD","_type":"mytype","_id":"1"}}
+        {"delete":{"_index":"myindexC","_id":"3"}}
+        {"index":{"_index":"myindexD","_id":"1"}}
         {"data":"MYDATA"}
       PAYLOAD
     end
 
     it 'performs the request' do
       expect(client_double.bulk(:body => [
-          { :index =>  { :_index => 'myindexA', :_type => 'mytype', :_id => '1', :data => { :title => 'Test' } } },
-          { :update => { :_index => 'myindexB', :_type => 'mytype', :_id => '2', :data => { :doc => { :title => 'Update' } } } },
-          { :delete => { :_index => 'myindexC', :_type => 'mytypeC', :_id => '3' } },
-          { :index =>  { :_index => 'myindexD', :_type => 'mytype', :_id => '1', :data => { :data => 'MYDATA' } } },
+          { :index =>  { :_index => 'myindexA', :_id => '1', :data => { :title => 'Test' } } },
+          { :update => { :_index => 'myindexB', :_id => '2', :data => { :doc => { :title => 'Update' } } } },
+          { :delete => { :_index => 'myindexC', :_id => '3' } },
+          { :index =>  { :_index => 'myindexD', :_id => '1', :data => { :data => 'MYDATA' } } },
       ])).to eq({})
     end
   end
@@ -80,13 +80,13 @@ describe 'client#bulk' do
 
     let(:body) do
       <<-PAYLOAD.gsub(/^\s+/, '')
-        {"update":{"_index":"myindex","_type":"mytype","_id":"1"}}
+        {"update":{"_index":"myindex","_id":"1"}}
         {"doc":{"data":{"title":"Update"}}}
       PAYLOAD
     end
 
     it 'performs the request' do
-      expect(client_double.bulk(body:[ { :update => { :_index => 'myindex', :_type => 'mytype', :_id => '1' } },
+      expect(client_double.bulk(body:[ { :update => { :_index => 'myindex', :_id => '1' } },
                                        { :doc => { :data => { :title => 'Update' } } } ])).to eq({})
     end
   end
@@ -134,15 +134,4 @@ describe 'client#bulk' do
       expect(client_double.bulk(index: 'foo^bar', body: [])).to eq({})
     end
   end
-
-  context 'when the type is provided' do
-
-    let(:url) do
-      'myindex/mytype/_bulk'
-    end
-
-    it 'performs the request' do
-      expect(client_double.bulk(index: 'myindex', type: 'mytype', body: [])).to eq({})
-    end
-  end
 end

data/spec/opensearch/api/actions/cat/all_pit_segments_spec.rb

@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# The OpenSearch Contributors require contributions made to
+# this file be licensed under the Apache-2.0 license or a
+# compatible open source license.
+#
+# Modifications Copyright OpenSearch Contributors. See
+# GitHub history for details.
+
+require 'spec_helper'
+
+describe 'client.cat#all_pit_segments' do
+
+  let(:expected_args) do
+    [
+      'GET',
+      '_cat/pit_segments/_all',
+      {},
+      nil,
+      {}
+    ]
+  end
+  let(:client) do
+    Class.new { include OpenSearch::API }.new
+  end
+
+  it 'does not accept unregistered params' do
+    expect {
+      client.cat.all_pit_segments(something: :else)
+    }.to raise_exception(ArgumentError)
+  end
+
+  it 'performs the request' do
+    expect(client_double.cat.all_pit_segments).to eq({})
+  end
+end

data/spec/opensearch/api/actions/cat/allocation_spec.rb

@@ -27,18 +27,17 @@
 require 'spec_helper'
 
 describe 'client.cat#allocation' do
-
   let(:expected_args) do
     [
-        'GET',
-        '_cat/allocation',
-        {},
-        nil,
-        {}
+      'GET',
+      '_cat/allocation',
+      {cluster_manager_timeout: 2},
+      nil,
+      {}
     ]
   end
 
   it 'performs the request' do
-    expect(client_double.cat.allocation).to eq({})
+    expect(client_double.cat.allocation(cluster_manager_timeout: 2)).to eq({})
   end
 end

data/spec/opensearch/api/actions/cat/cluster_manager_spec.rb

@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# The OpenSearch Contributors require contributions made to
+# this file be licensed under the Apache-2.0 license or a
+# compatible open source license.
+#
+# Modifications Copyright OpenSearch Contributors. See
+# GitHub history for details.
+
+require 'spec_helper'
+
+describe 'client.cat#cluster_manager' do
+  let(:expected_args) do
+    [
+      'GET',
+      '_cat/cluster_manager',
+      {},
+      nil,
+      {}
+    ]
+  end
+
+  it 'performs the request' do
+    expect(client_double.cat.cluster_manager).to eq({})
+  end
+end

data/spec/opensearch/api/actions/cat/pit_segments_spec.rb

@@ -0,0 +1,43 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# The OpenSearch Contributors require contributions made to
+# this file be licensed under the Apache-2.0 license or a
+# compatible open source license.
+#
+# Modifications Copyright OpenSearch Contributors. See
+# GitHub history for details.
+
+require 'spec_helper'
+
+describe 'client.cat#pit_segments' do
+
+  let(:expected_args) do
+    [
+      'GET',
+      '_cat/pit_segments',
+      {},
+      { pit_id: ['abc'] },
+      {}
+    ]
+  end
+
+  let(:client) do
+    Class.new { include OpenSearch::API }.new
+  end
+
+  it 'requires the :body argument' do
+    expect {
+      client.cat.pit_segments
+    }.to raise_exception(ArgumentError)
+  end
+
+  it 'does not accept unregistered params' do
+    expect {
+      client.cat.pit_segments(body: {}, something: :else)
+    }.to raise_exception(ArgumentError)
+  end
+
+  it 'performs the request' do
+    expect(client_double.cat.pit_segments(body: { pit_id: ['abc'] })).to eq({})
+  end
+end

data/spec/opensearch/api/actions/count_spec.rb

@@ -42,12 +42,12 @@ describe 'client#count' do
     expect(client_double.count).to eq({})
   end
 
-  context 'when an index and type are specified' do
+  context 'when an index is specified' do
 
     let(:expected_args) do
       [
         'POST',
-        'foo,bar/t1,t2/_count',
+        'foo,bar/_count',
         {},
         nil,
         {}
@@ -55,7 +55,7 @@ describe 'client#count' do
     end
 
     it 'performs the request' do
-      expect(client_double.count(index: ['foo','bar'], type: ['t1','t2'])).to eq({})
+      expect(client_double.count(index: ['foo','bar'])).to eq({})
     end
   end
 

data/spec/opensearch/api/actions/create_document_spec.rb

@@ -31,7 +31,7 @@ describe 'client#create_document' do
   let(:expected_args) do
     [
         'PUT',
-        'foo/bar/123',
+        'foo/_doc/123',
         { op_type: 'create' },
         { foo: 'bar' },
         {}
@@ -39,7 +39,7 @@ describe 'client#create_document' do
   end
 
   it 'performs the request' do
-    expect(client_double.create(index: 'foo', type: 'bar', id: '123', body: { foo: 'bar'})).to eq({})
+    expect(client_double.create(index: 'foo', id: '123', body: { foo: 'bar'})).to eq({})
   end
 
   context 'when the request needs to be URL-escaped' do
@@ -47,7 +47,7 @@ describe 'client#create_document' do
     let(:expected_args) do
       [
           'PUT',
-          'foo/bar%2Fbam/123',
+          'foo%5Ebar/_doc/123',
           { op_type: 'create' },
           {},
           {}
@@ -55,7 +55,7 @@ describe 'client#create_document' do
     end
 
     it 'performs the request' do
-      expect(client_double.create(index: 'foo', type: 'bar/bam', id: '123', body: {})).to eq({})
+      expect(client_double.create(index: 'foo^bar', id: '123', body: {})).to eq({})
     end
   end
 
@@ -64,7 +64,7 @@ describe 'client#create_document' do
     let(:expected_args) do
       [
           'PUT',
-          'foo/bar/1',
+          'foo/_doc/1',
           { op_type: 'create' },
           { foo: 'bar' },
           {}
@@ -72,7 +72,7 @@ describe 'client#create_document' do
     end
 
     it 'updates the arguments with the `op_type`' do
-      expect(client_double.create(index: 'foo', type: 'bar', id: 1, body: { foo: 'bar' })).to eq({})
+      expect(client_double.create(index: 'foo', id: 1, body: { foo: 'bar' })).to eq({})
     end
   end
 
@@ -81,7 +81,7 @@ describe 'client#create_document' do
     let(:expected_args) do
       [
           'POST',
-          'foo/bar',
+          'foo/_doc',
           { },
           { foo: 'bar' },
           {}
@@ -89,7 +89,7 @@ describe 'client#create_document' do
     end
 
     it 'updates the arguments with the `op_type`' do
-      expect(client_double.create(index: 'foo', type: 'bar', body: { foo: 'bar' })).to eq({})
+      expect(client_double.create(index: 'foo', body: { foo: 'bar' })).to eq({})
     end
   end
 end