estore 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdd806cd7c12b665577e8f686f9a14225fd102ce
-  data.tar.gz: 519601368cfc6e8d30912510fadbd2b866eff7e8
+  metadata.gz: 90ec9eb805fb44a8772c81a4f5ea5bfd4d224779
+  data.tar.gz: d29629f1fdb5f8819b0204becf1d1a97934f0ba7
 SHA512:
-  metadata.gz: 5e554e45930e79aeb9c1eca4cdc5437bc8a26f3228c02b71d63c4c5e1c573cac7268e83d51bcd96bf619c7b430d1ca22eaaffbe224c44b139f6e4e031b1306dd
-  data.tar.gz: 1ef5c432b902a710b61886b4e0ba5eee9448c021978add9d93b033b9b747dd5a693e019c960b855ea005cc350f781b9bdea73351f85905b958c7d5e0a348a29b
+  metadata.gz: 3896eeed05e045d57d635d467d9b002f5394b2b7f0a76f192d4bb0009e4c760d1b94fa60ce093ffbef483eab4a42c3d9bf52a2901e8a46d89eceba58c83e742b
+  data.tar.gz: 81a42f181c7541577a950b74d7a23824259c0cf31b20ac385ddbca91e58ed2d31cca791c127066024f2508a5173d39af6ae381f1bf0a2a30fc247b3c6489a6f3

data/.simplecov

@@ -7,8 +7,18 @@ SimpleCov.start do
   add_filter '/config/'
 
   require 'coveralls'
+
+  formatters = [
+    SimpleCov::Formatter::HTMLFormatter,
+    Coveralls::SimpleCov::Formatter
+  ]
+
+  if RUBY_ENGINE == 'rbx'
+    require 'codeclimate-test-reporter'
+    formatters << CodeClimate::TestReporter::Formatter
+  end
+
   SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-    Coveralls::SimpleCov::Formatter,
-    SimpleCov::Formatter::HTMLFormatter
+    *formatters
   ]
 end

data/.travis.yml

@@ -10,7 +10,7 @@ install:
   - "wget -nc http://download.geteventstore.com/binaries/EventStore-OSS-Linux-v3.0.3.tar.gz"
   - "tar -xvzf EventStore-OSS-Linux-v3.0.3.tar.gz"
   - "mv EventStore-OSS-Linux-v3.0.3 .event_store"
-  - "cd .event_store && ./run-node.sh --db ./ESData &"
+  - "cd .event_store && ./run-node.sh --mem-db &"
   - "bundle install"
 script: "bundle exec rake ci"
 rvm:

data/CHANGELOG.md

