aggregate_streams 0.0.0.0 → 1.0.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c87c67f4a3dfcf93d0e5ce30380844638a58dc4edfc1ed04d259d19bffc50c7
-  data.tar.gz: ff1cbe61e2df7aa1da19f45202fcca08abe342f1ba1a9fa7b8d8cf9534762b23
+  metadata.gz: 18f3677271347279d2697fd882d26202f4de35f1b1a572f111f71215a3931796
+  data.tar.gz: 0044e3485e0b089b938312743894272bdaa7db5bc34d71140c2ec0ce35d7552b
 SHA512:
-  metadata.gz: d05878e3d60552a37e307504c86fbc52ebe468700ac36431128782baf4765d1f31666125d4bd7f1b90fc61bbb6603ce062fe3c690fd87b6f619e89372a8b4251
-  data.tar.gz: 0546551ec19669f9edbddb0e496a4424c08d3046b14037491daddfef08231256e8d6e644fec3f0498474fe4d934d1c8857bcbb2e28cc978bdb9d393fe9fe2f41
+  metadata.gz: d0fde2fec378bc68128cb6fd5408a9c9498c7a2d20b5bab72b6df16bbe3b54b7c1c643e2f98bb4f50428cffcaf2baf88654702d6075d62a62196aa40fd8916b4
+  data.tar.gz: 29d05a5f5ab4dbe717c1914a8134dc749bcd2aeb24867d4760c1dac30d6881fc94889a046ade1ce04e55042067e0c332c1bd5dfcd03fa5cc0861e9d828c1e2b1

data/lib/aggregate_streams/aggregate_streams.rb

@@ -1,35 +1,14 @@
 module AggregateStreams
   def self.start(input_categories, output_category, writer_session: nil, snapshot_interval: nil, **consumer_args, &transform_action)
-    handler_block ||= proc { }
+    settings = {
+      :category => output_category,
+      :writer_session => writer_session,
+      :snapshot_interval => snapshot_interval,
+      :transform_action => transform_action
+    }
 
     input_categories.each do |input_category|
-      handler_cls = Class.new do
-        include Handle
-
-        category output_category
-
-        unless writer_session.nil?
-          writer_session_macro do
-            writer_session
-          end
-        end
-
-        unless snapshot_interval.nil?
-          snapshot_interval_macro snapshot_interval
-        end
-
-        unless transform_action.nil?
-          transform(&transform_action)
-        end
-      end
-
-      consumer_cls = Class.new do
-        include Consumer
-
-        handler handler_cls
-      end
-
-      consumer_cls.start(input_category, output_category: output_category, **consumer_args)
+      Consumer.start(input_category, output_category: output_category, supplemental_settings: settings, **consumer_args)
     end
   end
 end

data/lib/aggregate_streams/consumer.rb

@@ -1,25 +1,20 @@
 module AggregateStreams
-  module Consumer
-    def self.included(cls)
-      cls.class_exec do
-        include ::Consumer::Postgres
-        include Configure
-      end
-    end
+  class Consumer
+    include ::Consumer::Postgres
+
+    handler Handle
 
-    module Configure
-      def configure(output_category:, output_session: nil, **args)
-        super(**args)
+    def configure(output_category:, output_session: nil, **args)
+      super(**args)
 
-        input_category = self.category
+      input_category = self.category
 
-        PositionStore.configure(
-          self,
-          input_category,
-          output_category,
-          session: session
-        )
-      end
+      PositionStore.configure(
+        self,
+        input_category,
+        output_category,
+        session: output_session
+      )
     end
   end
 end

data/lib/aggregate_streams/controls/handler.rb

@@ -1,47 +1,24 @@
 module AggregateStreams
   module Controls
     module Handler
-      def self.example(category: nil, snapshot: nil, snapshot_interval: nil, &specialize)
-        if category.nil? && snapshot.nil? && snapshot_interval.nil? && specialize.nil?
-          cls = Example
-        else
-          cls = example_class(category: category, snapshot: snapshot, snapshot_interval: snapshot_interval, &specialize)
-        end
-
-        cls.build
-      end
-
-      def self.example_class(category: nil, snapshot: nil, snapshot_interval: nil, &specialize)
+      def self.example(category: nil, snapshot: nil, snapshot_interval: nil, session: nil, writer_session: nil, &transform_action)
         if category == :none
           category = nil
         else
           category ||= Category.example
         end
 
-        snapshot ||= false
+        settings_data = {}
 
-        if snapshot
-          snapshot_interval ||= Store.snapshot_interval
-        end
-
-        Class.new do
-          include AggregateStreams::Handle
-
-          unless category.nil?
-            category category
-          end
+        settings_data[:category] = category unless category.nil?
+        settings_data[:snapshot_interval] = snapshot_interval unless snapshot_interval.nil?
+        settings_data[:writer_session] = writer_session unless writer_session.nil?
+        settings_data[:transform_action] = transform_action unless transform_action.nil?
 
-          unless snapshot_interval.nil?
-            snapshot_interval snapshot_interval
-          end
+        settings = Settings.build(settings_data)
 
-          unless specialize.nil?
-            class_exec(&specialize)
-          end
-        end
+        Handle.build(session: session, settings: settings)
       end
-
-      Example = example_class
     end
   end
 end

data/lib/aggregate_streams/controls/store.rb

@@ -1,40 +1,16 @@
 module AggregateStreams
   module Controls
     module Store
