evt-message_store 1.0.1.2 → 1.1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6f8bc3eff87f99068e4ce07e8eb16e432a94670a98efc1f0c5c8bf9f088eac0
-  data.tar.gz: 5f3e8a3652909a57c67e32af2255452bd2e08a4805f21dd070cd05b8653439b2
+  metadata.gz: 40121815466711f7a023e49b5c02c8439456ef0eff75171a2ba0f56513358774
+  data.tar.gz: 4d3ce500d096eb4b877722b8dd6052cc6bcb8f7f7b90bba124453272e07a1d9c
 SHA512:
-  metadata.gz: f1ac5dd9d08309e768d47d826e2b8efd0a7b61f039d89f9f4da9c74a623aa6dac1f779fc228fa7d07acf0fd55543a64d9a88bdcb95db23bd399f6390deeec9a0
-  data.tar.gz: f2d459e14781ec06b7936135fdb2db46b39ea3ed01523f3c01217aaf3c4f3b11f3db3718277bba82b4e5c58bafff78d0eb413696a4eaeba034427f9247f5a996
+  metadata.gz: edeac71d9c4a5d8abcea0d48e6598007b05d88760a58fc62bd456a146f84f33383e15ce179415705d404639c1db9d14812409fc86fa6ebd51318cef65915ae58
+  data.tar.gz: 1c3d8ae0f92318f2742e9649595110d0fa777058b9f46ba1ffcf77b0304d9bf95224ed054d8938535b9f37519d2589bd7eb6bc79d46a9bc6be0aed7a6fe5f521

data/lib/message_store.rb

@@ -20,8 +20,9 @@ require 'message_store/stream_name'
 require 'message_store/log'
 
 require 'message_store/get'
-require 'message_store/get/last'
-require 'message_store/get/last/substitute'
+require 'message_store/get/substitute'
+require 'message_store/get/stream/last'
+require 'message_store/get/stream/last/substitute'
 require 'message_store/read/iterator'
 require 'message_store/read'
 require 'message_store/write'

data/lib/message_store/controls.rb

@@ -16,4 +16,3 @@ require 'message_store/controls/message_data/read'
 require 'message_store/controls/write'
 require 'message_store/controls/get'
 require 'message_store/controls/get_last'
-require 'message_store/controls/iterator'

data/lib/message_store/controls/get.rb

@@ -1,12 +1,15 @@
 module MessageStore
   module Controls
     module Get
-      def self.example(batch_size: nil, count: nil, global_position_offset: nil)
+      def self.example(stream_name: nil, batch_size: nil, count: nil, global_position_offset: nil)
+        stream_name ||= StreamName.example
         batch_size ||= 1
         count ||= 1
         global_position_offset ||= -> (x) { x ** 2 }
 
-        get = MessageStore::Get::Substitute.build(batch_size: batch_size)
+        get = MessageStore::Get::Substitute.build
+        get.stream_name = stream_name
+        get.batch_size = batch_size
 
         elements = (0..(count - 1)).to_a
 

data/lib/message_store/controls/get_last.rb

@@ -10,7 +10,7 @@ module MessageStore
       end
 
       class Example
-        include MessageStore::Get::Last
+        include MessageStore::Get::Stream::Last
 
         attr_writer :session
         def session

data/lib/message_store/controls/read.rb

@@ -3,7 +3,13 @@ module MessageStore
     module Read
       def self.example(stream_name: nil)
         stream_name ||= StreamName.example
-        Example.build(stream_name)
+
+        read = Example.build(stream_name)
+
+        get = Get.example(stream_name: stream_name)
+        read.iterator.get = get
+
+        read
       end
 
       class Example

data/lib/message_store/get.rb

@@ -8,63 +8,9 @@ module MessageStore
         include Log::Dependency
 
         abstract :call
