evt-message_store-postgres 1.0.0.1 → 1.1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dce43cd0b61f2ec2a7d02aaf91691fcb19a9f21a9e76ad6a55b38bcf192d5141
-  data.tar.gz: 342895c380f044f363a16abda6b0f3767958266cb3af2f68acafe8e55547b3dc
+  metadata.gz: '08aecf38cd82a29b1b60344994cf41ece2c62b49057db4745314ec5d35f081ee'
+  data.tar.gz: 7de3cec77d52439df435f08a3949c8391dd81675ae31c5f743417db0c7b08a08
 SHA512:
-  metadata.gz: b7d92f20c9a4499b055daaf93e0011e6c62feaddc907cea79a2d4a8cd583f67c665d9b44b4437d5cb0391716f6e32a45cb37fbd90210c39317136123a7df8538
-  data.tar.gz: 14a0a3864e65404a4a49a8c59f03313abb1502c2a9d8e1f78de2cd8b8d3a245526e3935468612facf83969d1b9f42faddd017f84f2e42ead2ae52dfb2e33a2d0
+  metadata.gz: c9e7dd59611731c9470fac62a26b0da19b1f3166499d100fe4bdeb60710c26fabd2b55bb0e9e845f946ba62268fe26369310aa87f33515f05a6a4df213bde3ab
+  data.tar.gz: c2d38e192e5c469c08a860ad8b187a1377ecd06f3b25e610c979df420330f7a0ac12ee33fc31a3de80173b3564bab7cb49de5f09cdb245e03210daf37ac80ad5

data/lib/message_store/postgres.rb

@@ -17,6 +17,7 @@ require 'message_store/postgres/put'
 require 'message_store/postgres/write'
 
 require 'message_store/postgres/get'
-require 'message_store/postgres/get/last'
-require 'message_store/postgres/read/iterator'
+require 'message_store/postgres/get/stream'
+require 'message_store/postgres/get/category'
+require 'message_store/postgres/get/stream/last'
 require 'message_store/postgres/read'

data/lib/message_store/postgres/get.rb

@@ -1,25 +1,37 @@
 module MessageStore
   module Postgres
-    class Get
-      include MessageStore::Get
+    module Get
+      def self.included(cls)
+        cls.class_exec do
+          include MessageStore::Get
+          prepend Call
+          prepend BatchSize
 
-      dependency :session, Session
+          extend SQLCommand
 
-      initializer na(:batch_size), :condition
+          dependency :session, Session
 
-      def batch_size
-        @batch_size ||= Defaults.batch_size
+          initializer :stream_name, na(:batch_size), :condition
+        end
+      end
+
+      module BatchSize
+        def batch_size
+          @batch_size ||= Defaults.batch_size
+        end
       end
 
-      def self.build(batch_size: nil, session: nil, condition: nil)
-        new(batch_size, condition).tap do |instance|
+      def self.build(stream_name, batch_size: nil, session: nil, condition: nil)
+        cls = specialization(stream_name)
+
+        cls.new(stream_name, batch_size, condition).tap do |instance|
           instance.configure(session: session)
         end
       end
 
-      def self.configure(receiver, attr_name: nil, batch_size: nil, condition: nil, session: nil)
+      def self.configure(receiver, stream_name, attr_name: nil, batch_size: nil, condition: nil, session: nil)
         attr_name ||= :get
-        instance = build(batch_size: batch_size, condition: condition, session: session)
+        instance = build(stream_name, batch_size: batch_size, condition: condition, session: session)
         receiver.public_send "#{attr_name}=", instance
       end
 
@@ -28,31 +40,33 @@ module MessageStore
       end
 
       def self.call(stream_name, position: nil, batch_size: nil, condition: nil,  session: nil)
-        instance = build(batch_size: batch_size, condition: condition, session: session)
-        instance.(stream_name, position: position)
+        instance = build(stream_name, batch_size: batch_size, condition: condition, session: session)
+        instance.(position)
       end
 
-      def call(stream_name, position: nil)
-        logger.trace(tag: :get) { "Getting message data (Position: #{position.inspect}, Stream Name: #{stream_name}, Batch Size: #{batch_size.inspect})" }
+      module Call
+        def call(position)
+          logger.trace(tag: :get) { "Getting message data (Stream Name: #{stream_name}, Position: #{position.inspect}, Batch Size: #{batch_size.inspect})" }
 
-        position ||= Defaults.position
+          position ||= Defaults.position
 
-        result = get_result(stream_name, position)
+          result = get_result(stream_name, position)
 
-        message_data = convert(result)
+          message_data = convert(result)
 
-        logger.info(tag: :get) { "Finished getting message data (Count: #{message_data.length}, Position: #{position.inspect}, Stream Name: #{stream_name}, Batch Size: #{batch_size.inspect})" }
-        logger.info(tags: [:data, :message_data]) { message_data.pretty_inspect }
+          logger.info(tag: :get) { "Finished getting message data (Count: #{message_data.length}, Stream Name: #{stream_name}, Position: #{position.inspect}, Batch Size: #{batch_size.inspect})" }
+          logger.info(tags: [:data, :message_data]) { message_data.pretty_inspect }
 
-        message_data
+          message_data
+        end
       end
 
       def get_result(stream_name, position)
-        logger.trace(tag: :get) { "Getting result (Stream: #{stream_name}, Position: #{position.inspect}, Batch Size: #{batch_size.inspect}, Condition: #{condition || '(none)'})" }
+        logger.trace(tag: :get) { "Getting result (Stream Name: #{stream_name}, Position: #{position.inspect}, Batch Size: #{batch_size.inspect}, Condition: #{condition || '(none)'})" }
 
         sql_command = self.class.sql_command(stream_name, position, batch_size, condition)
 
-        cond = self.class.constrain_condition(condition)
+        cond = Get.constrain_condition(condition)
 
         params = [
           stream_name,
@@ -63,7 +77,7 @@ module MessageStore
 
         result = session.execute(sql_command, params)
 
-        logger.debug(tag: :get) { "Finished getting result (Count: #{result.ntuples}, Stream: #{stream_name}, Position: #{position.inspect}, Batch Size: #{batch_size.inspect}, Condition: #{condition || '(none)'})" }
+        logger.debug(tag: :get) { "Finished getting result (Count: #{result.ntuples}, Stream Name: #{stream_name}, Position: #{position.inspect}, Batch Size: #{batch_size.inspect}, Condition: #{condition || '(none)'})" }
 
         result
       end
@@ -74,20 +88,13 @@ module MessageStore
         "(#{condition})"
       end
 
-      def self.sql_command(stream_name, position, batch_size, condition)
-        parameters = '$1::varchar, $2::bigint, $3::bigint, $4::varchar'
-
-        if category_stream?(stream_name)
-          return "SELECT * FROM get_category_messages(#{parameters});"
-        else
-          return "SELECT * FROM get_stream_messages(#{parameters});"
+      module SQLCommand
+        def sql_command(stream_name, position, batch_size, condition)
+          parameters = '$1::varchar, $2::bigint, $3::bigint, $4::varchar'
+          command_text(parameters)
         end
       end
 
-      def self.category_stream?(stream_name)
-        StreamName.category?(stream_name)
-      end
-
       def convert(result)
         logger.trace(tag: :get) { "Converting result to message data (Result Count: #{result.ntuples})" }
 
@@ -96,7 +103,7 @@ module MessageStore
           record['metadata'] = Deserialize.metadata(record['metadata'])
           record['time'] = Time.utc_coerced(record['time'])
 
-          MessageData::Read.build record
+          MessageData::Read.build(record)
         end
 
         logger.debug(tag: :get) { "Converted result to message data (Message Data Count: #{message_data.length})" }
@@ -104,6 +111,14 @@ module MessageStore
         message_data
       end
 
+      def self.specialization(stream_name)
+        if StreamName.category?(stream_name)
+          Category
+        else
+          Stream
+        end
+      end
+
       module Deserialize
         def self.data(serialized_data)
           return nil if serialized_data.nil?

data/lib/message_store/postgres/get/category.rb

@@ -0,0 +1,17 @@
+module MessageStore
+  module Postgres
+    module Get
+      class Category
+        include Get
+
+        def self.command_text(parameters)
+          "SELECT * FROM get_category_messages(#{parameters});"
+        end
+
+        def last_position(batch)
+          batch.last.global_position
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module MessageStore
+  module Postgres
+    module Get
+      class Stream
+        include Get
+
+        def self.command_text(parameters)
+          "SELECT * FROM get_stream_messages(#{parameters});"
+        end
+
+        def last_position(batch)
+          batch.last.position
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,88 @@
+module MessageStore
+  module Postgres
+    module Get
+      class Stream
+        class Last
+          include MessageStore::Get::Stream::Last
+
+          dependency :session, Session
+
+          def configure(session: nil)
+            Session.configure(self, session: session)
+          end
+
+          def call(stream_name)
+            logger.trace(tag: :get) { "Getting last message data (Stream Name: #{stream_name})" }
+
+            result = get_result(stream_name)
+
+            return nil if result.nil?
+
+            message_data = convert(result[0])
+
+            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
+
+          def get_result(stream_name)
+            logger.trace(tag: :get) { "Getting last record (Stream: #{stream_name})" }
+
+            sql_command = self.class.sql_command(stream_name)
+
+            params = [
+              stream_name
+            ]
+
+            result = session.execute(sql_command, params)
+
+            logger.debug(tag: :get) { "Finished getting result (Count: #{result.ntuples}, Stream: #{stream_name}" }
+
+            return nil if result.ntuples == 0
+
+            result
+          end
+
+          def self.sql_command(stream_name)
+            parameters = '$1::varchar'
+
+            "SELECT * FROM get_last_message(#{parameters});"
+          end
+
+          def convert(record)
+            logger.trace(tag: :get) { "Converting record to message data" }
+
+            record['data'] = Deserialize.data(record['data'])
+            record['metadata'] = Deserialize.metadata(record['metadata'])
+            record['time'] = Time.utc_coerced(record['time'])
+
+            message_data = MessageData::Read.build(record)
+
+            logger.debug(tag: :get) { "Converted record to message data" }
+
+            message_data
+          end
+
+          module Deserialize
+            def self.data(serialized_data)
+              return nil if serialized_data.nil?
+              Transform::Read.(serialized_data, :json, MessageData::Hash)
+            end
+
+            def self.metadata(serialized_metadata)
+              return nil if serialized_metadata.nil?
+              Transform::Read.(serialized_metadata, :json, MessageData::Hash)
+            end
+          end
+
+          module Time
+            def self.utc_coerced(local_time)
+              Clock::UTC.coerce(local_time)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/message_store/postgres/read.rb

@@ -4,8 +4,7 @@ module MessageStore
       include MessageStore::Read
 
       def configure(session: nil, condition: nil)
-        Iterator.configure(self, stream_name, position: position)
-        Get.configure(self.iterator, batch_size: batch_size, condition: condition, session: session)
+        Get.configure(self.iterator, self.stream_name, batch_size: batch_size, condition: condition, session: session)
       end
 
       module Defaults

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-message_store-postgres
 version: !ruby/object:Gem::Version
-  version: 1.0.0.1
+  version: 1.1.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: scripts
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-message_store
@@ -136,11 +136,12 @@ files:
 - lib/message_store/postgres/controls/put.rb
 - lib/message_store/postgres/controls/stream_name.rb
 - lib/message_store/postgres/get.rb
-- lib/message_store/postgres/get/last.rb
+- lib/message_store/postgres/get/category.rb
+- lib/message_store/postgres/get/stream.rb
+- lib/message_store/postgres/get/stream/last.rb
 - lib/message_store/postgres/log.rb
 - lib/message_store/postgres/put.rb
 - lib/message_store/postgres/read.rb
-- lib/message_store/postgres/read/iterator.rb
 - lib/message_store/postgres/session.rb
 - lib/message_store/postgres/settings.rb
 - lib/message_store/postgres/stream_name.rb
@@ -164,8 +165,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: Message store implementation for PostgreSQL

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

@@ -1,86 +0,0 @@
-module MessageStore
-  module Postgres
-    class Get
-      class Last
-        include MessageStore::Get::Last
-
-        dependency :session, Session
-
-        def configure(session: nil)
-          Session.configure(self, session: session)
-        end
-
-        def call(stream_name)
-          logger.trace(tag: :get) { "Getting last message data (Stream Name: #{stream_name})" }
-
-          result = get_result(stream_name)
-
-          return nil if result.nil?
-
-          message_data = convert(result[0])
-
-          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
-
-        def get_result(stream_name)
-          logger.trace(tag: :get) { "Getting last record (Stream: #{stream_name})" }
-
-          sql_command = self.class.sql_command(stream_name)
-
-          params = [
-            stream_name
-          ]
-
-          result = session.execute(sql_command, params)
-
-          logger.debug(tag: :get) { "Finished getting result (Count: #{result.ntuples}, Stream: #{stream_name}" }
-
-          return nil if result.ntuples == 0
-
-          result
-        end
-
-        def self.sql_command(stream_name)
-          parameters = '$1::varchar'
-
-          "SELECT * FROM get_last_message(#{parameters});"
-        end
-
-        def convert(record)
-          logger.trace(tag: :get) { "Converting record to message data" }
-
-          record['data'] = Deserialize.data(record['data'])
-          record['metadata'] = Deserialize.metadata(record['metadata'])
-          record['time'] = Time.utc_coerced(record['time'])
-
-          message_data = MessageData::Read.build(record)
-
-          logger.debug(tag: :get) { "Converted record to message data" }
-
-          message_data
-        end
-
-        module Deserialize
-          def self.data(serialized_data)
-            return nil if serialized_data.nil?
-            Transform::Read.(serialized_data, :json, MessageData::Hash)
-          end
-
-          def self.metadata(serialized_metadata)
-            return nil if serialized_metadata.nil?
-            Transform::Read.(serialized_metadata, :json, MessageData::Hash)
-          end
-        end
-
-        module Time
-          def self.utc_coerced(local_time)
-            Clock::UTC.coerce(local_time)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/message_store/postgres/read/iterator.rb

@@ -1,17 +0,0 @@
-module MessageStore
-  module Postgres
-    class Read
-      class Iterator
-        include MessageStore::Read::Iterator
-
-        def last_position
-          unless MessageStore::Postgres::StreamName.category?(stream_name)
-            batch.last.position
-          else
-            batch.last.global_position
-          end
-        end
-      end
-    end
-  end
-end