evt-consumer-event_store 0.1.0.2 → 0.2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e90762ac55e5ce8035cb1c10f683fdf7203fbe45
-  data.tar.gz: 5741856b20f5a0077ec98063524fcc82e65a3793
+  metadata.gz: 0b94ea341885393d6dec8741b6a3a5f01fbc0053
+  data.tar.gz: 0bfa655ea86e7b74dc444e696d13a2332b43a370
 SHA512:
-  metadata.gz: 4853990b3d1b1c0792f37c3a4b54a229a6187a528e83774aee0d738ef2930ecde35f5ae22f2285ab5e5a23997cedae510040e4b73d1ef725bd170f147d4e5130
-  data.tar.gz: adf4f3fdf5ccb2a6546a2ccf6f040eab2c95b90710b00a996579aadb02017dad880a855576e98248f3aae658546ffd426a1cb7805d6544ae531d4bffdf1c6219
+  metadata.gz: 64c7d5865f948d4e81ffe43a56e420e8dd0a53f7b8a343c5c39bb87d3786c5de4f9fac293f66483b1d46d9227fde7bd92b1c01c194ea4f47e31452758112b09b
+  data.tar.gz: 3e48509db49b9551e57e6e30bf5ae0e194c682f0f96d27369e6a8c6bb9a45dcb6c16df64b6a70cd43239da4aaefea712908b19edcdf745c6dfcfdd53010ae505

data/lib/consumer/event_store.rb

@@ -1,8 +1,6 @@
 require 'consumer'
 require 'messaging/event_store'
 
+require 'consumer/event_store/copy_session'
 require 'consumer/event_store/event_store'
-require 'consumer/event_store/subscription'
 require 'consumer/event_store/position_store'
-
-Consumer::EventStore.activate

data/lib/consumer/event_store/controls.rb

@@ -4,7 +4,6 @@ require 'consumer/event_store/controls/category'
 require 'consumer/event_store/controls/event_data'
 require 'consumer/event_store/controls/handle'
 require 'consumer/event_store/controls/position_stream'
-require 'consumer/event_store/controls/stream'
 require 'consumer/event_store/controls/stream_name'
 
 require 'consumer/event_store/controls/consumer'

data/lib/consumer/event_store/copy_session.rb

@@ -0,0 +1,11 @@
+module Consumer
+  module EventStore
+    module CopySession
+      def self.call(session)
+        copy = session.dup
+        copy.reconnect
+        copy
+      end
+    end
+  end
+end

data/lib/consumer/event_store/event_store.rb

@@ -1,9 +1,5 @@
 module Consumer
   module EventStore
-    def self.activate
-      Subscription.activate
-    end
-
     def self.included(cls)
       cls.class_exec do
         include Consumer
@@ -16,7 +12,7 @@ module Consumer
       long_poll_duration = Rational(cycle_timeout, 1000).ceil
 
       unless session.nil?
-        get_session = ::EventStore::HTTP::Session.copy session
+        get_session = CopySession.(session)
       end
 
       EventSource::EventStore::HTTP::Get.configure(
@@ -28,7 +24,7 @@ module Consumer
 
       PositionStore.configure(
         self,
-        stream,
+        stream_name,
         session: session,
         position_store: position_store
       )

data/lib/consumer/event_store/position_store.rb

@@ -10,9 +10,7 @@ module Consumer
       dependency :write, ::Messaging::EventStore::Write
 
       def self.build(stream_name, session: nil)
-        stream = EventSource::Stream.build stream_name
-
-        position_stream_name = StreamName.canonize stream.name
+        position_stream_name = StreamName.canonize stream_name
 
         instance = new position_stream_name
         EventSource::EventStore::HTTP::Session.configure instance, session: session
@@ -50,13 +48,17 @@ module Consumer
 
       module StreamName
         def self.canonize(stream_name)
-          stream = EventSource::Stream.build stream_name
+          types = EventSource::StreamName.get_type_list stream_name
+          types = Array(types)
+
+          return stream_name if types.include? 'position'
+
+          types << 'position'
 
-          return stream.name if stream.type == 'position'
+          entity_name = EventSource::StreamName.get_entity_name stream_name
+          id = EventSource::StreamName.get_id stream_name
 
-          stream_name = "#{stream.category}:position"
-          stream_name << "-#{stream.id}" if stream.id
-          stream_name
+          EventSource::StreamName.stream_name entity_name, id, types: types
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-consumer-event_store
 version: !ruby/object:Gem::Version
-  version: 0.1.0.2
+  version: 0.2.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-consumer
@@ -65,11 +65,10 @@ files:
 - lib/consumer/event_store/controls/event_data.rb
 - lib/consumer/event_store/controls/handle.rb
 - lib/consumer/event_store/controls/position_stream.rb
-- lib/consumer/event_store/controls/stream.rb
 - lib/consumer/event_store/controls/stream_name.rb
+- lib/consumer/event_store/copy_session.rb
 - lib/consumer/event_store/event_store.rb
 - lib/consumer/event_store/position_store.rb
-- lib/consumer/event_store/subscription.rb
 homepage: https://github.com/eventide-project/consumer-event-store
 licenses:
 - MIT

data/lib/consumer/event_store/controls/stream.rb

@@ -1,7 +0,0 @@
-module Consumer
-  module EventStore
-    module Controls
-      Stream = Consumer::Controls::Stream
-    end
-  end
-end

data/lib/consumer/event_store/subscription.rb

@@ -1,17 +0,0 @@
-module Consumer
-  module EventStore
-    module Subscription
-      def self.activate
-        Consumer::Subscription.class_exec do
-          prepend StreamName
-        end
-      end
-
-      module StreamName
-        def stream_name
-          EventSource::EventStore::HTTP::StreamName.canonize stream
-        end
-      end
-    end
-  end
-end