evt-message_store 1.1.0.0 → 2.3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40121815466711f7a023e49b5c02c8439456ef0eff75171a2ba0f56513358774
-  data.tar.gz: 4d3ce500d096eb4b877722b8dd6052cc6bcb8f7f7b90bba124453272e07a1d9c
+  metadata.gz: 10704ac2544b2ef44429b0e55c4c44ccc78fe460c141b1927997b00d7d2dea75
+  data.tar.gz: b217d7aa1b18943f71cfb8c450c3820da418ec6c465acfe23c02cf948563a925
 SHA512:
-  metadata.gz: edeac71d9c4a5d8abcea0d48e6598007b05d88760a58fc62bd456a146f84f33383e15ce179415705d404639c1db9d14812409fc86fa6ebd51318cef65915ae58
-  data.tar.gz: 1c3d8ae0f92318f2742e9649595110d0fa777058b9f46ba1ffcf77b0304d9bf95224ed054d8938535b9f37519d2589bd7eb6bc79d46a9bc6be0aed7a6fe5f521
+  metadata.gz: a898788cd605db367f529f2f750899b40cf164908ee8297c0e3e3e092c246953704a2021be8a25c5b9ace959b14a82536184f641228b6845cb7a49ee3ba2730c
+  data.tar.gz: 0272bc2fe2995e8448ccaee0e452037782a03581c0b77844233d27eaec2614971c2625959409c68b273a2027df7609a683ffb52ab21e179b41e075f0ed8203d0

data/lib/message_store/controls.rb

@@ -1,5 +1,6 @@
 require 'securerandom'
 
+require 'clock/controls'
 require 'identifier/uuid/controls'
 
 require 'message_store/controls/random_value'

data/lib/message_store/controls/category.rb

@@ -1,7 +1,7 @@
 module MessageStore
   module Controls
     module Category
-      def self.example(category: nil, randomize_category: nil)
+      def self.example(category: nil, type: nil, types: nil, randomize_category: nil)
         if randomize_category.nil?
           if !category.nil?
             randomize_category = false
@@ -16,6 +16,8 @@ module MessageStore
           category = "#{category}#{SecureRandom.hex(16)}XX"
         end
 
+        category = Controls::StreamName.stream_name(category, type: type, types: types)
+
         category
       end
     end

data/lib/message_store/controls/time.rb

@@ -8,52 +8,54 @@ module MessageStore
 
       module Raw
         def self.example
-          time = ::Time.parse("Jan 1 00:00:00 UTC 2000")
-          Clock::UTC.now(time)
+          Clock::Controls::Time::Raw.example
         end
       end
 
       module ISO8601
         def self.example(time=nil)
-          time ||= Raw.example
-          Clock::UTC.iso8601(time)
+          Clock::Controls::Time::ISO8601.example(time)
+        end
+
+        def self.precision
+          3
         end
       end
 
       module Processed
         def self.example(time=nil, offset_milliseconds: nil)
-          time ||= Time::Raw.example
-          time = Raw.example(time, offset_milliseconds: offset_milliseconds)
-          ISO8601.example(time)
+          offset_milliseconds ||= self.offset_milliseconds
+          Clock::Controls::Time::Offset.example(offset_milliseconds, time: time, precision: ISO8601.precision)
         end
 
         module Raw
           def self.example(time=nil, offset_milliseconds: nil)
-            time ||= Time::Raw.example
-            offset_milliseconds ||= 11
-            offset = Rational(offset_milliseconds, 1000)
-            time += offset
-            time
+            offset_milliseconds ||= Processed.offset_milliseconds
+            Clock::Controls::Time::Offset::Raw.example(offset_milliseconds, time: time, precision: ISO8601.precision)
           end
         end
+
+        def self.offset_milliseconds
+          11
+        end
       end
 
       module Effective
         def self.example(time=nil, offset_milliseconds: nil)
-          time ||= Time::Raw.example
-          time = Raw.example(time, offset_milliseconds: offset_milliseconds)
-          ISO8601.example(time)
+          offset_milliseconds ||= self.offset_milliseconds
+          Clock::Controls::Time::Offset.example(offset_milliseconds, time: time, precision: ISO8601.precision)
         end
 
         module Raw
           def self.example(time=nil, offset_milliseconds: nil)
-            time ||= Time::Raw.example
-            offset_milliseconds ||= 1
-            offset = Rational(offset_milliseconds, 1000)
-            time += offset
-            time
+            offset_milliseconds ||= Effective.offset_milliseconds
+            Clock::Controls::Time::Offset::Raw.example(offset_milliseconds, time: time, precision: ISO8601.precision)
           end
         end
