rails_event_store_active_record 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c45bf6b63a5317bf916c5bc831573fab866c762
-  data.tar.gz: a0a1a1ad2c1c662911b3da70829bae860741bc51
+  metadata.gz: 870a6b6052a42cee07f40861b1a9ace1a173984f
+  data.tar.gz: 8a4c447a0c33358373a5f8143b45f41f0f44949d
 SHA512:
-  metadata.gz: 4f936d894bf5b5d64395527873cbdc300abfe18b8ee9536c4989e53a48bfad17703bf5e4f7b81633279490917d73074863b7b0ed63330c32d7cff565219624cd
-  data.tar.gz: 6f5c2f8e1b899bb296439728a84b745bb4c772e4b1f39924e27c3d327b95d5a98c66b75eed88afbf932d02b5c90fd5c52a37165f941a1709aa7b38cb02762602
+  metadata.gz: 308760f7dfc995d9b535541150f32c4797f581deb00e349fde26f19320110af803305835cf53814d614aed981fe6cbcc819573a296883a7cfb0c8d34df406762
+  data.tar.gz: b9894d086f193ede1b9e46cd74344f8a8c6a921a4495c7c31e37e77d350dfc087d1c4088394a353b87a4b5de92655021f9e39389bce3e27af03dad1cb5ab2ec6

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'ruby_event_store', path: '../ruby_event_store'
+
+if v = ENV['RAILS_VERSION']
+  gem 'rails', v
+end

data/README.md

@@ -1,5 +1,5 @@
 # RailsEventStoreActiveRecord
 
