roo_on_rails 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d14955d3bf35c0fb4277d434994c4971d684e674abd389d0f4eaa0fea7cd751e
-  data.tar.gz: 02c6e300e34af9d73d14d6160ec8cc0839739931e8d08724b1809e66d02fab59
+  metadata.gz: 779360e44252a1b944aa8591e5a1996a7f461394fa8907ddf41428bb7212743d
+  data.tar.gz: f2a27f71b29dacf50739cabcdcd88cdfc89d37deeaf1bae8138a8ac929336c75
 SHA512:
-  metadata.gz: 57daba840c0c4503a6c57d36c5be1f0ac82b2884f1e9f7a0bb798d2911b4cb59c245278ae92cbddb4abb01870fbd242fc6875fb2a41a62705c1886aceb1e4a23
-  data.tar.gz: 1968747460540a729f7c85a46f0632a398522491ddf8a48784bf1343568155aaea89b951e7a005b0b919eac18776a49d585d7bdec6f1790535c89b987f1e7cd4
+  metadata.gz: bac595bc2dbcfcabfb479edbf0278399ce3911868b2da02b88051533503ee3891660d28c057e3a2f5301386990effdd5ce649630bc357a4d01db3796af1a1646
+  data.tar.gz: 220e8c0bb4b9d1734a8850bdb573adeade6c5f7782be7cf9ed09e7010222f0f2196519a2fc6831585a8bdfb88fd864b60af37aa3d02008e0cc5ca0c28750d788

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v2.2.2
+- Drops Railtie::Database. STATEMENT_TIMEOUT no longer set by this gem.
+
+# v2.2.1
+- Drops ActiveRecord::Base.establish_connection from Railtie::Database.
+
 # v2.2.0
 
 Breaking changes:

data/lib/roo_on_rails/tasks/db.rake

@@ -2,6 +2,7 @@ if defined?(ActiveRecord)
   namespace :db do
     desc 'Prints out the database statement timeout'
     task statement_timeout: :environment do
+      ActiveRecord::Base.establish_connection
       result = ActiveRecord::Base.connection.execute('SHOW statement_timeout').first
       puts result['statement_timeout']
     end
@@ -37,8 +38,6 @@ if defined?(ActiveRecord)
           configs.delete(old_url_config)
           configs << new_url_config
         end
-
-        ActiveRecord::Base.establish_connection
       end
     end
   end

data/lib/roo_on_rails/version.rb

@@ -1,3 +1,3 @@
 module RooOnRails
-  VERSION = '2.2.0'.freeze
+  VERSION = '2.2.2'.freeze
 end

data/lib/roo_on_rails.rb

@@ -6,7 +6,6 @@ end
 if defined?(Rails)
   require 'dotenv/rails-now'
   require 'roo_on_rails/railties/env'
-  require 'roo_on_rails/railties/database'
   require 'roo_on_rails/railties/http'
   require 'roo_on_rails/railties/sidekiq_integration'
   require 'roo_on_rails/railties/rake_tasks'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roo_on_rails
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Julien Letessier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-05 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv-rails
@@ -461,7 +461,6 @@ files:
 - lib/roo_on_rails/papertrail_client.rb
 - lib/roo_on_rails/rack/populate_env_from_jwt.rb
 - lib/roo_on_rails/rack/safe_timeouts.rb
-- lib/roo_on_rails/railties/database.rb
 - lib/roo_on_rails/railties/env.rb
 - lib/roo_on_rails/railties/google_oauth.rb
 - lib/roo_on_rails/railties/http.rb
@@ -498,7 +497,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Scaffolding for building services

data/lib/roo_on_rails/railties/database.rb

@@ -1,51 +0,0 @@
-module RooOnRails
-  module Railties
-    class Database < Rails::Railtie
-      initializer 'roo_on_rails.database', after: 'active_record.initialize_database' do
-        ActiveSupport.on_load :active_record do
-          Rails.logger.debug('[roo_on_rails.database] loading')
-
-          if Gem::Version.new(Rails.version) >= Gem::Version.new('6.1')
-            configs = ActiveRecord::Base.configurations.configurations
-            old_url_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: 'primary')
-            new_config_hash = old_url_config.configuration_hash.deep_dup
-            new_config_hash[:variables] ||= {}
-            statement_timeout = ENV.fetch('DATABASE_STATEMENT_TIMEOUT', 200)
-            # Use -1 to disable setting the statement timeout
-            new_config_hash[:variables][:statement_timeout] = statement_timeout unless statement_timeout == '-1'
-            new_config_hash[:reaping_frequency] = ENV['DATABASE_REAPING_FREQUENCY'] if ENV.key?('DATABASE_REAPING_FREQUENCY')
-            if old_url_config.respond_to?(:url)
-              new_url_config = ActiveRecord::DatabaseConfigurations::UrlConfig.new(
-                old_url_config.env_name,
-                old_url_config.name,
-                old_url_config.url,
-                new_config_hash
-              )
-            else
-              new_url_config = ActiveRecord::DatabaseConfigurations::HashConfig.new(
-                old_url_config.env_name,
-                old_url_config.name,
-                new_config_hash
-              )
-            end
-            configs.delete(old_url_config)
-            configs << new_url_config
-          else
-            config = ActiveRecord::Base.configurations[Rails.env]
-            config['variables'] ||= {}
-            statement_timeout = ENV.fetch('DATABASE_STATEMENT_TIMEOUT', 200)
-            # Use -1 to disable setting the statement timeout
-            unless statement_timeout == '-1'
-              config['variables']['statement_timeout'] = statement_timeout
-            end
-            if ENV.key?('DATABASE_REAPING_FREQUENCY')
-              config['reaping_frequency'] = ENV['DATABASE_REAPING_FREQUENCY']
-            end
-          end
-
-          ActiveRecord::Base.establish_connection
-        end
-      end
-    end
-  end
-end