evt-message_store 1.0.1.1 → 1.0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23b4e429e5c187e8de005adf7a2f148de18c4893e76456f50075e1f2d6dd782d
-  data.tar.gz: 94135a7d2f2c4f11014cf5bd3d564571ecc665d8d7cd8e93c728793fd9b3f107
+  metadata.gz: b6f8bc3eff87f99068e4ce07e8eb16e432a94670a98efc1f0c5c8bf9f088eac0
+  data.tar.gz: 5f3e8a3652909a57c67e32af2255452bd2e08a4805f21dd070cd05b8653439b2
 SHA512:
-  metadata.gz: 5aedd66443542670741cf422a2e4ab4836dd26a882e8c453e3365112fb2060a4ccbb07162fd0c226575459f5ff91c1a421005fdfc4b9a84c0ee71bbb5fde31e6
-  data.tar.gz: dc8dee30c6c22c1d5a2206b380cff2edd2d4e968b5687b5f071480d107802f0aae07363b303d5676967769700ad37755bff46151757eb48fbaa657accf279a5c
+  metadata.gz: f1ac5dd9d08309e768d47d826e2b8efd0a7b61f039d89f9f4da9c74a623aa6dac1f779fc228fa7d07acf0fd55543a64d9a88bdcb95db23bd399f6390deeec9a0
+  data.tar.gz: f2d459e14781ec06b7936135fdb2db46b39ea3ed01523f3c01217aaf3c4f3b11f3db3718277bba82b4e5c58bafff78d0eb413696a4eaeba034427f9247f5a996

data/lib/message_store/read/iterator.rb

@@ -19,14 +19,22 @@ module MessageStore
         end
       end
 
-      attr_accessor :starting_position
       attr_accessor :batch
 
+      def starting_position
+        @starting_position ||= 0
+      end
+      attr_writer :starting_position
+
       def batch_index
         @batch_index ||= 0
       end
       attr_writer :batch_index
 
+      def batch_size
+        get.batch_size
+      end
+
       module Build
         def build(stream_name, position: nil)
           new(stream_name).tap do |instance|
@@ -47,7 +55,9 @@ module MessageStore
       def next
         logger.trace { "Getting next message data (Batch Length: #{(batch &.length).inspect}, Batch Index: #{batch_index})" }
 
-        resupply if batch_depleted?
+        if batch_depleted?
+          resupply
+        end
 
         message_data = batch[batch_index]
 
@@ -59,35 +69,14 @@ module MessageStore
         message_data
       end
 
-      def advance_batch_index
-        logger.trace { "Advancing batch index (Batch Index: #{batch_index})" }
-        self.batch_index += 1
-        logger.debug { "Advanced batch index (Batch Index: #{batch_index})" }
-      end
-
-      def batch_depleted?
-        if batch.nil?
-          logger.debug { "Batch is depleted (Batch is nil)" }
-          return true
-        end
-
-        if batch.empty?
-          logger.debug { "Batch is depleted (Batch is empty)" }
-          return true
-        end
-
-        if batch_index == batch.length
-          logger.debug { "Batch is depleted (Batch Index: #{batch_index}, Batch Length: #{batch.length})" }
-          return true
-        end
-
-        false
-      end
-
       def resupply
         logger.trace { "Resupplying batch (Current Batch Length: #{(batch &.length).inspect})" }
 
-        batch = get_batch
+        batch = []
+        unless stream_depleted?
+          batch = get_batch
+        end
+
         reset(batch)
 
         logger.debug { "Batch resupplied (Next Batch Length: #{(batch &.length).inspect})" }
@@ -98,10 +87,7 @@ module MessageStore
 
         logger.trace "Getting batch (Position: #{position.inspect})"
 
-        batch = []
-        if position.nil? || position >= 0
-          batch = get.(stream_name, position: position)
-        end
+        batch = get.(stream_name, position: position)
 
         logger.debug { "Finished getting batch (Count: #{batch.length}, Position: #{position.inspect})" }
 
@@ -109,8 +95,8 @@ module MessageStore
       end
 
       def next_batch_starting_position
-        if batch.nil?
-          logger.debug { "Batch is nil (Next batch starting position: #{starting_position.inspect})" }
+        if not batch_initialized?
+          logger.debug { "Batch is not initialized (Next batch starting position: #{starting_position.inspect})" }
           return starting_position
         end
 
@@ -132,6 +118,51 @@ module MessageStore
         logger.debug { "Done resetting batch" }
       end
 
+      def advance_batch_index
+        logger.trace { "Advancing batch index (Batch Index: #{batch_index})" }
+        self.batch_index += 1
+        logger.debug { "Advanced batch index (Batch Index: #{batch_index})" }
+      end
+
+      def batch_initialized?
+        not batch.nil?
+      end
+
+      def batch_depleted?
+        if not batch_initialized?
+          logger.debug { "Batch is depleted (Batch is not initialized)" }
+          return true
+        end
+
+        if batch.empty?
+          logger.debug { "Batch is depleted (Batch is empty)" }
+          return true
+        end
+
+        if batch_index == batch.length
+          logger.debug { "Batch is depleted (Batch Index: #{batch_index}, Batch Length: #{batch.length})" }
+          return true
+        end
+
+        logger.debug { "Batch is not depleted (Batch Index: #{batch_index}, Batch Length: #{batch.length})" }
+        false
+      end
+
+      def stream_depleted?
+        if not batch_initialized?
+          logger.debug { "Stream is not depleted (Batch Length: (batch is nil), Batch Size: #{batch_size})" }
+          return false
+        end
+
+        if batch.length < batch_size
+          logger.debug { "Stream is depleted (Batch Length: #{batch.length}, Batch Size: #{batch_size})" }
+          return true
+        end
+
+        logger.debug { "Stream is not depleted (Batch Length: #{batch.length}, Batch Size: #{batch_size})" }
+        false
+      end
+
       class Substitute
         include Read::Iterator
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-message_store
 version: !ruby/object:Gem::Version
-  version: 1.0.1.1
+  version: 1.0.1.2
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2019-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-casing
@@ -178,8 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Common primitives for platform-specific message store implementations