routemaster-drain 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9452c2ba0c6f31936f6876817ee7d67ec770b2f
-  data.tar.gz: 7eb4da8f25e7780b2cdef784a499d2c2407f6334
+  metadata.gz: c0272cbd5f92879aa1a44d0b928d5671db23568d
+  data.tar.gz: a0c52c2160834a7542817358896b2d25cb6adc6a
 SHA512:
-  metadata.gz: 457ae9942fff794fbffc636263e4e1619f867badc0ba474ee217ffb48376aa40c4cfe887898eefe5fa1e2be44f64fe451a0677972e6a91336f0eeb6dc7459d02
-  data.tar.gz: cf88b0164f7292afd1e46641c07f59f0489307d55b1b4f2dd4268e037b30c2c60ad4818156206853334fe25fb07261b5a243e54918030d6831584e2f6e7dbff1
+  metadata.gz: 265ccd4eaa6f7fdb28f59f5a104b631341bf2858cbd940bef9825eab39539f8fcf64dc9600ccc1470f047f5c2585ead66b1d5b5955fe377e3a479d5e38160df7
+  data.tar.gz: 6c98dbc0dc65777ed88cc223b36b0ffe2017918481cf1a675b696dc9f5331380725a5f05fe1bb4ebfecfd6878e05bdd8fee23a354e629d18deaa4eb01798a508

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    routemaster-drain (1.0.4)
+    routemaster-drain (1.0.5)
       faraday (>= 0.9.0)
       faraday_middleware
       hashie

data/lib/routemaster/drain.rb

@@ -1,5 +1,5 @@
 module Routemaster
   module Drain
-    VERSION = '1.0.4'
+    VERSION = '1.0.5'
   end
 end

data/lib/routemaster/redis_broker.rb

@@ -27,8 +27,7 @@ module Routemaster
     private
 
     def _check_for_fork
-      return if Process.pid != @_pid
-      _cleanup
+      _cleanup unless Process.pid == @_pid
     end
 
     def _cleanup

data/spec/routemaster/redis_broker_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+require_relative '../../lib/routemaster/redis_broker'
+
+describe Routemaster::RedisBroker do
+  subject { Class.new(Routemaster::RedisBroker).instance }
+
+  describe "#get" do
+    let(:url)   { 'redis://localhost/12' }
+
+    context "setting up a redis namespace" do
+      let(:redis)           { instance_double(Redis) }
+      let(:redis_namespace) { instance_double(Redis::Namespace) }
+
+      before do
+        allow(Redis).to receive(:new) { redis }
+        allow(Redis::Namespace).to receive(:new) { redis_namespace }
+      end
+
+      it 'returns a namespaced redis connection' do
+        expect(subject.get(url)).to eq(redis_namespace)
+      end
+
+      it 'uses the url to initialise redis' do
+        expect(Redis).to receive(:new).with(url: url)
+        subject.get(url)
+      end
+
+      it 'namespaces with rm by default' do
+        expect(Redis::Namespace).to receive(:new).with('rm', redis: redis)
+        subject.get(url)
+      end
+
+      it 'can use a namespace based on the url' do
+        expect(Redis::Namespace).to receive(:new).with('other', redis: redis)
+        subject.get('redis://localhost/12/other')
+      end
+    end
+
+    context "when we are in the same process" do
+      it 'is a single connection for each url' do
+        expect(subject.get(url)).to eql(subject.get(url))
+      end
+    end
+
+    context "when we have forked" do
+      let!(:connection) { subject.get(url) }
+
+      it 'is a new connection for the newly forked process' do
+        # this is tied to implementation, but tests a 'fork' well enough
+        allow(Process).to receive(:pid) { -1 }
+        expect(subject.get(url)).to_not eql(connection)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: routemaster-drain
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -192,6 +192,7 @@ files:
 - spec/routemaster/middleware/filter_spec.rb
 - spec/routemaster/middleware/parse_spec.rb
 - spec/routemaster/middleware/root_post_only_spec.rb
+- spec/routemaster/redis_broker_spec.rb
 - spec/spec_helper.rb
 - spec/support/events.rb
 - spec/support/rack_test.rb
@@ -239,6 +240,7 @@ test_files:
 - spec/routemaster/middleware/filter_spec.rb
 - spec/routemaster/middleware/parse_spec.rb
 - spec/routemaster/middleware/root_post_only_spec.rb
+- spec/routemaster/redis_broker_spec.rb
 - spec/spec_helper.rb
 - spec/support/events.rb
 - spec/support/rack_test.rb