+
+        def self.offset_milliseconds
+          1
+        end
       end
     end
   end

data/lib/message_store/get/substitute.rb

@@ -7,6 +7,7 @@ module MessageStore
       include Get
 
       attr_accessor :stream_name
+      alias :category :stream_name
 
       def batch_size
         @batch_size ||= 1

data/lib/message_store/read.rb

@@ -70,6 +70,7 @@ module MessageStore
         message_data = iterator.next
 
         break if message_data.nil?
+        logger.debug(tags: [:data, :message_data]) { message_data.pretty_inspect }
 
         action.(message_data)
       end

data/lib/message_store/stream_name.rb

@@ -2,70 +2,113 @@ module MessageStore
   module StreamName
     Error = Class.new(RuntimeError)
 
-    def self.id_delimiter
+    def self.id_separator
       '-'
     end
 
-    def self.category_delimiter
+    def self.compound_id_separator
+      '+'
+    end
+
+    def self.category_type_separator
       ':'
     end
 
-    def self.type_delimiter
+    def self.compound_type_separator
       '+'
     end
 
-    def self.stream_name(category_name, id=nil, type: nil, types: nil)
-      if category_name == nil
-        raise Error, "Category name must not be omitted from stream name"
+    def self.stream_name(category, stream_id=nil, cardinal_id: nil, id: nil, ids: nil, type: nil, types: nil)
+      if category == nil
+        raise Error, "Category must not be omitted from stream name"
       end
 
-      types = Array(types)
-      types.unshift(type) unless type.nil?
+      stream_name = category
 
-      type_list = nil
-      type_list = types.join(type_delimiter) unless types.empty?
+      type_list = []
+      type_list.concat(Array(type))
+      type_list.concat(Array(types))
+
+      type_part = type_list.join(compound_type_separator)
+
+      if not type_part.empty?
+        stream_name = "#{stream_name}#{category_type_separator}#{type_part}"
+      end
 
-      stream_name = category_name
-      stream_name = "#{stream_name}#{category_delimiter}#{type_list}" unless type_list.nil?
-      stream_name = "#{stream_name}#{id_delimiter}#{id}" unless id.nil?
+      id_list = []
+      id_list << cardinal_id if not cardinal_id.nil?
+
+      id_list.concat(Array(stream_id))
+      id_list.concat(Array(id))
+      id_list.concat(Array(ids))
+
+      id_part = id_list.join(compound_id_separator)
+
+      if not id_part.empty?
+        stream_name = "#{stream_name}#{id_separator}#{id_part}"
+      end
 
       stream_name
     end
 
     def self.split(stream_name)
-      stream_name.split(id_delimiter, 2)
+      stream_name.split(id_separator, 2)
     end
 
     def self.get_id(stream_name)
       split(stream_name)[1]
     end
 
+    def self.get_ids(stream_name)
+      ids = get_id(stream_name)
+
+      return [] if ids.nil?
+
+      ids.split(compound_id_separator)
+    end
+
+    def self.get_cardinal_id(stream_name)
+      id = get_id(stream_name)
+
+      return nil if id.nil?
+
+      id.split(compound_id_separator).first
+    end
+
     def self.get_category(stream_name)
       split(stream_name)[0]
     end
 
     def self.category?(stream_name)
-      !stream_name.include?(id_delimiter)
+      !stream_name.include?(id_separator)
     end
 
-    def self.get_type_list(stream_name)
-      return nil unless stream_name.include?(category_delimiter)
+    def self.get_category_type(stream_name)
+      return nil unless stream_name.include?(category_type_separator)
 
       category = get_category(stream_name)
 
-      category.split(category_delimiter)[1]
+      category.split(category_type_separator)[1]
+    end
+
+    def self.get_type(*args)
+      get_category_type(*args)
     end
 
-    def self.get_types(stream_name)
-      type_list = get_type_list(stream_name)
+    def self.get_category_types(stream_name)
+      type_list = get_type(stream_name)
 
       return [] if type_list.nil?
 
-      type_list.split(type_delimiter)
+      type_list.split(compound_type_separator)
+    end
+
+    def self.get_types(*args)
+      get_category_types(*args)
     end
 
     def self.get_entity_name(stream_name)
-      get_category(stream_name).split(category_delimiter)[0]
+      get_category(stream_name).split(category_type_separator)[0]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-message_store
 version: !ruby/object:Gem::Version
-  version: 1.1.0.0
+  version: 2.3.0.2
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2020-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-casing
@@ -155,8 +155,6 @@ files:
 - 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
@@ -180,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Common primitives for platform-specific message store implementations

data/lib/message_store/postgres

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

data/lib/message_store/postgres.rb

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