event_store_client 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3deeba909c8bf46f05e7994ae5ebef841e622c17032f0259387871335f80e98
-  data.tar.gz: 0bc3e13528fa696506b3d34ca2b00004a736f30bb62d379f41ef50e4a2b180ab
+  metadata.gz: 72306acfd8fecce9f4ed423a4f72421b553fb8892ec73d4c4da702505470eed1
+  data.tar.gz: 8c686d2ae4c1a4db9f55083b18cb24132c9187a8b47b1d6180064915adb5dd12
 SHA512:
-  metadata.gz: 2606efc97b2695dc52d358a9c0bc967d0583c2b58b95b27289c6f9e4dbac04a87bb134dfc8a1e0b251ca11b08c5f0c28841c25f48fdbd4a33db2dd37a0369727
-  data.tar.gz: f1b690148757d9f316127b272c03d70558fc53a8868dbf0058d7669bcdd702b92849d44002dd6eb2367982525fdf25299931d8c8563c5c7ed7d3527f24d9ddc3
+  metadata.gz: 50ea4daa3e0ae81deb0b85fc1cd5a3210f742b23c981d2d23d0708830714e2f2a1e94208b4a007303065fe2a9d3480ce1febc7f3c9072568db27c1948d54aafd
+  data.tar.gz: 4ef0826898e6ab83ffec67167d089ba023736771baf0a671eca0da371cbf6d9813ab3459c183795c3cf13fd3ed406885992f8a9f5f1db4a71eab1bc762b7d5fe

data/README.md

@@ -113,8 +113,6 @@ events = client.read('newstream', direction: 'backward') #default 'forward'
 
 ### Subscribing to events
 
-# Using automatic pooling
-
 ```ruby
 client.subscribe(DummyHandler, to: [SomethingHappened])
 
@@ -129,10 +127,10 @@ client.publish(stream: 'newstream', events: events)
 # .... wait a little bit ... Your handler should be called for every single event you publish
 ```
 
-### Stop pooling
+### Stop polling for new events
 
 ```ruby
-client.stop_pooling
+client.stop_polling
 ```
 
 ## Contributing

data/lib/event_store_client/client.rb

@@ -14,48 +14,48 @@ module EventStoreClient
       connection.read(stream, direction: direction)
     end
 
-    def subscribe(subscriber, to: [], pooling: true)
+    def subscribe(subscriber, to: [], polling: true)
       raise NoCallMethodOnSubscriber unless subscriber.respond_to?(:call)
       @subscriptions.create(subscriber, to)
-      pool if pooling
+      poll if polling
     end
 
-    def pool(interval: 5)
-      return if @pooling_started
-      @pooling_started = true
+    def poll(interval: 5)
+      return if @polling_started
+      @polling_started = true
       thread1 = Thread.new do
         loop do
           create_pid_file
-          Thread.handle_interrupt(Interrupt => :never) {
-            begin
-              Thread.handle_interrupt(Interrupt => :immediate) {
-                broker.call(subscriptions)
-              }
-            rescue Exception => e
-              # When the thread had been interrupted or broker.call returned an error
-              sleep(interval) # wait for events to be processed
-              delete_pid_file
-              error_handler.call(e) if error_handler
-            ensure
-              # this code is run always
-              Thread.stop
+          Thread.handle_interrupt(Interrupt => :never) do
+            Thread.handle_interrupt(Interrupt => :immediate) do
+              broker.call(subscriptions)
             end
-          }
+          rescue Exception => e # rubocop:disable Lint/RescueException
+            # When the thread had been interrupted or broker.call returned an error
+            sleep(interval) # wait for events to be processed
+            delete_pid_file
+            error_handler&.call(e)
+          ensure
+            # this code is run always
+            Thread.stop
+          end
         end
       end
       thread2 = Thread.new do
-        loop { sleep 1; break unless thread1.alive?; thread1.run }
+        loop do
+          sleep 1
+          break unless thread1.alive?
+          thread1.run
+        end
       end
       @threads = [thread1, thread2]
       nil
     end
 
-    def stop_pooling
+    def stop_polling
       return if @threads.none?
-      @threads.each do |thread|
-        thread.kill
-      end
-      @pooling_started = false
+      @threads.each(&:kill)
+      @polling_started = false
       nil
     end
 
@@ -79,7 +79,7 @@ module EventStoreClient
     end
 
     def create_pid_file
-      return unless File.exists?(config.pid_path)
+      return unless File.exist?(config.pid_path)
       File.open(config.pid_path, 'w') { |file| file.write(SecureRandom.uuid) }
     end
 

data/lib/event_store_client/configuration.rb

@@ -19,7 +19,7 @@ module EventStoreClient
       @host = 'http://localhost'
       @port = 2113
       @per_page = 20
-      @pid_path = 'tmp/pool.pid'
+      @pid_path = 'tmp/poll.pid'
       @mapper = Mapper::Default.new
       @service_name = 'default'
       @error_handler = nil

data/lib/event_store_client/connection.rb

@@ -13,7 +13,7 @@ module EventStoreClient
     def read(stream, direction: 'forward')
       response =
         client.read(stream, start: 0, direction: direction)
