sqrewdriver 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 960177a8b086b8f3a761255650cd099772374d5a775fa0eaddadbc7c11d0a4e6
-  data.tar.gz: 0a187eac2691915e97ff7fa321aeef27bef3d4b3aeeee11826e310c34108ea71
+  metadata.gz: 502c4b11e87ca48df0966e2638a89dcb7295efa9399e4953e039345165e550b3
+  data.tar.gz: 6522640879f24a8422dc4e50fe778333bdd0a9d1c74f815932c5446b67cb96f3
 SHA512:
-  metadata.gz: f5ffdc6396c6fca90c6c33cb385da8a7df5dff42f536dcf3716bca5733f7b7e1c1ddccbcc4957211666760c837f2550871daec05650558a9cbc917fc036d4fc1
-  data.tar.gz: 7ffd2951ebf5171c0821dcf1ec71a34a96953d8f3e61f17c92291104aeee33372b9d13c697be7411e30ef22913e99832b563dd2352338a9c3d2164eb44a4e0c1
+  metadata.gz: 0c67020f0209e9045497c93e7e023c03df693e55c0a7a40a1785e42e294ae1a025631cbd0981d4ec64a03fd1fb6341bdd676ae0d2a9927b15afcfe1e946a6174
+  data.tar.gz: 866c67be25a34ae3a39fb76971bdf4f2e15f313a13a3535e50f05ef682f11d488b94c9d95180fb7dd4bd95ab6f031c35056a1aa27a022a9bf2f21b602fc4316b

data/.travis.yml

@@ -3,5 +3,5 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.6.1
+  - 2.6.2
 before_install: gem install bundler -v 2.0.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sqrewdriver (0.1.0)
+    sqrewdriver (0.1.1)
       aws-sdk-sqs
       concurrent-ruby
 

data/lib/sqrewdriver/client.rb

@@ -55,6 +55,10 @@ module Sqrewdriver
           @data << message
           @bytesize += size
         end
+
+        def size
+          @data.size
+        end
       end
 
       include MonitorMixin
@@ -77,7 +81,7 @@ module Sqrewdriver
 
         synchronize do
           @chunks << Chunk.new if @chunks.empty?
-          if @chunks.last.bytesize + add_size > MAX_PAYLOAD_SIZE
+          if @chunks.last.size == MAX_BATCH_SIZE || @chunks.last.bytesize + add_size > MAX_PAYLOAD_SIZE
             new_chunk = Chunk.new
             new_chunk.add(message, add_size)
             @chunks << new_chunk
@@ -97,7 +101,7 @@ module Sqrewdriver
 
         synchronize do
           @chunks << Chunk.new if @chunks.empty?
-          if @chunks.last.bytesize + add_size > MAX_PAYLOAD_SIZE
+          if @chunks.last.size == MAX_BATCH_SIZE || @chunks.last.bytesize + add_size > MAX_PAYLOAD_SIZE
             new_chunk = Chunk.new
             new_chunk.add(base_message, add_size)
             @chunks << new_chunk
@@ -171,13 +175,17 @@ module Sqrewdriver
 
     def wait_flushing(timeout = nil)
       zipped = Concurrent::Promises.zip_futures_on(@thread_pool, *@waiting_futures)
-      exceptions = zipped.reason(timeout)
+      unless zipped.wait(timeout)
+        raise Sqrewdriver::SendMessageTimeout
+      end
+
+      exceptions = zipped.reason
       raise Sqrewdriver::SendMessageErrors.new(exceptions) if exceptions
     end
 
-    def flush
+    def flush(timeout = nil)
       flush_async
-      wait_flushing
+      wait_flushing(timeout)
     end
 
     private
@@ -201,7 +209,7 @@ module Sqrewdriver
     def ensure_serializer_for_aggregation!(serializer)
       valid_serializer = @aggregate_messages_per.nil? || serializer.is_a?(Sqrewdriver::Serdes::JSONSerde)
       unless valid_serializer
-        raise InvalidSerializer, "If you use `aggregate_messages_per`, serializer must be `Oj` or `MultiJson`"
+        raise InvalidSerializer, "If you use `aggregate_messages_per`, serializer must be `Sqrewdriver::Serdes::JSONSerde`"
       end
     end
   end

data/lib/sqrewdriver/errors.rb

@@ -18,4 +18,6 @@ module Sqrewdriver
       @failed = failed
     end
   end
+
+  class SendMessageTimeout < StandardError; end
 end

data/lib/sqrewdriver/version.rb

@@ -1,3 +1,3 @@
 module Sqrewdriver
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqrewdriver
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-29 00:00:00.000000000 Z
+date: 2019-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs