RailsEventStore 2.6.X should point to RailsEventStoreActiveRecord

#1439
RailsEventStore · Dec 6, 2022 · e847fac · e847fac
1 parent 2e66713
commit e847fac
Show file tree

Hide file tree

Showing 23 changed files with 187 additions and 28 deletions.
diff --git a/contrib/dres_rails/Gemfile b/contrib/dres_rails/Gemfile
@@ -8,7 +8,7 @@ eval_gemfile "../../support/bundler/Gemfile.shared"
 gem "ruby_event_store", path: "../../ruby_event_store"
 gem "ruby_event_store-browser", path: "../../ruby_event_store-browser"
 gem "rails_event_store", path: "../../rails_event_store"
-gem "ruby_event_store-active_record", path: "../../ruby_event_store-active_record"
+gem "rails_event_store_active_record", path: "../../ruby_event_store-active_record"
 gem "aggregate_root", path: "../../aggregate_root"
 
 gem "pg"

diff --git a/contrib/dres_rails/Gemfile.lock b/contrib/dres_rails/Gemfile.lock
@@ -13,13 +13,17 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.6.0)
       arkency-command_bus (>= 0.4)
+      rails_event_store_active_record (= 2.6.0)
       ruby_event_store (= 2.6.0)
-      ruby_event_store-active_record (= 2.6.0)
       ruby_event_store-browser (= 2.6.0)
 
 PATH
   remote: ../../ruby_event_store-active_record
   specs:
+    rails_event_store_active_record (2.6.0)
+      activerecord (>= 6.0)
+      ruby_event_store (= 2.6.0)
+      ruby_event_store-active_record (= 2.6.0)
     ruby_event_store-active_record (2.6.0)
       activerecord (>= 6.0)
       ruby_event_store (= 2.6.0)
@@ -271,11 +275,11 @@ DEPENDENCIES
   mutant-rspec (= 0.11.17)
   pg
   rails_event_store!
+  rails_event_store_active_record!
   rake (>= 10.0)
   rspec (~> 3.6)
   rspec-rails
   ruby_event_store!
-  ruby_event_store-active_record!
   ruby_event_store-browser!
   timecop
 

diff --git a/contrib/ruby_event_store-protobuf/Gemfile b/contrib/ruby_event_store-protobuf/Gemfile
@@ -6,7 +6,7 @@ eval_gemfile "../../support/bundler/Gemfile.shared"
 gem "ruby_event_store", path: "../../ruby_event_store"
 gem "aggregate_root", path: "../../aggregate_root"
 gem "rails_event_store", path: "../../rails_event_store"
-gem "ruby_event_store-active_record", path: "../../ruby_event_store-active_record"
+gem "rails_event_store_active_record", path: "../../ruby_event_store-active_record"
 gem "ruby_event_store-browser", path: "../../ruby_event_store-browser"
 
 gem "protobuf_nested_struct"

diff --git a/contrib/ruby_event_store-protobuf/Gemfile.lock b/contrib/ruby_event_store-protobuf/Gemfile.lock
@@ -13,13 +13,17 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.6.0)
       arkency-command_bus (>= 0.4)
+      rails_event_store_active_record (= 2.6.0)
       ruby_event_store (= 2.6.0)
-      ruby_event_store-active_record (= 2.6.0)
       ruby_event_store-browser (= 2.6.0)
 
 PATH
   remote: ../../ruby_event_store-active_record
   specs:
+    rails_event_store_active_record (2.6.0)
+      activerecord (>= 6.0)
+      ruby_event_store (= 2.6.0)
+      ruby_event_store-active_record (= 2.6.0)
     ruby_event_store-active_record (2.6.0)
       activerecord (>= 6.0)
       ruby_event_store (= 2.6.0)
@@ -238,10 +242,10 @@ DEPENDENCIES
   protobuf_nested_struct
   rails (= 7.0.4)
   rails_event_store!
+  rails_event_store_active_record!
   rake (>= 10.0)
   rspec (~> 3.6)
   ruby_event_store!
-  ruby_event_store-active_record!
   ruby_event_store-browser!
   ruby_event_store-protobuf!
 

diff --git a/contrib/ruby_event_store-protobuf/Gemfile.rails_6_0.lock b/contrib/ruby_event_store-protobuf/Gemfile.rails_6_0.lock
@@ -13,13 +13,17 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.6.0)
       arkency-command_bus (>= 0.4)
+      rails_event_store_active_record (= 2.6.0)
       ruby_event_store (= 2.6.0)
-      ruby_event_store-active_record (= 2.6.0)
       ruby_event_store-browser (= 2.6.0)
 
 PATH
   remote: ../../ruby_event_store-active_record
   specs:
+    rails_event_store_active_record (2.6.0)
+      activerecord (>= 6.0)
+      ruby_event_store (= 2.6.0)
+      ruby_event_store-active_record (= 2.6.0)
     ruby_event_store-active_record (2.6.0)
       activerecord (>= 6.0)
       ruby_event_store (= 2.6.0)

diff --git a/contrib/ruby_event_store-protobuf/Gemfile.rails_6_1.lock b/contrib/ruby_event_store-protobuf/Gemfile.rails_6_1.lock
@@ -13,13 +13,17 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.6.0)
       arkency-command_bus (>= 0.4)
+      rails_event_store_active_record (= 2.6.0)
       ruby_event_store (= 2.6.0)
-      ruby_event_store-active_record (= 2.6.0)
       ruby_event_store-browser (= 2.6.0)
 
 PATH
   remote: ../../ruby_event_store-active_record
   specs:
+    rails_event_store_active_record (2.6.0)
+      activerecord (>= 6.0)
+      ruby_event_store (= 2.6.0)
+      ruby_event_store-active_record (= 2.6.0)
     ruby_event_store-active_record (2.6.0)
       activerecord (>= 6.0)
       ruby_event_store (= 2.6.0)

diff --git a/rails_event_store/Gemfile b/rails_event_store/Gemfile
@@ -5,7 +5,7 @@ eval_gemfile "../support/bundler/Gemfile.shared"
 
 gem "ruby_event_store", path: "../ruby_event_store"
 gem "ruby_event_store-browser", path: "../ruby_event_store-browser"
-gem "ruby_event_store-active_record", path: "../ruby_event_store-active_record"
+gem "rails_event_store_active_record", path: "../ruby_event_store-active_record"
 gem "aggregate_root", path: "../aggregate_root"
 
 gem "sidekiq"

diff --git a/rails_event_store/Gemfile.lock b/rails_event_store/Gemfile.lock
@@ -7,6 +7,10 @@ PATH
 PATH
   remote: ../ruby_event_store-active_record
   specs:
+    rails_event_store_active_record (2.6.0)
+      activerecord (>= 6.0)
+      ruby_event_store (= 2.6.0)
+      ruby_event_store-active_record (= 2.6.0)
     ruby_event_store-active_record (2.6.0)
       activerecord (>= 6.0)
       ruby_event_store (= 2.6.0)
@@ -33,8 +37,8 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.6.0)
       arkency-command_bus (>= 0.4)
+      rails_event_store_active_record (= 2.6.0)
       ruby_event_store (= 2.6.0)
-      ruby_event_store-active_record (= 2.6.0)
       ruby_event_store-browser (= 2.6.0)
 
 GEM
@@ -236,10 +240,10 @@ DEPENDENCIES
   rack-test
   rails (= 7.0.4)
   rails_event_store!
+  rails_event_store_active_record!
   rake (>= 10.0)
   rspec (~> 3.6)
   ruby_event_store!
-  ruby_event_store-active_record!
   ruby_event_store-browser!
   sidekiq
   sqlite3 (= 1.5.3)

diff --git a/rails_event_store/Gemfile.rails_6_0 b/rails_event_store/Gemfile.rails_6_0
@@ -5,7 +5,7 @@ eval_gemfile "../support/bundler/Gemfile.shared"
 
 gem "ruby_event_store", path: "../ruby_event_store"
 gem "ruby_event_store-browser", path: "../ruby_event_store-browser"
-gem "ruby_event_store-active_record", path: "../ruby_event_store-active_record"
+gem "rails_event_store_active_record", path: "../ruby_event_store-active_record"
 gem "aggregate_root", path: "../aggregate_root"
 
 gem "sidekiq"

diff --git a/rails_event_store/Gemfile.rails_6_0.lock b/rails_event_store/Gemfile.rails_6_0.lock
@@ -7,6 +7,10 @@ PATH
 PATH
   remote: ../ruby_event_store-active_record
   specs:
+    rails_event_store_active_record (2.6.0)
+      activerecord (>= 6.0)
+      ruby_event_store (= 2.6.0)
+      ruby_event_store-active_record (= 2.6.0)
     ruby_event_store-active_record (2.6.0)
       activerecord (>= 6.0)
       ruby_event_store (= 2.6.0)
@@ -33,8 +37,8 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.6.0)
       arkency-command_bus (>= 0.4)
+      rails_event_store_active_record (= 2.6.0)
       ruby_event_store (= 2.6.0)
-      ruby_event_store-active_record (= 2.6.0)
       ruby_event_store-browser (= 2.6.0)
 
 GEM
@@ -225,10 +229,10 @@ DEPENDENCIES
   rack-test
   rails (= 6.0.6)
   rails_event_store!
+  rails_event_store_active_record!
   rake (>= 10.0)
   rspec (~> 3.6)
   ruby_event_store!
-  ruby_event_store-active_record!
   ruby_event_store-browser!
   sidekiq
   sqlite3 (= 1.5.3)

diff --git a/rails_event_store/Gemfile.rails_6_1 b/rails_event_store/Gemfile.rails_6_1
@@ -5,7 +5,7 @@ eval_gemfile "../support/bundler/Gemfile.shared"
 
 gem "ruby_event_store", path: "../ruby_event_store"
 gem "ruby_event_store-browser", path: "../ruby_event_store-browser"
-gem "ruby_event_store-active_record", path: "../ruby_event_store-active_record"
+gem "rails_event_store_active_record", path: "../ruby_event_store-active_record"
 gem "aggregate_root", path: "../aggregate_root"
 
 gem "sidekiq"

diff --git a/rails_event_store/Gemfile.rails_6_1.lock b/rails_event_store/Gemfile.rails_6_1.lock
@@ -7,6 +7,10 @@ PATH
 PATH
   remote: ../ruby_event_store-active_record
   specs:
+    rails_event_store_active_record (2.6.0)
+      activerecord (>= 6.0)
+      ruby_event_store (= 2.6.0)
+      ruby_event_store-active_record (= 2.6.0)
     ruby_event_store-active_record (2.6.0)
       activerecord (>= 6.0)
       ruby_event_store (= 2.6.0)
@@ -33,8 +37,8 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.6.0)
       arkency-command_bus (>= 0.4)
+      rails_event_store_active_record (= 2.6.0)
       ruby_event_store (= 2.6.0)
-      ruby_event_store-active_record (= 2.6.0)
       ruby_event_store-browser (= 2.6.0)
 
 GEM
@@ -228,10 +232,10 @@ DEPENDENCIES
   rack-test
   rails (= 6.1.7)
   rails_event_store!
+  rails_event_store_active_record!
   rake (>= 10.0)
   rspec (~> 3.6)
   ruby_event_store!
-  ruby_event_store-active_record!
   ruby_event_store-browser!
   sidekiq
   sqlite3 (= 1.5.3)

diff --git a/rails_event_store/lib/rails_event_store.rb b/rails_event_store/lib/rails_event_store.rb
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-require "ruby_event_store/active_record"
+require "rails_event_store_active_record"
 require_relative "rails_event_store/all"
diff --git a/rails_event_store/rails_event_store.gemspec b/rails_event_store/rails_event_store.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "ruby_event_store", "= 2.6.0"
   spec.add_dependency "ruby_event_store-browser", "= 2.6.0"
-  spec.add_dependency "ruby_event_store-active_record", "= 2.6.0"
+  spec.add_dependency "rails_event_store_active_record", "= 2.6.0"
   spec.add_dependency "aggregate_root", "= 2.6.0"
   spec.add_dependency "activesupport", ">= 6.0"
   spec.add_dependency "activemodel", ">= 6.0"

diff --git a/rails_event_store/spec/dummy_6_0/Gemfile b/rails_event_store/spec/dummy_6_0/Gemfile
@@ -4,5 +4,5 @@ gem "rails", "~> 6.0"
 gem "rails_event_store", path: "../../"
 gem "ruby_event_store", path: "../../../ruby_event_store"
 gem "ruby_event_store-browser", path: "../../../ruby_event_store-browser"
-gem "ruby_event_store-active_record", path: "../../../ruby_event_store-active_record"
+gem "rails_event_store_active_record", path: "../../../ruby_event_store-active_record"
 gem "aggregate_root", path: "../../../aggregate_root"
diff --git a/rails_event_store/spec/dummy_6_0/Gemfile.lock b/rails_event_store/spec/dummy_6_0/Gemfile.lock
@@ -7,6 +7,10 @@ PATH
 PATH
   remote: ../../../ruby_event_store-active_record
   specs:
+    rails_event_store_active_record (2.6.0)
+      activerecord (>= 6.0)
+      ruby_event_store (= 2.6.0)
+      ruby_event_store-active_record (= 2.6.0)
     ruby_event_store-active_record (2.6.0)
       activerecord (>= 6.0)
       ruby_event_store (= 2.6.0)
@@ -33,8 +37,8 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.6.0)
       arkency-command_bus (>= 0.4)
