Remove redis-namespace gem (#34742)
				
					
				
			This commit is contained in:
		
							
								
								
									
										1
									
								
								Gemfile
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								Gemfile
									
									
									
									
									
								
							@@ -78,7 +78,6 @@ gem 'rack-cors', '~> 2.0', require: 'rack/cors'
 | 
				
			|||||||
gem 'rails-i18n', '~> 8.0'
 | 
					gem 'rails-i18n', '~> 8.0'
 | 
				
			||||||
gem 'redcarpet', '~> 3.6'
 | 
					gem 'redcarpet', '~> 3.6'
 | 
				
			||||||
gem 'redis', '~> 4.5', require: ['redis', 'redis/connection/hiredis']
 | 
					gem 'redis', '~> 4.5', require: ['redis', 'redis/connection/hiredis']
 | 
				
			||||||
gem 'redis-namespace', '~> 1.10'
 | 
					 | 
				
			||||||
gem 'rqrcode', '~> 3.0'
 | 
					gem 'rqrcode', '~> 3.0'
 | 
				
			||||||
gem 'ruby-progressbar', '~> 1.13'
 | 
					gem 'ruby-progressbar', '~> 1.13'
 | 
				
			||||||
gem 'sanitize', '~> 7.0'
 | 
					gem 'sanitize', '~> 7.0'
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -696,8 +696,6 @@ GEM
 | 
				
			|||||||
      psych (>= 4.0.0)
 | 
					      psych (>= 4.0.0)
 | 
				
			||||||
    redcarpet (3.6.1)
 | 
					    redcarpet (3.6.1)
 | 
				
			||||||
    redis (4.8.1)
 | 
					    redis (4.8.1)
 | 
				
			||||||
    redis-namespace (1.11.0)
 | 
					 | 
				
			||||||
      redis (>= 4)
 | 
					 | 
				
			||||||
    redlock (1.3.2)
 | 
					    redlock (1.3.2)
 | 
				
			||||||
      redis (>= 3.0.0, < 6.0)
 | 
					      redis (>= 3.0.0, < 6.0)
 | 
				
			||||||
    regexp_parser (2.10.0)
 | 
					    regexp_parser (2.10.0)
 | 
				
			||||||
@@ -1046,7 +1044,6 @@ DEPENDENCIES
 | 
				
			|||||||
  rdf-normalize (~> 0.5)
 | 
					  rdf-normalize (~> 0.5)
 | 
				
			||||||
  redcarpet (~> 3.6)
 | 
					  redcarpet (~> 3.6)
 | 
				
			||||||
  redis (~> 4.5)
 | 
					  redis (~> 4.5)
 | 
				
			||||||
  redis-namespace (~> 1.10)
 | 
					 | 
				
			||||||
  rqrcode (~> 3.0)
 | 
					  rqrcode (~> 3.0)
 | 
				
			||||||
  rspec-github (~> 3.0)
 | 
					  rspec-github (~> 3.0)
 | 
				
			||||||
  rspec-rails (~> 8.0)
 | 
					  rspec-rails (~> 8.0)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -119,10 +119,6 @@ class Admin::Metrics::Dimension::SoftwareVersionsDimension < Admin::Metrics::Dim
 | 
				
			|||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  def redis_info
 | 
					  def redis_info
 | 
				
			||||||
    @redis_info ||= if redis.is_a?(Redis::Namespace)
 | 
					    @redis_info ||= redis.info
 | 
				
			||||||
                      redis.redis.info
 | 
					 | 
				
			||||||
                    else
 | 
					 | 
				
			||||||
                      redis.info
 | 
					 | 
				
			||||||
                    end
 | 
					 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -58,11 +58,7 @@ class Admin::Metrics::Dimension::SpaceUsageDimension < Admin::Metrics::Dimension
 | 
				
			|||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  def redis_info
 | 
					  def redis_info
 | 
				
			||||||
    @redis_info ||= if redis.is_a?(Redis::Namespace)
 | 
					    @redis_info ||= redis.info
 | 
				
			||||||
                      redis.redis.info
 | 
					 | 
				
			||||||
                    else
 | 
					 | 
				
			||||||
                      redis.info
 | 
					 | 
				
			||||||
                    end
 | 
					 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  def search_size
 | 
					  def search_size
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -29,12 +29,7 @@ class RedisConnection
 | 
				
			|||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  def connection
 | 
					  def connection
 | 
				
			||||||
    namespace = config[:namespace]
 | 
					    raw_connection
 | 
				
			||||||
    if namespace.present?
 | 
					 | 
				
			||||||
      Redis::Namespace.new(namespace, redis: raw_connection)
 | 
					 | 
				
			||||||
    else
 | 
					 | 
				
			||||||
      raw_connection
 | 
					 | 
				
			||||||
    end
 | 
					 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  private
 | 
					  private
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,7 +24,6 @@ Bundler.require(*Rails.groups)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
require_relative '../lib/exceptions'
 | 
					require_relative '../lib/exceptions'
 | 
				
			||||||
require_relative '../lib/sanitize_ext/sanitize_config'
 | 
					require_relative '../lib/sanitize_ext/sanitize_config'
 | 
				
			||||||
require_relative '../lib/redis/namespace_extensions'
 | 
					 | 
				
			||||||
require_relative '../lib/paperclip/url_generator_extensions'
 | 
					require_relative '../lib/paperclip/url_generator_extensions'
 | 
				
			||||||
require_relative '../lib/paperclip/attachment_extensions'
 | 
					require_relative '../lib/paperclip/attachment_extensions'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,16 +0,0 @@
 | 
				
			|||||||
# frozen_string_literal: true
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
class Redis
 | 
					 | 
				
			||||||
  module NamespaceExtensions
 | 
					 | 
				
			||||||
    def exists?(...)
 | 
					 | 
				
			||||||
      call_with_namespace('exists?', ...)
 | 
					 | 
				
			||||||
    end
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    def with
 | 
					 | 
				
			||||||
      yield self
 | 
					 | 
				
			||||||
    end
 | 
					 | 
				
			||||||
  end
 | 
					 | 
				
			||||||
end
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
Redis::Namespace::COMMANDS['exists?'] = [:first]
 | 
					 | 
				
			||||||
Redis::Namespace.prepend(Redis::NamespaceExtensions)
 | 
					 | 
				
			||||||
@@ -43,7 +43,7 @@ RSpec.describe Oauth::AuthorizedApplicationsController do
 | 
				
			|||||||
    let!(:application) { Fabricate(:application) }
 | 
					    let!(:application) { Fabricate(:application) }
 | 
				
			||||||
    let!(:access_token) { Fabricate(:accessible_access_token, application: application, resource_owner_id: user.id) }
 | 
					    let!(:access_token) { Fabricate(:accessible_access_token, application: application, resource_owner_id: user.id) }
 | 
				
			||||||
    let!(:web_push_subscription) { Fabricate(:web_push_subscription, user: user, access_token: access_token) }
 | 
					    let!(:web_push_subscription) { Fabricate(:web_push_subscription, user: user, access_token: access_token) }
 | 
				
			||||||
    let(:redis_pipeline_stub) { instance_double(Redis::Namespace, publish: nil) }
 | 
					    let(:redis_pipeline_stub) { instance_double(Redis::PipelinedConnection, publish: nil) }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    before do
 | 
					    before do
 | 
				
			||||||
      sign_in user, scope: :user
 | 
					      sign_in user, scope: :user
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -478,7 +478,7 @@ RSpec.describe User do
 | 
				
			|||||||
    let!(:access_token) { Fabricate(:access_token, resource_owner_id: user.id) }
 | 
					    let!(:access_token) { Fabricate(:access_token, resource_owner_id: user.id) }
 | 
				
			||||||
    let!(:web_push_subscription) { Fabricate(:web_push_subscription, access_token: access_token) }
 | 
					    let!(:web_push_subscription) { Fabricate(:web_push_subscription, access_token: access_token) }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    let(:redis_pipeline_stub) { instance_double(Redis::Namespace, publish: nil) }
 | 
					    let(:redis_pipeline_stub) { instance_double(Redis::PipelinedConnection, publish: nil) }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    before { stub_redis }
 | 
					    before { stub_redis }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -101,7 +101,7 @@ RSpec.describe 'Settings applications page' do
 | 
				
			|||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  describe 'Destroying an application' do
 | 
					  describe 'Destroying an application' do
 | 
				
			||||||
    let(:redis_pipeline_stub) { instance_double(Redis::Namespace, publish: nil) }
 | 
					    let(:redis_pipeline_stub) { instance_double(Redis::PipelinedConnection, publish: nil) }
 | 
				
			||||||
    let!(:access_token) { Fabricate(:accessible_access_token, application: application) }
 | 
					    let!(:access_token) { Fabricate(:accessible_access_token, application: application) }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    before { stub_redis_pipeline }
 | 
					    before { stub_redis_pipeline }
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user