salestation 6.0.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b77552025e87bb75e54a85f715ce2b81b2dcc8dd25a9f1a5ba7867be48784eff
-  data.tar.gz: b6ccb07510f4ec8d64e141bdb2ba87dff2fc17640bf58e0668bde252698b63e0
+  metadata.gz: 9857054a58b0e3473784a61d8549a3e634419ce1de2d17ba039787a45b5129e4
+  data.tar.gz: 9eaf8d0bb0534077d4a3d150d98fe2d7444377f226a9cf0b8d157238f87789b3
 SHA512:
-  metadata.gz: 55d0cc16d83d1c3845fdf36682a7cf2679a8013a0e25b08ec44385e3eb63329b9b225f3447a15c9b0ac5e71c933d5423fac6df9835196520b325a6fbea3cd69d
-  data.tar.gz: 0d6e189ccedb87a9ecc85f1851ebc4911f2f3ceb838d63ca4d4c2bc2f678feba9f3c2596e9ac6dec536c21fbbf01885ffc6fac46cf72319ee358901a3416383e
+  metadata.gz: 5b052f9ab10cfe806eb9afee735f23b0f754796876881ca13868159c893e1d9b87667be83d6ca4a569b78f18a39e4fcff3c217c59ef60740e008bb3f906d4eb3
+  data.tar.gz: 6369669ef0ea0b3de90a8d396e787025aaf9abb9eed71b34f86b4814d7a83ba87464657807d711043d32f8015b3c15f4b3f789047f07ba4720bcf74072ef5f89

data/.github/CODEOWNERS

@@ -1 +1 @@
-* @salemove/tm-messenger
+* @salemove/tm-atlas

data/.github/workflows/publish.yml

@@ -3,7 +3,7 @@ name: Publish Gem
 on:
   push:
     branches:
-      - master
+      - fix-publish-gem-ci
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -18,6 +18,6 @@ jobs:
         uses: discourse/publish-rubygems-action@4bd305c65315cb691bad1e8de97a87aaf29a0a85
         env:
           RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
-          RELEASE_COMMAND: rake release
+          # RELEASE_COMMAND: rake release
           GIT_EMAIL: support@salemove.com
           GIT_NAME: sm-deployer

data/CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.1.0
+
+### Fixed
+
+- Fix incompatibility with ActiveRecord 7.1+ due to changes in its
+  connection clearing API.
+
 ## 6.0.0
 
 ### Changed

data/lib/salestation/web/active_record_connection_management.rb

@@ -12,13 +12,23 @@ module Salestation
 
         status, headers, body = @app.call(env)
         proxy = ::Rack::BodyProxy.new(body) do
-          ActiveRecord::Base.clear_active_connections! unless testing
+          clear_connections unless testing
         end
         [status, headers, proxy]
       rescue Exception
-        ActiveRecord::Base.clear_active_connections! unless testing
+        clear_connections unless testing
         raise
       end
+
+      def clear_connections
+        if ActiveRecord.version >= Gem::Version.new('7.1')
+          # For ActiveRecord 7.1 and newer
+          ActiveRecord::Base.connection_handler.clear_active_connections!
+        else
+          # For ActiveRecord 6.1 to 7.0
+          ActiveRecord::Base.clear_active_connections!
+        end
+      end
     end
   end
 end

data/salestation.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "salestation"
-  spec.version       = "6.0.0"
+  spec.version       = "6.1.1"
   spec.authors       = ["Glia TechMovers"]
   spec.email         = ["open-source@glia.com"]
 
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "bundler", ">= 2.0", "< 5"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry", "~> 0.14.2"

metadata

@@ -1,28 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: salestation
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.1
 platform: ruby
 authors:
 - Glia TechMovers
 bindir: bin
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: ''
 test_files: []