event_store_client 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 650872ba0eecbebfc09a26b58d3ff593bfd3d00db36a835e153233b665673f71
-  data.tar.gz: e202dc48ce4a69d345e6fe4cfc6fe734d362e2d7e9b7c6d1d865511e84d9a255
+  metadata.gz: cc9b9f123804c920a08c07937465ae04afcd971d784912099f06822725742901
+  data.tar.gz: 0e5e5e7d863180a90fa20a6c6d1d2b8e76b479cb50489910af2327a33e0d2c7f
 SHA512:
-  metadata.gz: e21ef0625b5e6b3faba04c19eda00efc736e408c787b6d60184eb666bc9ff88ff24a53f46a53efccafc0bd6c840c6beb42bd31229811115ba9ecbb9842c5c95c
-  data.tar.gz: 68c5e7b7150857ca2091505ea6180f219ba38c2156751d8706f719acf47755da7f85ed22c420fce0583f8226f8c7603302f29038c0c6b39117bde0e78f230b1e
+  metadata.gz: 04e46ab7a710fc53c7be0d22bbadd59e6a075495174b88447cb82f054de5dcfa02607a1bf7cc03392952bdabb6dffc68ec264575264bd1fb3a9d5ac32447caea
+  data.tar.gz: 188cff27182fe3e6f83250c70a3a4a5cab9814b7ef1ce61a624af2bcd235d4cf950723e7551d8ec2612f64923b117592341ea4ada03fe44660c6f2f7713f05ce

data/lib/event_store_client.rb

@@ -1,27 +1,19 @@
 # frozen_string_literal: true
 
 module EventStoreClient
-  def self.configure(&block)
-    config = Configuration.instance
-    config.configure(&block)
-  end
 end
 
-require 'event_store_client/configuration'
 require 'event_store_client/types'
 require 'event_store_client/event'
 require 'event_store_client/deserialized_event'
-
 require 'event_store_client/serializer/json'
 
 require 'event_store_client/mapper'
 
-require 'event_store_client/endpoint'
+require 'event_store_client/configuration'
 
 require 'event_store_client/store_adapter'
 
-require 'event_store_client/connection'
-
 require 'event_store_client/subscription'
 require 'event_store_client/subscriptions'
 require 'event_store_client/broker'

data/lib/event_store_client/broker.rb

@@ -4,9 +4,10 @@ module EventStoreClient
   class Broker
     def call(subscriptions)
       subscriptions.each do |subscription|
-        new_events = connection.consume_feed(subscription.stream, subscription.name) || []
-        next if new_events.none?
-        new_events.each { |event| subscription.subscriber.call(event) }
+        res = connection.consume_feed(subscription.stream, subscription.name) || []
+        next if res[:events].none?
+        res[:events].each { |event| subscription.subscriber.call(event) }
+        connection.ack(res[:ack_uri])
       end
     end
 

data/lib/event_store_client/client.rb

@@ -8,13 +8,21 @@ module EventStoreClient
     WrongExpectedEventVersion = Class.new(StandardError)
 
     def publish(stream:, events:, expected_version: nil)
-      connection.publish(stream: stream, events: events, expected_version: expected_version)
+      connection.append_to_stream(stream, events, expected_version: expected_version)
     rescue StoreAdapter::Api::Client::WrongExpectedEventVersion => e
       raise WrongExpectedEventVersion.new(e.message)
     end
 
-    def read(stream, direction: 'forward', start: 0, all: false)
-      connection.read(stream, direction: direction, start: start, all: all)
+    def read(stream, direction: 'forward', start: 0, all: false, resolve_links: true)
+      if all
+        connection.read_all_from_stream(
+          stream, start: start, direction: direction, resolve_links: resolve_links
+        )
+      else
+        connection.read(
+          stream, start: start, direction: direction, resolve_links: resolve_links
+        )
+      end
     end
 
     def subscribe(subscriber, to: [], polling: true)
@@ -81,12 +89,12 @@ module EventStoreClient
     attr_reader :subscriptions, :broker, :error_handler
 
     def config
-      EventStoreClient::Configuration.instance
+      EventStoreClient.config
     end
 
     def initialize
       @threads = []
-      @connection ||= Connection.new
+      @connection ||= EventStoreClient.adapter
       @error_handler ||= config.error_handler
       @service_name ||= 'default'
       @broker ||= Broker.new(connection: connection)

data/lib/event_store_client/configuration.rb

@@ -1,28 +1,47 @@
 # frozen_string_literal: true
 
-require 'dry-struct'
-require 'singleton'
+require 'dry-configurable'
 
 module EventStoreClient