+      rails_event_store_active_record (= 2.6.0)
       ruby_event_store (= 2.6.0)
-      ruby_event_store-active_record (= 2.6.0)
       ruby_event_store-browser (= 2.6.0)
 
 GEM
@@ -176,8 +180,8 @@ DEPENDENCIES
   aggregate_root!
   rails (~> 6.0)
   rails_event_store!
+  rails_event_store_active_record!
   ruby_event_store!
-  ruby_event_store-active_record!
   ruby_event_store-browser!
 
 BUNDLED WITH

diff --git a/rails_event_store/spec/dummy_6_1/Gemfile b/rails_event_store/spec/dummy_6_1/Gemfile
@@ -4,5 +4,5 @@ gem "rails", "~> 6.1"
 gem "rails_event_store", path: "../../"
 gem "ruby_event_store", path: "../../../ruby_event_store"
 gem "ruby_event_store-browser", path: "../../../ruby_event_store-browser"
-gem "ruby_event_store-active_record", path: "../../../ruby_event_store-active_record"
+gem "rails_event_store_active_record", path: "../../../ruby_event_store-active_record"
 gem "aggregate_root", path: "../../../aggregate_root"
diff --git a/rails_event_store/spec/dummy_6_1/Gemfile.lock b/rails_event_store/spec/dummy_6_1/Gemfile.lock
@@ -7,6 +7,10 @@ PATH
 PATH
   remote: ../../../ruby_event_store-active_record
   specs:
+    rails_event_store_active_record (2.6.0)
+      activerecord (>= 6.0)
+      ruby_event_store (= 2.6.0)
+      ruby_event_store-active_record (= 2.6.0)
     ruby_event_store-active_record (2.6.0)
       activerecord (>= 6.0)
       ruby_event_store (= 2.6.0)
@@ -33,8 +37,8 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.6.0)
       arkency-command_bus (>= 0.4)
+      rails_event_store_active_record (= 2.6.0)
       ruby_event_store (= 2.6.0)
-      ruby_event_store-active_record (= 2.6.0)
       ruby_event_store-browser (= 2.6.0)
 
 GEM
@@ -176,8 +180,8 @@ DEPENDENCIES
   aggregate_root!
   rails (~> 6.1)
   rails_event_store!
+  rails_event_store_active_record!
   ruby_event_store!
-  ruby_event_store-active_record!
   ruby_event_store-browser!
 
 BUNDLED WITH

diff --git a/rails_event_store/spec/dummy_7_0/Gemfile b/rails_event_store/spec/dummy_7_0/Gemfile
@@ -4,5 +4,5 @@ gem "rails", "~> 7.0"
 gem "rails_event_store", path: "../../"
 gem "ruby_event_store", path: "../../../ruby_event_store"
 gem "ruby_event_store-browser", path: "../../../ruby_event_store-browser"
-gem "ruby_event_store-active_record", path: "../../../ruby_event_store-active_record"
+gem "rails_event_store_active_record", path: "../../../ruby_event_store-active_record"
 gem "aggregate_root", path: "../../../aggregate_root"
diff --git a/rails_event_store/spec/dummy_7_0/Gemfile.lock b/rails_event_store/spec/dummy_7_0/Gemfile.lock
@@ -7,6 +7,10 @@ PATH
 PATH
   remote: ../../../ruby_event_store-active_record
   specs:
+    rails_event_store_active_record (2.6.0)
+      activerecord (>= 6.0)
+      ruby_event_store (= 2.6.0)
+      ruby_event_store-active_record (= 2.6.0)
     ruby_event_store-active_record (2.6.0)
       activerecord (>= 6.0)
       ruby_event_store (= 2.6.0)
@@ -33,8 +37,8 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.6.0)
       arkency-command_bus (>= 0.4)
+      rails_event_store_active_record (= 2.6.0)
       ruby_event_store (= 2.6.0)
-      ruby_event_store-active_record (= 2.6.0)
       ruby_event_store-browser (= 2.6.0)
 
 GEM
@@ -184,8 +188,8 @@ DEPENDENCIES
   aggregate_root!
   rails (~> 7.0)
   rails_event_store!
+  rails_event_store_active_record!
   ruby_event_store!
-  ruby_event_store-active_record!
   ruby_event_store-browser!
 
 BUNDLED WITH

diff --git a/ruby_event_store-active_record/Gemfile b/ruby_event_store-active_record/Gemfile
@@ -7,3 +7,4 @@ eval_gemfile "../support/bundler/Gemfile.database"
 gem "ruby_event_store", path: "../ruby_event_store"
 
 gem "childprocess"
+gem "rails", "7.0.4"