nexia_event_store 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc9b1f564f3ddc8e4d22914517f12d8cc6f53d02
-  data.tar.gz: e1c77390b4b25728ed97aff1704aa1ecbfabf7c8
+  metadata.gz: 115b1bb8a9f14f799f97b9038cf9ae1ed8a9aacd
+  data.tar.gz: b1e31142a7fda060e2f4b2cd1a81a3c0cc8dc652
 SHA512:
-  metadata.gz: 605f0b48862fd33d06ae738ed0be5c67c5a0bca60c0f02f4358f02017a81d98de7cc4400eec8e0acf03319d047012ae68e121b329b4c87b67450779631066d2f
-  data.tar.gz: d52f66b078358357c0f8b86a30d81e2659e24a9da5114d1155f2f4034609b9eba1173f54376db965fac5aba347adc2cd5c2b0fae052d861da78680e76128b46b
+  metadata.gz: 46eac58f16227a98364a52a33c0c9d8f91c1dcbfd8047c52373e4a0d0ea131a6f16324a5ccd54b7c21d2781f6903b2c312dbba32ad951b55bdb1fe4cf2d72671
+  data.tar.gz: 1f6c50f1f137024ac13b1a683b68815ea34e7f833555a66624b9bb885f2917b96708d8f06749af111164756bd0822da0c16de56269703e914f7ea937a92f3385

data/lib/event_store/event_stream.rb

@@ -38,22 +38,13 @@ module EventStore
 
     def last_event_before(start_time, fully_qualified_names = [])
       timestampz = start_time.strftime("%Y-%m-%d %H:%M:%S%z")
-      names = fully_qualified_names.map { |n| "'#{n}'" }.join(',')
-      last_event_before_query = <<-EOSQL
-      SELECT * FROM
-          (SELECT *, LAST_VALUE(occurred_at)
-             OVER(PARTITION BY fully_qualified_name ORDER BY occurred_at
-                  ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) as last
-          FROM #{@event_table}
-          WHERE aggregate_id = '#{@id}'
-            AND fully_qualified_name IN (#{names})
-            AND occurred_at < '#{timestampz}') AS subquery
-      WHERE occurred_at = last
-      ORDER BY occurred_at
-      EOSQL
-
-      query = EventStore.db[last_event_before_query]
-      query.all.map {|e| e[:serialized_event] = EventStore.unescape_bytea(e[:serialized_event]); e}
+
+      rows = fully_qualified_names.inject([]) { |memo, name|
+        memo + events.where(fully_qualified_name: name).where{ occurred_at < timestampz }
+                 .reverse_order(:occurred_at).limit(1).all
+      }.sort_by { |r| r[:occurred_at] }
+
+      rows.map {|r| r[:serialized_event] = EventStore.unescape_bytea(r[:serialized_event]); r}
     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.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexia_event_store
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Paul Saieg, John Colvin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -273,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Ruby implementation of an EventSource (A+ES) for the Nexia Ecosystem