event_store 0.1.5 → 0.1.6

data/.simplecov

@@ -0,0 +1,16 @@
+require 'simplecov'
+require 'simplecov-rcov'
+
+class SimpleCov::Formatter::MergedFormatter
+  def format(result)
+     SimpleCov::Formatter::HTMLFormatter.new.format(result)
+     SimpleCov::Formatter::RcovFormatter.new.format(result)
+  end
+end
+SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
+
+SimpleCov.start do
+  add_filter "_spec.rb"
+
+  SimpleCov.minimum_coverage 96
+end

data/Rakefile

@@ -4,6 +4,11 @@ RSpec::Core::RakeTask.new(:'spec:ci')
 
 task :default => :'spec:ci'
 
+def rspec_out_file
+  require 'rspec_junit_formatter'
+  "-f RspecJunitFormatter -o results.xml"
+end
+
 desc "Seed the performance db with millions of events"
 task :'db:seed:perf' do
   sh 'time bundle exec ruby spec/benchmark/seed_db.rb'
@@ -12,4 +17,9 @@ end
 desc "Run the performance benchmarks on the performance db"
 task :benchmark do
   sh 'bundle exec ruby spec/benchmark/bench.rb'
-end
+end
+
+desc "Run all tests and generate coverage xml"
+task :'spec:cov' do
+  sh "bundle exec rspec #{rspec_out_file} spec"
+end

data/db/event_store_sample_data_generator.rb

@@ -1,6 +1,6 @@
 # require_relative '../../protocol_buffers/lib/protocol_buffers'
 require 'faceplate_api'
-require "faceplate_api/thermostats/test_support/event_mother"
+require "faceplate_api/thermostats/test_support"
 require 'securerandom'
 require 'time'
 include FaceplateApi
@@ -15,7 +15,7 @@ versions_per_device = (0..(event_names.length * ITERATIONS)).to_a
 
 mothers = {}
 aggregate_ids.each do |aggregate_id|
-  mother  = Thermostats::EventMother.new(device_id: aggregate_id)
+  mother  = FaceplateApi::EventFixture.new(header: {device_id: aggregate_id}).event_mother
   mothers[mother] = versions_per_device.dup
 end
 

data/event_store.gemspec

@@ -32,4 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'pg', '~> 0.17.1'
   spec.add_dependency 'redis', "~> 3.0.7"
   spec.add_dependency 'hiredis'
+  spec.add_development_dependency 'rspec_junit_formatter'
 end

data/lib/event_store/aggregate.rb

@@ -23,7 +23,7 @@ module EventStore
         raw_event            = value.split(EventStore::SNAPSHOT_DELIMITER)
         fully_qualified_name = key
         version              = raw_event.first.to_i
-        serialized_event     = raw_event[1]
+        serialized_event     = EventStore.unescape_bytea(raw_event[1])
         occurred_at          = Time.parse(raw_event.last)
         snap << SerializedEvent.new(fully_qualified_name, serialized_event, version, occurred_at)
       end

data/lib/event_store/client.rb

@@ -81,7 +81,7 @@ module EventStore
 
     def translate_event(event_hash)
       occurred_at =  TimeHacker.translate_occurred_at_from_local_to_gmt(event_hash[:occurred_at])
-      SerializedEvent.new event_hash[:fully_qualified_name], event_hash[:serialized_event], event_hash[:version], occurred_at
+      SerializedEvent.new event_hash[:fully_qualified_name], EventStore.unescape_bytea(event_hash[:serialized_event]), event_hash[:version], occurred_at
     end
   end
 end

data/lib/event_store/event_appender.rb

@@ -57,7 +57,7 @@ module EventStore
       { :version              => raw_event.version.to_i,
         :aggregate_id         => raw_event.aggregate_id,
         :occurred_at          => Time.parse(raw_event.occurred_at.to_s).utc, #to_s truncates microseconds, which brake Time equality
-        :serialized_event     => raw_event.serialized_event,
+        :serialized_event     => EventStore.escape_bytea(raw_event.serialized_event),
         :fully_qualified_name => raw_event.fully_qualified_name }
     end
 

data/lib/event_store/version.rb

@@ -1,3 +1,3 @@
 module EventStore
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/event_store.rb

@@ -1,4 +1,5 @@
 require 'sequel'
+require 'sequel_core'
 require 'vertica'
 require 'sequel-vertica'
 require 'redis'
@@ -90,6 +91,19 @@ module EventStore
     create_db
   end
 
+  def self.escape_bytea(binary_string)
+    @adapter == 'vertica' ? binary_string : EventStore.db.literal(binary_string.to_sequel_blob)
+  end
+
+  def self.unescape_bytea(binary_string)
+    if @adapter == 'vertica'
+      binary_string
+    else
+      unescaped = Sequel::Postgres::Adapter.unescape_bytea(binary_string)
+      unescaped[0] == "'" && unescaped[-1] == "'" ? unescaped[1...-1] : unescaped #postgres adds an extra set of quotes when you insert it, Redis does not. Therefore we need to pull off the extra quotes if they are there
+    end
+  end
+
   def self.custom_config(database_config, redis_config, envrionment = 'production')
     self.redis_connect(redis_config)
     @adapter        = database_config['adapter'].to_s

