rails_event_store_active_record 0.33.0 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a49f351fe34c72ae9e6c6da5d5716071ee44855ab53b7dabb6f3bd6ae0a1d5a0
-  data.tar.gz: 94f26c9f91f300becfd53aead26fd3adbb804464bc0ef8d264dee5d6592b3c57
+  metadata.gz: 7ecd9126ba4ac3a8c749122e76290b605152f25c177d12e06aa050910077bdfe
+  data.tar.gz: ed776c89a46e9a401ba28fcebfd584fd835bd06b0a1f72846b124771a2f027d6
 SHA512:
-  metadata.gz: 2aa5b1f0c9ef1ed44ff8843e2236e6c3ad1a9362b8717799729ee804683ea0be8233f9a5a1402fa0cd340ae06bc48bd809f21a241736dd34104afbe59750f5a0
-  data.tar.gz: '09dfc711d13207f7a66804cbada368f6a4c5cf964cbe5070d98cbe3b20fd15aa85bd18fb050f17c69b078636459f1c0221aacb868f9e81836cc7f64421c363c3'
+  metadata.gz: df85cbbcbeab5492145ae68dc031481058b5f2d0fa56d422f629d95808132aa5baf70d9081c5a8909ba92b7935d16155bc9fdfae81e51361559b23a821a38cb3
+  data.tar.gz: 7ded0302fa417f62365d91e6ad275a5003e77c372f813c35f23bf6979004831210b691518a2e18d2c5c0de8c6b97a6322da215c966be4df229bf20458af183c1

data/Makefile

@@ -10,16 +10,15 @@ DATABASE_URL ?= sqlite3::memory:
 install: ## Install gem dependencies
 	@echo "Installing gem dependencies"
 	@bundle install
-	@BUNDLE_GEMFILE=spec/without_rails/Gemfile bundle install
+	@BUNDLE_GEMFILE=../lib/Gemfile.0_33_0 bundle install
 
 remove-lock:
 	@echo "Removing resolved dependency versions"
 	-rm Gemfile.lock
-	-rm spec/without_rails/Gemfile.lock
+	-rm ../lib/Gemfile.0_33_0.lock
 
 reinstall: remove-lock install ## Removing resolved dependency versions
 
-
 test: ## Run unit tests
 	@echo "Running unit tests"
 	@BUNDLE_GEMFILE=Gemfile bundle exec rspec

data/lib/rails_event_store_active_record.rb

@@ -1,4 +1,6 @@
 require 'rails_event_store_active_record/generators/migration_generator'
+require 'rails_event_store_active_record/generators/index_by_event_type_generator'
+require 'rails_event_store_active_record/generators/limit_for_event_id_generator'
 require 'rails_event_store_active_record/event'
 require 'rails_event_store_active_record/event_repository'
 require 'rails_event_store_active_record/event_repository_reader'

data/lib/rails_event_store_active_record/event_repository_reader.rb

@@ -15,6 +15,7 @@ module RailsEventStoreActiveRecord
 
       stream = EventInStream.preload(:event).where(stream: normalize_stream_name(spec))
       stream = stream.where(event_id: spec.with_ids) if spec.with_ids?
+      stream = stream.joins(:event).where(event_store_events: {event_type: spec.with_types}) if spec.with_types?
       stream = stream.order(position: order(spec)) unless spec.stream.global?
       stream = stream.limit(spec.limit) if spec.limit?
       stream = stream.where(start_condition(spec)) unless spec.head?
@@ -43,7 +44,7 @@ module RailsEventStoreActiveRecord
     def start_condition(specification)
       event_record =
         EventInStream.find_by!(event_id: specification.start, stream: normalize_stream_name(specification))
-      condition = specification.forward? ? 'id > ?' : 'id < ?'
+      condition = specification.forward? ? 'event_store_events_in_streams.id > ?' : 'event_store_events_in_streams.id < ?'
       [condition, event_record]
     end
 

data/lib/rails_event_store_active_record/generators/index_by_event_type_generator.rb

@@ -0,0 +1,29 @@
+begin
+  require 'rails/generators'
+rescue LoadError
+end
+
+module RailsEventStoreActiveRecord
+  class IndexByEventTypeGenerator < Rails::Generators::Base
+    source_root File.expand_path(File.join(File.dirname(__FILE__), '../generators/templates'))
+
+    def create_migration
+      template "index_by_event_type_template.rb", "db/migrate/#{timestamp}_index_by_event_type.rb"
+    end
+
+    private
+
+    def rails_version
+      Rails::VERSION::STRING
+    end
+
+    def migration_version
+      return nil if Gem::Version.new(rails_version) < Gem::Version.new("5.0.0")
+      "[4.2]"
+    end
+
+    def timestamp
+      Time.now.strftime("%Y%m%d%H%M%S")
+    end
+  end
+end if defined?(Rails::Generators::Base)

data/lib/rails_event_store_active_record/generators/limit_for_event_id_generator.rb