-      end
-    end
-
-    class Substitute
-      include Initializer
-      include Virtual
-
-      include Get
-
-      initializer na(:batch_size)
-
-      def batch_size
-        @batch_size ||= 1
-      end
-
-      def items
-        @items ||= []
-      end
-
-      def self.build(batch_size: nil, session: nil)
-        new(batch_size)
-      end
-
-      def call(stream_name=nil, position: nil)
-        position ||= 0
-
-        logger.trace(tag: :get) { "Getting (Position: #{position}, Batch Size: #{batch_size}, Stream Name: #{stream_name.inspect})" }
-
-        logger.debug(tag: :data) { "Items: \n#{items.pretty_inspect}" }
-        logger.debug(tag: :data) { "Position: #{position.inspect}" }
-        logger.debug(tag: :data) { "Batch Size: #{batch_size.inspect}" }
-
-        unless self.class.category?(stream_name)
-          index = (items.index { |i| i.position >= position })
-        else
-          index = (items.index { |i| i.global_position >= position })
-        end
-
-        logger.debug(tag: :data) { "Index: #{index.inspect}" }
-
-        if index.nil?
-          items = []
-        else
-          range = index..(index + batch_size - 1)
-          logger.debug(tag: :data) { "Range: #{range.pretty_inspect}" }
-
-          items = self.items[range]
-        end
-
-        logger.info(tag: :data) { "Got: \n#{items.pretty_inspect}" }
-        logger.info(tag: :get) { "Finished getting (Position: #{position}, Stream Name: #{stream_name.inspect})" }
-
-        items
-      end
-
-      def self.category?(stream_name)
-        !stream_name.include?('-')
+        abstract :stream_name
+        abstract :batch_size
+        abstract :last_position
       end
     end
   end

data/lib/message_store/get/stream/last.rb

@@ -0,0 +1,64 @@
+module MessageStore
+  module Get
+    module Stream
+      module Last
+        def self.included(cls)
+          cls.class_exec do
+            include Dependency
+            include Virtual
+            include Log::Dependency
+
+            extend Build
+            extend Call
+            extend Configure
+
+            prepend InstanceActuator
+
+            virtual :configure
+            abstract :call
+
+            const_set :Substitute, Substitute
+          end
+        end
+
+        module InstanceActuator
+          def call(stream_name)
+            logger.trace(tag: :get) { "Getting last message data (Stream Name: #{stream_name})" }
+
+            message_data = super
+
+            logger.info(tag: :get) { "Finished getting message data (Stream Name: #{stream_name})" }
+            logger.info(tags: [:data, :message_data]) { message_data.pretty_inspect }
+
+            message_data
+          end
+        end
+
+        module Build
+          def build(session: nil)
+            instance = new
+            instance.configure(session: session)
+            instance
+          end
+        end
+
+        module Configure
+          def configure(receiver, session: nil, attr_name: nil)
+            attr_name ||= :get_last
+
+            instance = build(session: session)
+            receiver.public_send("#{attr_name}=", instance)
+            instance
+          end
+        end
+
+        module Call
+          def call(stream_name, session: nil)
+            instance = build(session: session)
+            instance.(stream_name)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/message_store/get/stream/last/substitute.rb

@@ -0,0 +1,29 @@
+module MessageStore
+  module Get
+    module Stream
+      module Last
+        module Substitute
+          def self.build
+            GetLast.new
+          end
+
+          class GetLast
+            include Get::Stream::Last
+
+            def call(stream_name)
+              streams[stream_name]
+            end
+
+            def set(stream_name, message_data)
+              streams[stream_name] = message_data
+            end
+
+            def streams
+              @streams ||= {}
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/message_store/get/substitute.rb

