Merge pull request #207 from team-florence/improve-rails-7-2-compatibility

Improve Rails 7.2 compatibility

Author: dejan

meta_request/Dockerfile-rails-7.2

@@ -0,0 +1,36 @@
+FROM ruby:3.1-alpine
+
+RUN apk add --update --no-cache \
+        build-base \
+        curl-dev \
+        git \
+        nodejs \
+        shared-mime-info \
+        sqlite-dev \
+        tzdata \
+        yaml-dev \
+        yarn \
+        zlib-dev
+
+RUN mkdir /app /gem
+WORKDIR /app
+
+RUN gem update --system 3.5.7
+RUN bundle config force_ruby_platform true
+RUN gem install rails -v 7.2.1.1
+RUN rails new .
+
+COPY . /gem
+RUN bundle add meta_request --path /gem
+RUN bundle install
+
+COPY res/routes.rb /app/config/
+COPY res/dummy_controller.rb /app/app/controllers/
+COPY res/dummy /app/app/views/dummy
+COPY res/meta_request_test.rb /app/test/integration/
+
+RUN bundle exec rails db:migrate
+
+ENV PARALLEL_WORKERS 1
+
+CMD ["bin/rake"]

meta_request/docker-compose.yml

@@ -21,3 +21,11 @@ services:
     build:
       context: .
       dockerfile: Dockerfile-rails-7.0
+  test-rails-7.1:
+    build:
+      context: .
+      dockerfile: Dockerfile-rails-7.1
+  test-rails-7.2:
+    build:
+      context: .
+      dockerfile: Dockerfile-rails-7.2

meta_request/lib/meta_request/event.rb

@@ -66,6 +66,7 @@ def sanitize_hash(payload)
 
     def not_encodable?(value)
       return true if defined?(ActiveRecord) && value.is_a?(ActiveRecord::ConnectionAdapters::AbstractAdapter)
+      return true if defined?(ActiveRecord) && defined?(ActiveRecord::Transaction) && value.is_a?(ActiveRecord::Transaction)
       return true if defined?(ActionDispatch) && (value.is_a?(ActionDispatch::Request) || value.is_a?(ActionDispatch::Response))
       return true if defined?(ActionView) && value.is_a?(ActionView::Helpers::FormBuilder)