elastomer-client 0.3.3 → 0.4.0

data/test/client/docs_test.rb

@@ -250,7 +250,7 @@ describe Elastomer::Client::Docs do
 
     # for some reason, if there's no document indexed here all the mlt
     # queries return zero results
-    @docs.add \
+    @docs.index \
       :_id    => 3,
       :_type  => 'doc1',
       :title  => 'the author of faraday',
@@ -380,25 +380,25 @@ describe Elastomer::Client::Docs do
   # docs - An instance of Elastomer::Client::Docs or Elastomer::Client::Bulk. If
   #        nil uses the @docs instance variable.
   def populate!(docs = @docs)
-    docs.add \
+    docs.index \
       :_id    => 1,
       :_type  => 'doc1',
       :title  => 'the author of gravatar',
       :author => 'mojombo'
 
-    docs.add \
+    docs.index \
       :_id    => 2,
       :_type  => 'doc1',
       :title  => 'the author of resque',
       :author => 'defunkt'
 
-    docs.add \
+    docs.index \
       :_id    => 1,
       :_type  => 'doc2',
       :title  => 'the author of logging',
       :author => 'pea53'
 
-    docs.add \
+    docs.index \
       :_id    => 2,
       :_type  => 'doc2',
       :title  => 'the author of rubber-band',

data/test/client/errors_test.rb

@@ -0,0 +1,48 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+describe Elastomer::Client::Error do
+
+  it "is instantiated with a simple message" do
+    err = Elastomer::Client::Error.new "something went wrong"
+    assert_equal "something went wrong", err.message
+  end
+
+  it "is instantiated from an HTTP response" do
+    response = Faraday::Response.new(:body => "UTF8Error invalid middle-byte")
+    err = Elastomer::Client::Error.new(response)
+    assert_equal "UTF8Error invalid middle-byte", err.message
+
+    response = Faraday::Response.new(:body => {"error" => "IndexMissingException"})
+    err = Elastomer::Client::Error.new(response)
+    assert_equal "IndexMissingException", err.message
+  end
+
+  it "is instantiated from another exception" do
+    err = Faraday::Error::ConnectionFailed.new "could not connect to host"
+    err.set_backtrace %w[one two three four]
+
+    err = Elastomer::Client::Error.new(err, "POST", "/index/doc")
+    assert_equal "could not connect to host :: POST /index/doc", err.message
+    assert_equal %w[one two three four], err.backtrace
+  end
+
+  it "is fatal by default" do
+    assert Elastomer::Client::Error.fatal?, "client errors are fatal by default"
+
+    error = Elastomer::Client::Error.new "oops!"
+    assert !error.retry?, "client errors are not retryable by default"
+  end
+
+  it "has some fatal subclasses" do
+    assert Elastomer::Client::ResourceNotFound.fatal?, "Resource not found is fatal"
+    assert Elastomer::Client::ParsingError.fatal?, "Parsing error is fatal"
+    assert Elastomer::Client::SSLError.fatal?, "SSL error is fatal"
+    assert Elastomer::Client::RequestError.fatal?, "Request error is fatal"
+  end
+
+  it "has some non-fatal subclasses" do
+    assert !Elastomer::Client::TimeoutError.fatal?, "Timeouts are not fatal"
+    assert !Elastomer::Client::ConnectionFailed.fatal?, "Connection failures are not fatal"
+    assert !Elastomer::Client::ServerError.fatal?, "Server errors are not fatal"
+  end
+end

data/test/client/index_test.rb

@@ -130,6 +130,29 @@ describe Elastomer::Client::Index do
 
     $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
+  end
+
+  if es_version_1_x?
+    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 "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
   end
 
   # COMPATIBILITY ES 1.x removed English stopwords from the default analyzers,
@@ -154,6 +177,7 @@ describe Elastomer::Client::Index do
           }
         }
       )
+      wait_for_index(@name)
 
       tokens = @index.analyze 'Just a few words to analyze.', :analyzer => 'english_standard'
       tokens = tokens['tokens'].map { |h| h['token'] }

data/test/client/multi_search_test.rb

@@ -100,25 +100,25 @@ describe Elastomer::Client::MultiSearch do
   end
 
   def populate!
-    @docs.add \
+    @docs.index \
       :_id    => 1,
       :_type  => 'doc1',
       :title  => 'the author of gravatar',
       :author => 'mojombo'
 
-    @docs.add \
+    @docs.index \
       :_id    => 2,
       :_type  => 'doc1',
       :title  => 'the author of resque',
       :author => 'defunkt'
 
-    @docs.add \
+    @docs.index \
       :_id    => 1,
       :_type  => 'doc2',
       :title  => 'the author of logging',
       :author => 'pea53'
 
-    @docs.add \
+    @docs.index \
       :_id    => 2,
       :_type  => 'doc2',
       :title  => 'the author of rubber-band',

data/test/client/nodes_test.rb

@@ -2,7 +2,7 @@ require File.expand_path('../../test_helper', __FILE__)
 
 describe Elastomer::Client::Nodes do
 
