evt-event_source 0.18.2.1 → 0.19.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bdd6bac404bf5f1c0931fb2913688d4325abad2
-  data.tar.gz: df32dea81012d80b66a4e7ac30bd0da990b9459c
+  metadata.gz: d2023c4a4fded3ae97318f828482cfa3a1984560
+  data.tar.gz: '07874a76c0b95e1bc4f7a7da7a3404e5738a7556'
 SHA512:
-  metadata.gz: abefbc527a28696c7a36e5a789978137c33f72d5df872ef257339d5b38c84af1e2e84fba604f374768b4ed930a840456ca6da23fca12a34cf20e6431a3f8a8d0
-  data.tar.gz: e2bd805e94970393b74f00ba0996840c3963eb4eb8993fcd04ca3134223ac81c82ebcdf431cedea76f0cb086be4d041caa965ed38e8c1bc20202d3c59aa6fa6d
+  metadata.gz: d6c814ec4314887fb5a92b42d5588aa49cf22fe6434b5e9e89318bee444fb948eac1a1285da114d63f9a3d05840d418e4bc7fe6ff7b55fcdbc578f249ce1a393
+  data.tar.gz: 6e84704a70a50dc4a4d854e9d2266d4b8394b4b4f0e94867a9c603293088520f9e61e7a665bf6bf0cab3debc0d7a1126c1de58b44fb6c1e6a7687ab5852b3b44

data/lib/event_source/controls/stream_name.rb

@@ -1,10 +1,14 @@
 module EventSource
   module Controls
     module StreamName
-      def self.example(category: nil, id: nil, randomize_category: nil)
+      def self.example(category: nil, id: nil, type: nil, randomize_category: nil)
         category ||= Category.example(category: category, randomize_category: randomize_category)
         id ||= Identifier::UUID.random
 
+        unless type.nil?
+          category = "#{category}:#{type}"
+        end
+
         "#{category}-#{id}"
       end
     end

data/lib/event_source/stream.rb

@@ -2,30 +2,23 @@ module EventSource
   class Stream
     initializer :name
 
-    def self.get_type(name)
-      subtype = name.split(':').last.split('-').first
-
-      if name.start_with?(subtype)
-        return :stream
-      else
-        return subtype.to_sym
-      end
-    end
-
-    def self.canonize(stream)
-      return stream if stream.is_a? self
-
-      new stream
+    def self.build(subject)
+      return subject if subject.is_a? self
+      new(subject)
     end
 
-    def type
-      @type ||= self.class.get_type(name)
+    def id
+      @id ||= StreamName.get_id(name)
     end
 
     def category
       @category ||= StreamName.get_category(name)
     end
 
+    def type
+      @type ||= StreamName.get_type(name)
+    end
+
     def category?
       @is_category ||= !name.include?('-')
     end

data/lib/event_source/stream_name.rb

@@ -1,9 +1,11 @@
 module EventSource
   module StreamName
-    extend self
+    def self.stream_name(category_name, id=nil, type: nil)
+      stream_name = category_name
+      stream_name = "#{stream_name}:#{type}" unless type.nil?
+      stream_name = "#{stream_name}-#{id}" unless id.nil?
 
-    def stream_name(category_name, id)
-      "#{category_name}-#{id}"
+      stream_name
     end
 
     def self.get_id(stream_name)
@@ -14,5 +16,13 @@ module EventSource
     def self.get_category(stream_name)
       stream_name.split('-')[0]
     end
+
+    def self.get_type(name)
+      type = name.split(':').last.split('-').first
+
+      return nil if name.start_with?(type)
+
+      type
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-event_source
 version: !ruby/object:Gem::Version
-  version: 0.18.2.1
+  version: 0.19.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-casing