@@ -0,0 +1,72 @@
+module MessageStore
+  module Get
+    class Substitute
+      include Initializer
+      include Virtual
+
+      include Get
+
+      attr_accessor :stream_name
+
+      def batch_size
+        @batch_size ||= 1
+      end
+      attr_writer :batch_size
+
+      def items
+        @items ||= []
+      end
+
+      def self.build
+        new
+      end
+
+      def call(position)
+        position ||= 0
+
+        logger.trace(tag: :get) { "Getting (Position: #{position}, Stream Name: #{stream_name.inspect}, Batch Size: #{batch_size})" }
+
+        logger.debug(tag: :data) { "Items: \n#{items.pretty_inspect}" }
+        logger.debug(tag: :data) { "Position: #{position.inspect}" }
+        logger.debug(tag: :data) { "Batch Size: #{batch_size.inspect}" }
+
+        # No specialized Gets for substitute
+        # Complexity has to be inline for the control
+        # Scott, Tue Oct 1 2019
+        unless self.class.category_stream?(stream_name)
+          index = (items.index { |i| i.position >= position })
+        else
+          index = (items.index { |i| i.global_position >= position })
+        end
+
+        logger.debug(tag: :data) { "Index: #{index.inspect}" }
+
+        if index.nil?
+          items = []
+        else
+          range = index..(index + batch_size - 1)
+          logger.debug(tag: :data) { "Range: #{range.pretty_inspect}" }
+
+          items = self.items[range]
+        end
+
+        logger.info(tag: :data) { "Got: \n#{items.pretty_inspect}" }
+        logger.info(tag: :get) { "Finished getting (Position: #{position}, Stream Name: #{stream_name.inspect})" }
+
+        items
+      end
+
+      def last_position(batch)
+        if self.class.category_stream?(stream_name)
+          batch.last.global_position
+        else
+          batch.last.position
+        end
+      end
+
+      def self.category_stream?(stream_name)
+        StreamName.category?(stream_name)
+      end
+    end
+  end
+end

data/lib/message_store/postgres

@@ -0,0 +1 @@
+lib/message_store/Users/sbellware/projects/eventide/message-store-postgres/lib/message_store/postgre

data/lib/message_store/postgres.rb

@@ -0,0 +1 @@
+lib/message_store/Users/sbellware/projects/eventide/message-store-postgres/lib/message_store/postgre

data/lib/message_store/read.rb

@@ -24,6 +24,7 @@ module MessageStore
     module Build
       def build(stream_name, position: nil, batch_size: nil, session: nil, **arguments)
         new(stream_name, position, batch_size).tap do |instance|
+          Iterator.configure(instance, position)
           instance.configure(session: session, **arguments)
         end
       end

data/lib/message_store/read/iterator.rb

@@ -1,23 +1,12 @@
 module MessageStore
   module Read
-    module Iterator
-      def self.included(cls)
-        cls.class_exec do
-          include Dependency
-          include Initializer
-          include Virtual
-          include Log::Dependency
+    class Iterator
+      include Dependency
+      include Initializer
+      include Virtual
+      include Log::Dependency
 
-          extend Build
-          extend Configure
-
-          dependency :get, Get
-
-          initializer :stream_name
-
-          abstract :last_position
-        end
-      end
+      dependency :get, Get
 
       attr_accessor :batch
 
@@ -35,21 +24,17 @@ module MessageStore
         get.batch_size
       end
 
-      module Build
-        def build(stream_name, position: nil)
-          new(stream_name).tap do |instance|
-            instance.starting_position = position
-            Log.get(self).debug { "Built Iterator (Stream Name: #{stream_name}, Starting Position: #{position.inspect})" }
-          end
+      def self.build(position=nil)
+        new.tap do |instance|
+          instance.starting_position = position
+          Log.get(self).debug { "Built Iterator (Starting Position: #{position.inspect})" }
         end
       end
 
-      module Configure
-        def configure(receiver, stream_name, attr_name: nil, position: nil)
-          attr_name ||= :iterator
-          instance = build(stream_name, position: position)
-          receiver.public_send "#{attr_name}=", instance
-        end
+      def self.configure(receiver, position=nil, attr_name: nil)
+        attr_name ||= :iterator
+        instance = build(position)
+        receiver.public_send "#{attr_name}=", instance
       end
 
       def next
@@ -87,7 +72,7 @@ module MessageStore
 
         logger.trace "Getting batch (Position: #{position.inspect})"
 
-        batch = get.(stream_name, position: position)
+        batch = get.(position)
 
         logger.debug { "Finished getting batch (Count: #{batch.length}, Position: #{position.inspect})" }
 
@@ -107,6 +92,10 @@ module MessageStore
         next_position
       end
 
+      def last_position
+        get.last_position(batch)
+      end
+
       def reset(batch)
         logger.trace { "Resetting batch" }
 
@@ -163,13 +152,12 @@ module MessageStore
         false
       end
 