data/spec/event_store/client_spec.rb

@@ -1,24 +1,28 @@
 require 'spec_helper'
+require 'securerandom'
+AGGREGATE_ID_ONE   = SecureRandom.uuid
+AGGREGATE_ID_TWO   = SecureRandom.uuid
+AGGREGATE_ID_THREE = SecureRandom.uuid
 
 describe EventStore::Client do
   let(:es_client) { EventStore::Client }
 
   before do
-    client_1 = es_client.new('1', :device)
-    client_2 = es_client.new('2', :device)
+    client_1 = es_client.new(AGGREGATE_ID_ONE, :device)
+    client_2 = es_client.new(AGGREGATE_ID_TWO, :device)
 
-    events_by_aggregate_id  = {'1' => [], '2' => []}
+    events_by_aggregate_id  = {AGGREGATE_ID_ONE => [], AGGREGATE_ID_TWO => []}
     @event_time = Time.parse("2001-01-01 00:00:00 UTC")
-    ([1]*10 + [2]*10).shuffle.each_with_index do |aggregate_id, version|
-      events_by_aggregate_id[aggregate_id.to_s] << EventStore::Event.new(aggregate_id.to_s, @event_time, 'event_name', "#{234532.to_s(2)}_foo}", version)
+    ([AGGREGATE_ID_ONE]*10 + [AGGREGATE_ID_TWO]*10).shuffle.each_with_index do |aggregate_id, version|
+      events_by_aggregate_id[aggregate_id.to_s] << EventStore::Event.new(aggregate_id.to_s, @event_time, 'event_name', serialized_binary_event_data, version)
     end
-    client_1.append events_by_aggregate_id['1']
-    client_2.append events_by_aggregate_id['2']
+    client_1.append events_by_aggregate_id[AGGREGATE_ID_ONE]
+    client_2.append events_by_aggregate_id[AGGREGATE_ID_TWO]
   end
 
   describe '#raw_event_stream' do
     it "should be an array of hashes that represent database records, not EventStore::SerializedEvent objects" do
-      raw_stream = es_client.new(1, :device).raw_event_stream
+      raw_stream = es_client.new(AGGREGATE_ID_ONE, :device).raw_event_stream
       raw_stream.class.should == Array
       raw_event = raw_stream.first
       raw_event.class.should == Hash
@@ -31,19 +35,19 @@ describe EventStore::Client do
     end
 
     it 'should only have events for a single aggregate' do
-      stream = es_client.new(1, :device).raw_event_stream
-      stream.each { |event| event[:aggregate_id].should == '1' }
+      stream = es_client.new(AGGREGATE_ID_ONE, :device).raw_event_stream
+      stream.each { |event| event[:aggregate_id].should == AGGREGATE_ID_ONE }
     end
 
     it 'should have all events for that aggregate' do
-      stream = es_client.new(1, :device).raw_event_stream
+      stream = es_client.new(AGGREGATE_ID_ONE, :device).raw_event_stream
       expect(stream.count).to eq(10)
     end
   end
 
   describe '#event_stream' do
     it "should be an array of EventStore::SerializedEvent objects" do
-      stream = es_client.new(1, :device).event_stream
+      stream = es_client.new(AGGREGATE_ID_ONE, :device).event_stream
       stream.class.should == Array
       event = stream.first
       event.class.should == EventStore::SerializedEvent
@@ -55,20 +59,20 @@ describe EventStore::Client do
     end
 
     it 'should only have events for a single aggregate' do
-      raw_stream = es_client.new(1, :device).raw_event_stream
-      stream = es_client.new(1, :device).event_stream
+      raw_stream = es_client.new(AGGREGATE_ID_ONE, :device).raw_event_stream
+      stream = es_client.new(AGGREGATE_ID_ONE, :device).event_stream
       stream.map(&:fully_qualified_name).should == raw_stream.inject([]){|m, event| m << event[:fully_qualified_name]; m}
     end
 
     it 'should have all events for that aggregate' do
-      stream = es_client.new(1, :device).event_stream
+      stream = es_client.new(AGGREGATE_ID_ONE, :device).event_stream
       expect(stream.count).to eq(10)
     end
   end
 
 
   describe '#raw_event_streams_from_version' do
-    subject { es_client.new(1, :device) }
+    subject { es_client.new(AGGREGATE_ID_ONE, :device) }
 
     it 'should return all the raw events in the stream starting from a certain version' do
       minimum_event_version = 2
@@ -91,7 +95,7 @@ describe EventStore::Client do
   end
 
   describe 'event_stream_from_version' do
-    subject { es_client.new(1, :device) }
+    subject { es_client.new(AGGREGATE_ID_ONE, :device) }
 
     it 'should return all the raw events in the stream starting from a certain version' do
       minimum_event_version = 2