@@ -1,28 +1,35 @@
+## v0.1.3 - 2015-04-15
+### Added
+* Workers to dispatch events in subscriptions
+* Print error information while dispatching
+
+[Compare v0.1.2...v0.1.3](https://github.com/eventstore-rb/estore/compare/v0.1.2...v0.1.3)
+
 ## v0.1.2 - 2015-04-05
 ### Added
 * Errors during commands reject promises too
 * Unit testing started
 
-[Compare v0.1.1...v0.1.2](https://github.com/rom-rb/rom-event_store/compare/v0.1.1...v0.1.2)
+[Compare v0.1.1...v0.1.2](https://github.com/eventstore-rb/estore/compare/v0.1.1...v0.1.2)
 
 ## v0.1.1 - 2015-04-05
 ### Added
 * General errors during connection reject command promises
 
-[Compare v0.1.0...v0.1.1](https://github.com/rom-rb/rom-event_store/compare/v0.1.0...v0.1.1)
+[Compare v0.1.0...v0.1.1](https://github.com/eventstore-rb/estore/compare/v0.1.0...v0.1.1)
 
 ## v0.1.0 - 2015-04-03
 ### Added
 * General refactoring using the concept of `Command`
 
-[Compare v0.0.2...v0.1.0](https://github.com/rom-rb/rom-event_store/compare/v0.0.2...v0.1.0)
+[Compare v0.0.2...v0.1.0](https://github.com/eventstore-rb/estore/compare/v0.0.2...v0.1.0)
 
 ## v0.0.2 - 2015-04-01
 ### Added
 * Gem name changed to `estore`
 * Minor refactoring
 
-[Compare v0.0.1...v0.0.2](https://github.com/rom-rb/rom-event_store/compare/v0.0.1...v0.0.2)
+[Compare v0.0.1...v0.0.2](https://github.com/eventstore-rb/estore/compare/v0.0.1...v0.0.2)
 
 ## v0.0.1 - 2015-03-31
 Forked from [eventstore-ruby](https://github.com/mathieuravaux/eventstore-ruby)

data/Gemfile

@@ -5,4 +5,5 @@ gemspec
 
 group :test do
   gem 'coveralls', require: false
+  gem 'codeclimate-test-reporter', require: nil
 end

data/lib/estore/commands/reads/forward.rb

@@ -41,7 +41,7 @@ module Estore
 
         if error
           remove!
-          promise.reject error
+          promise.reject ReadEventsError.new(error)
         else
           keep_reading(response)
         end

data/lib/estore/commands/subscription.rb

@@ -6,6 +6,8 @@ module Estore
         @has_finished = false
         @stream = stream
         @resolve_link_tos = options.fetch(:resolve_link_tos, true)
+        @worker_queue = Queue.new
+        @worker = Thread.new { loop { worker_loop } }
       end
 
       def call
@@ -33,9 +35,17 @@ module Estore
         @handler = block
       end
 
-      def dispatch(event)
-        @position = event.original_event_number
-        @handler.call(event)
+      def enqueue(events)
+        events = Array(events)
+        @position = events.last.original_event_number
+        @worker_queue << events
+      end
+
+      def worker_loop
+        @worker_queue.pop.each { |event| @handler.call(event) }
+      rescue => e
+        puts e.message
+        puts e.backtrace
       end
     end
   end

data/lib/estore/commands/subscriptions/catch_up.rb

@@ -12,9 +12,8 @@ module Estore
         @from = from
         @batch = options[:batch_size]
         @mutex = Mutex.new
-        @queue = []
+        @while_catching_up = []
         @caught_up = false
-        @last_worker = nil
       end
 
       def start
@@ -22,37 +21,32 @@ module Estore
 
         # TODO: Think about doing something more clever?
         read = ReadForward.new(@connection, @stream, @from, @batch) do |events|
-          @last_worker = Thread.new(@last_worker) do |last_worker|
-            last_worker.join if last_worker
-            events.each { |event| dispatch(event) }
-          end
+          enqueue events unless events.empty?
         end
 
         read.call.sync
-        @last_worker.join if @last_worker
-
         switch_to_live
       end
 
       def switch_to_live
         @mutex.synchronize do
-          queued_events.each { |event| dispatch(event) }
+          unprocessed_events.each { |event| enqueue event }
           @caught_up = true
         end
       end
 
-      def queued_events
-        @queue.find_all { |event| event.original_event_number > @position }
+      def unprocessed_events
+        @while_catching_up.find_all { |event| event.original_event_number > @position }
       end
 
       def event_appeared(response)
         unless @caught_up
           @mutex.synchronize do
-            @queue << response.event unless @caught_up
+            @while_catching_up << response.event unless @caught_up
           end
         end
 
-        dispatch(response.event) if @caught_up
+        enqueue response.event if @caught_up
       end
     end
   end

data/lib/estore/commands/subscriptions/live.rb

@@ -8,7 +8,7 @@ module Estore
              SubscriptionConfirmation => :ignore
 
       def event_appeared(response)
-        dispatch(response.event)
+        enqueue response.event
       end
     end
   end

data/lib/estore/connection.rb

@@ -56,9 +56,7 @@ module Estore
     end
 
     def process_downstream
-      loop do
-        @buffer << socket.sysread(4096)
-      end
+      loop { @buffer << socket.sysread(4096) }
     rescue IOError, EOFError
       @context.on_error(DisconnectionError.new) unless @terminating
     rescue => error

data/lib/estore/connection_context.rb

@@ -26,6 +26,9 @@ module Estore
     rescue => error
       command.reject! error
       remove(command)
+
+      puts "[DISPATCH] #{error.message}"
+      puts error.backtrace
     end
 
     def empty?

data/lib/estore/errors.rb

@@ -2,4 +2,5 @@ module Estore
   CannotConnectError = Class.new(StandardError)
   DisconnectionError = Class.new(StandardError)
   WriteEventsError = Class.new(StandardError)
+  ReadEventsError = Class.new(StandardError)
 end

data/lib/estore/version.rb

@@ -1,3 +1,3 @@
 module Estore
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/integration/session_spec.rb

@@ -108,4 +108,26 @@ describe Estore::Session do
 
     expect(received).to have(2130).events.starting_at(30).before(20.seconds)
   end
+
+  it 'allows to make a catchup subscription to a non-existing stream' do
+    stream = random_stream
+    received = []
+
+    sub = session.subscription(stream, from: 0)
+
+    sub.on_event do |event|
+      received << event
+      puts "Receiving... #{received.size}"
+    end
+
+    sub.start
+
+    Thread.new do
+      30.times do
+        stream_with(2, stream)
+      end
+    end
+
+    expect(received).to have(60).events.starting_at(0).before(20.seconds)
+  end
 end

data/spec/unit/estore/connection_context_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe Estore::ConnectionContext do
   subject(:context) { Estore::ConnectionContext.new }
 
-  let(:bad_command) do
-    BadCommand = Class.new do
+  let(:bad_command_class) do
+    Class.new do
       attr_reader :error
 
       def uuid
@@ -19,10 +19,10 @@ describe Estore::ConnectionContext do
         boom
       end
     end
-
-    BadCommand.new
   end
 
+  let(:bad_command) { bad_command_class.new }
+
   before do
     context.register(bad_command)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: estore
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Mathieu Ravaux
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake