event_store 0.2.8 → 0.2.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTgxNzVkNDg1ZTRiYTYxYmExMTQwYTExZTViMWNmM2E5NzkxMzQ0MA==
+    MTc5NmM1ODQ2NTAwNWM4YzRmM2EzNTAzZjNmYjg3OTM4YThiYmIxMQ==
   data.tar.gz: !binary |-
-    NGNlZTcwMDdkNjcyYmQyMmVlMDY1NTRiNDc5MGVkNmM5ZTMwNWVhMA==
+    YmEyNWViZTUwMDE2MzE1ZDM5NmI0NjUzMGRhNjYyNmQ0N2EzODExNA==
 SHA512:
   metadata.gz: !binary |-
-    MGRhZjc4MzU5ZjlmMGIzOTgxNmU5NjQ3NzVhYjhkNzViMWFkNWI5NmY2MmE3
-    MGM4ZmQxNDVkZTBlMmQ4MmIzOTVlYzNkMGI5NTM3YTEzODdlN2RjZjUzMGFj
-    ZTIxZDA4OGM5OGM2Mjc4NWE4N2E3NmNiMGRmZmUwN2UyNjI3YmI=
+    YmRkOWYyMjdhMTQ2OTM2YzUzZjY2NWYwMWI4NDA2NTQ5ODNlOGE5OWViM2Q0
+    NTQ4MjUwNzdlYTY0MWRjNjAzNThhMDFjMGUxMTQ1YzRjNTdjMWNkZGY5Yzkx
+    NTc3ODE1ODU2NWQ4M2VkNDQxNmY3YjNjNzU3YWFiMjQ0M2E2MjY=
   data.tar.gz: !binary |-
-    MWFjYjRiYWY4NDY5ZDRhZmZlYjMxZGQ5M2NiNjlmZmIwNDQ3MTFhN2JkOWEw
-    YWJiOGFmYTVjNzQzZTlkZmE2ZmIzMDYzZDRkNDM3YjJhZDAyYjQwYWYzMzM3
-    NDUyMjIwYzE0MGM1MDc2YWVlNTZjYjc4ZTgyMzVlNTQ2YzkwMzY=
+    NzYxMzE0MWU3ZTcxMDlhYTU2Y2IwZmM2NzFiMDg0NWRhZjBiOWExZDZkODk0
+    MTZlNDY0NmE3M2RjZDdkNjFiYWI4ZWY4NDJiNzc1Y2UxMzhlYTM2ZmQ2NzBi
+    OTVjMjY0NGNmNGMzNjlmMzA2NmVjYjM3ODc0ZjVmY2RiYWJkMWY=

data/lib/event_store.rb

@@ -99,16 +99,11 @@ module EventStore
   end
 
   def self.escape_bytea(binary_string)
-    @adapter == 'vertica' ? binary_string.unpack('H*').join : EventStore.db.literal(binary_string.to_sequel_blob)
+    binary_string.unpack('H*').join
   end
 
   def self.unescape_bytea(binary_string)
-    if @adapter == 'vertica'
-      [binary_string].pack("H*")
-    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
+    [binary_string].pack("H*")
   end
 
   def self.custom_config(database_config, redis_config, table_name = 'events', environment = 'production')
@@ -138,4 +133,4 @@ module EventStore
   def self.vertica_host
     File.read File.expand_path(File.join('..','..','db', 'vertica_host_address.txt'), __FILE__)
   end
-end
+end

data/lib/event_store/aggregate.rb

@@ -45,7 +45,10 @@ module EventStore
     end
 
     def events_from(version_number, max = nil)
-      events.limit(max).where{ version >= version_number.to_i }.all
+      events.limit(max).where{ version >= version_number.to_i }.all.map do |event|
+        event[:serialized_event] = EventStore.unescape_bytea(event[:serialized_event])
+        event
+      end
     end
 
     def event_stream_between(start_time, end_time, fully_qualified_names = [])

data/lib/event_store/version.rb

@@ -1,3 +1,3 @@
 module EventStore
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

data/spec/event_store/client_spec.rb

@@ -78,6 +78,25 @@ describe EventStore::Client do
       stream = es_client.new(AGGREGATE_ID_ONE, :device).event_stream
       expect(stream.count).to eq(10)
     end
+
+    context "when the serialized event is terminated prematurely with a null byte" do
+      it "does not truncate the serialized event when there is a binary zero value is at the end" do
+        serialized_event = serialized_event_data_terminated_by_null
+        client = es_client.new("any_device", :device)
+        event = EventStore::Event.new("any_device", @event_time, 'other_event_name', serialized_event, client.version + 1)
+        client.append([event])
+        expect(client.event_stream.last[:serialized_event]).to eql(serialized_event)
+      end
+
+      it "conversion of byte array to and from hex should be lossless" do
+        client = es_client.new("any_device", :device)
+        serialized_event = serialized_event_data_terminated_by_null
+        event = EventStore::Event.new("any_device", @event_time, 'terminated_by_null_event', serialized_event, client.version + 1)
+        client.append([event])
+        hex_from_db = EventStore.db.from(EventStore.fully_qualified_table).where(fully_qualified_name: 'terminated_by_null_event').first[:serialized_event]
+        expect(hex_from_db).to eql(EventStore.escape_bytea(serialized_event))
+      end
+    end
   end
 
 
@@ -380,6 +399,10 @@ describe EventStore::Client do
     end
 
   end
+  def serialized_event_data_terminated_by_null
+    @term_data ||= File.open(File.expand_path("../binary_string_term_with_null_byte.txt", __FILE__), 'rb') {|f| f.read}
+    @term_data
+  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: event_store
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Paul Saieg, John Colvin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -240,6 +240,7 @@ files:
 - spec/benchmark/bench.rb
 - spec/benchmark/memory_profile.rb
 - spec/benchmark/seed_db.rb
+- spec/event_store/binary_string_term_with_null_byte.txt
 - spec/event_store/client_spec.rb
 - spec/event_store/config_spec.rb
 - spec/event_store/serialized_binary_event_data.txt
@@ -274,6 +275,7 @@ test_files:
 - spec/benchmark/bench.rb
 - spec/benchmark/memory_profile.rb
 - spec/benchmark/seed_db.rb
+- spec/event_store/binary_string_term_with_null_byte.txt
 - spec/event_store/client_spec.rb
 - spec/event_store/config_spec.rb
 - spec/event_store/serialized_binary_event_data.txt