- An Active Record based implementation of events repository for [Rails Event Store](http://github.com/RailsEventStore/rails_event_store/rails_event_store).
+ An Active Record based implementation of events repository for [Rails Event Store](https://github.com/RailsEventStore/rails_event_store/rails_event_store).
 
 This is the default repository used in `rails_event_store` gem.

data/lib/rails_event_store_active_record/event.rb

@@ -4,8 +4,6 @@ module RailsEventStoreActiveRecord
   class Event < ::ActiveRecord::Base
     self.primary_key = :id
     self.table_name = 'event_store_events'
-    serialize :metadata
-    serialize :data
   end
 
   class EventInStream < ::ActiveRecord::Base

data/lib/rails_event_store_active_record/event_repository.rb

@@ -6,8 +6,9 @@ module RailsEventStoreActiveRecord
 
     POSITION_SHIFT = 1
 
-    def initialize
+    def initialize(mapper: RubyEventStore::Mappers::Default.new)
       verify_correct_schema_present
+      @mapper = mapper
     end
 
     def append_to_stream(events, stream_name, expected_version)
@@ -32,14 +33,10 @@ module RailsEventStoreActiveRecord
           position = unless expected_version.equal?(:any)
             expected_version + index + POSITION_SHIFT
           end
-          Event.create!(
-            id: event.event_id,
-            data: event.data,
-            metadata: event.metadata,
-            event_type: event.class,
-          )
+          build_event_record(event).save!
           events = [{
             stream: RubyEventStore::GLOBAL_STREAM,
+            position: nil,
             event_id: event.event_id
           }]
           events.unshift({
@@ -68,9 +65,8 @@ module RailsEventStoreActiveRecord
     end
 
     def last_stream_event(stream_name)
-      build_event_entity(
-        EventInStream.where(stream: stream_name).order('position DESC, id DESC').first
-      )
+      record = EventInStream.where(stream: stream_name).order('position DESC, id DESC').first
+      record && build_event_instance(record)
     end
 
     def read_events_forward(stream_name, after_event_id, count)
@@ -81,7 +77,7 @@ module RailsEventStoreActiveRecord
       end
 
       stream.preload(:event).order('position ASC, id ASC').limit(count)
-        .map(&method(:build_event_entity))
+        .map(&method(:build_event_instance))
     end
 
     def read_events_backward(stream_name, before_event_id, count)
@@ -92,17 +88,17 @@ module RailsEventStoreActiveRecord
       end
 
       stream.preload(:event).order('position DESC, id DESC').limit(count)
-        .map(&method(:build_event_entity))
+        .map(&method(:build_event_instance))
     end
 
     def read_stream_events_forward(stream_name)
       EventInStream.preload(:event).where(stream: stream_name).order('position ASC, id ASC')
-        .map(&method(:build_event_entity))
+        .map(&method(:build_event_instance))
     end
 
     def read_stream_events_backward(stream_name)
       EventInStream.preload(:event).where(stream: stream_name).order('position DESC, id DESC')
-        .map(&method(:build_event_entity))
+        .map(&method(:build_event_instance))
     end
 
     def read_all_streams_forward(after_event_id, count)
@@ -113,7 +109,7 @@ module RailsEventStoreActiveRecord
       end
 
       stream.preload(:event).order('id ASC').limit(count)
-        .map(&method(:build_event_entity))
+        .map(&method(:build_event_instance))
     end
 
     def read_all_streams_backward(before_event_id, count)
@@ -124,24 +120,37 @@ module RailsEventStoreActiveRecord
       end
 
       stream.preload(:event).order('id DESC').limit(count)
-        .map(&method(:build_event_entity))
+        .map(&method(:build_event_instance))
     end
 
     private
 
+    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
     end
 
-    def build_event_entity(record)
-      return nil unless record
-      record.event.event_type.constantize.new(
-        event_id: record.event.id,
-        metadata: record.event.metadata,
-        data: record.event.data
+    def build_event_record(event)
+      serialized_record = mapper.event_to_serialized_record(event)
+      Event.new(
+        id:         serialized_record.event_id,
+        data:       serialized_record.data,
+        metadata:   serialized_record.metadata,
+        event_type: serialized_record.event_type
+      )
+    end
+
+    def build_event_instance(record)
+      serialized_record = RubyEventStore::SerializedRecord.new(
+        event_id:         record.event.id,
+        metadata:   record.event.metadata,
+        data:       record.event.data,
+        event_type: record.event.event_type
       )
+      mapper.serialized_record_to_event(serialized_record)
     end
 
     def normalize_to_array(events)

data/lib/rails_event_store_active_record/generators/templates/migration_template.rb

@@ -1,6 +1,8 @@
 class CreateEventStoreEvents < ActiveRecord::Migration<%= migration_version %>
   def change
     postgres = ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
+    sqlite   = ActiveRecord::Base.connection.adapter_name == "SQLite"
+    rails_42 = Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new("5.0.0")
     enable_extension "pgcrypto" if postgres
     create_table(:event_store_events_in_streams, force: false) do |t|
       t.string      :stream,      null: false
@@ -31,6 +33,9 @@ class CreateEventStoreEvents < ActiveRecord::Migration<%= migration_version %>
         t.text        :data,        null: false
         t.datetime    :created_at,  null: false
       end
+      if sqlite && rails_42
+        add_index :event_store_events, :id, unique: true
+      end
     end
     add_index :event_store_events, :created_at
   end

data/lib/rails_event_store_active_record/generators/templates/v1_v2_migration_template.rb

@@ -13,6 +13,7 @@ class MigrateResSchemaV1ToV2 < ActiveRecord::Migration<%= migration_version %>
     postgres = ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
     mysql    = ActiveRecord::Base.connection.adapter_name == "Mysql2"
     sqlite   = ActiveRecord::Base.connection.adapter_name == "SQLite"
+    rails_42 = Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new("5.0.0")
     enable_extension "pgcrypto" if postgres
     create_table(:event_store_events_in_streams, force: false) do |t|
       t.string      :stream,      null: false
@@ -68,6 +69,7 @@ class MigrateResSchemaV1ToV2 < ActiveRecord::Migration<%= migration_version %>
         t.text        :data,        null: false
         t.datetime    :created_at,  null: false
       end
+      add_index :event_store_events, :id, unique: true if rails_42
       add_index :event_store_events, :created_at
       execute <<-SQL
         INSERT INTO event_store_events(id, event_type, metadata, data, created_at)
@@ -81,7 +83,7 @@ class MigrateResSchemaV1ToV2 < ActiveRecord::Migration<%= migration_version %>
   end
 
   def preserve_positions?(stream_name)
-    # http://railseventstore.org/docs/expected_version/
+    # https://railseventstore.org/docs/expected_version/
     #
     # return true if you use given stream for event sourcing
     #   (especially with AggregateRoot gem)
@@ -94,4 +96,4 @@ class MigrateResSchemaV1ToV2 < ActiveRecord::Migration<%= migration_version %>
     raise NotImplementedError
     # false
   end
-end
+end

data/lib/rails_event_store_active_record/legacy_event_repository.rb

@@ -11,6 +11,18 @@ module RailsEventStoreActiveRecord
 
     private_constant :LegacyEvent
 
+    def initialize
+      warn <<-MSG
+`RailsEventStoreActiveRecord::LegacyEventRepository` has been deprecated.
+
+Please migrate to new database schema and use `RailsEventStoreActiveRecord::EventRepository`
+instead:
+
+  rails generate rails_event_store_active_record:v1_v2_migration
+
+      MSG
+    end
+
     def append_to_stream(events, stream_name, expected_version)
       validate_expected_version_is_not_auto(expected_version)
       validate_expected_version_is_any_for_global_stream(expected_version, stream_name)

data/lib/rails_event_store_active_record/version.rb

@@ -1,3 +1,3 @@
 module RailsEventStoreActiveRecord
-  VERSION = "0.19.0"
+  VERSION = "0.20.0"
 end

data/rails_event_store_active_record.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Active Record events repository for Rails Event Store}
   spec.description   = %q{Implementation of events repository based on Rails Active Record for Rails Event Store'}
-  spec.homepage      = 'https://github.com/arkency/rails_event_store_active_record'
+  spec.homepage      = 'https://github.com/RailsEventStore/rails_event_store_active_record'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = 'exe'
@@ -30,8 +30,8 @@ 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.19.0'
+  spec.add_dependency 'ruby_event_store', '= 0.20.0'
   spec.add_dependency 'activesupport', '>= 3.0'
   spec.add_dependency 'activemodel', '>= 3.0'
-  spec.add_dependency 'activerecord-import'
+  spec.add_dependency 'activerecord-import', '~> 0.21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_event_store_active_record
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2017-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -196,16 +196,16 @@ dependencies:
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
 description: Implementation of events repository based on Rails Active Record for
   Rails Event Store'
 email:
@@ -230,7 +230,7 @@ files:
 - lib/rails_event_store_active_record/legacy_event_repository.rb
 - lib/rails_event_store_active_record/version.rb
 - rails_event_store_active_record.gemspec
-homepage: https://github.com/arkency/rails_event_store_active_record
+homepage: https://github.com/RailsEventStore/rails_event_store_active_record
 licenses:
 - MIT
 metadata: {}
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Active Record events repository for Rails Event Store