evt-messaging 1.3.1.0 → 2.5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28931525ae23fbd0711034390490c280469d927bc45756bf4cab3925d124325b
-  data.tar.gz: 2764b0011d3a0faae98f37758766b42cb25dd4ab52a6241b811bf53d86391cc4
+  metadata.gz: 7bc5ad08d7cd5f55d19c1b407f80cd3448a6d877a22afd0f81b0261c25f2396c
+  data.tar.gz: ba24610fc9a6e02666f4d5094ffb4bb13ab9c084f7fccc34f237fb9dc520cb4d
 SHA512:
-  metadata.gz: 315edabbf8c2d64e37660db52e64e483a74a93b9371350b72aa326f926f7ab7a84b40aec7a3512d795f5dc395e987a3441c92b6955e530ba6db4536a2bfa427f
-  data.tar.gz: 8992a8383b2c0ba84a8109250f896ca9e1634d67c400a7cc3226065d3391d628633b556f9c720d329837057a8026a5b52df9ab7e03850d51d53712fc57360509
+  metadata.gz: 6a60193d1bd2f2bc8acb856b80dc76bf3bfb46ddb1a4d6810565b8725a1af6791e5197aaf94b1c89bc747af60b835c441e9a232d89acd97fe387d6cdc1e09352
+  data.tar.gz: ada89ba5b187b8762be1c5b2da07040d40e8cb3f96d61d019020c0d8e2dc2755387de5040fb46f5ad45544a149fb3fdba99a7aabde039582b63f76ac11001c07

data/lib/messaging/controls/stream_name.rb

@@ -3,7 +3,7 @@ module Messaging
     StreamName = MessageStore::Controls::StreamName
 
     module StreamName
-      module Named
+      module NamedCategory
         def self.example
           Example.new
         end

data/lib/messaging/handle.rb

@@ -7,7 +7,10 @@ module Messaging
         include Dependency
         include Virtual
 
-        dependency :handler_logger, ::Log
+        def handler_logger
+          @handler_logger ||= Log.get(self)
+        end
+        attr_writer :handler_logger
 
         extend Build
         extend Call
@@ -25,7 +28,6 @@ module Messaging
       def build(strict: nil, session: nil)
         instance = new
         instance.strict = strict
-        Log.configure(instance, attr_name: :handler_logger)
 
         if Build.configure_session?(instance)
           instance.configure(session: session)
@@ -48,12 +50,12 @@ module Messaging
         return true if parameter_type == :key
 
         error_message = "Optional session parameter of configure is not a keyword argument (Type: #{parameter_type.inspect})"
-        logger.error(tag: :handle) { error_message }
+        handler_logger.error(tag: :handle) { error_message }
         raise ArgumentError, error_message
       end
 
-      def self.logger
-        @logger ||= Log.build(self)
+      def self.handler_logger
+        @handler_logger ||= Log.get(self)
       end
     end
 

data/lib/messaging/message_registry.rb

@@ -4,12 +4,18 @@ module Messaging
 
     include Log::Dependency
 
-    def entries
-      @entries ||= []
+    def message_classes
+      @message_classes ||= []
+    end
+
+    def message_types
+      message_classes.map do |message_class|
+        message_class.message_type
+      end
     end
 
     def get(message_name)
-      entries.find do |message_class|
+      message_classes.find do |message_class|
         message_class.message_name == message_name
       end
     end
@@ -22,19 +28,19 @@ module Messaging
         raise Error, error_msg
       end
 
-      entries << message_class
+      message_classes << message_class
 
       logger.debug { "Registered #{message_class}"}
 
-      entries
+      message_classes
     end
 
     def registered?(message_class)
-      entries.include?(message_class)
+      message_classes.include?(message_class)
     end
 
     def length
-      entries.length
+      message_classes.length
     end
   end
 end

data/lib/messaging/stream_name.rb

@@ -13,13 +13,21 @@ module Messaging
       end
     end
 
-    def stream_name(id, category=nil, type: nil, types: nil)
-      if id == nil
+    def stream_name(stream_id=nil, stream_category=nil, category: nil, cardinal_id: nil, id: nil, ids: nil, type: nil, types: nil)
+      if stream_id.nil? && cardinal_id.nil? && id.nil? && ids.nil?
         raise Error, "ID must not be omitted from stream name"
       end
 
-      category ||= self.category
-      MessageStore::StreamName.stream_name(category, id, type: type, types: types)
+      stream_category ||= category
+      if stream_category.nil?
+        if not self.respond_to?(:category)
+          raise Error, "Category must not be omitted from stream name"
+        else
+          stream_category = self.category
+        end
+      end
+
+      MessageStore::StreamName.stream_name(stream_category, stream_id, cardinal_id: cardinal_id, id: id, ids: ids, type: type, types: types)
     end
 
     def category_stream_name(category=nil, type: nil, types: nil)
@@ -51,8 +59,32 @@ module Messaging
       MessageStore::StreamName.get_category(stream_name)
     end
 
+    def self.category?(stream_name)
+      MessageStore::StreamName.category?(stream_name)
+    end
+
+    def self.get_entity_name(stream_name)
+      MessageStore::StreamName.get_entity_name(stream_name)
+    end
+
     def self.get_id(stream_name)
       MessageStore::StreamName.get_id(stream_name)
     end
+
+    def self.get_ids(stream_name)
+      MessageStore::StreamName.get_ids(stream_name)
+    end
+
+    def self.get_cardinal_id(stream_name)
+      MessageStore::StreamName.get_cardinal_id(stream_name)
+    end
+
+    def self.get_type(stream_name)
+      MessageStore::StreamName.get_type(stream_name)
+    end
+
+    def self.get_types(stream_name)
+      MessageStore::StreamName.get_types(stream_name)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-messaging
 version: !ruby/object:Gem::Version
-  version: 1.3.1.0
+  version: 2.5.1.1
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-message_store
@@ -44,7 +44,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/loader.rb
 - lib/messaging.rb
 - lib/messaging/category.rb
 - lib/messaging/controls.rb
@@ -92,7 +91,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 messaging implementations for Eventide

data/lib/loader.rb

@@ -1 +0,0 @@
-lib/messaging.rb