rails_event_store_active_record 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d9b1b348afcdfb181fa21de7e02634bbefd6fb2
-  data.tar.gz: 1f1c9e835e50c9968b9decec17a23e55546c8813
+  metadata.gz: 303421f1c02382bcb00a76cc09102dfca1a926dd
+  data.tar.gz: 329ae1361280c35255b69751c77b6fe3657affb2
 SHA512:
-  metadata.gz: 4e1ab1cdb157e94a52d66132526904bebfa9db5eddd5f0e12afc551794698f90dcd26e70b7902107b8b1c69094556401dc06ee813522c67bdd4ee2e9f8f83833
-  data.tar.gz: 8e39656125d3abf7e3c6e66c0bdb0ee19b3ce36fc00f0858c670b5fbc079ec181ea3b17ac47ddf24f4aa795dc9ef8325031f2a9aa803c17624f575cee77179bc
+  metadata.gz: e1b0b2289b35a8cdead875a2cc484bab23ab524ef94c6789553ce7815912f79918d5e666c2fecd9efebec84a9130561ddf586d02ce5f6059df75ffd62d7c54ac
+  data.tar.gz: 4f11f781d3ed17d87d7ff32f759a396116c40cabbf70528a39364567f883df3bd0434078b4a9ce80cb00236f4e691fdd27a8e6dd4492a2cbea9d645018f36462

data/Makefile

@@ -15,7 +15,7 @@ mutate: test  ## Run mutation tests
 	@bundle exec mutant --include lib --require ruby_event_store --use rspec "RailsEventStoreActiveRecord*" \
 	  --ignore-subject "RailsEventStoreActiveRecord::EventRepository#normalize_to_array" \
 	  --ignore-subject "RailsEventStoreActiveRecord::LegacyEventRepository#normalize_to_array" \
-	  --ignore-subject "RailsEventStoreActiveRecord::EventRepository#detect_pkey_index_violated"
+	  --ignore-subject "RailsEventStoreActiveRecord::EventRepository#detect_index_violated"
 
 build:
 	@gem build -V rails_event_store_active_record.gemspec

data/lib/rails_event_store_active_record/event_repository.rb

@@ -12,48 +12,19 @@ module RailsEventStoreActiveRecord
     end
 
     def append_to_stream(events, stream_name, expected_version)
-      raise RubyEventStore::InvalidExpectedVersion if stream_name.eql?(RubyEventStore::GLOBAL_STREAM) && !expected_version.equal?(:any)
-
-      events = normalize_to_array(events)
-      expected_version =
-        case expected_version
-        when Integer, :any
-          expected_version
-        when :none
-          -1
-        when :auto
-          eis = EventInStream.where(stream: stream_name).order("position DESC").first
-          (eis && eis.position) || -1
-        else
-          raise RubyEventStore::InvalidExpectedVersion
-        end
+      add_to_stream(events, stream_name, expected_version, true) do |event|
+        build_event_record(event).save!
+        event.event_id
+      end
+    end
 
-      ActiveRecord::Base.transaction(requires_new: true) do
-        in_stream = events.flat_map.with_index do |event, index|
-          position = unless expected_version.equal?(:any)
-            expected_version + index + POSITION_SHIFT
-          end
-          build_event_record(event).save!
-          events = [{
-            stream: RubyEventStore::GLOBAL_STREAM,
-            position: nil,
-            event_id: event.event_id
-          }]
-          events.unshift({
-            stream:   stream_name,
-            position: position,
-            event_id: event.event_id
-          }) unless stream_name.eql?(RubyEventStore::GLOBAL_STREAM)
-          events
-        end
-        EventInStream.import(in_stream)
+    def link_to_stream(event_ids, stream_name, expected_version)
+      (normalize_to_array(event_ids) - Event.where(id: event_ids).pluck(:id)).each do |id|
+        raise RubyEventStore::EventNotFound.new(id)
       end
-      self
-    rescue ActiveRecord::RecordNotUnique => e
-      if detect_pkey_index_violated(e)
-        raise RubyEventStore::EventDuplicatedInStream
+      add_to_stream(event_ids, stream_name, expected_version, nil) do |event_id|
+        event_id
       end
-      raise RubyEventStore::WrongExpectedEventVersion
     end
 
     def delete_stream(stream_name)
@@ -133,7 +104,7 @@ module RailsEventStoreActiveRecord
       )
       mapper.serialized_record_to_event(serialized_record)
     rescue ActiveRecord::RecordNotFound
-      raise RubyEventStore::EventNotFound
+      raise RubyEventStore::EventNotFound.new(event_id)
     end
 
     def get_all_streams
@@ -146,10 +117,80 @@ module RailsEventStoreActiveRecord
 
     attr_reader :mapper
 