-  class Configuration
-    include Singleton
+  extend Dry::Configurable
 
-    attr_accessor :per_page, :service_name, :mapper, :error_handler, :pid_path, :adapter
+  # Supported adapters: %i[api in_memory]
+  #
+  setting :adapter, :api
 
-    def configure
-      yield(self) if block_given?
-    end
+  setting :error_handler
+  setting :eventstore_url, 'http://localhost:2113' do |value|
+    value.is_a?(URI) ? value : URI(value)
+  end
+
+  setting :eventstore_user, 'admin'
+  setting :eventstore_password, 'changeit'
+
+  setting :db_port, 2113
+
+  setting :per_page, 20
+  setting :pid_path, 'tmp/poll.pid'
 
-    private
+  setting :service_name, 'default'
 
-    def initialize
-      @per_page = 20
-      @pid_path = 'tmp/poll.pid'
-      @mapper = Mapper::Default.new
-      @service_name = 'default'
-      @error_handler = nil
-      @adapter = EventStoreClient::StoreAdapter::Api::Client.new(
-        host: 'http://localhost', port: 2113, per_page: per_page
+  setting :mapper, Mapper::Default.new
+
+  def self.configure
+    yield(config) if block_given?
+  end
+
+  def self.adapter
+    case config.adapter
+    when :api
+      StoreAdapter::Api::Client.new(
+        config.eventstore_url,
+        per_page: config.per_page,
+        mapper: config.mapper,
+        connection_options: {}
+      )
+    else
+      StoreAdapter::InMemory.new(
+        mapper: config.mapper, per_page: config.per_page
       )
     end
   end

data/lib/event_store_client/mapper/default.rb

@@ -5,7 +5,8 @@ module EventStoreClient
     class Default
       def serialize(event)
         Event.new(
-          type: event.class.to_s,
+          id: event.respond_to?(:id) ? event.id : nil,
+          type: (event.respond_to?(:type) ? event.type : nil) || event.class.to_s,
           data: serializer.serialize(event.data),
           metadata: serializer.serialize(event.metadata)
         )

data/lib/event_store_client/serializer/json.rb

@@ -7,6 +7,8 @@ module Serializer
     end
 
     def self.serialize(data)
+      return data if data.is_a?(String)
+
       JSON.generate(data)
     end
   end

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

@@ -7,14 +7,16 @@ module EventStoreClient
         WrongExpectedEventVersion = Class.new(StandardError)
 
         def append_to_stream(stream_name, events, expected_version: nil)
+          serialized_events = events.map { |event| mapper.serialize(event) }
           headers = {
             'ES-ExpectedVersion' => expected_version&.to_s
           }.reject { |_key, val| val.nil? || val.empty? }
 
-          data = build_events_data(events)
+          data = build_events_data(serialized_events)
           response = make_request(:post, "/streams/#{stream_name}", body: data, headers: headers)
           validate_response(response, expected_version)
           response
+          serialized_events
         end
 
         def delete_stream(stream_name, hard_delete: false)
@@ -31,11 +33,39 @@ module EventStoreClient
             'Accept' => 'application/vnd.eventstore.atom+json'
           }
 
-          make_request(
+          response = make_request(
             :get,
             "/streams/#{stream_name}/#{start}/#{direction}/#{count}",
             headers: headers
           )
+          return [] if response.body.nil? || response.body.empty?
+          JSON.parse(response.body)['entries'].map do |entry|
+            deserialize_event(entry)
+          end.reverse
+        end
+
+        def read_all_from_stream(stream, start: 0, resolve_links: true)
+          count = per_page
+          events = []
+          failed_requests_count = 0
+
+          while failed_requests_count < 3
+            begin
+              response =
+                read(stream, start: start, direction: 'forward', resolve_links: resolve_links)
+              failed_requests_count += 1 && next unless response.success? || response.status == 404
+            rescue Faraday::ConnectionFailed
+              failed_requests_count += 1
+              next
+            end
+            failed_requests_count = 0
+            break if response.body.nil? || response.body.empty?
+            entries = JSON.parse(response.body)['entries']
+            break if entries.empty?
+            events += entries.map { |entry| deserialize_event(entry) }.reverse
+            start += count
+          end
+          events
         end
 
         def join_streams(name, streams)
@@ -79,18 +109,31 @@ module EventStoreClient
           subscription_name,
           count: 1,
           long_poll: 0,
-          resolve_links: true
+          resolve_links: true,
+          per_page: 20
         )
           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(
+          response = make_request(
             :get,
             "/subscriptions/#{stream_name}/#{subscription_name}/#{count}",
             headers: headers
           )
+
+          return [] if response.body || response.body.empty?
+
+          body = JSON.parse(response.body)
+
+          ack_info = body['links'].find { |link| link['relation'] == 'ackAll' }
+          return unless ack_info
+          ack_uri = ack_info['uri']
+          events = body['entries'].map do |entry|
+            deserialize_event(entry)
+          end
+          { ack_uri: ack_uri, events: events }
         end
 
         def link_to(stream_name, events, expected_version: nil)
@@ -106,7 +149,7 @@ module EventStoreClient
             headers: headers
           )
           validate_response(response, expected_version)
