evt-event_source-postgres 0.13.1.0 → 0.14.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0573e3a185792d80a07c24903296f5368d886d3
-  data.tar.gz: 05f950765f78cc0b868449bed5a2cb358e68a0cc
+  metadata.gz: 68c942d8feff2931948d186e19525fe08dba49ee
+  data.tar.gz: 3fe781d10b0cffc9d9ad04895cc23b06aa5c0a0a
 SHA512:
-  metadata.gz: 35a37eff132a03a01c6403fbf027b3a2aee6cb722c32056448f19cb42d96d90f27c90200c68de485587d29a93c24f1fc5ff6185c9a4387d9177fbed6106e6fff
-  data.tar.gz: b0fbcf5896e1d7ae8ad974224edeb2c556b39ea82b307d5cfacc199ab1b69b54d3c313a2fa43c49a1999b15a39e689cdd3f0fc2abdc16ae7c4ef221492f706d5
+  metadata.gz: 76a88b8684a1edc793f9daa976dbe74865e6752a87601cfc3e3f0d836789f1afc461eb46cd179a16edddb3712f4b440b87ccc895296da6f92c9c8dc7871e5271
+  data.tar.gz: 0c45cde102edd51e9d81b39571aa227386bf85c36af676c1b92ea1684f0615081497938d9fe867144ab0bf6002f47ac32e1238f5462375daea8cf1f4f01f5f0d

data/lib/event_source/postgres/controls.rb

@@ -2,6 +2,5 @@ require 'event_source/controls'
 
 require 'event_source/postgres/controls/category'
 require 'event_source/postgres/controls/stream_name'
-require 'event_source/postgres/controls/stream'
 require 'event_source/postgres/controls/event_data'
 require 'event_source/postgres/controls/put'

data/lib/event_source/postgres/get/last/select_statement.rb

@@ -5,15 +5,10 @@ module EventSource
         class SelectStatement
           include Log::Dependency
 
-          initializer :stream
-
-          def stream_name
-            stream.name
-          end
+          initializer :stream_name
 
           def self.build(stream_name)
-            stream = Stream.new(stream_name)
-            new(stream)
+            new(stream_name)
           end
 
           def sql

data/lib/event_source/postgres/get/select_statement.rb

@@ -4,7 +4,7 @@ module EventSource
       class SelectStatement
         include Log::Dependency
 
-        initializer :stream, w(:position), w(:batch_size)
+        initializer :stream_name, w(:position), w(:batch_size)
 
         def position
           @position ||= Defaults.position
@@ -14,21 +14,20 @@ module EventSource
           @batch_size ||= Defaults.batch_size
         end
 
-        def stream_name
-          stream.name
+        def stream_type
+          @stream_type ||= StreamName.get_type(stream_name)
         end
 
-        def stream_type
-          stream.type
+        def category_stream?
+          is_category_stream ||= StreamName.category?(stream_name)
         end
 
         def self.build(stream_name, position: nil, batch_size: nil)
-          stream = Stream.new(stream_name)
-          new(stream, position, batch_size)
+          new(stream_name, position, batch_size)
         end
 
         def sql
-          logger.trace(tag: :sql) { "Composing select statement (Stream: #{stream_name}, Category: #{stream.category?}, Type: #{stream_type.inspect}, Position: #{position}, Batch Size: #{batch_size})" }
+          logger.trace(tag: :sql) { "Composing select statement (Stream: #{stream_name}, Category: #{category_stream?}, Type: #{stream_type.inspect}, Position: #{position}, Batch Size: #{batch_size})" }
 
           statement = <<-SQL
             SELECT
@@ -52,14 +51,14 @@ module EventSource
             ;
           SQL
 
-          logger.debug(tag: :sql) { "Composed select statement (Stream: #{stream_name}, Category: #{stream.category?}, Type: #{stream_type.inspect}, Position: #{position}, Batch Size: #{batch_size})" }
+          logger.debug(tag: :sql) { "Composed select statement (Stream: #{stream_name}, Category: #{category_stream?}, Type: #{stream_type.inspect}, Position: #{position}, Batch Size: #{batch_size})" }
           logger.debug(tags: [:data, :sql]) { "Statement: #{statement}" }
 
           statement
         end
 
         def where_clause_field
-          unless stream.category?
+          unless category_stream?
             'stream_name'
           else
             'category(stream_name)'
@@ -67,7 +66,7 @@ module EventSource
         end
 
         def position_field
-          unless stream.category?
+          unless category_stream?
             'position'
           else
             'global_position'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-event_source-postgres
 version: !ruby/object:Gem::Version
-  version: 0.13.1.0
+  version: 0.14.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-event_source
@@ -106,7 +106,6 @@ files:
 - lib/event_source/postgres/controls/category.rb
 - lib/event_source/postgres/controls/event_data.rb
 - lib/event_source/postgres/controls/put.rb
-- lib/event_source/postgres/controls/stream.rb
 - lib/event_source/postgres/controls/stream_name.rb
 - lib/event_source/postgres/get.rb
 - lib/event_source/postgres/get/last.rb

data/lib/event_source/postgres/controls/stream.rb

@@ -1,7 +0,0 @@
-module EventSource
-  module Postgres
-    module Controls
-      Stream = EventSource::Controls::Stream
-    end
-  end
-end