modis 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a9d3d05277e2ddf26b7c14547b3e03f37cb6fbb771ba9b2a6b61acce6485bd9
-  data.tar.gz: 031d2f34a15d5f077b5b01c2e4286b73285ed2171f4029577c2d812a22f6da6d
+  metadata.gz: 4490e45322b9ae24bb78a01190616971ff18fd0ee14030493a2cb76f1496d8ac
+  data.tar.gz: 135acda908b954b448aff439a4fd6663f06297da29b7bc8ce936c2f153696e05
 SHA512:
-  metadata.gz: 9b76390c567d8ba5495c226cb7425372797fe9b3d5e2d2a07a8f891bed7e5aa4f3c66d84f54c6cac7814f07f156e958687a62da8179c4d1922da2efb065412c1
-  data.tar.gz: dba384ff8ad647615016ed340c21e72088d45b1186b91e96f28c579b73ff7d45cd2616b10c70d42fcb17e1f4cfe4889074c0eb8a6ab41b0e92082d83d663c026
+  metadata.gz: 656b9746bb1381ae3eee2cec837e3a1adebcd505eea7cb3289f660d8bfa17371e4defabb567898000b4e1a5a49775205deff1081a00299422e125360a3a186b2
+  data.tar.gz: 49c2d453ca3079306ee51fc9d97bda1330d10871a205a57b22ca70260dc746b8d8c589fc66750bb09b8af7aa6421faf8fa1e3fb79ae2035411c32033fd328bb3

data/.github_changelog_generator

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

data/CHANGELOG.md

@@ -1,8 +1,20 @@
 # Changelog
 
-## [v4.1.0](https://github.com/rpush/modis/tree/v4.1.0) (2024-07-31)
+## [v4.3.1](https://github.com/rpush/modis/tree/v4.3.1) (2024-08-01)
 
-[Full Changelog](https://github.com/rpush/modis/compare/v4.2.0...v4.1.0)
+[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.1)
       activemodel (>= 5.2)
       activesupport (>= 5.2)
       connection_pool (>= 2)

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.1'
 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/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.1
 platform: ruby
 authors:
 - Ian Leitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-31 00:00:00.000000000 Z
+date: 2024-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel