gitlab-mail_room 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d894cd7c411ae358d57bbf83b19f968283d57bc7a933b08372dfa7f4bdae8c3d
-  data.tar.gz: cc58d74e461dd0d727377a0dcb5716270c82f54046cce532bf3b4a4766759fe7
+  metadata.gz: c08c7fc259366a99916418eb7487ad88670c1003533fd372b8314c1f4026fc19
+  data.tar.gz: c6500d0249a3c59c62af80939a9018609e92b7347119ff61f11a292bb704cbd5
 SHA512:
-  metadata.gz: c83273f42748dd42813b3614a677de3fdfcaf0939b39a04a2be85208b3ded8e8df274db2c29e9fad6f429f688e5fe42266a98a5b52eae21dfe425d318b8258b0
-  data.tar.gz: da92b942d53c0b675b803b251d438556a0fd2bb740a75ccfe748a1068cb035a7462966d3a7bac39e979cee2a2b85ae0d4d210e833f89b53a4a4d032634b5e71c
+  metadata.gz: 95df5a25eb397d315458cb841417f610c3d32d8145504a6899bc7377b99083fd3da56dc9fa4953ffe463702d0c1dd4ddc118a98562ba7400f1dac8ed780adb40
+  data.tar.gz: 28ee5cfc4e792023e76ea89b64728e24229b14510270eec56d0e52d8fdefffd282f57f9a2b7e8b10c6c95b4a1e6210044634d84e7ef3ac52914313a450ac3313

data/lib/mail_room/delivery/sidekiq.rb

@@ -8,16 +8,17 @@ module MailRoom
     # Sidekiq Delivery method
     # @author Douwe Maan
     class Sidekiq
-      Options = Struct.new(:redis_url, :namespace, :sentinels, :queue, :worker, :logger) do
+      Options = Struct.new(:redis_url, :namespace, :sentinels, :queue, :worker, :logger, :redis_db) do
         def initialize(mailbox)
           redis_url = mailbox.delivery_options[:redis_url] || "redis://localhost:6379"
+          redis_db  = mailbox.delivery_options[:redis_db] || 0
           namespace = mailbox.delivery_options[:namespace]
           sentinels = mailbox.delivery_options[:sentinels]
           queue     = mailbox.delivery_options[:queue] || "default"
           worker    = mailbox.delivery_options[:worker]
           logger = mailbox.logger
 
-          super(redis_url, namespace, sentinels, queue, worker, logger)
+          super(redis_url, namespace, sentinels, queue, worker, logger, redis_db)
         end
       end
 
@@ -45,7 +46,7 @@ module MailRoom
       def client
         @client ||= begin
           sentinels = options.sentinels
-          redis_options = { url: options.redis_url }
+          redis_options = { url: options.redis_url, db: options.redis_db }
           redis_options[:sentinels] = sentinels if sentinels
 
           redis = ::Redis.new(redis_options)

data/lib/mail_room/version.rb

@@ -1,4 +1,4 @@
 module MailRoom
   # Current version of gitlab-mail_room gem
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/spec/lib/delivery/sidekiq_spec.rb

@@ -8,23 +8,45 @@ describe MailRoom::Delivery::Sidekiq do
 
   describe '#options' do
     let(:redis_url) { 'redis://localhost' }
+    let(:redis_options) { { redis_url: redis_url } }
 
     context 'when only redis_url is specified' do
       let(:mailbox) {
         build_mailbox(
           delivery_method: :sidekiq,
-          delivery_options: {
-            redis_url: redis_url
-          }
+          delivery_options: redis_options
         )
       }
 
-      it 'client has same specified redis_url' do
-        expect(redis.client.options[:url]).to eq(redis_url)
+      context 'with simple redis url' do
+        it 'client has same specified redis_url' do
+          expect(redis.client.options[:url]).to eq(redis_url)
+        end
+
+        it 'client is a instance of RedisNamespace class' do
+          expect(redis).to be_a ::Redis
+        end
+
+        it 'connection has correct values' do
+          expect(redis.connection[:host]).to eq('localhost')
+          expect(redis.connection[:db]).to eq(0)
+        end
       end
 
-      it 'client is a instance of RedisNamespace class' do
-        expect(redis).to be_a ::Redis
+      context 'with redis_db specified in options' do
+        before do
+          redis_options[:redis_db] = 4
+        end
+
+        it 'client has correct redis_url' do
+          expect(redis.client.options[:url]).to eq(redis_url)
+        end
+
+
+        it 'connection has correct values' do
+          expect(redis.connection[:host]).to eq('localhost')
+          expect(redis.connection[:db]).to eq(4)
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-mail_room
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Tony Pitale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-16 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-imap