modis 4.3.0 → 4.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a9d3d05277e2ddf26b7c14547b3e03f37cb6fbb771ba9b2a6b61acce6485bd9
-  data.tar.gz: 031d2f34a15d5f077b5b01c2e4286b73285ed2171f4029577c2d812a22f6da6d
+  metadata.gz: bd66702e695b7d99aa4687b5112f11182228c746109da11e993ababfa5eb62d0
+  data.tar.gz: 7999704909f7ad4bfa8365d3107fe2e9f4446070545898bc53d6939c0f733526
 SHA512:
-  metadata.gz: 9b76390c567d8ba5495c226cb7425372797fe9b3d5e2d2a07a8f891bed7e5aa4f3c66d84f54c6cac7814f07f156e958687a62da8179c4d1922da2efb065412c1
-  data.tar.gz: dba384ff8ad647615016ed340c21e72088d45b1186b91e96f28c579b73ff7d45cd2616b10c70d42fcb17e1f4cfe4889074c0eb8a6ab41b0e92082d83d663c026
+  metadata.gz: fc275ca88973e5b553125a3b0cd7f4aa048e4627d4b6ba2f8ebba9867910e0f7acd004d1084b8ad93dbe9bbb836c111615a0cd8e0bbd523c323ee8098c1023ce
+  data.tar.gz: 37848dacc6eb044dbf04af650111916876f0c13c74f09cd8793cd34a52b5121f8504283357944175c3cfb4c4105d0bec1212649ecef3a87c76d9c3d646885d19

data/.github/workflows/test.yml

@@ -28,9 +28,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gemfile: ['rails_5.2', 'rails_6.0', 'rails_6.1', 'rails_7.0']
+        gemfile: ['rails_5.2', 'rails_6.0', 'rails_6.1', 'rails_7.0', 'rails_7.1', 'rails_7.2']
 
-        ruby: ['2.4', '2.5', '2.6', '2.7', '3.0', '3.1']
+        ruby: ['2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
 
         exclude:
           # Rails 5.2 requires Ruby < 3.0
@@ -39,6 +39,10 @@ jobs:
             gemfile: 'rails_5.2'
           - ruby: '3.1'
             gemfile: 'rails_5.2'
+          - ruby: '3.2'
+            gemfile: 'rails_5.2'
+          - ruby: '3.3'
+            gemfile: 'rails_5.2'
           # Rails >= 6 requires Ruby >= 2.5
           - ruby: '2.4'
             gemfile: 'rails_6.0'
@@ -51,6 +55,22 @@ jobs:
             gemfile: 'rails_7.0'
           - ruby: '2.6'
             gemfile: 'rails_7.0'
+          - ruby: '2.4'
+            gemfile: 'rails_7.1'
+          - ruby: '2.5'
+            gemfile: 'rails_7.1'
+          - ruby: '2.6'
+            gemfile: 'rails_7.1'
+          - ruby: '2.4'
+            gemfile: 'rails_7.2'
+          - ruby: '2.5'
+            gemfile: 'rails_7.2'
+          - ruby: '2.6'
+            gemfile: 'rails_7.2'
+          - ruby: '2.7'
+            gemfile: 'rails_7.2'
+          - ruby: '3.0'
+            gemfile: 'rails_7.2'
 
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
@@ -66,3 +86,15 @@ jobs:
 
     - name: Run tests
       run: bundle exec rake
+
+  tests:
+    runs-on: ubuntu-latest
+    needs: test
+    if: always()
+    steps:
+      - name: All tests ok
+        if: ${{ !(contains(needs.*.result, 'failure')) }}
+        run: exit 0
+      - name: Some tests failed
+        if: ${{ contains(needs.*.result, 'failure') }}
+        run: exit 1

data/.github_changelog_generator

@@ -1,3 +1,3 @@
 user=rpush
 project=modis
-future-release=v4.1.0
+future-release=v4.3.2

data/Appraisals

@@ -19,3 +19,13 @@ appraise 'rails-7.0' do
   gem 'activemodel', '~> 7.0.0'
   gem 'activesupport', '~> 7.0.0'
 end
+
+appraise 'rails-7.1' do
+  gem 'activemodel', '~> 7.1.0'
+  gem 'activesupport', '~> 7.1.0'
+end
+
+appraise 'rails-7.2' do
+  gem 'activemodel', '~> 7.2.0'
+  gem 'activesupport', '~> 7.2.0'
+end

data/CHANGELOG.md

@@ -1,8 +1,29 @@
 # Changelog
 
-## [v4.1.0](https://github.com/rpush/modis/tree/v4.1.0) (2024-07-31)
+## [v4.3.2](https://github.com/rpush/modis/tree/v4.3.2) (2024-09-06)
 
-[Full Changelog](https://github.com/rpush/modis/compare/v4.2.0...v4.1.0)
+[Full Changelog](https://github.com/rpush/modis/compare/v4.3.1...v4.3.2)
+
+**Merged pull requests:**
+
+- Test on Rails 7.2 [\#54](https://github.com/rpush/modis/pull/54) ([benlangfeld](https://github.com/benlangfeld))
+- Test on new Ruby/Rails versions [\#52](https://github.com/rpush/modis/pull/52) ([benlangfeld](https://github.com/benlangfeld))
+
+## [v4.3.1](https://github.com/rpush/modis/tree/v4.3.1) (2024-08-01)
+
+[Full Changelog](https://github.com/rpush/modis/compare/v4.3.0...v4.3.1)
+
+**Closed issues:**
+
+- Release 4.3.0 breaks the Rpush initialization [\#50](https://github.com/rpush/modis/issues/50)
+
+**Merged pull requests:**
+
+- Restore backwards compatibility broken in 4.3.0 [\#51](https://github.com/rpush/modis/pull/51) ([benlangfeld](https://github.com/benlangfeld))
+
+## [v4.3.0](https://github.com/rpush/modis/tree/v4.3.0) (2024-07-31)
+
+[Full Changelog](https://github.com/rpush/modis/compare/v4.2.0...v4.3.0)
 
 **Merged pull requests:**
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    modis (4.3.0)
+    modis (4.3.2)
       activemodel (>= 5.2)
       activesupport (>= 5.2)
       connection_pool (>= 2)
@@ -94,7 +94,7 @@ GEM
     public_suffix (5.0.1)
     rainbow (3.0.0)
     rake (13.0.1)
-    redis (5.2.0)
+    redis (5.3.0)
       redis-client (>= 0.22.0)
     redis-client (0.22.2)
       connection_pool

data/gemfiles/rails_7.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activemodel", "~> 7.1.0"
+gem "activesupport", "~> 7.1.0"
+
+gemspec path: "../"

data/gemfiles/rails_7.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activemodel", "~> 7.2.0"
+gem "activesupport", "~> 7.2.0"
+
+gemspec path: "../"

data/lib/modis/configuration.rb

@@ -9,8 +9,8 @@ module Modis
   end
 
   class << self
-    attr_reader :config
+    def config
+      @config ||= Configuration.new
+    end
   end
-
-  @config = Configuration.new
 end

data/lib/modis/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Modis
-  VERSION = '4.3.0'
+  VERSION = '4.3.2'
 end

data/lib/modis.rb

@@ -18,11 +18,14 @@ require 'modis/index'
 require 'modis/model'
 
 module Modis
-  @mutex = Mutex.new
   class << self
     attr_writer :connection_pool_size, :connection_pool_timeout,
                 :connection_pools
 
+    def mutex
+      @mutex ||= Mutex.new
+    end
+
     def redis_options
       @redis_options ||= { default: {} }
     end
@@ -31,7 +34,20 @@ module Modis
       if options.is_a?(Hash) && options.values.first.is_a?(Hash)
         @redis_options = options.transform_values(&:dup)
       else
-        @redis_options[:default] = options
+        redis_options[:default] = options
+      end
+    end
+
+    def reset!
+      connection_pools.each do |key, _|
+        with_connection(key) do |connection|
+          keys = connection.keys "#{config.namespace}:*"
+          connection.del(*keys) unless keys.empty?
+        end
+      end
+      instance_variables.each do |var|
+        instance_variable_set(var, nil)
+        remove_instance_variable(var)
       end
     end
 
@@ -49,7 +65,7 @@ module Modis
 
     def connection_pool(pool_name = :default)
       connection_pools[pool_name] ||= begin
-        @mutex.synchronize do
+        mutex.synchronize do
           ConnectionPool.new(
             size: connection_pool_size,
             timeout: connection_pool_timeout

data/spec/multi_redis_spec.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'spec_helper'
+
 module MultiRedisSpec
   class DefaultUserModel
     include Modis::Model

data/spec/persistence_spec.rb

@@ -277,7 +277,7 @@ describe Modis::Persistence do
   end
 
   describe 'update_attributes!' do
-    around(:each) { |example| ActiveSupport::Deprecation.silence { example.run } }
+    around(:each) { |example| ActiveSupport::Deprecation.new.silence { example.run } }
 
     it 'updates the given attributes' do
       model.update_attributes!(name: 'Derp', age: 29)
@@ -331,7 +331,7 @@ describe Modis::Persistence do
   end
 
   describe 'update_attributes' do
-    around(:each) { |example| ActiveSupport::Deprecation.silence { example.run } }
+    around(:each) { |example| ActiveSupport::Deprecation.new.silence { example.run } }
 
     it 'updates the given attributes' do
       model.update_attributes(name: 'Derp', age: 29)

data/spec/spec_helper.rb

@@ -14,18 +14,12 @@ require 'modis'
 
 Redis.raise_deprecations = true if Gem.loaded_specs['redis'].version >= Gem::Version.new('4.6.0')
 
-Modis.configure do |config|
-  config.namespace = 'modis'
-end
-
 RSpec.configure do |config|
   config.after :each do
     RSpec::Mocks.space.proxy_for(Modis).reset
-    Modis.connection_pools.each do |key, _|
-      Modis.with_connection(key) do |connection|
-        keys = connection.keys "#{Modis.config.namespace}:*"
-        connection.del(*keys) unless keys.empty?
-      end
+    Modis.reset!
+    Modis.configure do |modis_config|
+      modis_config.namespace = 'modis'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modis
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.2
 platform: ruby
 authors:
 - Ian Leitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-31 00:00:00.000000000 Z
+date: 2024-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -233,6 +233,8 @@ files:
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
 - gemfiles/rails_7.0.gemfile
+- gemfiles/rails_7.1.gemfile
+- gemfiles/rails_7.2.gemfile
 - lib/modis.rb
 - lib/modis/attribute.rb
 - lib/modis/configuration.rb