@@ -0,0 +1,29 @@
+begin
+  require 'rails/generators'
+rescue LoadError
+end
+
+module RailsEventStoreActiveRecord
+  class LimitForEventIdGenerator < Rails::Generators::Base
+    source_root File.expand_path(File.join(File.dirname(__FILE__), '../generators/templates'))
+
+    def create_migration
+      template "limit_for_event_id_template.rb", "db/migrate/#{timestamp}_limit_for_event_id.rb"
+    end
+
+    private
+
+    def rails_version
+      Rails::VERSION::STRING
+    end
+
+    def migration_version
+      return nil if Gem::Version.new(rails_version) < Gem::Version.new("5.0.0")
+      "[4.2]"
+    end
+
+    def timestamp
+      Time.now.strftime("%Y%m%d%H%M%S")
+    end
+  end
+end if defined?(Rails::Generators::Base)

data/lib/rails_event_store_active_record/generators/migration_generator.rb

@@ -8,7 +8,7 @@ module RailsEventStoreActiveRecord
     source_root File.expand_path(File.join(File.dirname(__FILE__), '../generators/templates'))
 
     def create_migration
-      template "migration_template.rb", "db/migrate/#{timestamp}_create_event_store_events.rb"
+      template "create_event_store_events_template.rb", "db/migrate/#{timestamp}_create_event_store_events.rb"
     end
 
     private

data/lib/rails_event_store_active_record/generators/templates/{migration_template.rb → create_event_store_events_template.rb}

@@ -10,7 +10,7 @@ class CreateEventStoreEvents < ActiveRecord::Migration<%= migration_version %>
       if postgres
         t.references :event, null: false, type: :uuid
       else
-        t.references :event, null: false, type: :string
+        t.references :event, null: false, type: :string, limit: 36
       end
       t.datetime    :created_at,  null: false
     end
@@ -38,5 +38,6 @@ class CreateEventStoreEvents < ActiveRecord::Migration<%= migration_version %>
       end
     end
     add_index :event_store_events, :created_at
+    add_index :event_store_events, :event_type
   end
 end

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

@@ -0,0 +1,5 @@
+class IndexByEventType < ActiveRecord::Migration<%= migration_version %>
+  def change
+    add_index :event_store_events, :event_type unless index_exists? :event_store_events, :event_type
+  end
+end

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

@@ -0,0 +1,6 @@
+class LimitForEventId < ActiveRecord::Migration<%= migration_version %>
+  def change
+    postgres = ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
+    change_column(:event_store_events_in_streams, :event_id, :string, limit: 36) unless postgres
+  end
+end

data/lib/rails_event_store_active_record/version.rb

@@ -1,3 +1,3 @@
 module RailsEventStoreActiveRecord
-  VERSION = "0.33.0"
+  VERSION = "0.34.0"
 end

data/rails_event_store_active_record.gemspec

@@ -32,12 +32,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'sqlite3', '1.3.13'
   spec.add_development_dependency 'pg', '0.21'
   spec.add_development_dependency 'mysql2', '0.4.10'
-  spec.add_development_dependency 'mutant-rspec', '~> 0.8.17'
+  spec.add_development_dependency 'mutant-rspec', '= 0.8.17'
   spec.add_development_dependency 'fakefs', '~> 0.11.2'
   spec.add_development_dependency 'childprocess'
   spec.add_development_dependency 'google-protobuf', '~> 3.5.1.2'
 
-  spec.add_dependency 'ruby_event_store', '= 0.33.0'
+  spec.add_dependency 'ruby_event_store', '= 0.34.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.33.0
+  version: 0.34.0
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2018-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,14 +112,14 @@ dependencies:
   name: mutant-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.8.17
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.8.17
 - !ruby/object:Gem::Dependency
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.33.0
+        version: 0.34.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.33.0
+        version: 0.34.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -239,8 +239,12 @@ files:
 - lib/rails_event_store_active_record/event.rb
 - lib/rails_event_store_active_record/event_repository.rb
 - lib/rails_event_store_active_record/event_repository_reader.rb
+- lib/rails_event_store_active_record/generators/index_by_event_type_generator.rb
+- lib/rails_event_store_active_record/generators/limit_for_event_id_generator.rb
 - lib/rails_event_store_active_record/generators/migration_generator.rb
-- lib/rails_event_store_active_record/generators/templates/migration_template.rb
+- lib/rails_event_store_active_record/generators/templates/create_event_store_events_template.rb
+- lib/rails_event_store_active_record/generators/templates/index_by_event_type_template.rb
+- lib/rails_event_store_active_record/generators/templates/limit_for_event_id_template.rb
 - lib/rails_event_store_active_record/index_violation_detector.rb
 - lib/rails_event_store_active_record/pg_linearized_event_repository.rb
 - lib/rails_event_store_active_record/version.rb
@@ -269,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 3.0.0.beta1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Active Record events repository for Rails Event Store