evt-message_store 1.2.0.0 → 2.3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f11bc763f84ee7713a149dcbd82c93a05c3bd6bc77ccf6238f3eddff404547ab
-  data.tar.gz: 58a75a34e87d818aed83f73bfe446a0435ba6dbc6e7266cb4a0230878d81cc62
+  metadata.gz: 156de8cf748968c091d28df2d2ce7b9c25d0a996ada4d6f473a1a31667bee851
+  data.tar.gz: 81aab6e0f701fdf1c9c9263c0548b6f8f22d8b75241b3720af314e2cc47b211d
 SHA512:
-  metadata.gz: c4b2f5af783cbc5dd299bcd6c00072dfa2c8da0c34917f10967714a694cb872bd2186cfeb580b8886454e39b0bbf2cf3da0fb648945bec8d965752a261a8770d
-  data.tar.gz: 81e9df220c30010d3fe1863d521b2407940f674005c00569763b0e8da6fbbf8bace91cc06a9e2e55ff7bea6f1bee28d6351ed4c3d7ed5268b00afa7a5638cccd
+  metadata.gz: 83be616f3481e506586e349480ff6cbb2e53d369aae02eb1de2c312d3c94e04c8a455652a4581a08ba57fb15cc8a7765043ac42a334aaf13a1ca48931865ce61
+  data.tar.gz: 6df8f35fae0c431eaa6fa79716eb254953e39593f7b76ebea2c1310ed928c0c65974bb072b902a608d23404d30bd771afd5b8fe1511660a5ab3778f97a894c25

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

@@ -2,49 +2,57 @@ 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.type_delimiter
-      '+'
+    def self.category_type_separator
+      ':'
     end
 
-    class << self
-      alias :compound_id_delimiter :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))
 
-      stream_name = category_name
-      stream_name = "#{stream_name}#{category_delimiter}#{type_list}" unless type_list.nil?
+      type_part = type_list.join(compound_type_separator)
 
-      if not id.nil?
-        if id.is_a?(Array)
-          id = id.join(compound_id_delimiter)
-        end
+      if not type_part.empty?
+        stream_name = "#{stream_name}#{category_type_separator}#{type_part}"
       end
 
-      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)
@@ -56,7 +64,15 @@ module MessageStore
 
       return [] if ids.nil?
 
-      ids.split(compound_id_delimiter)
+      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)
@@ -64,15 +80,15 @@ module MessageStore
     end
 
     def self.category?(stream_name)
-      !stream_name.include?(id_delimiter)
+      !stream_name.include?(id_separator)
     end
 
     def self.get_category_type(stream_name)
-      return nil unless stream_name.include?(category_delimiter)
+      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)
@@ -84,7 +100,7 @@ module MessageStore
 
       return [] if type_list.nil?
 
-      type_list.split(type_delimiter)
+      type_list.split(compound_type_separator)
     end
 
     def self.get_types(*args)
@@ -92,7 +108,7 @@ module MessageStore
     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.2.0.0
+  version: 2.3.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-03 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-casing