waistband 0.13.0 → 0.14.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTJiYTBiZGZiN2FmYWEzZTdlZGFhYmU5NjA3MjAyMDgwZTM2MmVhZQ==
+    ZDE2ZWE0ODU1NDM1YzMzM2UwOGIxMDlhZDRhODUxZWI5NDIxMDc3Mw==
   data.tar.gz: !binary |-
-    N2I2MDAzZTEwNGViZGQ0NDE5MWY1NzAyOGE4YTVmMmEwNzk0YTVjYw==
+    NGE4YjJhNjc2NDNhMjQ1Zjc3MDU5ZTE4MjZhNTY2ZWIxYjFjZGJiNQ==
 SHA512:
   metadata.gz: !binary |-
-    YTU3ZWVjMGMzNDc2NWQzYTRhYmRjYmE3ODgzODk3ZDkzZDk0ZWQ5ZTczNmMx
-    MjA3M2ZlOTU1NGQ4NTI0OTVlZTc1ZDg0MTEyYTlkMjBlMDE3ODgyOGE4YmUw
-    ZjU4OTUyY2Q3YTJmY2RjNmFhZTFhM2ZlMzNkNTkzODUyZDg1OGM=
+    MTA4NzM4Zjk5YTk0NjZmOGE3OTk4OGUyZGQzYTMyZDkxODFlZGFhNzM2ZDM1
+    NzU0NWU4ZGJiNDk2YzA0ZWM2Zjc1MDJkNzcyYjcxZDRlYTQzNzQ0ZWIxMTYy
+    Y2U4NDA5NDVkMTJhYmU0MTkxMzhmOGUyZjA4YjM4ZmI5MGI4MjI=
   data.tar.gz: !binary |-
-    NGMwMjdiZDUwYzE4ZjQxM2RlZjA5YzZlNzQxNWZlYWJkYzRhN2RmYzM4ZTlh
-    YjRkYTJiYmQ5Njg1ZmMyM2I5ODkxOWVlNWViMzliY2Y2YjVlZWQ0OTgwZTQ1
-    ZWVjYzA0NjlkZjFkODZiNDA0YTRhMmJlNDk1NzVlMDY5MTdkNjQ=
+    NGMwMzA4MGIxZjAyNmIyMzMyMWQxMzllZTM3YzJlZTM3YjI4MDBjOTU2MjRl
+    ZmZjZDlmZDJkZjhiOGMzNThlZDAwNDhhN2QxN2JlNDY1MzNjNzIwYmEwM2E0
+    MDk5NTc0MWVkNzZkOGE2YzE2MGI1NDcyZjIwODU1OTcwMjE3ZGY=

data/lib/waistband/configuration.rb

@@ -10,7 +10,7 @@ module Waistband
 
     attr_accessor :config_dir
     attr_writer   :timeout
-    attr_reader   :env
+    attr_reader   :env, :logger
 
     def initialize
       @yml_config = {}
@@ -68,6 +68,10 @@ module Waistband
       remove_instance_variable '@timeout'
     end
 
+    def logger=(logger)
+      @logger = logger
+    end
+
     private
 
       def load_yml_with_erb(file)

data/lib/waistband/index.rb

@@ -12,7 +12,8 @@ module Waistband
       options = options.stringify_keys
 
       @index_name = index_name
-      @stringify = config['stringify']
+      @stringify  = config['stringify']
+      @log_level  = config['log_level']
 
       # subindexes checks
       if options['version'].present?
@@ -67,7 +68,7 @@ module Waistband
     end
 
     def create!
-      client.indices.create index: config_name, body: config.except('name', 'stringify')
+      client.indices.create index: config_name, body: config.except('name', 'stringify', 'log_level')
     rescue Elasticsearch::Transport::Transport::Errors::BadRequest => ex
       raise ex unless ex.message.to_s =~ /IndexAlreadyExistsException/
       raise ::Waistband::Errors::IndexExists.new("Index already exists")
@@ -194,7 +195,16 @@ module Waistband
     end
 
     def client
-      @client ||= ::Waistband.config.client
+      @client ||= begin
+        _client = ::Waistband.config.client
+
+        if @log_level && Waistband.config.logger
+          _client.transport.logger       = Waistband.config.logger
+          _client.transport.logger.level = @log_level
+        end
+
+        _client
+      end
     end
 
     private

data/lib/waistband/version.rb

@@ -1,3 +1,3 @@
 module Waistband
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

data/spec/config/waistband/waistband_search.yml

@@ -1,5 +1,6 @@
 development: &DEV
   stringify: false
+  log_level: 2 # warning
   settings:
     index:
       number_of_shards: 1

data/spec/lib/index_spec.rb

@@ -323,4 +323,34 @@ describe Waistband::Index do
 
   end
 
+  describe 'logging' do
+
+    class FakeLog
+      attr_reader :level
+
+      def level=(val)
+        @level = val
+      end
+
+      def info(val);  end
+      def debug(val); end
+      def fatal(val); end
+    end
+
+    before do
+      Waistband.config.logger = FakeLog.new
+    end
+
+    it "sets the index's client transport logger" do
+      expect(index2.client.transport.logger).to be_a FakeLog
+      expect(index2.client.transport.logger.level).to eql 2
+    end
+
+    it "logs" do
+      expect(Waistband.config.logger).to receive(:info).with(kind_of(String)).once
+      index2.search({})
+    end
+
+  end
+
 end

data/spec/spec_helper.rb

@@ -21,6 +21,7 @@ RSpec.configure do |config|
   end
 
   config.around(:each) do |example|
+    IndexHelper.delete_all
     IndexHelper.create_all
     example.run
     IndexHelper.delete_all

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waistband
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - David Jairala