-          response
+          true
         end
 
         def ack(url)
@@ -115,11 +158,12 @@ module EventStoreClient
 
         private
 
-        attr_reader :endpoint, :per_page, :connection_options
+        attr_reader :uri, :per_page, :connection_options, :mapper
 
-        def initialize(host:, port:, per_page: 20, connection_options: {})
-          @endpoint = Endpoint.new(host: host, port: port)
+        def initialize(uri, per_page: 20, mapper:, connection_options: {})
+          @uri = uri
           @per_page = per_page
+          @mapper = mapper
           @connection_options = connection_options
         end
 
@@ -154,7 +198,7 @@ module EventStoreClient
         end
 
         def connection
-          @connection ||= Api::Connection.new(endpoint, connection_options).call
+          @connection ||= Api::Connection.new(uri, connection_options).call
         end
 
         def validate_response(resp, expected_version)
@@ -164,6 +208,18 @@ module EventStoreClient
             "expected: #{expected_version}"
           )
         end
+
+        def deserialize_event(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)
+        end
       end
     end
   end

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

@@ -9,23 +9,27 @@ module EventStoreClient
         def call
           Faraday.new(
             {
-              url: endpoint.url,
+              url: uri.to_s,
               headers: DEFAULT_HEADERS
             }.merge(options)
           ) do |conn|
-            conn.basic_auth(ENV['EVENT_STORE_USER'], ENV['EVENT_STORE_PASSWORD'])
+            conn.basic_auth(config.eventstore_user, config.eventstore_password)
             conn.adapter Faraday.default_adapter
           end
         end
 
         private
 
-        def initialize(endpoint, options = {})
-          @endpoint = endpoint
+        def config
+          EventStoreClient.config
+        end
+
+        def initialize(uri, options = {})
+          @uri = uri
           @options = options
         end
 
-        attr_reader :endpoint, :options
+        attr_reader :uri, :options
 
         DEFAULT_HEADERS = {
           'Content-Type' => 'application/vnd.eventstore.events+json'

data/lib/event_store_client/store_adapter/in_memory.rb

@@ -33,7 +33,27 @@ module EventStoreClient
             read_stream_backward(stream_name, start: start)
           end
 
-        Response.new(response.to_json, 200)
+        res = Response.new(response.to_json, 200)
+
+        return [] if res.body.nil? || res.body.empty?
+        JSON.parse(res.body)['entries'].map do |entry|
+          deserialize_event(entry)
+        end.reverse
+      end
+
+      def read_all_from_stream(stream_name, direction: 'forward', start: 0, resolve_links: true)
+        response =
+          if direction == 'forward'
+            read_stream_forward(stream_name, start: start)
+          else
+            read_stream_backward(stream_name, start: start)
+          end
+        res = Response.new(response.to_json, 200)
+
+        return [] if res.body.nil? || res.body.empty?
+          JSON.parse(res.body)['entries'].map do |entry|
+            deserialize_event(entry)
+          end.reverse
       end
 
       def subscribe_to_stream(stream_name, subscription_name, **)
@@ -54,6 +74,7 @@ module EventStoreClient
 
       def link_to(stream_name, events, **)
         append_to_stream(stream_name, events)
+        events
       end
 
       def ack(url)
@@ -64,11 +85,11 @@ module EventStoreClient
 
       private
 
-      attr_reader :endpoint, :per_page
+      attr_reader :per_page, :mapper
 
-      def initialize(host:, port:, per_page: 20)
-        @endpoint = Endpoint.new(host: host, port: port)
+      def initialize(mapper:, per_page: 20)
         @per_page = per_page
+        @mapper = mapper
         @event_store = {}
       end
 
@@ -115,11 +136,25 @@ module EventStoreClient
         else
           [{
             'uri' =>
-              "http://#{endpoint.url}/streams/#{stream_name}/#{batch_size}/#{direction}/#{count}",
+              "/streams/#{stream_name}/#{batch_size}/#{direction}/#{count}",
             'relation' => direction
           }]
         end
       end
+
+      private
+
+      def deserialize_event(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)
+      end
     end
   end
 end

data/lib/event_store_client/subscriptions.rb

@@ -25,8 +25,9 @@ module EventStoreClient
     private
 
     def create_subscription(subscription)
+      # store position somewhere.
       connection.join_streams(subscription.name, subscription.observed_streams)
-      connection.subscribe(subscription.stream, name: subscription.name)
+      connection.subscribe_to_stream(subscription.stream, name: subscription.name)
     end
 
     attr_reader :connection, :subscriptions, :service

data/lib/event_store_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event_store_client
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Sebastian Wilgosz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-21 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-schema
@@ -42,16 +42,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rss
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.8
+- !ruby/object:Gem::Dependency
+  name: dry-configurable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -108,12 +122,10 @@ files:
 - lib/event_store_client/broker.rb
 - lib/event_store_client/client.rb
 - lib/event_store_client/configuration.rb
-- lib/event_store_client/connection.rb
 - lib/event_store_client/data_decryptor.rb
 - lib/event_store_client/data_encryptor.rb
 - lib/event_store_client/deserialized_event.rb
 - lib/event_store_client/encryption_metadata.rb
-- lib/event_store_client/endpoint.rb
 - lib/event_store_client/event.rb
 - lib/event_store_client/mapper.rb
 - lib/event_store_client/mapper/default.rb
@@ -148,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Ruby integration for https://eventstore.org

data/lib/event_store_client/connection.rb

@@ -1,112 +0,0 @@
-# frozen_string_literal: true
-
-module EventStoreClient
-  class Connection
-    def publish(stream:, events:, expected_version: nil)
-      serialized_events = events.map { |event| mapper.serialize(event) }
-      client.append_to_stream(
-        stream, serialized_events, expected_version: expected_version
-      )
-      serialized_events
-    end
-
-    def read(stream, direction:, start:, all:, resolve_links: true)
-      return read_all_from_stream(stream, start: start, resolve_links: resolve_links) if all
-      read_from_stream(
-        stream, direction: direction, start: start, resolve_links: resolve_links
-      )
-    end
-
-    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
-
-    def consume_feed(stream, subscription)
-      response = client.consume_feed(stream, subscription)
-      return [] unless response.body
-      body = JSON.parse(response.body)
-
-      ack = body['links'].find { |link| link['relation'] == 'ackAll' }
-      return unless ack
-      ack_uri = ack['uri']
-      events = body['entries'].map do |entry|
-        deserialize_event(entry)
-      end
-      client.ack(ack_uri)
-      events
-    end
-
-    def link_to(stream, events, expected_version: nil)
-      client.link_to(stream, events, expected_version: expected_version)
-
-      true
-    end
-
-    private
-
-    attr_reader :mapper, :per_page, :client
-
-    def config
-      EventStoreClient::Configuration.instance
-    end
-
-    def initialize
-      @per_page = config.per_page
-      @mapper = config.mapper
-      @client = config.adapter
-    end
-
-    def read_from_stream(stream, direction:, start:, resolve_links:)
-      response =
-        client.read(
-          stream, start: start, direction: direction, resolve_links: resolve_links
-        )
-      return [] if response.body.nil? || response.body.empty?
-      JSON.parse(response.body)['entries'].map do |entry|
-        deserialize_event(entry)
-      end.reverse
-    end
-
-    def read_all_from_stream(stream, start:, resolve_links:)
-      count = per_page
-      events = []
-      failed_requests_count = 0
-
-      while failed_requests_count < 3
-        begin
-          response =
-            client.read(stream, start: start, direction: 'forward', resolve_links: resolve_links)
-          failed_requests_count += 1 && next unless response.success? || response.status == 404
-        rescue Faraday::ConnectionFailed
-          failed_requests_count += 1
-          next
-        end
-        failed_requests_count = 0
-        break if response.body.nil? || response.body.empty?
-        entries = JSON.parse(response.body)['entries']
-        break if entries.empty?
-        events += entries.map { |entry| deserialize_event(entry) }.reverse
-        start += count
-      end
-      events
-    end
-
-    def deserialize_event(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)
-    end
-  end
-end

data/lib/event_store_client/endpoint.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require 'dry-struct'
-
-module EventStoreClient
-  class Endpoint < Dry::Struct
-    attribute :host, Types::String
-    attribute :port, Types::Coercible::Integer
-
-    def url
-      "#{host}:#{port}"
-    end
-  end
-end