elastomer-client 0.7.0 → 0.8.1

data/test/core_ext/time_test.rb

@@ -1,20 +1,20 @@
-require File.expand_path('../../test_helper', __FILE__)
-require 'elastomer/core_ext/time'
+require File.expand_path("../../test_helper", __FILE__)
+require "elastomer/core_ext/time"
 
-describe 'JSON conversions for Time' do
+describe "JSON conversions for Time" do
   before do
-    @name  = 'elastomer-time-test'
+    @name  = "elastomer-time-test"
     @index = $client.index(@name)
 
     unless @index.exists?
       @index.create \
-        :settings => { 'index.number_of_shards' => 1, 'index.number_of_replicas' => 0 },
+        :settings => { "index.number_of_shards" => 1, "index.number_of_replicas" => 0 },
         :mappings => {
           :doc1 => {
             :_source => { :enabled => true }, :_all => { :enabled => false },
             :properties => {
-              :title      => { :type => 'string', :index => 'not_analyzed' },
-              :created_at => { :type => 'date' }
+              :title      => { :type => "string", :index => "not_analyzed" },
+              :created_at => { :type => "date" }
             }
           }
         }
@@ -29,18 +29,18 @@ describe 'JSON conversions for Time' do
     @index.delete if @index.exists?
   end
 
-  it 'generates ISO8601 formatted time strings' do
+  it "generates ISO8601 formatted time strings" do
     time = Time.utc(2013, 5, 3, 10, 1, 31)
     assert_equal '"2013-05-03T10:01:31Z"', MultiJson.encode(time)
   end
 
-  it 'indexes time fields' do
+  it "indexes time fields" do
     time = Time.utc(2013, 5, 3, 10, 1, 31)
-    h = @docs.index({:title => 'test document', :created_at => time}, :type => 'doc1')
+    h = @docs.index({:title => "test document", :created_at => time}, :type => "doc1")
 
     assert_created(h)
 
-    doc = @docs.get(:type => 'doc1', :id => h['_id'])
-    assert_equal '2013-05-03T10:01:31Z', doc['_source']['created_at']
+    doc = @docs.get(:type => "doc1", :id => h["_id"])
+    assert_equal "2013-05-03T10:01:31Z", doc["_source"]["created_at"]
   end
 end

data/test/middleware/encode_json_test.rb

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

data/test/middleware/opaque_id_test.rb

@@ -1,25 +1,25 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path("../../test_helper", __FILE__)
 
 describe Elastomer::Middleware::OpaqueId do
 
   before do
     stubs = Faraday::Adapter::Test::Stubs.new do |stub|
-      stub.get('/_cluster/health') { |env|
+      stub.get("/_cluster/health") { |env|
         [ 200,
 
-          { 'X-Opaque-Id'    => env[:request_headers]['X-Opaque-Id'],
-            'Content-Type'   => 'application/json; charset=UTF-8',
-            'Content-Length' => '49' },
+          { "X-Opaque-Id"    => env[:request_headers]["X-Opaque-Id"],
+            "Content-Type"   => "application/json; charset=UTF-8",
+            "Content-Length" => "49" },
 
           %q[{"cluster_name":"elasticsearch","status":"green"}]
         ]
       }
 
-      stub.get('/') { |env|
-        [ 200, {}, {'version' => {'number' => '1.0.0'}}  ]
+      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"}] ]
+      stub.get("/_cluster/state") { |env|
+        [ 200, {"X-Opaque-Id" => "00000000-0000-0000-0000-000000000000"}, %q[{"foo":"bar"}] ]
       }
     end
 
@@ -35,7 +35,7 @@ describe Elastomer::Middleware::OpaqueId do
     assert_equal({"cluster_name" => "elasticsearch", "status" => "green"}, health)
   end
 
-  it 'raises an exception on conflicting headers' do
+  it "raises an exception on conflicting headers" do
     assert_raises(Elastomer::Client::OpaqueIdError) { @client.cluster.state }
   end
 

data/test/middleware/parse_json_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path("../../test_helper", __FILE__)
 
 describe Elastomer::Middleware::ParseJson do
   let(:middleware) { Elastomer::Middleware::ParseJson.new(lambda {|env| Faraday::Response.new(env)})}
@@ -6,7 +6,7 @@ describe Elastomer::Middleware::ParseJson do
 
   def process(body, content_type = nil)
     env = { :body => body, :response_headers => Faraday::Utils::Headers.new(headers) }
-    env[:response_headers]['content-type'] = content_type if content_type
+    env[:response_headers]["content-type"] = content_type if content_type
     middleware.call(env)
   end
 
@@ -15,34 +15,34 @@ describe Elastomer::Middleware::ParseJson do
     assert_nil response.body
   end
 
-  it 'nullifies empty body' do
+  it "nullifies empty body" do
     response = process("")
     assert_nil response.body
   end
 
-  it 'nullifies blank body' do
+  it "nullifies blank body" do
     response = process(" ")
     assert_nil response.body
   end
 
-  it 'parses json body with empty type' do
+  it "parses json body with empty type" do
     response = process('{"a":1}')
-    assert_equal({'a' => 1}, response.body)
+    assert_equal({"a" => 1}, response.body)
   end
 
-  it 'parses json body of correct type' do
-    response = process('{"a":1}', 'application/json; charset=utf-8')
-    assert_equal({'a' => 1}, response.body)
+  it "parses json body of correct type" do
+    response = process('{"a":1}', "application/json; charset=utf-8")
+    assert_equal({"a" => 1}, response.body)
   end
 
-  it 'ignores json body if incorrect type' do
-    response = process('{"a":1}', 'application/xml; charset=utf-8')
+  it "ignores json body if incorrect type" do
+    response = process('{"a":1}', "application/xml; charset=utf-8")
     assert_equal('{"a":1}', response.body)
   end
 
-  it 'chokes on invalid json' do
-    assert_raises(Faraday::Error::ParsingError) { process '{!'      }
-    assert_raises(Faraday::Error::ParsingError) { process 'invalid' }
+  it "chokes on invalid json" do
+    assert_raises(Faraday::Error::ParsingError) { process "{!"      }
+    assert_raises(Faraday::Error::ParsingError) { process "invalid" }
 
     # surprisingly these are all valid according to MultiJson
     #

data/test/notifications_test.rb

@@ -1,9 +1,9 @@
-require File.expand_path('../test_helper', __FILE__)
-require 'elastomer/notifications'
+require File.expand_path("../test_helper", __FILE__)
+require "elastomer/notifications"
 
 describe Elastomer::Notifications do
   before do
-    @name = 'elastomer-notifications-test'
+    @name = "elastomer-notifications-test"
     @index = $client.index @name
     @index.delete if @index.exists?
     @events = []
@@ -20,51 +20,51 @@ describe Elastomer::Notifications do
   it "instruments timeouts" do
     $client.stub :connection, lambda { raise Faraday::Error::TimeoutError } do
       assert_raises(Elastomer::Client::TimeoutError) { $client.info }
-      event = @events.detect { |e| e.payload[:action] == 'cluster.info' }
+      event = @events.detect { |e| e.payload[:action] == "cluster.info" }
       exception = event.payload[:exception]
-      assert_equal 'Elastomer::Client::TimeoutError', exception[0]
-      assert_match 'timeout', exception[1]
+      assert_equal "Elastomer::Client::TimeoutError", exception[0]
+      assert_match "timeout", exception[1]
     end
   end
 
-  it 'instruments cluster actions' do
-    $client.ping; assert_action_event('cluster.ping')
-    $client.info; assert_action_event('cluster.info')
+  it "instruments cluster actions" do
+    $client.ping; assert_action_event("cluster.ping")
+    $client.info; assert_action_event("cluster.info")
   end
 
-  it 'instruments node actions' do
+  it "instruments node actions" do
     nodes = $client.nodes
-    nodes.info; assert_action_event('nodes.info')
-    nodes.stats; assert_action_event('nodes.stats')
-    nodes.hot_threads; assert_action_event('nodes.hot_threads')
+    nodes.info; assert_action_event("nodes.info")
+    nodes.stats; assert_action_event("nodes.stats")
+    nodes.hot_threads; assert_action_event("nodes.hot_threads")
   end
 
-  it 'instruments node shutdown' do
-    client = stub_client(:post, '/_cluster/nodes/_shutdown')
-    client.nodes.shutdown; assert_action_event('nodes.shutdown')
+  it "instruments node shutdown" do
+    client = stub_client(:post, "/_cluster/nodes/_shutdown")
+    client.nodes.shutdown; assert_action_event("nodes.shutdown")
   end
 
-  it 'instruments index actions' do
-    @index.exists?; assert_action_event('index.exists')
-    @index.create('number_of_replicas' => 0)
-    assert_action_event('index.create')
-    @index.get_settings; assert_action_event('index.get_settings')
-    @index.update_settings('number_of_replicas' => 0)
-    assert_action_event('index.get_settings')
-    @index.close; assert_action_event('index.close')
-    @index.open; assert_action_event('index.open')
-    @index.delete; assert_action_event('index.delete')
+  it "instruments index actions" do
+    @index.exists?; assert_action_event("index.exists")
+    @index.create("number_of_replicas" => 0)
+    assert_action_event("index.create")
+    @index.get_settings; assert_action_event("index.get_settings")
+    @index.update_settings("number_of_replicas" => 0)
+    assert_action_event("index.get_settings")
+    @index.close; assert_action_event("index.close")
+    @index.open; assert_action_event("index.open")
+    @index.delete; assert_action_event("index.delete")
   end
 
-  it 'includes the response body in the payload' do
-    @index.create('number_of_replicas' => 0)
-    event = @events.detect { |e| e.payload[:action] == 'index.create' }
+  it "includes the response body in the payload" do
+    @index.create("number_of_replicas" => 0)
+    event = @events.detect { |e| e.payload[:action] == "index.create" }
     assert event.payload[:response_body]
   end
 
-  it 'includes the request body in the payload' do
-    @index.create('number_of_replicas' => 0)
-    event = @events.detect { |e| e.payload[:action] == 'index.create' }
+  it "includes the request body in the payload" do
+    @index.create("number_of_replicas" => 0)
+    event = @events.detect { |e| e.payload[:action] == "index.create" }
 
     payload = event.payload
     assert payload[:response_body]

data/test/test_helper.rb

@@ -1,31 +1,31 @@
-require 'webmock/minitest'
+require "webmock/minitest"
 WebMock.allow_net_connect!
 
-require 'securerandom'
-require 'rubygems' unless defined? Gem
-require 'bundler'
+require "securerandom"
+require "rubygems" unless defined? Gem
+require "bundler"
 Bundler.require(:default, :development)
 
-if ENV['COVERAGE'] == 'true'
-  require 'simplecov'
+if ENV["COVERAGE"] == "true"
+  require "simplecov"
   SimpleCov.start do
     add_filter "/test/"
     add_filter "/vendor/"
   end
 end
 
-require 'minitest/spec'
-require 'minitest/autorun'
+require "minitest/spec"
+require "minitest/autorun"
 
 # push the lib folder onto the load path
-$LOAD_PATH.unshift 'lib'
-require 'elastomer/client'
+$LOAD_PATH.unshift "lib"
+require "elastomer/client"
 
 # we are going to use the same client instance everywhere!
 # the client should always be stateless
 $client_params = {
-  :port => ENV['BOXEN_ELASTICSEARCH_PORT'] || 9200,
-  :read_timeout => 2,
+  :port => ENV["BOXEN_ELASTICSEARCH_PORT"] || 9200,
+  :read_timeout => 10,
   :open_timeout => 1,
   :opaque_id => false
 }
@@ -50,7 +50,7 @@ MiniTest::Unit.after_tests do
 end
 
 # add custom assertions
-require File.expand_path('../assertions', __FILE__)
+require File.expand_path("../assertions", __FILE__)
 
 # require 'elastomer/notifications'
 # require 'pp'
@@ -75,11 +75,11 @@ require File.expand_path('../assertions', __FILE__)
 # Returns the cluster health response.
 # Raises Elastomer::Client::TimeoutError if requested status is not achieved
 # within 5 seconds.
-def wait_for_index(name, status='yellow')
+def wait_for_index(name, status="yellow")
   $client.cluster.health(
     :index           => name,
     :wait_for_status => status,
-    :timeout         => '5s'
+    :timeout         => "5s"
   )
 end
 
@@ -89,7 +89,7 @@ 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"
 end
 
 # Elasticsearch 1.4 changed the response body for interacting with index
@@ -98,20 +98,20 @@ end
 #
 # Returns `true` if the response contains an "aliases" key.
 def es_version_always_returns_aliases?
-  $client.semantic_version <  '1.4.0' ||
-  $client.semantic_version >= '1.4.3'
+  $client.semantic_version <  "1.4.0" ||
+  $client.semantic_version >= "1.4.3"
 end
 
 # ElasticSearch 1.3 added the `search_shards` API endpoint.
 def es_version_supports_search_shards?
-  $client.semantic_version >= '1.3.0'
+  $client.semantic_version >= "1.3.0"
 end
 
 # Elasticsearch 1.2 removed support for gateway snapshots.
 #
 # Returns true if Elasticsearch version supports gateway snapshots.
 def es_version_supports_gateway_snapshots?
-  $client.semantic_version <= '1.2.0'
+  $client.semantic_version <= "1.2.0"
 end
 
 # Elasticsearch 1.4.0 had a bug in its handling of the Mapping API where it
@@ -120,13 +120,13 @@ end
 #
 # See: https://github.com/elastic/elasticsearch/pull/8426
 def es_version_supports_update_mapping_with__all_disabled?
-  $client.semantic_version != '1.4.0'
+  $client.semantic_version != "1.4.0"
 end
 
 # Elasticsearch 1.6 requires the repo.path setting when creating
 # FS repositories.
 def es_version_requires_repo_path?
-  $client.semantic_version >= '1.6.0'
+  $client.semantic_version >= "1.6.0"
 end
 
 def run_snapshot_tests?
@@ -146,8 +146,8 @@ def run_snapshot_tests?
 end
 
 def create_repo(name, settings = {})
-  location = File.join(*[ENV['SNAPSHOT_DIR'], name].compact)
-  default_settings = {:type => 'fs', :settings => {:location => location}}
+  location = File.join(*[ENV["SNAPSHOT_DIR"], name].compact)
+  default_settings = {:type => "fs", :settings => {:location => location}}
   $client.repository(name).create(default_settings.merge(settings))
 end