-      return [] unless response.body&.present?
+      return [] if response.body&.empty?
       JSON.parse(response.body)['entries'].map do |entry|
         event = EventStoreClient::Event.new(
           id: entry['eventId'],

data/lib/event_store_client/endpoint.rb

@@ -4,13 +4,11 @@ require 'dry-struct'
 
 module EventStoreClient
   class Endpoint < Dry::Struct
+    attribute :host, Types::String
+    attribute :port, Types::Coercible::Integer
+
     def url
       "#{host}:#{port}"
     end
-
-    private
-
-    attribute :host, Types::String
-    attribute :port, Types::Coercible::Integer
   end
 end

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

@@ -22,8 +22,11 @@ module EventStoreClient
         end
 
         def delete_stream(stream_name, hard_delete)
-          headers = JSON_HEADERS.merge('ES-HardDelete' => hard_delete.to_s)
-          make_request(:delete, "/streams/#{stream_name}", {}, headers)
+          headers = {
+            'ES-HardDelete' => hard_delete.to_s
+          }.reject { |_key, val| val.empty? }
+
+          make_request(:delete, "/streams/#{stream_name}", body: {}, headers: headers)
         end
 
         def read(stream_name, direction: 'forward', start: 0, count: per_page)
@@ -43,7 +46,7 @@ module EventStoreClient
               resolveLinkTos: true
             },
             headers: {
-              "Content-Type" => "application/json"
+              'Content-Type' => 'application/json'
             }
           )
         end
@@ -51,15 +54,14 @@ module EventStoreClient
         def consume_feed(
           stream_name,
           subscription_name,
-          start: 0,
           count: 1,
-          long_pool: 0
+          long_poll: 0
         )
-          headers = long_pool > 0 ? { "ES-LongPoll" => "#{long_pool}" } : {}
+          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'
           make_request(
-          :get,
+            :get,
             "/subscriptions/#{stream_name}/#{subscription_name}/#{count}",
             headers: headers
           )

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

@@ -17,13 +17,13 @@ module EventStoreClient
 
         attr_reader :name
 
+        SUPPORTED_METHODS = %w[get post put delete].freeze
+
         def initialize(name)
-          raise InvalidMethodError unless name.to_s.in?(SUPPORTED_METHODS)
+          raise InvalidMethodError unless SUPPORTED_METHODS.include?(name.to_s)
 
           @name = name.to_s
         end
-
-        SUPPORTED_METHODS = %w[get post put].freeze
       end
     end
   end

data/lib/event_store_client/store_adapter/in_memory.rb

@@ -5,7 +5,7 @@ module EventStoreClient
     class InMemory
       attr_reader :event_store
 
-      def append_to_stream(stream_name, events, expected_version: nil)
+      def append_to_stream(stream_name, events, expected_version: nil) # rubocop:disable Lint/UnusedMethodArgument,Metrics/LineLength
         event_store[stream_name] = [] unless event_store.key?(stream_name)
 
         [events].flatten.each do |event|
@@ -19,14 +19,32 @@ module EventStoreClient
         end
       end
 
-      def delete_stream(stream_name, hard_delete: false)
+      def read(stream_name, direction: 'forward', start: 0, count: per_page)
+        if direction == 'forward'
+          read_stream_forward(stream_name, start: start, count: per_page)
+        else
+          read_stream_backward(stream_name, start: start, count: per_page)
+        end
+      end
+
+      def delete_stream(stream_name, hard_delete: false) # rubocop:disable Lint/UnusedMethodArgument
         event_store.delete(stream_name)
       end
 
+      private
+
+      attr_reader :endpoint, :per_page
+
+      def initialize(host:, port:, per_page: 20)
+        @endpoint = Endpoint.new(host: host, port: port)
+        @per_page = per_page
+        @event_store = {}
+      end
+
       def read_stream_backward(stream_name, start: 0, count: per_page)
         return [] unless event_store.key?(stream_name)
 
-        start = start == 0 ? event_store[stream_name].length - 1 : start
+        start = start.zero? ? event_store[stream_name].length - 1 : start
         last_index = start - count
         entries = event_store[stream_name].select do |event|
           event['positionEventNumber'] > last_index &&
@@ -52,22 +70,13 @@ module EventStoreClient
         }
       end
 
-      private
-
-      attr_reader :endpoint, :per_page
-
-      def initialize(host:, port:, per_page: 20)
-        @endpoint = Endpoint.new(host: host, port: port)
-        @per_page = per_page
-        @event_store = {}
-      end
-
       def links(stream_name, batch_size, direction, entries, count)
-        if entries.empty? || batch_size < 0
+        if entries.empty? || batch_size.negative?
           []
         else
           [{
-            'uri' => "http://#{endpoint.url}/streams/#{stream_name}/#{batch_size}/#{direction}/#{count}",
+            'uri' =>
+              "http://#{endpoint.url}/streams/#{stream_name}/#{batch_size}/#{direction}/#{count}",
             'relation' => direction
           }]
         end

data/lib/event_store_client/subscription.rb

@@ -6,6 +6,7 @@ module EventStoreClient
     attr_reader :stream, :name
 
     private
+
     def initialize(type:, name:)
       @name = name
       @subscribers = []

data/lib/event_store_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event_store_client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sebastian Wilgosz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-02 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Easy to use client for event-sources applications written in ruby
 email:
 - sebastian@driggl.com
@@ -115,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Ruby integration for https://eventstore.org