@@ -114,24 +118,24 @@ describe EventStore::Client do
   end
 
   describe '#peek' do
-    let(:client) {es_client.new(1, :device)}
+    let(:client) {es_client.new(AGGREGATE_ID_ONE, :device)}
     subject { client.peek }
 
     it 'should return the last event in the event stream' do
-      last_event = EventStore.db.from(client.event_table).where(aggregate_id: '1').order(:version).last
-      subject.should == EventStore::SerializedEvent.new(last_event[:fully_qualified_name], last_event[:serialized_event].to_s, last_event[:version], @event_time)
+      last_event = EventStore.db.from(client.event_table).where(aggregate_id: AGGREGATE_ID_ONE).order(:version).last
+      subject.should == EventStore::SerializedEvent.new(last_event[:fully_qualified_name], EventStore.unescape_bytea(last_event[:serialized_event]), last_event[:version], @event_time)
     end
   end
 
   describe '#append' do
     before do
-      @client = EventStore::Client.new('1', :device)
+      @client = EventStore::Client.new(AGGREGATE_ID_ONE, :device)
       @event = @client.peek
       version = @client.version
-      @old_event = EventStore::Event.new('1', (@event_time - 2000).utc, "old", "#{1000.to_s(2)}_foo", version += 1)
-      @new_event = EventStore::Event.new('1', (@event_time - 1000).utc, "new", "#{1001.to_s(2)}_foo", version += 1)
-      @really_new_event = EventStore::Event.new('1', (@event_time + 100).utc, "really_new", "#{1002.to_s(2)}_foo", version += 1)
-      @duplicate_event  = EventStore::Event.new('1', (@event_time).utc, 'duplicate', "#{12.to_s(2)}_foo", version += 1)
+      @old_event = EventStore::Event.new(AGGREGATE_ID_ONE, (@event_time - 2000).utc, "old", "#{1000.to_s(2)}_foo", version += 1)
+      @new_event = EventStore::Event.new(AGGREGATE_ID_ONE, (@event_time - 1000).utc, "new", "#{1001.to_s(2)}_foo", version += 1)
+      @really_new_event = EventStore::Event.new(AGGREGATE_ID_ONE, (@event_time + 100).utc, "really_new", "#{1002.to_s(2)}_foo", version += 1)
+      @duplicate_event  = EventStore::Event.new(AGGREGATE_ID_ONE, (@event_time).utc, 'duplicate', "#{12.to_s(2)}_foo", version += 1)
     end
 
     describe "when expected version number is greater than the last version" do
@@ -250,17 +254,17 @@ describe EventStore::Client do
 
     describe 'snapshot' do
       before do
-        @client = es_client.new('10', :device)
+        @client = es_client.new(AGGREGATE_ID_THREE, :device)
         @client.snapshot.length.should == 0
         version = @client.version
-        @client.append %w{ e1 e2 e3 e1 e2 e4 e5 e2 e5 e4}.map {|fqn|EventStore::Event.new('10', Time.now.utc, fqn, 234532.to_s(2), version += 1)}
+        @client.append %w{ e1 e2 e3 e1 e2 e4 e5 e2 e5 e4}.map {|fqn|EventStore::Event.new(AGGREGATE_ID_THREE, Time.now.utc, fqn, serialized_binary_event_data, version += 1)}
       end
 
       it "finds the most recent records for each type" do
         version = @client.version
-        expected_snapshot = %w{ e1 e2 e3 e4 e5 }.map {|fqn| EventStore::SerializedEvent.new(fqn, 234532.to_s(2), version +=1 ) }
-        @client.event_stream.length.should == 10
+        expected_snapshot = %w{ e1 e2 e3 e4 e5 }.map {|fqn| EventStore::SerializedEvent.new(fqn, serialized_binary_event_data, version +=1 ) }
         actual_snapshot = @client.snapshot
+        @client.event_stream.length.should == 10
         actual_snapshot.length.should == 5
         actual_snapshot.map(&:fully_qualified_name).should == ["e3", "e1", "e2", "e5", "e4"] #sorted by version no
         actual_snapshot.map(&:serialized_event).should == expected_snapshot.map(&:serialized_event)
@@ -283,5 +287,10 @@ describe EventStore::Client do
       aggregate = client.instance_variable_get("@aggregate")
       EventStore.redis.hset(aggregate.snapshot_version_table, :current_version, 1000)
     end
+
+  end
+  def serialized_binary_event_data
+    @event_data ||= File.open(File.expand_path("../serialized_binary_event_data.txt", __FILE__), 'rb') {|f| f.read}
+    @event_data
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: event_store
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-15 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -220,6 +220,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! '["A Ruby implementation of an EventSource (A+ES) tuned for Vertica
   or Postgres"]'
 email:
@@ -230,6 +246,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .simplecov
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -269,12 +286,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3767686812779732667
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3767686812779732667
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -289,4 +312,3 @@ test_files:
 - spec/event_store/snapshot_spec.rb
 - spec/event_store/vertica guy notes.txt
 - spec/spec_helper.rb
-has_rdoc: