waistband 0.15.2 → 0.16.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjFjYjExMGYzNDE5ZWY0ZWVhMTM2OTY4MWQ2NTljYzg4NjM2MzQ1OA==
+    ODI0YzRhY2YwNjFlYzU5ZTA4NmVjYTVhM2RjZjMyY2JlN2RiNTdmYw==
   data.tar.gz: !binary |-
-    NTQ1ZTM0NzNmNWVjYmJkMmVmNTM5NzhmOTE3MjE1Yjk3MDVlMDIxMA==
+    ZDZiMDgwZGQ0MGQ1NGM0ODdmMGNkODU4NWYwNWQyNzBjZGMxZWJjNg==
 SHA512:
   metadata.gz: !binary |-
-    MDk2NmYzYThhZDc4ZWEwNTM1M2I0OTQ2MmJhNTM3YjAxMTAwZjU2YzU3MWRj
-    NzlhM2VhZTk0NGRkZDZmZGRiNGM0ZDFkNGU3MTAxZTVmNTgxMDc0ZTQ1YTZh
-    OWI0YTRmNDljN2FiNTg0MzE1NmZlYzNlZmNjZDFiYjI3NDU1MmE=
+    NDQ3ZmJlZmZkYzQ5MjgzNGQyMTM5MmJhYTQ3YThhN2JkZGQ5YWNjOTk4ZThi
+    ZWM4MjNiYTc5ODVmYTIxYzUwOTc0ZmViZjY3OTU0ZGExYzA2Y2E5YmQ5YjI0
+    YmM0Y2M2ZjM4MzYxNWNhODI2OWMzODE3MDdhOTc5ZjAzNTRjZDI=
   data.tar.gz: !binary |-
-    NWYwNjZiODQyZTgyZDI5OGRiY2NhOTg5ZmJmYjBlNjg2ZjkxZmMzNDI1M2E3
-    ODI0N2NkNmY1NjFjNjc2Y2I3MWUxNjUzZmQ4ODNhZDFmYTEyMzgyYjBjYTlm
-    MzYwNWJiMTQ0MGQ5NjAyMmI5YmMwMmI4MmYyMTI5MjEyNTAzMGE=
+    MDVjMzAxZjcwN2QwNGYzM2I5N2JmZDA3ODEwYTZmNGU3NWRlNTY5Y2Y5MmI4
+    NWJkZTgxNGMwYzFiZDY3NTFhMTc2ZTlhOGZlMmNjZWE4ZDcxZGY1YWU5M2Jm
+    MWEwZTk3YWExOGJhZTk0MGIyYTM5NWMxMDI2NWRkMGUxNTQyMDY=

data/lib/waistband/index.rb

@@ -8,6 +8,8 @@ require 'elasticsearch'
 module Waistband
   class Index
 
+    BODY_SIZE_LIMIT = 100_000
+
     def initialize(index_name, options = {})
       options = options.stringify_keys
 
@@ -95,6 +97,8 @@ module Waistband
       # map everything to strings if need be
       body_hash = stringify_all(body_hash) if @stringify
 
+      verify_body_size(config_name, _type, id, body_hash)
+
       saved = client.index(
         index: config_name,
         type: _type,
@@ -215,6 +219,29 @@ module Waistband
 
     private
 
+      def verify_body_size(index_config_name, type, id, body_hash)
+        body_json = body_hash.to_json
+        size = body_json.bytesize
+
+        if size > BODY_SIZE_LIMIT
+          msg  = "verify_body_size: Body size larger than limit.  "
+          msg << "Current size: #{size}.  Limit: #{BODY_SIZE_LIMIT}.  "
+          msg << "index_config_name: #{index_config_name}.  _type: #{type}.  id: #{id}.  "
+          msg << "body: #{body_json[0, 1000]}"
+          log_warning(msg)
+        end
+      end
+
+      def log_warning(msg)
+        return unless logger
+
+        logger.warn "[WAISTBAND :: WARNING] #{msg}"
+      end
+
+      def logger
+        client.transport.logger
+      end
+
       def client_config_hash
         config['connection']
       end

data/lib/waistband/version.rb

@@ -1,3 +1,3 @@
 module Waistband
-  VERSION = "0.15.2"
+  VERSION = "0.16.1"
 end

data/spec/lib/body_size_logging_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Waistband::Index do
+
+  let(:index) { Waistband::Index.new('search') }
+
+  before do
+    Waistband.config.logger = FakeLog.new
+  end
+
+  it "logs a warning when the body size of a document to store is too large" do
+    thing_string = ("a" * 150_000).to_s
+
+    expect(Waistband.config.logger).to receive(:warn).with(
+      "[WAISTBAND :: WARNING] verify_body_size: Body size larger than limit.  Current size: 150012.  Limit: 100000.  index_config_name: search_test.  _type: search.  id: test_large_body.  body: {\"thing\":\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+    ).once
+
+    body = {thing: thing_string}
+    index.save('test_large_body', body)
+    data = index.read('test_large_body')
+
+    expect(data).to be_present
+  end
+
+end

data/spec/lib/index_spec.rb

@@ -332,18 +332,6 @@ describe Waistband::Index do
 
   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

data/spec/support/fake_log.rb

@@ -0,0 +1,12 @@
+class FakeLog
+  attr_reader :level
+
+  def level=(val)
+    @level = val
+  end
+
+  def info(val);  end
+  def debug(val); end
+  def fatal(val); end
+  def warn(val); end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waistband
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.1
 platform: ruby
 authors:
 - David Jairala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -112,12 +112,14 @@ files:
 - spec/config/waistband/waistband_geo.yml
 - spec/config/waistband/waistband_multi_connection_events.yml
 - spec/config/waistband/waistband_search.yml
+- spec/lib/body_size_logging_spec.rb
 - 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
 - spec/spec_helper.rb
+- spec/support/fake_log.rb
 - spec/support/index_helper.rb
 - waistband.gemspec
 homepage: https://github.com/taskrabbit/waistband
@@ -151,10 +153,12 @@ test_files:
 - spec/config/waistband/waistband_geo.yml
 - spec/config/waistband/waistband_multi_connection_events.yml
 - spec/config/waistband/waistband_search.yml
+- spec/lib/body_size_logging_spec.rb
 - 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
 - spec/spec_helper.rb
+- spec/support/fake_log.rb
 - spec/support/index_helper.rb