estore 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18db1ad6f67a5c73ecd75dbe6fc80f5f03b717f2
-  data.tar.gz: 47b240aa7ce8fddbe969103718a42a1668575f8d
+  metadata.gz: 78dbb09be7de8d003f5e6c5241a96df71b47c2db
+  data.tar.gz: 2e5cc0c9440c44154542855e92c014fe11fa7e83
 SHA512:
-  metadata.gz: b5d4d2f91f7e7c2296684ac876e11b9c3959db6988e5b48cf0a8e5888723cd048acf68b14ebe159b0e9c2d4494030d2179912ef1777c6a4b878b5c85fbebcb60
-  data.tar.gz: abaeaa10b0ec1c4d623bddb40550cee7f8d8afe2eddf36f19baea5092548cd5a74b6dd8098329f6d07a5b2626c634e57ae45d3bb846d79868f57dd8e9bb6c035
+  metadata.gz: 852983cf3c549846b0638e2405531b4455e8fc8ef4961b0f65f3de1a4f4dd3e676446b3c7acd5b6aeb320ad91fe9cf5b2dc10c1931cb96244f27ee204c6113e3
+  data.tar.gz: 75bea923d74418ea433f5e03952cf76ba302daa82ec7d8704dde450154c86807049562f60038905f1e0c1de7d34d9abb54b183cd86f4c9b7f7097ebb17c5bcdc

data/lib/estore/commands/append.rb

@@ -26,15 +26,15 @@ module Estore
       end
 
       def handle(message, *)
+        remove!
+
         response = decode(WriteEventsCompleted, message)
 
-        if response.result != OperationResult::Success
-          # TODO: Create custom exceptions
-          raise "WriteEvents command failed with uuid #{@uuid}"
+        if response.result == OperationResult::Success
+          promise.fulfill(response)
+        else
+          promise.reject Estore::WriteEventsError.new(response)
         end
-
-        remove!
-        promise.fulfill(response)
       end
 
       private

data/lib/estore/commands/base.rb

@@ -16,6 +16,10 @@ module Estore
         @connection.remove(self)
       end
 
+      def reject!(error)
+        @promise.reject(error) if @promise
+      end
+
       def write(command, message = nil)
         @connection.write(@uuid, command, message)
       end

data/lib/estore/commands/ping.rb

@@ -4,11 +4,13 @@ module Estore
       include Command
 
       def call
+        register!
         write('Ping')
         promise
       end
 
       def handle(*)
+        remove!
         promise.fulfill('Pong')
       end
     end

data/lib/estore/connection.rb

@@ -5,12 +5,13 @@ module Estore
   class Connection
     extend Forwardable
 
+    attr_reader :host, :port
     delegate [:register, :remove] => :@context
 
-    def initialize(host, port, context)
+    def initialize(host, port)
       @host = host
       @port = Integer(port)
-      @context = context
+      @context = ConnectionContext.new
       @buffer = Buffer.new(&method(:on_received_package))
       @mutex = Mutex.new
     end
@@ -47,14 +48,11 @@ module Estore
 
     def connect
       @socket = TCPSocket.open(@host, @port)
-      Thread.new do
-        process_downstream
-      end
+      Thread.new { process_downstream }
       @socket
     rescue TimeoutError, Errno::ECONNREFUSED, Errno::EHOSTDOWN,
            Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::ETIMEDOUT
-      raise CannotConnectError, "Error connecting to Eventstore on "\
-        "#{@host.inspect}:#{@port.inspect} (#{$ERROR_INFO.class})"
+      raise CannotConnectError, "#{@host}:#{@port} (#{$ERROR_INFO.class})"
     end
 
     def process_downstream
@@ -62,21 +60,8 @@ module Estore
         @buffer << socket.sysread(4096)
       end
     rescue IOError, EOFError
-      on_disconnect
+      @context.on_error(DisconnectionError.new) unless @terminating
     rescue => error
-      on_exception(error)
-    end
-
-    def on_disconnect
-      return if @terminating
-      puts 'Eventstore disconnected'
-      context.on_error(DisconnectionError.new('Eventstore disconnected'))
-    end
-
-    def on_exception(error)
-      puts "process_downstream_error"
-      puts error.message
-      puts error.backtrace
       @context.on_error(error)
     end
   end

data/lib/estore/connection_context.rb

@@ -24,5 +24,12 @@ module Estore
       command = @commands[uuid]
       command.handle(message, type) if command
     end
+
+    def on_error(error)
+      # TODO: Error handling
+      @mutex.synchronize do
+        @commands.each { |_uuid, command| command.reject! error }
+      end
+    end
   end
 end

data/lib/estore/errors.rb

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

data/lib/estore/session.rb

@@ -13,21 +13,16 @@ module Estore
   # To get maximum performance from the connection, it is recommended to use it
   # asynchronously.
   class Session
-    attr_reader :host, :port, :connection, :context
+    extend Forwardable
 
-    def initialize(host, port = 2113)
-      @host = host
-      @port = port
-      @context = ConnectionContext.new
-      @connection = Connection.new(host, port, context)
-    end
+    delegate [:host, :post] => :@connection
 
-    def on_error(error = nil, &block)
-      context.on_error(error, &block)
+    def initialize(host, port = 2113)
+      @connection = Connection.new(host, port)
     end
 
     def close
-      connection.close
+      @connection.close
     end
 
     def ping
@@ -68,7 +63,7 @@ module Estore
     private
 
     def command(command, *args)
-      command.new(connection, *args)
+      command.new(@connection, *args)
     end
   end
 end

data/lib/estore/version.rb

@@ -1,3 +1,3 @@
 module Estore
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/integration/session_spec.rb

@@ -39,33 +39,22 @@ describe Estore::Session do
     stream
   end
 
-  RSpec::Matchers.define :start_from do |start|
-    match do |events|
-      events.each_with_index do |event, index|
-        expect(parse_data(event)).to eql('id' => index + start)
-      end
-    end
-  end
-
   it 'reads all the events from a stream' do
-    events = session.read(stream_with(200)).sync
+    stream = session.read(stream_with(200)).sync
 
-    expect(events.size).to be(200)
-    expect(events).to start_from(0)
+    expect(stream).to have(200).events.starting_at(0)
   end
 
   it 'reads all the events forward from a stream' do
-    events = session.read(stream_with(100), from: 20).sync
+    stream = session.read(stream_with(100), from: 20).sync
 
-    expect(events.size).to be(80)
-    expect(events).to start_from(20)
+    expect(stream).to have(80).events.starting_at(20)
   end
 
   it 'reads a batch of events from a stream' do
-    events = session.read(stream_with(30), from: 10, limit: 15).sync
+    stream = session.read(stream_with(30), from: 10, limit: 15).sync
 
-    expect(events.size).to be(15)
-    expect(events).to start_from(10)
+    expect(stream).to have(15).events.starting_at(10)
   end
 
   it 'allows to make a live subscription' do
@@ -80,15 +69,7 @@ describe Estore::Session do
 
     stream_with(50, stream)
 
-    Timeout.timeout(5) do
-      loop do
-        break if received.size >= 50
-        sleep(0.1)
-      end
-    end
-
-    expect(received.size).to be(50)
-    expect(received).to start_from(20)
+    expect(received).to have(50).events.starting_at(20).before(5.seconds)
   end
 
   it 'allows to make a catchup subscription' do
@@ -97,8 +78,11 @@ describe Estore::Session do
 
     stream_with(2100, stream)
 
-    sub = session.subscription(stream, from: 20)
-    sub.on_event { |event| received << event }
+    sub = session.subscription(stream, from: 30)
+    sub.on_event do |event|
+      received << event
+      puts "Receiving... #{received.size}"
+    end
     sub.start
 
     Thread.new do
@@ -107,14 +91,6 @@ describe Estore::Session do
       end
     end
 
-    Timeout.timeout(5) do
-      loop do
-        break if received.size >= 2180
-        sleep(0.1)
-      end
-    end
-
-    expect(received.size).to be(2180)
-    expect(received).to start_from(20)
+    expect(received).to have(2170).events.starting_at(30).before(20.seconds)
   end
 end

data/spec/spec_helper.rb

@@ -13,3 +13,45 @@ trap 'TTIN' do
     puts "\n\n\n"
   end
 end
+
+class Integer
+  # Just for readability
+  def seconds
+    self
+  end
+end
+
+RSpec::Matchers.define :have do |expectation|
+  match do |actual|
+    if @timeout
+      Timeout.timeout @timeout do
+        loop do
+          break if actual.to_a.size >= expectation
+          sleep(0.1)
+        end
+      end
+    end
+
+    expect(actual.to_a.size).to @bigger ? be >= expectation : be(expectation)
+
+    if @start
+      actual.each_with_index do |wrapper, index|
+        expect(wrapper.event.event_number).to be(index + @start)
+      end
+    end
+  end
+
+  chain(:events) {}
+
+  chain :before do |seconds|
+    @timeout = seconds
+  end
+
+  chain :or_more do
+    @bigger = true
+  end
+
+  chain :starting_at do |start|
+    @start = start
+  end
+end

metadata

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