waistband 0.9.3 → 0.9.4

data/lib/waistband/configuration.rb

@@ -24,6 +24,7 @@ module Waistband
 
       @env        ||= ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
       @yml_config   = YAML.load_file("#{config_dir}/waistband.yml")[@env].with_indifferent_access
+      @adapter      = @yml_config.delete('adapter')
     end
 
     def index(name)
@@ -42,18 +43,21 @@ module Waistband
     end
 
     def client
-      Elasticsearch::Client.new(
-              hosts: hosts,
-              randomize_hosts: true,
-              retry_on_failure: retries,
-              reload_on_failure: reload_on_failure,
-              transport_options: {
-                request: {
-                  open_timeout: @yml_config['timeout'],
-                  timeout: @yml_config['timeout']
-                }
-              }
-            )
+      client_hash = {
+        adapter: @adapter,
+        hosts: hosts,
+        randomize_hosts: true,
+        retry_on_failure: retries,
+        reload_on_failure: reload_on_failure,
+        transport_options: {
+          request: {
+            open_timeout: @yml_config['timeout'],
+            timeout: @yml_config['timeout']
+          }
+        }
+      }
+
+      Elasticsearch::Client.new client_hash
     end
 
     private

data/lib/waistband/version.rb

@@ -1,3 +1,3 @@
 module Waistband
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/spec/lib/configuration_spec.rb

@@ -23,6 +23,17 @@ describe Waistband::Configuration do
     expect(::Waistband.client).to be_a ::Elasticsearch::Transport::Client
   end
 
+  it "permits passing in an adapter to use to the client" do
+    original_config = YAML.load_file(File.join(::Waistband.config.config_dir, 'waistband.yml'))['test']
+
+    expect(::Waistband.config.instance_variable_get('@adapter')).to be_nil
+
+    YAML.stub(:load_file).and_return({'test' => original_config.merge({'adapter' => :net_http})})
+    ::Waistband.config.setup
+    expect(::Waistband.config.instance_variable_get('@adapter')).to eql :net_http
+    expect(::Waistband.client.transport.options[:adapter]).to eql :net_http
+  end
+
   describe '#hosts' do
 
     it "returns array of all available servers' configs" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waistband
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport