estore 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a58e5f588a5c8c0d2b25fedf68429869effc0dd
-  data.tar.gz: f59bc201d6f2c2fcc9dcc5f1d2bb825a70f8aac7
+  metadata.gz: 788e47dab75704db758ce692febbfe443f923cf8
+  data.tar.gz: 7f9e72691c2199897cd933b58fff8069535d0a24
 SHA512:
-  metadata.gz: 19c2507e00eca563cb754a645cc4b6a2dde55346a1f99d6a8b82ca406b30d73128e8e2ca5ea5761733514d33464b8a3fc16e7d4ba0618b6c5fae0fa2e08716ab
-  data.tar.gz: 43e2a30135b4b708cd9593e41a51692de8501b4b736db77e2aaf0a281caa7af64f84de2de090192daa626ce5e3b493fce2c298a005b0e0ac97ade2fc310066df
+  metadata.gz: 936915386686cddcd4c6a03c07e237007ed42db68216b4e0abced32680fff2b41947286df3e0bdd15a3b5e8ce09be9b7f0816bbc40b0f114b91f458433f686e6
+  data.tar.gz: 1d433f68f8c8abea1a10d7cdb6a2eb034a7f60280596e4d3851e5acd09e10a190d0461fd669e015bca74aee5aec4f87cbefb8b0a792e545d4d0b50dabd1c0427

data/.rubocop.yml

@@ -7,5 +7,69 @@ AllCops:
 Metrics/LineLength:
   Max: 140
 
-# Style/Documentation:
-#   Enabled: false
+# It’s quite readable when we know what we are doing
+Lint/AssignmentInCondition:
+  Enabled: false
+
+# No need to handle LoadError in Rakefile
+Lint/HandleExceptions:
+  Exclude:
+    - Rakefile
+
+# gemspec is a special snowflake
+Metrics/LineLength:
+  Exclude:
+    - rom-event_store.gemspec
+
+# The enforced style doesn’t match Vim’s defaults
+Style/AlignParameters:
+  Enabled: false
+
+# UTF-8 is perfectly fine in comments
+Style/AsciiComments:
+  Enabled: false
+
+# Allow using braces for value-returning blocks
+Style/Blocks:
+  Enabled: false
+
+# Documentation checked by Inch CI
+Style/Documentation:
+  Enabled: false
+
+# Early returns have their vices
+Style/GuardClause:
+  Enabled: false
+
+# Need to be skipped for >-> usage
+Style/Lambda:
+  Enabled: false
+
+# Multiline block chains are ok
+Style/MultilineBlockChain:
+  Enabled: false
+
+# Even a single escaped slash can be confusing
+Style/RegexpLiteral:
+  MaxSlashes: 0
+
+# Don’t introduce semantic fail/raise distinction
+Style/SignalException:
+  EnforcedStyle: only_raise
+
+# Need to be skipped for >-> usage
+Style/SpaceAroundOperators:
+  Enabled: false
+
+# Accept both single and double quotes
+Style/StringLiterals:
+  Enabled: false
+
+# Allow def self.foo; @foo; end
+Style/TrivialAccessors:
+  Enabled: false
+
+# This is a shim file for those who require 'rom-mongo'
+Style/FileName:
+  Exclude:
+    - lib/rom-event_store.rb

data/.travis.yml

@@ -0,0 +1,26 @@
+language: ruby
+sudo: false
+cache: bundler
+bundler_args: --without yard guard benchmarks tools
+env:
+  global:
+    - JRUBY_OPTS='--dev -J-Xmx1024M'
+    - CODECLIMATE_REPO_TOKEN=86bb9d558da8217d85126a02c4a264dc8789bb4cc8d3949e8fcbabca0440f2fa
+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 &"
+  - "bundle install"
+script: "bundle exec rake ci"
+rvm:
+  - 2.0
+  - 2.1
+  - rbx-2
+  - jruby
+  - jruby-head
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head

data/Gemfile

@@ -2,3 +2,16 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in estore.gemspec
 gemspec
+
+group :test do
+  gem 'rspec', '~> 3.1'
+  gem 'codeclimate-test-reporter', require: false
+end
+
+group :tools do
+  gem 'rubocop'
+
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-rubocop'
+end

data/README.md

@@ -1,34 +1,46 @@
-# Eventstore
+[gem]: https://rubygems.org/gems/estore
+[travis]: https://travis-ci.org/rom-eventstore/estore
+[gemnasium]: https://gemnasium.com/rom-eventstore/estore
+[codeclimate]: https://codeclimate.com/github/rom-eventstore/estore
+[inchpages]: http://inch-ci.org/github/rom-eventstore/estore
+[gitter]: https://gitter.im/rom-eventstore/estore?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
 
