Revert "RailsEventStore 2.6.X should point to RailsEventStoreActiveRe…

…cord" This reverts commit e847fac.
RailsEventStore · Dec 8, 2022 · 1e0ae0e · 1e0ae0e
1 parent fd7ce40
commit 1e0ae0e
Show file tree

Hide file tree

Showing 20 changed files with 12 additions and 68 deletions.
diff --git a/contrib/dres_rails/Gemfile b/contrib/dres_rails/Gemfile
@@ -9,7 +9,6 @@ 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,17 +13,13 @@ 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)
@@ -276,7 +272,6 @@ DEPENDENCIES
   mutant-rspec (= 0.11.17)
   pg
   rails_event_store!
-  rails_event_store_active_record!
   rake (>= 10.0)
   rspec (~> 3.6)
   rspec-rails

diff --git a/contrib/ruby_event_store-protobuf/Gemfile b/contrib/ruby_event_store-protobuf/Gemfile
@@ -7,7 +7,6 @@ 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,17 +13,13 @@ 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)
@@ -242,7 +238,6 @@ 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!

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,17 +13,13 @@ 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,17 +13,13 @@ 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
@@ -6,7 +6,6 @@ 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,10 +7,6 @@ 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)
@@ -37,8 +33,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
@@ -240,7 +236,6 @@ DEPENDENCIES
   rack-test
   rails (= 7.0.4)
   rails_event_store!
-  rails_event_store_active_record!
   rake (>= 10.0)
   rspec (~> 3.6)
   ruby_event_store!

diff --git a/rails_event_store/Gemfile.rails_6_0 b/rails_event_store/Gemfile.rails_6_0
@@ -6,7 +6,6 @@ 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,10 +7,6 @@ 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)
@@ -37,8 +33,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
@@ -229,7 +225,6 @@ DEPENDENCIES
   rack-test
   rails (= 6.0.6)
   rails_event_store!
-  rails_event_store_active_record!
   rake (>= 10.0)
   rspec (~> 3.6)
   ruby_event_store!

diff --git a/rails_event_store/Gemfile.rails_6_1 b/rails_event_store/Gemfile.rails_6_1
@@ -6,7 +6,6 @@ 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,10 +7,6 @@ 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)
@@ -37,8 +33,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
@@ -232,7 +228,6 @@ DEPENDENCIES
   rack-test
   rails (= 6.1.7)
   rails_event_store!
-  rails_event_store_active_record!
   rake (>= 10.0)
   rspec (~> 3.6)
   ruby_event_store!

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 "rails_event_store_active_record"
+require "ruby_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 "rails_event_store_active_record", "= 2.6.0"
+  spec.add_dependency "ruby_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
@@ -5,5 +5,4 @@ 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,10 +7,6 @@ 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)
@@ -37,8 +33,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
@@ -180,7 +176,6 @@ 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!

diff --git a/rails_event_store/spec/dummy_6_1/Gemfile b/rails_event_store/spec/dummy_6_1/Gemfile
@@ -5,5 +5,4 @@ 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,10 +7,6 @@ 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)
@@ -37,8 +33,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
@@ -180,7 +176,6 @@ 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!

diff --git a/rails_event_store/spec/dummy_7_0/Gemfile b/rails_event_store/spec/dummy_7_0/Gemfile
@@ -5,5 +5,4 @@ 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,10 +7,6 @@ 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)
@@ -37,8 +33,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
@@ -188,7 +184,6 @@ 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!