Revert "RailsEventStore 2.6.X should point to RailsEventStoreActiveRe…

…cord" This reverts commit e847fac.
RailsEventStore · Jan 30, 2023 · 7e78fb2 · 7e78fb2
1 parent 7d112e8
commit 7e78fb2
Show file tree

Hide file tree

Showing 23 changed files with 17 additions and 54 deletions.
diff --git a/contrib/dres_rails/Gemfile b/contrib/dres_rails/Gemfile
@@ -9,7 +9,6 @@ gem "ruby_event_store", path: "../.."
 gem "ruby_event_store-browser", path: "../.."
 gem "rails_event_store", path: "../.."
 gem "ruby_event_store-active_record", path: "../.."
-gem "rails_event_store_active_record", path: "../.."
 gem "aggregate_root", path: "../.."
 
 gem "pg"

diff --git a/contrib/dres_rails/Gemfile.lock b/contrib/dres_rails/Gemfile.lock
@@ -9,11 +9,9 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.9.0)
       arkency-command_bus (>= 0.4)
-      rails_event_store_active_record (= 2.9.0)
       ruby_event_store (= 2.9.0)
-      ruby_event_store-browser (= 2.9.0)
-    rails_event_store_active_record (2.9.0)
       ruby_event_store-active_record (= 2.9.0)
+      ruby_event_store-browser (= 2.9.0)
     ruby_event_store (2.9.0)
       concurrent-ruby (~> 1.0, >= 1.1.6)
     ruby_event_store-active_record (2.9.0)
@@ -259,7 +257,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: "../.."
 gem "aggregate_root", path: "../.."
 gem "rails_event_store", path: "../.."
 gem "ruby_event_store-active_record", path: "../.."
-gem "rails_event_store_active_record", path: "../.."
 gem "ruby_event_store-browser", path: "../.."
 
 gem "protobuf_nested_struct"

diff --git a/contrib/ruby_event_store-protobuf/Gemfile.lock b/contrib/ruby_event_store-protobuf/Gemfile.lock
@@ -9,11 +9,9 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.9.0)
       arkency-command_bus (>= 0.4)
-      rails_event_store_active_record (= 2.9.0)
       ruby_event_store (= 2.9.0)
-      ruby_event_store-browser (= 2.9.0)
-    rails_event_store_active_record (2.9.0)
       ruby_event_store-active_record (= 2.9.0)
+      ruby_event_store-browser (= 2.9.0)
     ruby_event_store (2.9.0)
       concurrent-ruby (~> 1.0, >= 1.1.6)
     ruby_event_store-active_record (2.9.0)
@@ -235,7 +233,6 @@ DEPENDENCIES
   protobuf_nested_struct
   rails (= 7.0.4.2)
   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
@@ -9,8 +9,8 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.9.0)
       arkency-command_bus (>= 0.4)
-      rails_event_store_active_record (= 2.9.0)
       ruby_event_store (= 2.9.0)
+      ruby_event_store-active_record (= 2.9.0)
       ruby_event_store-browser (= 2.9.0)
     rails_event_store_active_record (2.9.0)
       ruby_event_store-active_record (= 2.9.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
@@ -9,8 +9,8 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.9.0)
       arkency-command_bus (>= 0.4)
-      rails_event_store_active_record (= 2.9.0)
       ruby_event_store (= 2.9.0)
+      ruby_event_store-active_record (= 2.9.0)
       ruby_event_store-browser (= 2.9.0)
     rails_event_store_active_record (2.9.0)
       ruby_event_store-active_record (= 2.9.0)

diff --git a/contrib/ruby_event_store-sidekiq_scheduler/Gemfile.lock b/contrib/ruby_event_store-sidekiq_scheduler/Gemfile.lock
@@ -9,11 +9,9 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.9.0)
       arkency-command_bus (>= 0.4)
-      rails_event_store_active_record (= 2.9.0)
       ruby_event_store (= 2.9.0)
-      ruby_event_store-browser (= 2.9.0)
-    rails_event_store_active_record (2.9.0)
       ruby_event_store-active_record (= 2.9.0)
+      ruby_event_store-browser (= 2.9.0)
     ruby_event_store (2.9.0)
       concurrent-ruby (~> 1.0, >= 1.1.6)
     ruby_event_store-active_record (2.9.0)

diff --git a/contrib/ruby_event_store-sidekiq_scheduler/Gemfile.sidekiq_5.lock b/contrib/ruby_event_store-sidekiq_scheduler/Gemfile.sidekiq_5.lock
@@ -9,11 +9,9 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.9.0)
       arkency-command_bus (>= 0.4)
-      rails_event_store_active_record (= 2.9.0)
       ruby_event_store (= 2.9.0)
-      ruby_event_store-browser (= 2.9.0)
-    rails_event_store_active_record (2.9.0)
       ruby_event_store-active_record (= 2.9.0)
+      ruby_event_store-browser (= 2.9.0)
     ruby_event_store (2.9.0)
       concurrent-ruby (~> 1.0, >= 1.1.6)
     ruby_event_store-active_record (2.9.0)

diff --git a/contrib/ruby_event_store-sidekiq_scheduler/Gemfile.sidekiq_6.lock b/contrib/ruby_event_store-sidekiq_scheduler/Gemfile.sidekiq_6.lock
@@ -9,11 +9,9 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.9.0)
       arkency-command_bus (>= 0.4)
-      rails_event_store_active_record (= 2.9.0)
       ruby_event_store (= 2.9.0)
-      ruby_event_store-browser (= 2.9.0)
-    rails_event_store_active_record (2.9.0)
       ruby_event_store-active_record (= 2.9.0)
+      ruby_event_store-browser (= 2.9.0)
     ruby_event_store (2.9.0)
       concurrent-ruby (~> 1.0, >= 1.1.6)
     ruby_event_store-active_record (2.9.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: ".."
 gem "ruby_event_store-browser", path: ".."
 gem "ruby_event_store-active_record", path: ".."
-gem "rails_event_store_active_record", path: ".."
 gem "aggregate_root", path: ".."
 
 gem "sidekiq"

diff --git a/rails_event_store/Gemfile.lock b/rails_event_store/Gemfile.lock
@@ -3,8 +3,6 @@ PATH
   specs:
     aggregate_root (2.9.0)
       ruby_event_store (= 2.9.0)
-    rails_event_store_active_record (2.9.0)
-      ruby_event_store-active_record (= 2.9.0)
     ruby_event_store (2.9.0)
       concurrent-ruby (~> 1.0, >= 1.1.6)
     ruby_event_store-active_record (2.9.0)
@@ -23,8 +21,8 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.9.0)
       arkency-command_bus (>= 0.4)
-      rails_event_store_active_record (= 2.9.0)
       ruby_event_store (= 2.9.0)
+      ruby_event_store-active_record (= 2.9.0)
       ruby_event_store-browser (= 2.9.0)
 
 GEM
@@ -234,7 +232,6 @@ DEPENDENCIES
   rack-test
   rails (= 7.0.4.2)
   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: ".."
 gem "ruby_event_store-browser", path: ".."
 gem "ruby_event_store-active_record", path: ".."
-gem "rails_event_store_active_record", path: ".."
 gem "aggregate_root", path: ".."
 
 gem "sidekiq"

diff --git a/rails_event_store/Gemfile.rails_6_0.lock b/rails_event_store/Gemfile.rails_6_0.lock
@@ -3,8 +3,6 @@ PATH
   specs:
     aggregate_root (2.9.0)
       ruby_event_store (= 2.9.0)
-    rails_event_store_active_record (2.9.0)
-      ruby_event_store-active_record (= 2.9.0)
     ruby_event_store (2.9.0)
       concurrent-ruby (~> 1.0, >= 1.1.6)
     ruby_event_store-active_record (2.9.0)
@@ -23,8 +21,8 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.9.0)
       arkency-command_bus (>= 0.4)
-      rails_event_store_active_record (= 2.9.0)
       ruby_event_store (= 2.9.0)
+      ruby_event_store-active_record (= 2.9.0)
       ruby_event_store-browser (= 2.9.0)
 
 GEM
@@ -239,7 +237,6 @@ DEPENDENCIES
   rack-test
   rails (= 6.0.6.1)
   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: ".."
 gem "ruby_event_store-browser", path: ".."
 gem "ruby_event_store-active_record", path: ".."
-gem "rails_event_store_active_record", path: ".."
 gem "aggregate_root", path: ".."
 
 gem "sidekiq"

diff --git a/rails_event_store/Gemfile.rails_6_1.lock b/rails_event_store/Gemfile.rails_6_1.lock
@@ -3,8 +3,6 @@ PATH
   specs:
     aggregate_root (2.9.0)
       ruby_event_store (= 2.9.0)
-    rails_event_store_active_record (2.9.0)
-      ruby_event_store-active_record (= 2.9.0)
     ruby_event_store (2.9.0)
       concurrent-ruby (~> 1.0, >= 1.1.6)
     ruby_event_store-active_record (2.9.0)
@@ -23,8 +21,8 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.9.0)
       arkency-command_bus (>= 0.4)
