Skip to content

Commit

Permalink
Merge 733cfbf into 18611aa
Browse files Browse the repository at this point in the history
  • Loading branch information
dongoon committed Dec 30, 2017
2 parents 18611aa + 733cfbf commit 74a5204
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 1 deletion.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ group :development do
gem 'rack-test', '~> 0.6'
gem 'rake', '~> 10.0'
gem 'redis', '~> 3.2'
gem 'redis-namespace', '~> 1.5'
gem 'rspec', '~> 3.0'
gem 'rubocop', '>= 0.41', '< 0.50'
gem 'simplecov', '~> 0.9'
Expand Down
3 changes: 2 additions & 1 deletion lib/googleauth/stores/redis_token_store.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

require 'redis'
require 'redis-namespace'
require 'googleauth/token_store'

module Google
Expand All @@ -52,7 +53,7 @@ def initialize(options = {})
redis = options.delete(:redis)
prefix = options.delete(:prefix)
@redis = case redis
when Redis
when Redis, Redis::Namespace
redis
else
Redis.new(options)
Expand Down
16 changes: 16 additions & 0 deletions spec/googleauth/stores/redis_token_store_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
require 'spec_helper'
require 'fakeredis/rspec'
require 'googleauth/stores/store_examples'
require 'redis-namespace'

describe Google::Auth::Stores::RedisTokenStore do
let(:redis) do
Expand All @@ -46,5 +47,20 @@
Google::Auth::Stores::RedisTokenStore.new(redis: redis)
end

context 'use redis-namespace' do
let(:named_redis) do
Redis::Namespace.new(redis: Redis.new)
end
let(:redis) do
named_redis
end

it_behaves_like 'token store'

it 'should use redis-namespace' do
expect(store.instance_variable_get(:@redis)).to be == named_redis
end
end

it_behaves_like 'token store'
end

0 comments on commit 74a5204

Please sign in to comment.