-      class Substitute
-        include Read::Iterator
-
-        initializer :stream_name
+## Need not exist?
+      class Substitute < Iterator
+##        include Read::Iterator
 
         def self.build()
-          new('some_stream_name')
+          new
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-message_store
 version: !ruby/object:Gem::Version
-  version: 1.0.1.2
+  version: 1.1.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-24 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-casing
@@ -134,7 +134,6 @@ files:
 - lib/message_store/controls/get.rb
 - lib/message_store/controls/get_last.rb
 - lib/message_store/controls/id.rb
-- lib/message_store/controls/iterator.rb
 - lib/message_store/controls/message_data.rb
 - lib/message_store/controls/message_data/hash.rb
 - lib/message_store/controls/message_data/metadata.rb
@@ -147,14 +146,17 @@ files:
 - lib/message_store/controls/write.rb
 - lib/message_store/expected_version.rb
 - lib/message_store/get.rb
-- lib/message_store/get/last.rb
-- lib/message_store/get/last/substitute.rb
+- lib/message_store/get/stream/last.rb
+- lib/message_store/get/stream/last/substitute.rb
+- lib/message_store/get/substitute.rb
 - lib/message_store/log.rb
 - lib/message_store/message_data.rb
 - lib/message_store/message_data/hash/transform.rb
 - lib/message_store/message_data/read.rb
 - lib/message_store/message_data/write.rb
 - lib/message_store/no_stream.rb
+- lib/message_store/postgres
+- lib/message_store/postgres.rb
 - lib/message_store/read.rb
 - lib/message_store/read/iterator.rb
 - lib/message_store/stream_name.rb

data/lib/message_store/controls/iterator.rb

@@ -1,26 +0,0 @@
-module MessageStore
-  module Controls
-    module Iterator
-      def self.example(stream_name: nil, position: nil)
-        stream_name ||= StreamName.example
-        Example.build(stream_name, position: position)
-      end
-
-      class Example
-        include MessageStore::Read::Iterator
-
-        def last_position
-          unless self.class.category?(stream_name)
-            batch.last.position
-          else
-            batch.last.global_position
-          end
-        end
-
-        def self.category?(stream_name)
-          !stream_name.include?('-')
-        end
-      end
-    end
-  end
-end

data/lib/message_store/get/last.rb

@@ -1,62 +0,0 @@
-module MessageStore
-  module Get
-    module Last
-      def self.included(cls)
-        cls.class_exec do
-          include Dependency
-          include Virtual
-          include Log::Dependency
-
-          extend Build
-          extend Call
-          extend Configure
-
-          prepend InstanceActuator
-
-          virtual :configure
-          abstract :call
-
-          const_set :Substitute, Substitute
-        end
-      end
-
-      module InstanceActuator
-        def call(stream_name)
-          logger.trace(tag: :get) { "Getting last message data (Stream Name: #{stream_name})" }
-
-          message_data = super
-
-          logger.info(tag: :get) { "Finished getting message data (Stream Name: #{stream_name})" }
-          logger.info(tags: [:data, :message_data]) { message_data.pretty_inspect }
-
-          message_data
-        end
-      end
-
-      module Build
-        def build(session: nil)
-          instance = new
-          instance.configure(session: session)
-          instance
-        end
-      end
-
-      module Configure
-        def configure(receiver, session: nil, attr_name: nil)
-          attr_name ||= :get_last
-
-          instance = build(session: session)
-          receiver.public_send("#{attr_name}=", instance)
-          instance
-        end
-      end
-
-      module Call
-        def call(stream_name, session: nil)
-          instance = build(session: session)
-          instance.(stream_name)
-        end
-      end
-    end
-  end
-end

data/lib/message_store/get/last/substitute.rb

@@ -1,27 +0,0 @@
-module MessageStore
-  module Get
-    module Last
-      module Substitute
-        def self.build
-          GetLast.new
-        end
-
-        class GetLast
-          include Get::Last
-
-          def call(stream_name)
-            streams[stream_name]
-          end
-
-          def set(stream_name, message_data)
-            streams[stream_name] = message_data
-          end
-
-          def streams
-            @streams ||= {}
-          end
-        end
-      end
-    end
-  end
-end