-    def detect_pkey_index_violated(e)
-      e.message.include?("for key 'PRIMARY'")       ||  # MySQL
-      e.message.include?("event_store_events_pkey") ||  # Postgresql
-      e.message.include?("event_store_events.id")       # Sqlite3
+    def add_to_stream(collection, stream_name, expected_version, include_global, &to_event_id)
+      raise RubyEventStore::InvalidExpectedVersion if stream_name.eql?(RubyEventStore::GLOBAL_STREAM) && !expected_version.equal?(:any)
+
+      collection = normalize_to_array(collection)
+      expected_version = normalize_expected_version(expected_version, stream_name)
+
+      ActiveRecord::Base.transaction(requires_new: true) do
+        in_stream = collection.flat_map.with_index do |element, index|
+          position = compute_position(expected_version, index)
+          event_id = to_event_id.call(element)
+          collection = []
+          collection.unshift({
+            stream: RubyEventStore::GLOBAL_STREAM,
+            position: nil,
+            event_id: event_id
+          }) if include_global
+          collection.unshift({
+            stream:   stream_name,
+            position: position,
+            event_id: event_id
+          }) unless stream_name.eql?(RubyEventStore::GLOBAL_STREAM)
+          collection
+        end
+        EventInStream.import(in_stream)
+      end
+      self
+    rescue ActiveRecord::RecordNotUnique => e
+      raise_error(e)
+    end
+
+    def raise_error(e)
+      if detect_index_violated(e)
+        raise RubyEventStore::EventDuplicatedInStream
+      end
+      raise RubyEventStore::WrongExpectedEventVersion
+    end
+
+    def compute_position(expected_version, index)
+      unless expected_version.equal?(:any)
+        expected_version + index + POSITION_SHIFT
+      end
+    end
+
+    def normalize_expected_version(expected_version, stream_name)
+      case expected_version
+        when Integer, :any
+          expected_version
+        when :none
+          -1
+        when :auto
+          eis = EventInStream.where(stream: stream_name).order("position DESC").first
+          (eis && eis.position) || -1
+        else
+          raise RubyEventStore::InvalidExpectedVersion
+      end
+    end
+
+    MYSQL_PKEY_ERROR    = "for key 'PRIMARY'"
+    POSTGRES_PKEY_ERROR = "event_store_events_pkey"
+    SQLITE3_PKEY_ERROR  = "event_store_events.id"
+
+    MYSQL_INDEX_ERROR    = "for key 'index_event_store_events_in_streams_on_stream_and_event_id'"
+    POSTGRES_INDEX_ERROR = "Key (stream, event_id)"
+    SQLITE3_INDEX_ERROR  = "event_store_events_in_streams.stream, event_store_events_in_streams.event_id"
+
+    def detect_index_violated(e)
+      m = e.message
+      m.include?(MYSQL_PKEY_ERROR)     ||
+      m.include?(POSTGRES_PKEY_ERROR)  ||
+      m.include?(SQLITE3_PKEY_ERROR)   ||
+
+      m.include?(MYSQL_INDEX_ERROR)    ||
+      m.include?(POSTGRES_INDEX_ERROR) ||
+      m.include?(SQLITE3_INDEX_ERROR)
     end
 
     def build_event_record(event)

data/lib/rails_event_store_active_record/legacy_event_repository.rb

@@ -46,6 +46,10 @@ instead:
       raise RubyEventStore::EventDuplicatedInStream
     end
 
+    def link_to_stream(_event_ids, _stream_name, _expected_version)
+      raise RubyEventStore::NotSupported
+    end
+
     def delete_stream(stream_name)
       LegacyEvent.where({stream: stream_name}).update_all(stream: RubyEventStore::GLOBAL_STREAM)
     end
@@ -113,7 +117,7 @@ instead:
     end
 
     def read_event(event_id)
-      build_event_entity(LegacyEvent.find_by(event_id: event_id)) or raise RubyEventStore::EventNotFound
+      build_event_entity(LegacyEvent.find_by(event_id: event_id)) or raise RubyEventStore::EventNotFound.new(event_id)
     end
 
     def get_all_streams

data/lib/rails_event_store_active_record/version.rb

@@ -1,3 +1,3 @@
 module RailsEventStoreActiveRecord
-  VERSION = "0.21.0"
+  VERSION = "0.22.0"
 end

data/rails_event_store_active_record.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'fakefs', '~> 0.11.2'
   spec.add_development_dependency 'childprocess'
 
-  spec.add_dependency 'ruby_event_store', '= 0.21.0'
+  spec.add_dependency 'ruby_event_store', '= 0.22.0'
   spec.add_dependency 'activesupport', '>= 3.0'
   spec.add_dependency 'activemodel', '>= 3.0'
   spec.add_dependency 'activerecord-import', '~> 0.21'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_event_store_active_record
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2018-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Active Record events repository for Rails Event Store