evt-message_store 1.1.0.1 → 2.3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb701682703ac52f3b1ffa560609cb6b0c58954a33bec499419fead5e1c7ee98
-  data.tar.gz: 7403cdf146cec248a05b53958e4eab4cc73a0f3576ef623adb369ff761ba8d96
+  metadata.gz: 0275af52a5677309393ba2fe0a1447042e32c9b586864eaba2b99b661f188607
+  data.tar.gz: f69ddf11f2594d75fdaa0711f099d0684bf2d240fd61a5cf76735f848ce91425
 SHA512:
-  metadata.gz: 3952554446f23f64b1a7c3c8b7a7ef30e070d3b66614ba9c0f62862272318ba707c2f8e3765c7eb4d00edafa90e154d1ea001a9b1692b2016f784e0422c559f3
-  data.tar.gz: ef0eb2a182e1001cf47de2b28ef68a39346456fd9fe7dba67998f012392c736a5dae1772cf400d665f4651ad8994587824b9a1b78d155fddf0b216cdb918bb59
+  metadata.gz: 33d403b5079967fa053ed4cc74c49486ae7dd64166407cf26cfdc078d2524afa34ee67a0da085eae3468241d1c88eead55ad2ade6f0a3f5cf788d1a383173cba
+  data.tar.gz: 057bf4f68b0ca75f1f5cba5bbfe82b031c147e0f2ec2c24c368bf094db46183b54f9c176764b8d961680ce86f2c5d6100910a434748834f273f9958430dd7a5c

data/lib/message_store.rb

@@ -11,11 +11,13 @@ require 'async_invocation'
 
 require 'message_store/expected_version'
 require 'message_store/no_stream'
+require 'message_store/id'
+require 'message_store/stream_name'
+
 require 'message_store/message_data'
 require 'message_store/message_data/hash/transform'
 require 'message_store/message_data/write'
 require 'message_store/message_data/read'
-require 'message_store/stream_name'
 
 require 'message_store/log'
 

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/id.rb

@@ -0,0 +1,45 @@
+module MessageStore
+  module ID
+    Error = Class.new(RuntimeError)
+
+    def self.compound_id_separator
+      '+'
+    end
+
+    def self.id(id)
+      if id.is_a?(Array)
+        id = compound_id(id)
+      else
+        if id.nil?
+          raise Error, "ID must not be omitted"
+        end
+      end
+
+      id
+    end
+
+    def self.get(id)
+      id(id)
+    end
+
+    def self.compound_id(ids)
+      if ids.empty?
+        raise Error, "IDs must not be omitted"
+      end
+
+      ids.join(compound_id_separator)
+    end
+
+    def self.get_cardinal_id(id)
+      parse(id).first
+    end
+
+    def self.parse(id)
+      if id.nil?
+        raise Error, "ID must not be omitted"
+      end
+
+      id.split(compound_id_separator)
+    end
+  end
+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
+      ID.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
+
+      stream_name = category
+
+      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
 
-      types = Array(types)
-      types.unshift(type) unless type.nil?
+      id_list = []
+      id_list << cardinal_id if not cardinal_id.nil?
 
-      type_list = nil
-      type_list = types.join(type_delimiter) unless types.empty?
+      id_list.concat(Array(stream_id))
+      id_list.concat(Array(id))
+      id_list.concat(Array(ids))
 
-      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_part = nil
+      if not id_list.empty?
+        id_part = ID.compound_id(id_list)
+        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?
+
+      ID.parse(ids)
+    end
+
+    def self.get_cardinal_id(stream_name)
+      id = get_id(stream_name)
+
+      return nil if id.nil?
+
+      ID.get_cardinal_id(id)
+    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.1
+  version: 2.3.1.0
 platform: ruby
 authors:
 - The Eventide Project
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-casing
@@ -149,14 +149,13 @@ files:
 - lib/message_store/get/stream/last.rb
 - lib/message_store/get/stream/last/substitute.rb
 - lib/message_store/get/substitute.rb
+- lib/message_store/id.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
@@ -165,7 +164,7 @@ homepage: https://github.com/eventide-project/message-store
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -180,8 +179,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Common primitives for platform-specific message store implementations
 test_files: []

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