-[![Join the chat at https://gitter.im/mathieuravaux/eventstore-ruby](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mathieuravaux/eventstore-ruby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+# Estore
 
-Ruby client library Eventstore
+[![Gem Version](https://badge.fury.io/rb/estore.svg)][gem]
+[![Build Status](https://travis-ci.org/rom-eventstore/estore.svg?branch=master)][travis]
+[![Dependency Status](https://gemnasium.com/rom-eventstore/estore.png)][gemnasium]
+[![Code Climate](https://codeclimate.com/github/rom-eventstore/estore/badges/gpa.svg)][codeclimate]
+[![Test Coverage](https://codeclimate.com/github/rom-eventstore/estore/badges/coverage.svg)][codeclimate]
+[![Inline docs](http://inch-ci.org/github/rom-eventstore/estore.svg?branch=master)][inchpages]
+[![Join the chat at https://gitter.im/rom-eventstore/estore](https://badges.gitter.im/Join%20Chat.svg)][gitter]
 
-Eventstore is an open-source, functional database
-with Complex Event Processing in JavaScript
+An [Event Store](http://geteventstore.com/) driver for Ruby
 
-[![Circle CI](https://circleci.com/gh/mathieuravaux/eventstore-ruby.svg?style=svg)](https://circleci.com/gh/mathieuravaux/eventstore-ruby)
+## Installation
 
-## Install
-
-Add this line to your application's Gemfile and run Bundler:
+Add this line to your application's Gemfile:
 
 ```ruby
 gem 'estore'
 ```
 
+And then execute:
+
+    $ bundle
+
 Or install it yourself as:
 
     $ gem install estore
 
 ## Usage
 
+See [spec/integration/session_spec.rb](spec/integration/session_spec.rb) for a sample usage.
+
+## License
 
+See [LICENSE](LICENSE) file.
 
-## Contributing
+## Credits
 
-1. Fork it ( https://github.com/mathieuravaux/eventstore/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+  * [Mathieu Ravaux](https://github.com/mathieuravaux)

data/Rakefile

@@ -1,21 +1,39 @@
-require 'bundler/gem_tasks'
+require 'bundler'
 require 'rspec/core/rake_task'
 
-VENDORED_PROTO = 'vendor/proto/ClientMessageDtos.proto'
-PROTO_URL = 'https://raw.githubusercontent.com/EventStore/EventStore/oss-v3.0.1/src/Protos/ClientAPI/ClientMessageDtos.proto'
-PROTO_DIR = 'lib/estore'
+Bundler.setup
 
 RSpec::Core::RakeTask.new(:spec)
+task default: [:ci]
+
+desc 'Run CI tasks'
+task ci: [:spec]
+
+begin
+  require 'rubocop/rake_task'
+
+  Rake::Task[:default].enhance [:rubocop]
+
+  RuboCop::RakeTask.new do |task|
+    task.options << '--display-cop-names'
+  end
+rescue LoadError
+end
 
-task default: :spec
+VENDORED_PROTO = 'vendor/proto/ClientMessageDtos.proto'
+PROTO_URL = 'https://raw.githubusercontent.com/EventStore/EventStore/'\
+    'oss-v3.0.1/src/Protos/ClientAPI/ClientMessageDtos.proto'
 
 desc 'Update the protobuf messages definition'
 task :proto do
   system("wget -O #{VENDORED_PROTO} #{PROTO_URL}")
-  system("mkdir -p #{PROTO_DIR}")
-  beefcake_bin = Bundler.bin_path.join('protoc-gen-beefcake').to_s
-  if system("BEEFCAKE_NAMESPACE=Eventstore protoc --plugin=#{beefcake_bin} --beefcake_out lib/estore #{VENDORED_PROTO}")
+
+  beefcake = Bundler.bin_path.join('protoc-gen-beefcake').to_s
+
+  if system("BEEFCAKE_NAMESPACE=Estore protoc --plugin=#{beefcake} "\
+      "--beefcake_out lib/estore #{VENDORED_PROTO}")
     FileUtils.mv('lib/estore/ClientMessageDtos.pb.rb', 'lib/estore/messages.rb')
-    system("sed -i '' 's/module Eventstore/class Eventstore/' lib/estore/messages.rb")
+    system("sed -i '' 's/module Eventstore/class Eventstore/' "\
+        "lib/estore/messages.rb")
   end
 end

data/estore.gemspec

@@ -5,24 +5,23 @@ require 'estore/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'estore'
-  spec.version       = EventStore::VERSION
+  spec.version       = Estore::VERSION
   spec.authors       = ['Mathieu Ravaux', 'Héctor Ramón']
   spec.email         = ['mathieu.ravaux@gmail.com', 'hector0193@gmail.com']
-  spec.summary       = 'Ruby client API for the Event Store.'
-  spec.description   = 'Event Store is an open-source, functional database with Complex Event Processing in JavaScript.'
-  spec.homepage      = 'https://github.com/rom-eventstore/eventstore-ruby'
+  spec.summary       = 'An Event Store driver for Ruby'
+  spec.description   = spec.summary
+  spec.homepage      = 'https://github.com/rom-eventstore/estore'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(/^spec\//)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ['lib']
 
   spec.add_dependency 'beefcake', '~> 1.1.0.pre1'
   spec.add_dependency 'promise.rb', '~> 0.6.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rubocop', '~> 0.28.0'
 end

data/lib/estore.rb

@@ -1,92 +1,11 @@
-require 'securerandom'
-
-# The Eventstore class is responsible for maintaining a full-duplex connection
-# between the client and the Event Store server.
-# EventStore is thread-safe, and it is recommended that only one instance per application is created.
-#
-# All operations are handled fully asynchronously, returning a promise.
-# If you need to execute synchronously, simply call .sync on the returned promise.
-#
-# To get maximum performance from the connection, it is recommended that it be used asynchronously.
-class Eventstore
-  attr_reader :host, :port, :connection, :context, :error_handler
-  def initialize(host, port = 2113)
-    @host = host
-    @port = port
-    @context = ConnectionContext.new
-    @connection = Connection.new(host, port, context)
-  end
-
-  def on_error(error = nil, &block)
-    context.on_error(error, &block)
-  end
-
-  def close
-    connection.close
-  end
-
-  def ping
-    command('Ping')
-  end
-
-  def new_event(event_type, data, content_type: 'json', uuid: nil)
-    uuid ||= SecureRandom.uuid
-    content_type_code = { 'json' => 1 }.fetch(content_type, 0)
-    NewEvent.new(
-      event_id: Package.encode_uuid(uuid),
-      event_type: event_type,
-      data: data,
-      data_content_type: content_type_code,
-      metadata_content_type: 1
-    )
-  end
-
-  def write_events(stream, events)
-    events = Array(events)
-    msg = WriteEvents.new(
-      event_stream_id: stream,
-      expected_version: -2,
-      events: events,
-      require_master: true
-    )
-    command('WriteEvents', msg)
-  end
-
-  def read_stream_events_forward(stream, start, max)
-    msg = ReadStreamEvents.new(
-      event_stream_id: stream,
-      from_event_number: start,
-      max_count: max,
-      resolve_link_tos: true,
-      require_master: false
-    )
-    command('ReadStreamEventsForward', msg)
-  end
-
-  def subscribe_to_stream(handler, stream, resolve_link_tos = false)
-    msg = SubscribeToStream.new(event_stream_id: stream, resolve_link_tos: resolve_link_tos)
-    command('SubscribeToStream', msg, handler)
-  end
-
-  def unsubscribe_from_stream(subscription_uuid)
-    msg = UnsubscribeFromStream.new
-    command('UnsubscribeFromStream', msg, uuid: subscription_uuid)
-  end
-
-  private
-
-  def command(*args)
-    connection.send_command(*args)
-  end
-end
-
-require_relative 'estore/errors'
-require_relative 'estore/package'
-require_relative 'estore/messages'
-require_relative 'estore/message_extensions'
-require_relative 'estore/connection_context'
-require_relative 'estore/connection'
-require_relative 'estore/connection/buffer'
-require_relative 'estore/connection/commands'
-require_relative 'estore/subscription'
-require_relative 'estore/catchup_subscription'
+require 'estore/session'
+require 'estore/errors'
+require 'estore/package'
+require 'estore/messages'
+require 'estore/message_extensions'
+require 'estore/connection_context'
+require 'estore/connection'
+require 'estore/connection/buffer'
+require 'estore/connection/commands'
+require 'estore/subscription'
+require 'estore/catchup_subscription'

data/lib/estore/catchup_subscription.rb

@@ -1,28 +1,29 @@
-class Eventstore
+class Estore
   # Catch-Up Subscriptions
   #
-  # This kind of subscription specifies a starting point, in the form of an event
-  # number or transaction file position. The given function will be called for events
-  # from the starting point until the end of the stream, and then for subsequently written events.
-  #
-  # For example, if a starting point of 50 is specified when a stream has 100 events in it,
-  # the subscriber can expect to see events 51 through 100, and then any events subsequently
-  # written until such time as the subscription is dropped or closed.
+  # This kind of subscription specifies a starting point, in the form of an
+  # event number or transaction file position. The given function will be
+  # called for events from the starting point until the end of the stream,
+  # and then for subsequently written events.
   #
+  # For example, if a starting point of 50 is specified when a stream has 100
+  # events in it, the subscriber can expect to see events 51 through 100, and
+  # then any events subsequently written until such time as the subscription is
+  # dropped or closed.
   class CatchUpSubscription < Subscription
     MAX_READ_BATCH = 100
 
     attr_reader :from, :caught_up
 
-    def initialize(eventstore, stream, from, resolve_link_tos: true, batch_size: MAX_READ_BATCH)
-      super(eventstore, stream, resolve_link_tos: resolve_link_tos)
+    def initialize(estore, stream, from, options = {})
+      super(estore, stream, options)
+
       @from = from
       @caught_up = false
-
       @mutex = Mutex.new
       @queue = []
-      @position = from
-      @batch_size = batch_size
+      @position = from - 1
+      @batch_size = options[:batch_size] || 100
     end
 
     def on_catchup(&block)
@@ -48,17 +49,14 @@ class Eventstore
     end
 
     def switch_to_live
-      log("fn=switch_to_live id=#{@id} stream=#{stream} at=start position=#{@position} queue_size=#{@queue.size}")
       @mutex.synchronize do
         dispatch_events(received_while_backfilling)
         @queue = nil
         @caught_up = true
       end
-      log("fn=switch_to_live id=#{@id} stream=#{stream} at=finish position=#{@position}")
     end
 
     def backfill
-      log("fn=backfill at=start position=#{@position}")
       loop do
         events, finished = fetch_batch(@position + 1)
         @mutex.synchronize do
@@ -66,7 +64,6 @@ class Eventstore
         end
         break if finished
       end
-      log("fn=backfill at=finish position=#{@position}")
     end
 
     def dispatch_events(events)
@@ -74,7 +71,7 @@ class Eventstore
     end
 
     def fetch_batch(from)
-      prom = eventstore.read_stream_events_forward(stream, from, @batch_size)
+      prom = @estore.read(stream, from, @batch_size)
       response = prom.sync
       [Array(response.events), response.is_end_of_stream]
     end
@@ -86,9 +83,5 @@ class Eventstore
     def call_on_catchup
       @on_catchup.call if @on_catchup
     end
-
-    def log(msg)
-      puts(msg)
-    end
   end
 end

data/lib/estore/connection.rb

@@ -1,16 +1,14 @@
-class Eventstore
+class Estore
   # Connection owns the TCP socket, formats and sends commands over the socket.
-  # It also starts a background thread to read from the TCP socket and handle received packages,
-  # dispatching them to the calling app.
+  # It also starts a background thread to read from the TCP socket and handle
+  # received packages, dispatching them to the calling app.
   class Connection
-    attr_reader :host, :port, :context, :error_handler
-    attr_reader :buffer, :mutex
+    attr_reader :host, :port, :context, :buffer, :mutex
 
     def initialize(host, port, context)
       @host = host
       @port = Integer(port)
       @context = context
-
       @buffer = Buffer.new(&method(:on_received_package))
       @mutex = Mutex.new
     end
@@ -29,34 +27,36 @@ class Eventstore
 
       mutex.synchronize do
         promise = context.register_command(correlation_id, command, handler)
-        # puts "Sending #{command} command with correlation id #{correlation_id}"
-        # puts "Sending to socket: #{frame.length} #{frame.inspect}"
-        to_write = frame.to_s
-        socket.write(to_write)
+        socket.write(frame.to_s)
         promise
       end
     end
 
     private
 
-    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
     def on_received_package(command, message, uuid, _flags)
-      # p(fn: "on_received_package", command: command)
-      # callback = context.received_package(uuid, command, message)
       case command
-      when 'Pong' then                              context.fulfilled_command(uuid, 'Pong')
-      when 'HeartbeatRequestCommand' then           send_command('HeartbeatResponseCommand')
-      when 'SubscriptionConfirmation' then          context.fulfilled_command(uuid, decode(SubscriptionConfirmation, message))
+      when 'Pong'
+        context.fulfill(uuid, 'Pong')
+      when 'HeartbeatRequestCommand'
+        send_command('HeartbeatResponseCommand')
+      when 'SubscriptionConfirmation'
+        context.fulfill(uuid, decode(SubscriptionConfirmation, message))
       when 'ReadStreamEventsForwardCompleted'
-        context.fulfilled_command(uuid, decode(ReadStreamEventsCompleted, message))
+        context.fulfill(uuid, decode(ReadStreamEventsCompleted, message))
       when 'StreamEventAppeared'
         resolved_event = decode(StreamEventAppeared, message).event
-        context.trigger(uuid, 'event_appeared', resolved_event)
-      when 'WriteEventsCompleted' then              on_write_events_completed(uuid, decode(WriteEventsCompleted, message))
-      else fail command
+        context.trigger(uuid, :event_appeared, resolved_event)
+      when 'WriteEventsCompleted'
+        on_write_events_completed(uuid, decode(WriteEventsCompleted, message))
+      else
+        raise command
       end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize
+    # rubocop:enable Metrics/MethodLength
 
     def on_write_events_completed(uuid, response)
       if response.result != OperationResult::Success
@@ -65,7 +65,7 @@ class Eventstore
         return
       end
 
-      context.fulfilled_command(uuid, response)
+      context.fulfill(uuid, response)
     end
 
     def decode(type, message)
@@ -91,7 +91,8 @@ class Eventstore
       @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, "Error connecting to Eventstore on "\
+        "#{host.inspect}:#{port.inspect} (#{$ERROR_INFO.class})"
     end
 
     def process_downstream

data/lib/estore/connection/buffer.rb

@@ -1,6 +1,7 @@
-class Eventstore
+class Estore
   class Connection
-    # Buffer receives data from the TCP connection, and parses the binary packages.
+    # Buffer receives data from the TCP connection, and parses the binary
+    # packages.
     # Parsed packages are given back to the given handler as they are decoded.
     class Buffer
       attr_reader :buffer, :handler, :mutex
@@ -11,7 +12,9 @@ class Eventstore
       end
 
       def <<(bytes)
-        bytes = bytes.force_encoding('BINARY') if bytes.respond_to? :force_encoding
+        bytes = bytes.force_encoding('BINARY') if
+          bytes.respond_to? :force_encoding
+
         mutex.synchronize do
           @buffer << bytes
         end
@@ -50,7 +53,7 @@ class Eventstore
 
       def handle(pkg)
         code, flags, uuid_bytes, message = parse(pkg)
-        command = Eventstore::Connection.command_name(code)
+        command = Estore::Connection.command_name(code)
         handler.call(command, message, Package.parse_uuid(uuid_bytes), flags)
       end
 

data/lib/estore/connection/commands.rb

@@ -1,4 +1,4 @@
-class Eventstore
+class Estore
   # Mapping between command names and codes
   # From https://github.com/EventStore/EventStore/blob/master/src/EventStore.ClientAPI/SystemData/TcpCommand.cs
   class Connection

data/lib/estore/connection_context.rb

@@ -1,11 +1,12 @@
 require 'promise'
 
-class Eventstore
+class Estore
   # Extension of a Ruby implementation of the Promises/A+ spec
   # that carries the correlation id of the command.
   # @see https://github.com/lgierth/promise.rb
   class Promise < ::Promise
     attr_reader :correlation_id
+
     def initialize(correlation_id)
       super()
       @correlation_id = correlation_id
@@ -29,9 +30,8 @@ class Eventstore
       @targets = {}
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
     def register_command(uuid, command, target = nil)
-      # p fn: "register_command", uuid: uuid, command: command
       case command
       when 'Ping' then promise(uuid)
       when 'ReadStreamEventsForward' then promise(uuid)
@@ -39,26 +39,28 @@ class Eventstore
       when 'WriteEvents' then promise(uuid)
       when 'HeartbeatResponseCommand' then :nothing_to_do
       when 'UnsubscribeFromStream' then :nothing_to_do
-      else fail("Unknown command #{command}")
+      else raise "Unknown command #{command}"
       end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength
 
-    def fulfilled_command(uuid, value)
+    def fulfill(uuid, value)
       prom = nil
+
       mutex.synchronize do
         prom = requests.delete(uuid)
       end
-      # p fn: "fulfilled_command", uuid: uuid, prom: prom, requests: requests
+
       prom.fulfill(value) if prom
     end
 
     def rejected_command(uuid, error)
       prom = nil
+
       mutex.synchronize do
         prom = requests.delete(uuid)
       end
-      # p fn: "fulfilled_command", uuid: uuid, prom: prom, requests: requests
+
       prom.reject(error) if prom
     end
 

data/lib/estore/errors.rb

@@ -1,4 +1,4 @@
-class Eventstore
+class Estore
   class CannotConnectError < RuntimeError; end
   class DisconnectionError < RuntimeError; end
 end

data/lib/estore/message_extensions.rb

@@ -1,4 +1,4 @@
-class Eventstore
+class Estore
   # @see https://github.com/EventStore/EventStore/blob/master/src/EventStore.Core/Data/ResolvedEvent.cs#L9
   module OriginalEventMixin
     def original_event
@@ -15,5 +15,5 @@ class Eventstore
   end
 end
 
-Eventstore::ResolvedEvent.include(Eventstore::OriginalEventMixin)
-Eventstore::ResolvedIndexedEvent.include(Eventstore::OriginalEventMixin)
+Estore::ResolvedEvent.send(:include, Estore::OriginalEventMixin)
+Estore::ResolvedIndexedEvent.send(:include, Estore::OriginalEventMixin)

data/lib/estore/messages.rb

@@ -1,7 +1,7 @@
 ## Generated from vendor/proto/ClientMessageDtos.proto for EventStore.Client.Messages
 require 'beefcake'
 
-class Eventstore
+class Estore
   module OperationResult
     Success = 0
     PrepareTimeout = 1

data/lib/estore/package.rb

@@ -1,4 +1,4 @@
-class Eventstore
+class Estore
   # Package is a length-prefixed binary frame transferred over TCP
   class Package
     def self.encode(code, correlation_id, msg)
@@ -24,7 +24,9 @@ class Eventstore
     end
 
     def self.parse_uuid(bytes)
-      a, b, c, d, e, f, g, h = *bytes.unpack('n*').map { |n| n.to_s(16) }.map { |n| n.rjust(4, '0') }
+      a, b, c, d, e, f, g, h =
+        *bytes.unpack('n*').map { |n| n.to_s(16) }.map { |n| n.rjust(4, '0') }
+
       [a, b, '-', c, '-', d, '-', e, '-', f, g, h].join('')
     end
   end

data/lib/estore/session.rb

@@ -0,0 +1,100 @@
+require 'securerandom'
+
+class Estore  # TODO: Change to module
+  # The Session class is responsible for maintaining a full-duplex connection
+  # between the client and the Event Store server.
+  # An Estore session is thread-safe, and it is recommended to only have one
+  # instance per application.
+  #
+  # All operations are handled fully asynchronously, returning a promise.
+  # If you need to execute synchronously, simply call .sync on the returned
+  # promise.
+  #
+  # To get maximum performance from the connection, it is recommended to use it
+  # asynchronously.
+  class Session
+    attr_reader :host, :port, :connection, :context
+
+    def initialize(host, port = 2113)
+      @host = host
+      @port = port
+      @context = ConnectionContext.new
+      @connection = Connection.new(host, port, context)
+    end
+
+    def on_error(error = nil, &block)
+      context.on_error(error, &block)
+    end
+
+    def close
+      connection.close
+    end
+
+    def ping
+      command('Ping')
+    end
+
+    def read(stream, start, limit)
+      msg = ReadStreamEvents.new(
+        event_stream_id: stream,
+        from_event_number: start,
+        max_count: limit,
+        resolve_link_tos: true,
+        require_master: false
+      )
+
+      command('ReadStreamEventsForward', msg)
+    end
+
+    def append(stream, events, options = {})
+      msg = WriteEvents.new(
+        event_stream_id: stream,
+        expected_version: options[:expected_version] || -2,
+        events: Array(events).map { |event| new_event(event) },
+        require_master: true
+      )
+
+      command('WriteEvents', msg)
+    end
+
+    def subscribe(stream, handler, options = {})
+      msg = SubscribeToStream.new(
+        event_stream_id: stream,
+        resolve_link_tos: options[:resolve_link_tos]
+      )
+
+      command('SubscribeToStream', msg, handler)
+    end
+
+    def subscription(stream, options = {})
+      if options[:catch_up_from]
+        CatchUpSubscription.new(self, stream, options[:catch_up_from], options)
+      else
+        Subscription.new(self, stream, options)
+      end
+    end
+
+    private
+
+    CONTENT_TYPES = {
+      json: 1
+    }
+
+    def new_event(event)
+      uuid = event[:id] || SecureRandom.uuid
+      content_type = event.fetch(:content_type, :json)
+
+      NewEvent.new(
+        event_id: Package.encode_uuid(uuid),
+        event_type: event[:type],
+        data: event[:data],
+        data_content_type: CONTENT_TYPES.fetch(content_type, 0),
+        metadata_content_type: 1
+      )
+    end
+
+    def command(*args)
+      connection.send_command(*args)
+    end
+  end
+end

data/lib/estore/subscription.rb

@@ -1,4 +1,4 @@
-class Eventstore
+class Estore
   # Volatile Subscriptions
   #
   # This kind of subscription calls a given function for events written
@@ -8,12 +8,12 @@ class Eventstore
   # the subscriber can expect to see event number 101 onwards until the time
   # the subscription is closed or dropped.
   class Subscription
-    attr_reader :eventstore, :stream, :resolve_link_tos, :id, :position
+    attr_reader :id, :stream, :resolve_link_tos, :position
 
-    def initialize(eventstore, stream, resolve_link_tos: true)
-      @eventstore = eventstore
+    def initialize(estore, stream, options = {})
+      @estore = estore
       @stream = stream
-      @resolve_link_tos = resolve_link_tos
+      @resolve_link_tos = options.fetch(:resolve_link_tos, true)
     end
 
     def on_error(&block)
@@ -29,14 +29,14 @@ class Eventstore
     end
 
     def stop
-      eventstore.unsubscribe_from_stream(id) if id
+      @estore.unsubscribe(id) if id
       @id = nil
     end
 
     private
 
     def subscribe
-      prom = eventstore.subscribe_to_stream(self, stream, resolve_link_tos)
+      prom = @estore.subscribe(stream, self, resolve_link_tos: resolve_link_tos)
       @id = prom.correlation_id
       prom.sync
     end

data/lib/estore/version.rb

@@ -1,3 +1,3 @@
-module EventStore
-  VERSION = '0.0.1'
+class Estore
+  VERSION = '0.0.2'
 end

data/spec/integration/session_spec.rb

@@ -0,0 +1,106 @@
+require 'spec_helper'
+require 'securerandom'
+require 'json'
+
+describe Estore::Session do
+  subject(:session) { Estore::Session.new('127.0.0.1', 1113) }
+
+  before do
+    @id = -1
+  end
+
+  def data
+    @id += 1
+    { 'id' => @id }
+  end
+
+  def parse_data(wrapper)
+    JSON.parse(wrapper.event.data)
+  end
+
+  def event
+    {
+      type: 'TestEvent',
+      data: data.to_json
+    }
+  end
+
+  def events(n)
+    (1..n).map { event }
+  end
+
+  def random_stream
+    "test-#{SecureRandom.uuid}"
+  end
+
+  def populate(count, stream = nil)
+    stream ||= random_stream
+    session.append(stream, events(count)).sync
+    stream
+  end
+
+  it 'reads events from a stream' do
+    stream = populate(20)
+    read = session.read(stream, 0, 20).sync
+
+    expect(read.events.size).to be(20)
+
+    read.events.each_with_index do |event, index|
+      expect(parse_data(event)).to eql('id' => index)
+    end
+  end
+
+  it 'allows to make a live subscription' do
+    stream = random_stream
+    received = 0
+
+    sub = session.subscription(stream)
+    sub.on_error { |error| raise error.inspect }
+
+    sub.on_event do |event|
+      expect(parse_data(event)).to eql('id' => received)
+      received += 1
+    end
+
+    sub.start
+
+    populate(50, stream)
+
+    Timeout.timeout(5) do
+      loop do
+        break if received >= 50
+        sleep(0.1)
+      end
+    end
+  end
+
+  it 'allows to make a catchup subscription' do
+    stream = random_stream
+    received = 0
+
+    populate(50, stream)
+
+    sub = session.subscription(stream, catch_up_from: 20)
+    sub.on_error { |error| raise error.inspect }
+
+    sub.on_event do |event|
+      expect(parse_data(event)).to eql('id' => received + 20)
+      received += 1
+    end
+
+    sub.start
+
+    Thread.new do
+      50.times do
+        populate(2, stream)
+      end
+    end
+
+    Timeout.timeout(5) do
+      loop do
+        break if received >= 130
+        sleep(0.1)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,7 +1,10 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'estore'
+# encoding: utf-8
+if RUBY_ENGINE == 'rbx'
+  require 'codeclimate-test-reporter'
+  CodeClimate::TestReporter.start
+end
 
-require 'json'
+require 'estore'
 
 trap 'TTIN' do
   Thread.list.each do |thread|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: estore
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Mathieu Ravaux
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
@@ -43,32 +43,18 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,21 +68,20 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.28.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Event Store is an open-source, functional database with Complex Event
-  Processing in JavaScript.
+        version: 0.28.0
+description: An Event Store driver for Ruby
 email:
 - mathieu.ravaux@gmail.com
 - hector0193@gmail.com
@@ -106,13 +91,13 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- circle.yml
 - estore.gemspec
 - lib/estore.rb
 - lib/estore/catchup_subscription.rb
@@ -124,13 +109,13 @@ files:
 - lib/estore/message_extensions.rb
 - lib/estore/messages.rb
 - lib/estore/package.rb
+- lib/estore/session.rb
 - lib/estore/subscription.rb
 - lib/estore/version.rb
-- spec/db/.gitkeep
-- spec/eventstore_spec.rb
+- spec/integration/session_spec.rb
 - spec/spec_helper.rb
 - vendor/proto/ClientMessageDtos.proto
-homepage: https://github.com/rom-eventstore/eventstore-ruby
+homepage: https://github.com/rom-eventstore/estore
 licenses:
 - MIT
 metadata: {}
@@ -153,8 +138,7 @@ rubyforge_project:
 rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: Ruby client API for the Event Store.
+summary: An Event Store driver for Ruby
 test_files:
-- spec/db/.gitkeep
-- spec/eventstore_spec.rb
+- spec/integration/session_spec.rb
 - spec/spec_helper.rb

data/circle.yml

@@ -1,3 +0,0 @@
-notify:
-  webhooks:
-    - url: https://webhooks.gitter.im/e/e20bfa93dc2e11895805

data/spec/eventstore_spec.rb

@@ -1,103 +0,0 @@
-require 'spec_helper'
-
-describe Eventstore do
-  let(:es) { Eventstore.new('localhost', 1113) }
-  subject { new_estore }
-  let(:injector) { new_estore }
-
-  def new_estore
-    es = Eventstore.new('localhost', 1113)
-    es.on_error { |error| Thread.main.raise(error) }
-    es
-  end
-
-  it 'supports the PING command' do
-    Timeout.timeout(1) do
-      promise = es.ping
-      result = promise.sync
-      expect(result).to eql 'Pong'
-    end
-  end
-
-  def inject_event(stream)
-    event_type = 'TestEvent'
-    data = JSON.generate(at: Time.now.to_i, foo: 'bar')
-    event = injector.new_event(event_type, data)
-    # puts ">#{stream}\t\t#{event.inspect}"
-    prom = injector.write_events(stream, event)
-    prom.sync
-  end
-
-  it 'dumps the content of the outlet stream from the last checkpoint' do
-    inject_events('outlet', 50)
-    events = subject.read_stream_events_forward('outlet', 1, 20).sync
-    expect(events).to be_kind_of(Eventstore::ReadStreamEventsCompleted)
-    events.events.each do |event|
-      expect(event).to be_kind_of(Eventstore::ResolvedIndexedEvent)
-      JSON.parse(event.event.data)
-    end
-  end
-
-  def inject_events_async(stream, target)
-    Thread.new do
-      begin
-        inject_events(stream, target)
-      rescue => error
-        puts(error.inspect)
-        puts(*error.backtrace)
-        Thread.main.raise(error)
-      end
-    end
-  end
-
-  def inject_events(stream, target)
-    target.times do |_i|
-      inject_event(stream)
-    end
-  end
-
-  it 'allows to make a live subscription' do
-    stream = "catchup-test-#{SecureRandom.uuid}"
-    received = 0
-
-    sub = subject.new_subscription(stream)
-    sub.on_event { |_event| received += 1 }
-    sub.on_error { |error| fail(error.inspect) }
-    sub.start
-
-    inject_events(stream, 50)
-
-    Timeout.timeout(20) do
-      loop do
-        break if received >= 50
-        sleep(0.1)
-      end
-    end
-  end
-
-  it 'allows to make a catch-up subscription' do
-    stream = "catchup-test-#{SecureRandom.uuid}"
-    received = 0
-    mutex = Mutex.new
-
-    expect(subject.ping.sync).to eql 'Pong'
-
-    # puts "stream: #{stream}"
-
-    inject_events(stream, 1220)
-
-    sub = subject.new_catchup_subscription(stream, -1)
-    sub.on_event { |_event| mutex.synchronize { received += 1 } }
-    sub.on_error { |error| fail error.inspect }
-    sub.start
-
-    inject_events_async(stream, 780)
-
-    Timeout.timeout(10) do
-      loop do
-        break if received >= 2000
-        sleep(0.1)
-      end
-    end
-  end
-end