-      def self.example(category: nil, snapshot: nil, snapshot_interval: nil)
-        if category.nil? && snapshot.nil?
-          cls = Example
-        else
-          cls = example_class(category: category, snapshot: snapshot, snapshot_interval: snapshot_interval)
-        end
-
-        cls.build
-      end
-
-      def self.example_class(category: nil, snapshot: nil, snapshot_interval: nil)
+      def self.example(category: nil, snapshot_interval: nil)
         if category == :none
           category = nil
         else
           category ||= self.category
         end
 
-        snapshot ||= false
+        snapshot_interval ||= self.snapshot_interval
 
-        if snapshot
-          snapshot_interval ||= self.snapshot_interval
-        end
-
-        Class.new do
-          include AggregateStreams::Store
-
-          unless category.nil?
-            category category
-          end
-
-          unless snapshot_interval.nil?
-            snapshot EntitySnapshot::Postgres, interval: snapshot_interval
-          end
-        end
+        AggregateStreams::Store.build(category: category, snapshot_interval: snapshot_interval)
       end
 
       def self.category
@@ -44,8 +20,6 @@ module AggregateStreams
       def self.snapshot_interval
         11
       end
-
-      Example = self.example_class
     end
   end
 end

data/lib/aggregate_streams/handle.rb

@@ -1,33 +1,27 @@
 module AggregateStreams
-  module Handle
-    TransformError = Class.new(RuntimeError)
-
-    def self.included(cls)
-      cls.class_exec do
-        include Messaging::Handle
-        include Messaging::StreamName
+  class Handle
+    include Messaging::Handle
+    include Messaging::StreamName
 
-        include Log::Dependency
+    include Log::Dependency
 
-        prepend Configure
+    TransformError = Class.new(RuntimeError)
 
-        extend StoreClass
-        extend CategoryMacro
-        extend TransformMacro
-        extend SnapshotIntervalMacro
-        extend WriterSessionMacro
+    setting :category
+    setting :snapshot_interval
+    setting :writer_session
+    setting :transform_action
 
-        const_set :Store, store_class
+    dependency :store, Store
+    dependency :write, MessageStore::Postgres::Write
 
-        dependency :store, self::Store
-        dependency :write, MessageStore::Postgres::Write
+    def configure(session: nil)
+      writer_session = self.writer_session
+      writer_session ||= session
 
-        virtual :writer_session
+      Store.configure(self, category: category, session: writer_session, snapshot_interval: snapshot_interval)
 
-        virtual :transform_action do
-          proc { |message_data| message_data }
-        end
-      end
+      MessageStore::Postgres::Write.configure(self, session: writer_session)
     end
 
     def handle(message_data)
@@ -84,7 +78,11 @@ module AggregateStreams
     end
 
     def transform(write_message_data, stream_name)
-      transform_action.(write_message_data, stream_name)
+      if transform_action.nil?
+        write_message_data
+      else
+        transform_action.(write_message_data, stream_name)
+      end
     end
 
     def assure_message_data(message_data)
@@ -92,57 +90,5 @@ module AggregateStreams
         raise TransformError, "Not an instance of MessageData::Write"
       end
     end
-
-    module Configure
-      def configure(session: nil)
-        writer_session = self.writer_session
-        writer_session ||= session
-
-        self.class::Store.configure(self, session: writer_session)
-
-        MessageStore::Postgres::Write.configure(self, session: writer_session)
-      end
-    end
-
-    module StoreClass
-      def store_class
-        @store_class ||= Class.new do
-          include Store
-        end
-      end
-      alias_method :store_cls, :store_class
-    end
-
-    module CategoryMacro
-      def category_macro(category)
-        super(category)
-
-        store_class.category_macro(category)
-      end
-      alias_method :category, :category_macro
-    end
-
-    module TransformMacro
-      def transform_macro(&transform_action)
-        define_method(:transform_action) do
-          transform_action
-        end
-      end
-      alias_method :transform, :transform_macro
-    end
-
-    module SnapshotIntervalMacro
-      def snapshot_interval_macro(interval)
-        store_class.snapshot(EntitySnapshot::Postgres, interval: interval)
-      end
-      alias_method :snapshot_interval, :snapshot_interval_macro
-    end
-
-    module WriterSessionMacro
-      def writer_session_macro(&block)
-        define_method(:writer_session, &block)
-      end
-      alias_method :writer_session, :writer_session_macro
-    end
   end
 end

data/lib/aggregate_streams/store.rb

@@ -1,19 +1,10 @@
 module AggregateStreams
-  module Store
-    def self.included(cls)
-      cls.class_exec do
-        include EntityStore
+  class Store
+    include EntityStore
 
-        entity Aggregation
-        projection Projection
-        reader MessageStore::Postgres::Read, batch_size: Defaults.batch_size
-      end
-    end
-
-    module Defaults
-      def self.batch_size
-        MessageStore::Postgres::Read::Defaults.batch_size
-      end
-    end
+    entity Aggregation
+    projection Projection
+    reader MessageStore::Postgres::Read
+    snapshot EntitySnapshot::Postgres, interval: 1000
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aggregate_streams
 version: !ruby/object:Gem::Version
-  version: 0.0.0.0
+  version: 1.0.0.0.rc1
 platform: ruby
 authors:
 - Nathan Ladd
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-consumer-postgres
@@ -132,9 +132,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.4
 signing_key: