waistband 0.14.3 → 0.15.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzA4NjY0MjVjNDZlZjdkZGJlM2Q4NDg2ZDI5YzM4NjQzNWMwMjI3Yw==
+    ZGY2N2VmZTYyOTM4MjMzZTk2NTZmNjgyNjRjMjMwODVlMTNkZTAxMQ==
   data.tar.gz: !binary |-
-    MDUxOTM4NTNmMGZhNGVlOTEzMDQzMzRjZDJhZGZmYTQ1ODRjYTY0Mg==
+    MTRiNmJhMjdkYTliZmU1YWVmMDdhYzk0OTA4N2Q3MmI0NWZiNjk3Yw==
 SHA512:
   metadata.gz: !binary |-
-    NzVlNGU5NzQ4OGZiMjRhNzRkODEwOGQxZmJmYTVkMTE5ZDhmMjEyNjRhNzU4
-    OWM1OTg0NTg0OWJhYzc0ZjMyMDMyNDlhNTgyMzYzNDM4MGY0NzhjYzU1ZjVm
-    MjJhODdjMTQ1ZmJmNWMxYjJkMzFiYjk4YmFlNzU0YThmYjkyMjI=
+    NjliOGI1ZDhjZTAyMmM1ZGJhNWRjOGI0YTFmZjM0MDQ0YThkOTgxMzMxYjA1
+    MzAzMTBhYTQzNzk0MDRjYTA5ZTAxOGVmMjlkOTVlMzk4MDk5YTA1OWQ5YzAx
+    YmM4NmRlNzk3ZjM0N2YxYmEzYzBkZjY4NjY4OGQwNmM1YWI2NWM=
   data.tar.gz: !binary |-
-    M2U4ZTFhZDFmZGY5YzZhYjc5MjU1NTRhYzE2M2UwZjNlMjNjYTQzNTEwZTE0
-    MTBjNTdiYTA0YTU4ZWVmMWJmZDNlNTMwODYzYjViMTI1OTUwZTdlNGEyNGRl
-    NmExODc3YzVkOGYzMWZjM2MyMjk2Nzg4ZTExMjAwYzI2ZWZhZjU=
+    MjFjNTllOTExNDYwNzU0MGIwNWI4Yjg1Zjg4ZDZkZjJiZDUzY2I2MWE0NmEz
+    MjAzNjM4MWI3MTc2MzVlOTMzOWNmZDQ2ZWI5NGU1NDQwY2NmZjU1MWJjODNl
+    MjE4YTFmMDIzMmY2YTliMmRkNzE2MDZhZmFhMTU2MTUxYjgxNmM=

data/Gemfile

@@ -3,6 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in waistband.gemspec
 gemspec
 
-gem 'rspec', '~> 3.0.0'
+gem 'rspec', '~> 3.1.0'
 gem 'debugger', '~> 1.6.8'
 gem 'timecop', '~> 0.7.1'

data/lib/waistband.rb

@@ -5,6 +5,7 @@ module Waistband
   autoload :Errors,           "waistband/errors"
   autoload :StringifiedArray, "waistband/stringified_array"
   autoload :StringifiedHash,  "waistband/stringified_hash"
+  autoload :Client,           "waistband/client"
   autoload :Configuration,    "waistband/configuration"
   autoload :Index,            "waistband/index"
   autoload :SearchResults,    "waistband/search_results"

data/lib/waistband/client.rb

@@ -0,0 +1,61 @@
+module Waistband
+  class Client
+
+    class << self
+
+      def from_config(config_hash)
+        new(
+          config_hash['servers'], randomize_hosts: true,
+          retry_on_failure: config_hash['retries'],
+          reload_on_failure: config_hash['reload_on_failure'],
+          timeout: config_hash['timeout'],
+          adapter: config_hash['adapter']
+        )
+      end
+
+    end
+
+    def initialize(servers, options = {})
+      @servers = servers
+      @randomize_hosts = options.fetch(:randomize_hosts, true)
+      @retry_on_failure = options[:retry_on_failure]
+      @reload_on_failure = options[:reload_on_failure]
+      @timeout = options[:timeout]
+      @adapter = options[:adapter]
+    end
+
+    def connection
+      @connection ||= Elasticsearch::Client.new config_hash
+    end
+
+    def config_hash
+      {
+        adapter: @adapter,
+        hosts: hosts,
+        randomize_hosts: @randomize_hosts,
+        retry_on_failure: @retry_on_failure,
+        reload_on_failure: @reload_on_failure,
+        transport_options: {
+          request: {
+            open_timeout: @timeout,
+            timeout: @timeout
+          }
+        }
+      }
+    end
+
+    def method_missing(method_name, *args, &block)
+      return connection.send(method_name, *args, &block) if connection.respond_to?(method_name)
+      super
+    end
+
+    private
+
+      def hosts
+        @hosts ||= @servers.map do |server_name, config|
+          config
+        end
+      end
+
+  end
+end

data/lib/waistband/configuration.rb

@@ -40,28 +40,8 @@ module Waistband
       super
     end
 
-    def hosts
-      @hosts ||= @yml_config['servers'].map do |server_name, config|
-        config
-      end
-    end
-
     def client
-      client_hash = {
-        adapter: @adapter,
-        hosts: hosts,
-        randomize_hosts: true,
-        retry_on_failure: retries,
-        reload_on_failure: reload_on_failure,
-        transport_options: {
-          request: {
-            open_timeout: timeout,
-            timeout: timeout
-          }
-        }
-      }
-
-      Elasticsearch::Client.new client_hash
+      ::Waistband::Client.from_config(client_config_hash)
     end
 
     def reset_timeout
@@ -70,6 +50,17 @@ module Waistband
 
     private
 
+      def client_config_hash
+        {
+          'servers' => servers,
+          'randomize_hosts' => true,
+          'retry_on_failure' => retries,
+          'reload_on_failure' => reload_on_failure,
+          'timeout' => timeout,
+          'adapter' => @adapter
+        }
+      end
+
       def load_yml_with_erb(file)
         if defined?(ERB)
           YAML.load(ERB.new(File.read(file)).result)

data/lib/waistband/index.rb

@@ -196,7 +196,12 @@ module Waistband
 
     def client
       @client ||= begin
-        _client = ::Waistband.config.client
+
+        _client = if client_config_hash
+          ::Waistband::Client.from_config(client_config_hash)
+        else
+          ::Waistband.config.client
+        end
 
         if @log_level && Waistband.config.logger
           _client.transport.logger       = Waistband.config.logger
@@ -204,11 +209,16 @@ module Waistband
         end
 
         _client
+
       end
     end
 
     private
 
+      def client_config_hash
+        config['connection']
+      end
+
       def get_page_info(body_hash)
         page = body_hash[:page]
         page_size = body_hash[:page_size]

data/lib/waistband/version.rb

@@ -1,3 +1,3 @@
 module Waistband
-  VERSION = "0.14.3"
+  VERSION = "0.15.1"
 end

data/spec/config/waistband/waistband_multi_connection_events.yml

@@ -0,0 +1,22 @@
+development: &DEV
+  stringify: true
+  connection:
+    timeout: 2
+    retries: 5
+    reload_on_failure: true
+    servers:
+      server1:
+        host: 127.0.0.1
+        port: 9200
+        protocol: http
+  settings:
+    index:
+      number_of_shards: 1
+      number_of_replicas: 1
+  mappings:
+    event:
+      _source:
+        includes: ["*"]
+
+test:
+  <<: *DEV

data/spec/lib/configuration_spec.rb

@@ -19,8 +19,9 @@ describe Waistband::Configuration do
   end
 
   it "proxies the client" do
-    expect(::Waistband.config.client).to be_a ::Elasticsearch::Transport::Client
-    expect(::Waistband.client).to be_a ::Elasticsearch::Transport::Client
+    expect(::Waistband.config.client).to be_a ::Waistband::Client
+    expect(::Waistband.config.client.connection).to be_a ::Elasticsearch::Transport::Client
+    expect(::Waistband.client).to be_a ::Waistband::Client
   end
 
   it "permits passing in an adapter to use to the client" do
@@ -42,13 +43,14 @@ describe Waistband::Configuration do
     expect(::Waistband.config.send(:timeout)).to eql 2
   end
 
-  describe '#hosts' do
+  describe 'hosts' do
 
     it "returns array of all available servers' configs" do
-      expect(config.hosts).to be_an Array
-      expect(config.hosts.size).to eql 2
+      hosts = config.client.send(:hosts)
+      expect(hosts).to be_an Array
+      expect(hosts.size).to eql 2
 
-      config.hosts.each_with_index do |server, i|
+      hosts.each_with_index do |server, i|
         expect(server['host']).to match /127\.0\.0\.1|localhost/
         expect(server['port']).to eql 9200
         expect(server['protocol']).to eql 'http'

data/spec/lib/index_multi_connection_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Waistband::Index do
+
+  let(:index) { Waistband::Index.new('multi_connection_events') }
+  let(:client) { index.client }
+
+  it "grabs connection data from the index's settings" do
+    expect(client).to be_a(::Waistband::Client)
+    expect(client.connection).to be_a(::Elasticsearch::Transport::Client)
+    expect(client.instance_variable_get('@servers')).to eql({"server1"=>{"host"=>"127.0.0.1", "port"=>9200, "protocol"=>"http"}})
+  end
+
+  it "correctly sets hosts" do
+    expect(client.send(:config_hash)[:hosts]).to eql([{"host"=>"127.0.0.1", "port"=>9200, "protocol"=>"http"}])
+  end
+
+  it "works" do
+    index.delete
+    index.create
+    index.save('testing123', {ok: 'yeah'})
+    index.refresh
+    data = index.read('testing123')
+    expect(data['_source']['ok']).to eql 'yeah'
+  end
+
+end

data/spec/lib/index_spec.rb

@@ -76,6 +76,13 @@ describe Waistband::Index do
     expect(result.hits).to be_an Array
   end
 
+  it "correctly sets hosts" do
+    expect(index.client.send(:hosts)).to eql([
+      {"host" => "localhost", "port" => 9200, "protocol" => "http"},
+      {"host" => "127.0.0.1", "port" => 9200, "protocol" => "http"}
+    ])
+  end
+
   describe "storing" do
 
     it "stores data" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waistband
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.15.1
 platform: ruby
 authors:
 - David Jairala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -97,6 +97,7 @@ files:
 - README.md
 - Rakefile
 - lib/waistband.rb
+- lib/waistband/client.rb
 - lib/waistband/configuration.rb
 - lib/waistband/errors.rb
 - lib/waistband/index.rb
@@ -109,8 +110,10 @@ files:
 - spec/config/waistband/waistband_events.yml
 - spec/config/waistband/waistband_events_no_name.yml
 - spec/config/waistband/waistband_geo.yml
+- spec/config/waistband/waistband_multi_connection_events.yml
 - spec/config/waistband/waistband_search.yml
 - spec/lib/configuration_spec.rb
+- spec/lib/index_multi_connection_spec.rb
 - spec/lib/index_spec.rb
 - spec/lib/result_spec.rb
 - spec/lib/search_results_spec.rb
@@ -146,8 +149,10 @@ test_files:
 - spec/config/waistband/waistband_events.yml
 - spec/config/waistband/waistband_events_no_name.yml
 - spec/config/waistband/waistband_geo.yml
+- spec/config/waistband/waistband_multi_connection_events.yml
 - spec/config/waistband/waistband_search.yml
 - spec/lib/configuration_spec.rb
+- spec/lib/index_multi_connection_spec.rb
 - spec/lib/index_spec.rb
 - spec/lib/result_spec.rb
 - spec/lib/search_results_spec.rb