redis-store 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90b9775d198eedd8f7fbfbf48548ea825bf888a80bf430be0b7124d9092b6f7a
-  data.tar.gz: bfa57fa72dafc2bf60885da2501cd377eaceb45892a5e21ca9515d378556f95a
+  metadata.gz: b56845874e768c8ec1357c19affb5e7cdb3914d4839cd18d0e443f03b0e843e8
+  data.tar.gz: ab3b3872974e7e6fef5992701227397dbc00e8a905d532ab031da57eb2a7ed83
 SHA512:
-  metadata.gz: c4c0e067c7e20907158913fa39dbc86abc5c5b3a8120f966e2f311dcb3ae380596c824d0bfcb9385ca77681e8fb98d06ff63f45c289dfb51a1916d5448fe7ab4
-  data.tar.gz: d6e2d2bc963b99870f4a4abe0e20ede46dc3177f214685922aa0313e8baa9f2879d1fadd1d7786b5ce6d7dc9b736ee7a1ee74664041bbf4479347e96c44b0421
+  metadata.gz: 96808f1f4a574c79e2e322825e1d7c0f89265ca06db21de1d277e6d519a5c4698b495b9f9c81c3d72811280d400de8b043f15c57bb7f1a02fdf08023b3dcd673
+  data.tar.gz: 5f6a9ca80e5c7166c003421a6942bed21996b8daa09f134e1646f47942ae086246655068b7f0108e8a710622ec96f4bf4649812d44c2c8538b484bb401a38d60

data/.github/workflows/ci.yml

@@ -19,6 +19,8 @@ jobs:
           - "2.7"
           - "3.0"
           - "3.1"
+          - "3.2"
+          - "3.3"
           # - 'head'
           - "jruby"
           # - 'jruby-head'
@@ -45,7 +47,7 @@ jobs:
         ports:
           - 6381:6381
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
@@ -54,11 +56,11 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1
+          ruby-version: 3.3
           bundler-cache: true
       - run: bundle exec rake lint

data/.github/workflows/publish.yml

@@ -11,11 +11,11 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
-          bundle-cache: true
+          ruby-version: "3.3"
+          bundler-cache: true
       - run: |
           mkdir -p ~/.gem
           cat << EOF > ~/.gem/credentials

data/lib/redis/store/factory.rb

@@ -78,12 +78,19 @@ class Redis
             :scheme   => uri.scheme,
             :host     => uri.hostname,
             :port     => uri.port || DEFAULT_PORT,
-            :password => uri.password.nil? ? nil : CGI.unescape(uri.password.to_s)
+            :ssl      => uri.scheme == 'rediss'
           }
 
           options[:db]        = db.to_i   if db
           options[:namespace] = namespace if namespace
         end
+
+        if uri.user && !uri.user.empty?
+          options[:username] = uri.user
+        end
+
+        options[:password] = CGI.unescape(uri.password.to_s) if uri.password
+
         if uri.query
           query = Hash[URI.decode_www_form(uri.query)]
           query.each do |(key, value)|

data/lib/redis/store/version.rb

@@ -1,6 +1,6 @@
 class Redis
   class Store < self
-    VERSION = '1.10.0'
+    VERSION = '1.11.0'
 
     def self.redis_client_defined?
       # Doesn't work if declared as constant

data/lib/redis/store.rb

@@ -71,6 +71,8 @@ class Redis
         options.delete(:marshalling)
         options.delete(:namespace)
         options.delete(:scheme)
+        # Redis ACL support added in https://github.com/redis/redis-rb/pull/967
+        options.delete(:username) unless Gem::Version.new(Redis::VERSION) >= Gem::Version.new("4.3.0")
       end
 
       def _extend_marshalling

data/test/redis/store/factory_test.rb

@@ -147,6 +147,13 @@ describe "Redis::Store::Factory" do
       it "uses specified host" do
         store = Redis::Store::Factory.create "redis://127.0.0.1"
         _(store.to_s).must_equal("Redis Client connected to 127.0.0.1:6379 against DB 0")
+        client = store.instance_variable_get(:@client)
+
+        if Gem::Version.new(Redis::VERSION) >= Gem::Version.new('5.0.0')
+          assert_equal(false, client.instance_variable_get(:@config).instance_variable_get(:@ssl))
+        else
+          assert_equal(false, client.options[:ssl])
+        end
       end
 
       it "uses specified port" do
@@ -159,6 +166,13 @@ describe "Redis::Store::Factory" do
         client = store.instance_variable_get(:@client)
         # `redis-client` does NOT have `scheme`
         client.respond_to?(:scheme) && _(client.scheme).must_equal('rediss')
+
+        if Gem::Version.new(Redis::VERSION) >= Gem::Version.new('5.0.0')
+          # binding.irb
+          assert_equal(true, client.instance_variable_get(:@config).instance_variable_get(:@ssl))
+        else
+          assert_equal(true, client.options[:ssl])
+        end
       end
 
       it "correctly defaults to redis:// when relative scheme specified" do
@@ -198,6 +212,28 @@ describe "Redis::Store::Factory" do
         _(store.instance_variable_get(:@client).password).must_equal("secret")
       end
 
+      if Gem::Version.new(Redis::VERSION) >= Gem::Version.new("4.3.0")
+        it "uses specified path with username and password" do
+          store = Redis::Store::Factory.create "unix://test-user:secret@/var/run/redis.sock"
+          _(store.instance_variable_get(:@client).username).must_equal("test-user")
+          _(store.instance_variable_get(:@client).password).must_equal("secret")
+        end
+
+        it "uses specified username and password" do
+          store = Redis::Store::Factory.create "redis://test-user:secret@127.0.0.1:6379/0/theplaylist"
+          _(store.instance_variable_get(:@client).username).must_equal("test-user")
+          _(store.instance_variable_get(:@client).password).must_equal("secret")
+        end
+
+        it "uses a default username" do
+          store = Redis::Store::Factory.create "redis://:secret@127.0.0.1:6379/0/theplaylist"
+          username = Gem::Version.new(Redis::VERSION) >= Gem::Version.new("5.0") ? "default" : nil
+
+          _(store.instance_variable_get(:@client).username).must_equal(username)
+          _(store.instance_variable_get(:@client).password).must_equal("secret")
+        end
+      end
+
       it 'uses specified password with special characters' do
         store = Redis::Store::Factory.create 'redis://:pwd%40123@127.0.0.1:6379/0/theplaylist'
         _(store.instance_variable_get(:@client).password).must_equal('pwd@123')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-store
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Luca Guidi
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-11 00:00:00.000000000 Z
+date: 2024-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -222,7 +222,7 @@ homepage: http://redis-store.org/redis-store
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -237,8 +237,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.16
-signing_key:
+rubygems_version: 3.5.11
+signing_key: 
 specification_version: 4
 summary: Redis stores for Ruby frameworks
 test_files: []