-  it 'gets info for the ndoe(s)' do
+  it 'gets info for the node(s)' do
     h = $client.nodes.info
     assert h.key?('cluster_name'), 'the cluster name is returned'
     assert_instance_of Hash, h['nodes'], 'the node list is returned'
@@ -16,6 +16,28 @@ describe Elastomer::Client::Nodes do
     assert node.key?('indices'), 'indices stats are returned'
   end
 
+  if es_version_1_x?
+    it 'fitlers node info' do
+      h = $client.nodes.info(:info => 'os')
+      node = h['nodes'].values.first
+      assert node.key?('os'), 'expected os info to be present'
+      assert !node.key?('jvm'), 'expected jvm info to be absent'
+
+      h = $client.nodes.info(:info => %w[jvm process])
+      node = h['nodes'].values.first
+      assert node.key?('jvm'), 'expected jvm info to be present'
+      assert node.key?('process'), 'expected process info to be present'
+      assert !node.key?('network'), 'expected network info to be absent'
+    end
+
+    it 'filters node stats' do
+      h = $client.nodes.stats(:stats => 'http')
+      node = h['nodes'].values.first
+      assert node.key?('http'), 'expected http stats to be present'
+      assert !node.key?('indices'), 'expected indices stats to be absent'
+    end
+  end
+
   it 'gets the hot threads for the node(s)' do
     str = $client.nodes.hot_threads :read_timeout => 2
     assert_instance_of String, str
@@ -27,7 +49,7 @@ describe Elastomer::Client::Nodes do
     assert_empty h['nodes']
   end
 
-  it 'can be scoped to a multiple nodes' do
+  it 'can be scoped to multiple nodes' do
     h = $client.nodes(%w[node1 node2 node3]).info
     assert_empty h['nodes']
   end

data/test/client/repository_test.rb

@@ -0,0 +1,108 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+describe Elastomer::Client::Repository do
+
+  if es_version_1_x?
+
+    before do
+      @name = 'elastomer-repository-test'
+      @repo = $client.repository(@name)
+      @repo.delete if @repo.exists?
+    end
+
+    after do
+      @repo.delete if @repo.exists?
+    end
+
+    it 'determines if a repo exists' do
+      assert_equal false, @repo.exists?
+      assert_equal false, @repo.exist?
+      with_tmp_repo do
+        assert_equal true, @repo.exists?
+      end
+    end
+
+    it 'creates repos' do
+      Dir.mktmpdir do |dir|
+        response = @repo.create({:type => 'fs', :settings => {:location => dir}})
+        assert_equal true, response["acknowledged"]
+      end
+    end
+
+    it 'cannot create a repo without a name' do
+      Dir.mktmpdir do |dir|
+        lambda {
+          $client.repository.create({:type => 'fs', :settings => {:location => dir}})
+        }.must_raise ArgumentError
+      end
+    end
+
+    it 'gets repos' do
+      with_tmp_repo do
+        response = @repo.get
+        refute_nil response[@name]
+      end
+    end
+
+    it 'gets all repos' do
+      with_tmp_repo do
+        response = $client.repository.get
+        refute_nil response[@name]
+      end
+    end
+
+    it 'gets repo status' do
+      with_tmp_repo do
+        response = @repo.status
+        assert_equal [], response["snapshots"]
+      end
+    end
+
+    it 'gets status of all repos' do
+      response = $client.repository.status
+      assert_equal [], response["snapshots"]
+    end
+
+    it 'updates repos' do
+      Dir.mktmpdir do |dir|
+        @repo.create({:type => 'fs', :settings => {:location => dir}})
+        response = @repo.update(:type => 'fs', :settings => {:compress => true, :location => dir})
+        assert_equal true, response["acknowledged"]
+        response = @repo.get
+        assert_equal "true", response[@name]["settings"]["compress"]
+      end
+    end
+
+    it 'cannot update a repo without a name' do
+      Dir.mktmpdir do |dir|
+        lambda {
+          $client.repository.update({:type => 'fs', :settings => {:location => dir}})
+        }.must_raise ArgumentError
+      end
+    end
+
+    it 'deletes repos' do
+      with_tmp_repo do
+        response = @repo.delete
+        assert_equal true, response["acknowledged"]
+        assert_equal false, @repo.exists?
+      end
+    end
+
+    it 'cannot delete a repo without a name' do
+      lambda {
+        $client.repository.delete
+      }.must_raise ArgumentError
+    end
+
+    it 'gets snapshots' do
+      with_tmp_repo do
+        response = @repo.snapshots.get
+        assert_equal [], response["snapshots"]
+        response = @repo.snapshot.get
+        assert_equal [], response["snapshots"]
+        assert_equal false, @repo.snapshot('elastomer-test').exists?
+      end
+    end
+  end
+end

data/test/client/snapshot_test.rb

@@ -0,0 +1,111 @@
+
+require File.expand_path('../../test_helper', __FILE__)
+
+describe Elastomer::Client::Snapshot do
+  if es_version_1_x?
+    before do
+      @index_name = 'elastomer-snapshot-test-index'
+      @index = $client.index(@index_name)
+      @repo_name = 'elastomer-snapshot-test'
+      @name = 'elastomer-test'
+      @repo = $client.repository(@repo_name)
+      @snapshot = $client.snapshot(@repo_name, @name)
+      @repo.delete if @repo.exists?
+      # No need to delete snapshots because each with_tmp_repo location is unique
+    end
+
+    after do
+      @repo.delete if @repo.exists?
+      @index.delete if @index.exists?
+    end
+
+    it 'determines if a snapshot exists' do
+      with_tmp_repo do
+        assert_equal false, @snapshot.exists?
+        assert_equal false, @snapshot.exist?
+        @snapshot.create({}, :wait_for_completion => true)
+        assert_equal true, @snapshot.exist?
+      end
+    end
+
+    it 'creates snapshots' do
+      with_tmp_repo do
+        response = @snapshot.create({}, :wait_for_completion => true)
+        assert_equal @name, response["snapshot"]["snapshot"]
+      end
+    end
+
+    it 'creates snapshots with options' do
+      @index.create(:number_of_shards => 1, :number_of_replicas => 0)
+      with_tmp_repo do
+        response = @snapshot.create({:indices => [@index_name]}, :wait_for_completion => true)
+        assert_equal [@index_name], response["snapshot"]["indices"]
+        assert_equal 1, response["snapshot"]["shards"]["total"]
+      end
+    end
+
+    it 'gets snapshot info for one and all' do
+      with_tmp_snapshot do
+        response = @snapshot.get
+        assert_equal @name, response["snapshots"][0]["snapshot"]
+        response = @repo.snapshots.get
+        assert_equal @name, response["snapshots"][0]["snapshot"]
+      end
+    end
+
+    it 'gets snapshot status for one and all' do
+      @index.create(:number_of_shards => 1, :number_of_replicas => 0)
+      with_tmp_repo do
+        @snapshot.create({:indices => [@index_name]}, :wait_for_completion => true)
+        response = @snapshot.status
+        assert_equal 1, response["snapshots"][0]["shards_stats"]["total"]
+      end
+    end
+
+    it 'gets status of snapshots in progress' do
+      # we can't reliably get status of an in-progress snapshot in tests, so
+      # check for an empty result instead
+      response = @repo.snapshots.status
+      assert_equal [], response["snapshots"]
+      response = $client.snapshot.status
+      assert_equal [], response["snapshots"]
+    end
+
+    it 'disallows nil repo name with non-nil snapshot name' do
+      assert_raises(ArgumentError) { $client.repository.snapshot('snapshot') }
+      assert_raises(ArgumentError) { $client.snapshot(nil, 'snapshot') }
+    end
+
+    it 'deletes snapshots' do
+      with_tmp_snapshot do
+        response = @snapshot.delete
+        assert_equal true, response["acknowledged"]
+      end
+    end
+
+    it 'restores snapshots' do
+      @index.create(:number_of_shards => 1, :number_of_replicas => 0)
+      wait_for_index(@index_name)
+      with_tmp_repo do
+        @snapshot.create({:indices => [@index_name]}, :wait_for_completion => true)
+        @index.delete
+        response = @snapshot.restore({}, :wait_for_completion => true)
+        assert_equal 1, response["snapshot"]["shards"]["total"]
+      end
+    end
+
+    it 'restores snapshots with options' do
+      @index.create(:number_of_shards => 1, :number_of_replicas => 0)
+      wait_for_index(@index_name)
+      with_tmp_repo do
+        @snapshot.create({:indices => [@index_name]}, :wait_for_completion => true)
+        response = @snapshot.restore({
+          :rename_pattern => @index_name,
+          :rename_replacement => "#{@index_name}-restored"
+        }, :wait_for_completion => true)
+        assert_equal ["#{@index_name}-restored"], response["snapshot"]["indices"]
+        assert_equal 1, response["snapshot"]["shards"]["total"]
+      end
+    end
+  end
+end

data/test/client/template_test.rb

@@ -11,6 +11,12 @@ describe Elastomer::Client::Cluster do
     @template.delete if @template.exists?
   end
 
+  it 'lists templates in the cluster' do
+    @template.create({:template => 'test-elastomer*'})
+    templates = $client.cluster.templates
+    assert !templates.empty?, "expected to see a template"
+  end
+
   it 'creates a template' do
     assert !@template.exists?, 'the template should not exist'
 

data/test/middleware/opaque_id_test.rb

@@ -15,6 +15,9 @@ describe Elastomer::Middleware::OpaqueId do
         ]
       }
 
+      stub.get('/') { |env|
+        [ 200, {}, {'version' => {'number' => '1.0.0'}}  ]
+      }
       stub.get('/_cluster/state') { |env|
         [ 200, {'X-Opaque-Id' => "00000000-0000-0000-0000-000000000000"}, %q[{"foo":"bar"}] ]
       }