evt-consumer-event_store 0.2.1.1 → 0.3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 662e0114549951c68e052b7cb91cd869fb3b6c08
-  data.tar.gz: b89ef00453b95aa34b649540bb9aaa73ca489902
+  metadata.gz: 8198797269a8305829bf75445528c0e9857a2b4e
+  data.tar.gz: ff430be9229c0b32aa819d452767aba402c3ce9f
 SHA512:
-  metadata.gz: c2d42ea109c7fc95836c1fc74c0ebd5ece1feed7d1d9ba391e488e45c57da17875defe0883835c037baf96d78b8d3e3ae6d201af9a54c8169b8c5dd8bf286935
-  data.tar.gz: e3e13bdbbf5188b3cf2684a0973c87834e970e9227f20984b2df9cb99b338c405ec3dfec421409127f67f0ac1629140479767df2626281c13e6d4bae9dffd351
+  metadata.gz: 2e2ae37969637886332a04760b2c9f4e435e570d7bc7f74f0aa9849d2c8a40a125bdf431ffbd84767380524edeab757116a4e97e6c1dab8592afced0baa21e1c
+  data.tar.gz: f20d34f092577d031febbe0eb4ce4d151519475b7f17cee491526ad596a548c314ecf8011ade78ab00175dd8205d309a0e64c0ebbffe16bd9c5a3e1f154f9fc0

data/lib/consumer/event_store/controls/{event_data.rb → message_data.rb}

@@ -1,7 +1,7 @@
 module Consumer
   module EventStore
     module Controls
-      EventData = ::Consumer::Controls::EventData
+      MessageData = ::Consumer::Controls::MessageData
     end
   end
 end

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

@@ -7,7 +7,7 @@ module Consumer
             stream_name ||= StreamName.example type: 'position'
             position ||= 0
 
-            message = PositionStore::PositionUpdated.new
+            message = PositionStore::Updated.new
             message.position = position
 
             Messaging::EventStore::Write.(message, stream_name)

data/lib/consumer/event_store/controls.rb

@@ -1,7 +1,7 @@
 require 'consumer/controls'
 
 require 'consumer/event_store/controls/category'
-require 'consumer/event_store/controls/event_data'
+require 'consumer/event_store/controls/message_data'
 require 'consumer/event_store/controls/handle'
 require 'consumer/event_store/controls/position_stream'
 require 'consumer/event_store/controls/stream_name'

data/lib/consumer/event_store/event_store.rb

@@ -15,18 +15,16 @@ module Consumer
         get_session = CopySession.(session)
       end
 
-      EventSource::EventStore::HTTP::Get.configure(
+      MessageStore::EventStore::Get.configure(
         self,
         batch_size: batch_size,
         long_poll_duration: long_poll_duration,
         session: get_session
       )
 
-      position_store_stream_name = stream_name.sub %r{\A\$ce-}, ''
-
       PositionStore.configure(
         self,
-        position_store_stream_name,
+        stream_name,
         session: session,
         position_store: position_store
       )

data/lib/consumer/event_store/position_store/stream_name.rb

@@ -0,0 +1,28 @@
+module Consumer
+  module EventStore
+    class PositionStore
+      module StreamName
+        def self.get(stream_name)
+          match_data = MessageStore::EventStore::StreamName.parse(stream_name)
+
+          types = match_data[:type_list]
+          types = Array(types)
+
+          return stream_name if types.include?('position')
+
+          types << 'position'
+
+          entity_name = match_data[:entity]
+
+          stream_id = match_data[:stream_id]
+
+          MessageStore::StreamName.stream_name(
+            entity_name,
+            stream_id,
+            types: types
+          )
+        end
+      end
+    end
+  end
+end

data/lib/consumer/event_store/position_store/updated.rb

@@ -0,0 +1,11 @@
+module Consumer
+  module EventStore
+    class PositionStore
+      class Updated
+        include Messaging::Message
+
+        attribute :position, Integer
+      end
+    end
+  end
+end

data/lib/consumer/event_store/position_store.rb

@@ -5,61 +5,38 @@ module Consumer
 
       initializer :stream_name
 
-      dependency :get_last, EventSource::EventStore::HTTP::Get::Last
-      dependency :session, EventSource::EventStore::HTTP::Session
+      dependency :get_last, MessageStore::EventStore::Get::Last
+      dependency :session, MessageStore::EventStore::Session
       dependency :write, ::Messaging::EventStore::Write
 
       def self.build(stream_name, session: nil)
-        position_stream_name = StreamName.canonize stream_name
+        position_stream_name = StreamName.get(stream_name)
 
         instance = new position_stream_name
-        EventSource::EventStore::HTTP::Session.configure instance, session: session
+        MessageStore::EventStore::Session.configure instance, session: session
         instance.configure
         instance
       end
 
       def configure
-        EventSource::EventStore::HTTP::Get::Last.configure self, session: session
+        MessageStore::EventStore::Get::Last.configure self, session: session
         Messaging::EventStore::Write.configure self, session: session
       end
 
       def get
-        event_data = get_last.(stream_name)
+        message_data = get_last.(stream_name)
 
-        return nil if event_data.nil?
+        return nil if message_data.nil?
 
-        message = Messaging::Message::Import.(event_data, PositionUpdated)
+        message = Messaging::Message::Import.(message_data, Updated)
         message.position
       end
 
       def put(position)
-        message = PositionUpdated.build :position => position
+        message = Updated.new
+        message.position = position
 
         write.(message, stream_name)
-
-        message
-      end
-
-      class PositionUpdated
-        include Messaging::Message
-
-        attribute :position, Integer
-      end
-
-      module StreamName
-        def self.canonize(stream_name)
-          types = EventSource::StreamName.get_type_list stream_name
-          types = Array(types)
-
-          return stream_name if types.include? 'position'
-
-          types << 'position'
-
-          entity_name = EventSource::StreamName.get_entity_name stream_name
-          id = EventSource::StreamName.get_id stream_name
-
-          EventSource::StreamName.stream_name entity_name, id, types: types
-        end
       end
     end
   end

data/lib/consumer/event_store.rb

@@ -1,6 +1,11 @@
 require 'consumer'
+
 require 'messaging/event_store'
 
+require 'consumer/event_store/position_store'
+require 'consumer/event_store/position_store/updated'
+require 'consumer/event_store/position_store/stream_name'
+
 require 'consumer/event_store/copy_session'
+
 require 'consumer/event_store/event_store'
-require 'consumer/event_store/position_store'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-consumer-event_store
 version: !ruby/object:Gem::Version
-  version: 0.2.1.1
+  version: 0.3.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-consumer
@@ -62,13 +62,15 @@ files:
 - lib/consumer/event_store/controls.rb
 - lib/consumer/event_store/controls/category.rb
 - lib/consumer/event_store/controls/consumer.rb
-- lib/consumer/event_store/controls/event_data.rb
 - lib/consumer/event_store/controls/handle.rb
+- lib/consumer/event_store/controls/message_data.rb
 - lib/consumer/event_store/controls/position_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/position_store/stream_name.rb
+- lib/consumer/event_store/position_store/updated.rb
 homepage: https://github.com/eventide-project/consumer-event-store
 licenses:
 - MIT