-      rails_event_store_active_record (= 2.9.0)
       ruby_event_store (= 2.9.0)
+      ruby_event_store-active_record (= 2.9.0)
       ruby_event_store-browser (= 2.9.0)
 
 GEM
@@ -242,7 +240,6 @@ DEPENDENCIES
   rack-test
   rails (= 6.1.7.2)
   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.9.0"
   spec.add_dependency "ruby_event_store-browser", "= 2.9.0"
-  spec.add_dependency "rails_event_store_active_record", "= 2.9.0"
+  spec.add_dependency "ruby_event_store-active_record", "= 2.9.0"
   spec.add_dependency "aggregate_root", "= 2.9.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,7 +4,6 @@ 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"
 
 gem "rails", "6.0.6.1"
diff --git a/rails_event_store/spec/dummy_6_0/Gemfile.lock b/rails_event_store/spec/dummy_6_0/Gemfile.lock
@@ -7,8 +7,6 @@ PATH
 PATH
   remote: ../../../ruby_event_store-active_record
   specs:
-    rails_event_store_active_record (2.9.0)
-      ruby_event_store-active_record (= 2.9.0)
     ruby_event_store-active_record (2.9.0)
       activerecord (>= 6.0)
       ruby_event_store (= 2.9.0)
@@ -35,8 +33,8 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.9.0)
       arkency-command_bus (>= 0.4)
-      rails_event_store_active_record (= 2.9.0)
       ruby_event_store (= 2.9.0)
+      ruby_event_store-active_record (= 2.9.0)
       ruby_event_store-browser (= 2.9.0)
 
 GEM
@@ -195,7 +193,6 @@ DEPENDENCIES
   aggregate_root!
   rails (= 6.0.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_6_1/Gemfile b/rails_event_store/spec/dummy_6_1/Gemfile
@@ -4,7 +4,6 @@ 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"
 
 gem "rails", "6.1.7.2"
diff --git a/rails_event_store/spec/dummy_6_1/Gemfile.lock b/rails_event_store/spec/dummy_6_1/Gemfile.lock
@@ -7,8 +7,6 @@ PATH
 PATH
   remote: ../../../ruby_event_store-active_record
   specs:
-    rails_event_store_active_record (2.9.0)
-      ruby_event_store-active_record (= 2.9.0)
     ruby_event_store-active_record (2.9.0)
       activerecord (>= 6.0)
       ruby_event_store (= 2.9.0)
@@ -35,8 +33,8 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.9.0)
       arkency-command_bus (>= 0.4)
-      rails_event_store_active_record (= 2.9.0)
       ruby_event_store (= 2.9.0)
+      ruby_event_store-active_record (= 2.9.0)
       ruby_event_store-browser (= 2.9.0)
 
 GEM
@@ -198,7 +196,6 @@ DEPENDENCIES
   aggregate_root!
   rails (= 6.1.7.2)
   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
@@ -4,7 +4,6 @@ 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"
 
 gem "rails", "7.0.4.2"
diff --git a/rails_event_store/spec/dummy_7_0/Gemfile.lock b/rails_event_store/spec/dummy_7_0/Gemfile.lock
@@ -7,8 +7,6 @@ PATH
 PATH
   remote: ../../../ruby_event_store-active_record
   specs:
-    rails_event_store_active_record (2.9.0)
-      ruby_event_store-active_record (= 2.9.0)
     ruby_event_store-active_record (2.9.0)
       activerecord (>= 6.0)
       ruby_event_store (= 2.9.0)
@@ -35,8 +33,8 @@ PATH
       activesupport (>= 6.0)
       aggregate_root (= 2.9.0)
       arkency-command_bus (>= 0.4)
-      rails_event_store_active_record (= 2.9.0)
       ruby_event_store (= 2.9.0)
+      ruby_event_store-active_record (= 2.9.0)
       ruby_event_store-browser (= 2.9.0)
 
 GEM
@@ -142,6 +140,8 @@ GEM
     nio4r (2.5.8)
     nokogiri (1.14.0-arm64-darwin)
       racc (~> 1.4)
+    nokogiri (1.14.0-x86_64-linux)
+      racc (~> 1.4)
     racc (1.6.2)
     rack (2.2.6.2)
     rack-test (2.0.2)
@@ -184,14 +184,12 @@ GEM
 
 PLATFORMS
   arm64-darwin-22
-  ruby
   x86_64-linux
 
 DEPENDENCIES
   aggregate_root!
   rails (= 7.0.4.2)
   rails_event_store!
-  rails_event_store_active_record!
   ruby_event_store!
   ruby_event_store-active_record!
   ruby_event_store-browser!