redis_selector 0.0.1 → 0.1.0

data/Gemfile

@@ -2,3 +2,8 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in redis_selector/.gemspec
 gemspec
+
+group :test do
+  gem "rspec", "~>2.6"
+  gem "rake"
+end

data/Rakefile

@@ -1 +1,10 @@
 require 'bundler/gem_tasks'
+require 'bundler/setup'
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = %w(-fs --color)
+  t.pattern = "spec/**/*_spec.rb"
+end
+
+task :default => :spec

data/lib/redis_selector.rb

@@ -18,8 +18,10 @@ module RedisSelector
   end
 
   def self.unmock!
+    require 'redis'
     self.mocking = false
   end
+  unmock!
 
   def self.configure(config)
     self.config = config
@@ -36,7 +38,10 @@ module RedisSelector
     redis_selector = Module.nesting[0]
 
     config = redis_selector.config || {}
-    redis_info = config[what] || config['default'] || DEFAULT_REDIS
+    redis_info = (config[what] || config['default'] || DEFAULT_REDIS).
+      inject({}) do |opts, (k, v)|
+        opts.merge!(k.to_sym => v)
+      end
 
     redis = if redis_selector.mocking
               # A MockRedis instance doesn't persist anywhere once we
@@ -44,12 +49,11 @@ module RedisSelector
               # does. That's why we hold onto this mock like this;
               # otherwise, repeated calls to with_redis(:foo) each get
               # a completely empty mock.
-              redis_selector.mock_redises[redis_info['host']] ||= MockRedis.new
+              redis_selector.mock_redises[redis_info[:host]] ||= MockRedis.new(redis_info)
             else
-              Redis.new(:host => redis_info['host'])
+              Redis.new(redis_info)
             end
 
-    redis.select(redis_info['db']) if redis_info['db']
     result = yield redis
     result
   ensure

data/lib/redis_selector/version.rb

@@ -1,3 +1,3 @@
 module RedisSelector
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/redis_selector.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "redis_selector"
 
+  s.add_dependency  "redis"
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/spec/redis_selector_spec.rb

@@ -0,0 +1,47 @@
+$LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
+require 'redis_selector'
+
+class RedisUser
+  extend RedisSelector
+
+  def self.use_redis(what)
+    with_redis(what) {|r| true}
+  end
+end
+
+describe "RedisSelector" do
+  it "works without being configured" do
+    Redis.should_receive(:new).with(:host => 'localhost')
+    RedisUser.use_redis(:something)
+  end
+end
+
+describe "RedisSelector" do
+  before do
+    RedisSelector.configure(
+      :leaderboards => {
+        :host    => 'redisbox',
+        :timeout => 30,
+        :color   => 'blue',
+      },
+      :stringkeys => {
+        'host' => 'localhost',
+        'db'   => 1,
+      })
+  end
+
+  it "passes along arbitrary options" do
+    Redis.should_receive(:new).with(
+      :host    => 'redisbox',
+      :timeout => 30,
+      :color   => 'blue')
+    RedisUser.use_redis(:leaderboards)
+  end
+
+  it "converts keys to symbols" do
+    Redis.should_receive(:new).with(
+      :host => 'localhost',
+      :db   => 1)
+    RedisUser.use_redis(:stringkeys)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redis_selector
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Samuel Merritt
@@ -15,10 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-08 00:00:00 -07:00
+date: 2011-09-22 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: redis
+  prerelease: false
+  type: :runtime
+  version_requirements: *id001
 description: "Lets you select different Redis instances/databases easily.\n    This way, you get logical grouping of different Redis datasets.\n\n    Also supports mocking in test mode (via mock_redis gem).\n  "
 email: 
 - spam@andcheese.org
@@ -34,10 +47,10 @@ files:
 - README.md
 - Rakefile
 - lib/redis_selector.rb
-- lib/redis_selector/.rb
 - lib/redis_selector/version.rb
 - redis_selector.gemspec
 - redis_selector/.gemspec
+- spec/redis_selector_spec.rb
 has_rdoc: true
 homepage: ""
 licenses: []
@@ -72,5 +85,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Easy way to select different Redis instances/databases based on purpose.
-test_files: []
-
+test_files: 
+- spec/redis_selector_spec.rb

data/lib/redis_selector/.rb

@@ -1,5 +0,0 @@
-require "redis_selector//version"
-
-module RedisSelector/
-  # Your code goes here...
-end