event_store_client 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc9b72a371be013731424338e4faed48bbd625f39a4e18a1b77a8f32fbc0b16d
-  data.tar.gz: 97c351e9404da7efa5add4fd1375d35cca4d1bbc133cfe80704614f86ec2ec5c
+  metadata.gz: b27db234d64f8cbe377e6eb65b5b194c7b42178bf4201323baae5ac6a7e99f57
+  data.tar.gz: b4df0eaec15c72dbaeccd1fa64485a23df385f889e5d448e1cd24be96913ed65
 SHA512:
-  metadata.gz: cb3e3b0834d95a0a4d3139b7499360f555e53f60256e5b71b3993db2deca3a0904c524f958b91bbec8243b6d680c7705af5e100a714af919db3250ca4873a1d7
-  data.tar.gz: cb344c5a518110c8d9c22bfb0fba2ea107c20b2dd0e7566f688a9e1ec0bd6a9694e13a5df92eacf70ebb27bce901f7930dc03bb0fc4c7b6d876a4d90df9549e2
+  metadata.gz: 5c0f0760c3c0ce01b39dc8c9501b8112c38f911ab4415bd64fda77cda17d0e5684d4f8d362d3f1728939a6ad85b88bba3a71a2161d3399999ea425a781893564
+  data.tar.gz: 7a5d1d6983f90d6ad38c4b57323f4290934f38e687b1302e712b9a0723b26d873ce49128d3341a6334ac62abe0c8896608943012b679d4788bac778bcdc35742

data/lib/event_store_client/broker.rb

@@ -6,11 +6,7 @@ module EventStoreClient
       subscriptions.each do |subscription|
         new_events = connection.consume_feed(subscription.stream, subscription.name)
         next if new_events.none?
-        new_events.each do |event|
-          subscription.subscribers.each do |subscriber|
-            subscriber.call(event)
-          end
-        end
+        new_events.each { |event| subscription.subscriber.call(event) }
       end
     end
 

data/lib/event_store_client/connection.rb

@@ -19,6 +19,10 @@ module EventStoreClient
 
     def delete_stream(stream); end
 
+    def join_streams(name, streams)
+      client.join_streams(name, streams)
+    end
+
     def subscribe(stream, name:)
       client.subscribe_to_stream(stream, name)
     end
@@ -27,18 +31,12 @@ module EventStoreClient
       response = client.consume_feed(stream, subscription)
       return [] unless response.body
       body = JSON.parse(response.body)
-      ack_uri =
-        body['links'].find { |link| link['relation'] == 'ackAll' }.
-          try(:[], 'uri')
+
+      ack = body['links'].find { |link| link['relation'] == 'ackAll' }
+      return unless ack
+      ack_uri = ack['uri']
       events = body['entries'].map do |entry|
-        event = EventStoreClient::Event.new(
-          id: entry['eventId'],
-          title: entry['title'],
-          type: entry['eventType'],
-          data: entry['data'] || '{}',
-          metadata: entry['isMetaData'] ? entry['metaData'] : '{}'
-        )
-        mapper.deserialize(event)
+        deserialize_event(entry)
       end
       client.ack(ack_uri)
       events
@@ -112,9 +110,10 @@ module EventStoreClient
         id: entry['eventId'],
         title: entry['title'],
         type: entry['eventType'],
-        data: entry['data'],
-        metadata: entry['metaData']
+        data: entry['data'] || '{}',
+        metadata: entry['isMetaData'] ? entry['metaData'] : '{}'
       )
+
       mapper.deserialize(event)
     end
   end

data/lib/event_store_client/store_adapter/api/client.rb

@@ -38,6 +38,24 @@ module EventStoreClient
           )
         end
 
+        def join_streams(name, streams)
+          data = <<~STRING
+            fromStreams(#{streams})
+            .when({
+              $any: function(s,e) {
+                linkTo("#{name}", e)
+              }
+            })
+          STRING
+
+          make_request(
+            :post,
+            "/projections/continuous?name=#{name}&type=js&enabled=true&emit=true%26trackemittedstreams=true", # rubocop:disable Metrics/LineLength
+            body: data,
+            headers: {}
+          )
+        end
+
         def subscribe_to_stream(
           stream_name, subscription_name, stats: true, start_from: 0, retries: 5
         )
@@ -48,7 +66,7 @@ module EventStoreClient
               extraStatistics: stats,
               startFrom: start_from,
               maxRetryCount: retries,
-              resolveLinkTos: true
+              resolveLinktos: true
             },
             headers: {
               'Content-Type' => 'application/json'
@@ -60,11 +78,14 @@ module EventStoreClient
           stream_name,
           subscription_name,
           count: 1,
-          long_poll: 0
+          long_poll: 0,
+          resolve_links: true
         )
           headers = long_poll.positive? ? { 'ES-LongPoll' => long_poll.to_s } : {}
           headers['Content-Type'] = 'application/vnd.eventstore.competingatom+json'
           headers['Accept'] = 'application/vnd.eventstore.competingatom+json'
+          headers['ES-ResolveLinkTos'] = resolve_links.to_s
+
           make_request(
             :get,
             "/subscriptions/#{stream_name}/#{subscription_name}/#{count}",
@@ -126,7 +147,7 @@ module EventStoreClient
           method = RequestMethod.new(method_name)
           connection.send(method.to_s, path) do |req|
             req.headers = req.headers.merge(headers)
-            req.body = body.to_json
+            req.body = body.is_a?(String) ? body : body.to_json
             req.params['embed'] = 'body' if method == :get
           end
         end

data/lib/event_store_client/subscription.rb

@@ -2,15 +2,21 @@
 
 module EventStoreClient
   class Subscription
-    attr_accessor :subscribers
-    attr_reader :stream, :name
+    attr_reader :stream, :subscriber, :name, :observed_streams
 
     private
 
-    def initialize(type:, name:)
-      @name = name
-      @subscribers = []
-      @stream = "$et-#{type}"
+    def initialize(subscriber, service:, event_types:)
+      subscriber_class =
+        if subscriber.class.name == 'Class'
+          subscriber.name
+        else
+          subscriber.class.name
+        end
+      @name = "#{service}-#{subscriber_class}"
+      @subscriber = subscriber
+      @stream = name
+      @observed_streams = event_types.reduce([]) { |r, type| r << "$et-#{type}" }
     end
   end
 end

data/lib/event_store_client/subscriptions.rb

@@ -3,16 +3,17 @@
 module EventStoreClient
   class Subscriptions
     def create(subscriber, event_types)
-      event_types.each do |type|
-        subscription = subscriptions[type.to_s] || Subscription.new(type: type, name: service)
-        subscription.subscribers |= [subscriber]
-        create_subscription(subscription) unless @subscriptions.key?(type.to_s)
-        @subscriptions[type.to_s] = subscription
+      subscription = Subscription.new(subscriber, event_types: event_types, service: service)
+      connection.join_streams(subscriber.class.name, subscription.observed_streams)
+      unless @subscriptions.detect { |sub| sub.name == subscription.name }
+        create_subscription(subscription)
       end
+
+      subscriptions << subscription
     end
 
     def each
-      subscriptions.values.each do |subscription|
+      subscriptions.each do |subscription|
         yield(subscription)
       end
     end
@@ -24,6 +25,7 @@ module EventStoreClient
     private
 
     def create_subscription(subscription)
+      connection.join_streams(subscription.name, subscription.observed_streams)
       connection.subscribe(subscription.stream, name: subscription.name)
     end
 
@@ -32,7 +34,7 @@ module EventStoreClient
     def initialize(connection:, service: 'default')
       @connection = connection
       @service = service
-      @subscriptions = {}
+      @subscriptions = []
     end
   end
 end

data/lib/event_store_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EventStoreClient
-  VERSION = '0.1.15'
+  VERSION = '0.1.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event_store_client
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Sebastian Wilgosz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-schema