redis_connector 0.0.1 → 0.0.2

data/Rakefile

@@ -1 +1,9 @@
+#!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = %w(--format Fuubar)
+end
+
+task :default => [:spec]

data/lib/redis_connector.rb

@@ -1,121 +1,9 @@
-require "redis_connector/version"
-
-class RedisConnector
-  def self.with_session name = :default, &block
-    p = pools[name]
-    raise "No session configuration for #{name}" unless p
-    
-    p.with(&block)
-  end
-  
-  def self.session_names
-    pools.keys
-  end
-  
-  def self.pools
-    @pools || {}
-  end
-  
-  def self.load_config config = nil
-    if config_file.file?
-      ::RedisConnector.load!(config_file)
-    else
-      raise "File not found: config/redis_connector.yml"
-    end
-    
-  end
-  
-  def self.load! filename
-    conf = YAML::load_file filename
-    unless conf && conf[current_env]
-      raise "RedisConnector: no configuration for :#{current_env} environment."
-    end
-    
-    envconf = conf[current_env].symbolize_keys
-    
-    unless envconf[:sessions]
-      raise "Missing :sessions section in redis_connector.yml for :#{current_env} environement"
-    end
-    
-    @connection_configs = envconf[:sessions].each_with_object({}) do |(name, prm), memo|
-      memo[name.to_sym] = insert_default_values(prm)
-    end
-    
-    establish_connections!
-  end
-  
-  def self.establish_connections!
-    @pools = {}
-    @connection_configs.each do |name, params|
-      params[:znode_alias] ||= name
-      
-      @pools[name] = ConnectionPool.new(size: params[:pool_size], timeout: params[:timeout]) do
-        case params[:driver]
-        when 'redis'
-          init_vanilla_redis(params)
-        when 'redis_failover' 
-          init_failover_redis(params)
-        else
-          raise "Unrecognized redis driver: #{driver.inspect}"
-        end
-      end
-    end
-  end
-  
-  def self.close_connections!
-  end
-  
-  def self.init_vanilla_redis params
-    redis = Redis.new host: params[:host], port: params[:port]
-    redis = Redis::Namespace.new(params[:namespace], redis: redis) if params[:namespace]
-    redis
-  end
-  
-  def self.init_failover_redis params
-    if defined? RedisFailover::Client
-      zk = params.fetch(:zkservers)
-      znode = "/rf_#{name}"
-
-      if za = params[:znode_alias]
-        znode = "/rf_#{za}"
-      end
+require 'yaml'
+require 'redis'
+require 'redis-namespace'
+require 'connection_pool'
 
-      args = {zkservers: zk, znode_path: znode}
-      args.merge!(namespace: params[:namespace]) if params[:namespace]
-      redis = RedisFailover::Client.new args
-      redis
-    else
-      raise "RedisFailover::Client is not found. Add it to Gemfile and run `bundle install`"
-    end
-  end
-  
-  def self.insert_default_values prm
-    res = prm.symbolize_keys
-    
-    res[:host] ||= 'localhost'
-    res[:port] ||= 6379
-
-    res[:pool_size] ||= 1
-    res[:timeout] ||= 5
-    res[:driver] ||= 'redis'
+require 'redis_connector/util'
+require "redis_connector/version"
+require 'redis_connector/connector'
 
-    res
-  end
-  
-  private
-  def self.current_env
-    if defined? Rails
-      Rails.env
-    else
-      ENV['RAILS_ENV'] || ENV['CURRENT_ENV'] || 'development'
-    end
-  end
-  
-  def self.config_file
-    if defined? Rails
-      Rails.root.join("config", "redis_connector.yml")
-    else
-      'config/redis_connector.yml'
-    end
-  end
-end

data/lib/redis_connector/connector.rb

@@ -0,0 +1,121 @@
+class RedisConnector
+  extend Util
+  
+  def self.with_session name = :default, &block
+    p = pools[name]
+    raise "No session configuration for #{name}" unless p
+    
+    p.with(&block)
+  end
+  
+  def self.session_names
+    pools.keys
+  end
+  
+  def self.pools
+    @pools || {}
+  end
+  
+  def self.configure config = nil
+  
+    envconf = if config && config.is_a?(Hash)
+      config = stringify_keys(config)
+      config[current_env] || config
+    else
+      config ||= config_file
+      
+      conf = YAML::load_file config
+
+      envconf = conf[current_env] || conf
+    end
+    
+    envconf = symbolize_keys(envconf)
+
+    unless envconf[:sessions]
+      raise "Missing :sessions section in redis_connector.yml for :#{current_env} environement"
+    end
+    
+    @connection_configs = envconf[:sessions].each_with_object({}) do |(name, prm), memo|
+      memo[name.to_sym] = insert_default_values(prm)
+    end
+    
+    establish_connections!
+  end
+  
+  def self.establish_connections!
+    @pools = {}
+    @connection_configs.each do |name, params|
+      params[:znode_alias] ||= name
+      
+      @pools[name] = ConnectionPool.new(size: params[:pool_size], timeout: params[:timeout]) do
+        case params[:driver]
+        when 'redis'
+          init_vanilla_redis(params)
+        when 'redis_failover' 
+          init_failover_redis(params)
+        else
+          raise "Unrecognized redis driver: #{driver.inspect}"
+        end
+      end
+    end
+  end
+  
+  def self.close_connections!
+    # we should call #quit on all connections
+  end
+  
+  def self.init_vanilla_redis params
+    redis = Redis.new host: params[:host], port: params[:port]
+    redis = Redis::Namespace.new(params[:namespace], redis: redis) if params[:namespace]
+    redis
+  end
+  
+  def self.init_failover_redis params
+    if defined? RedisFailover::Client
+      zk = params.fetch(:zkservers)
+      znode = "/rf_#{name}"
+
+      if za = params[:znode_alias]
+        znode = "/rf_#{za}"
+      end
+
+      args = {zkservers: zk, znode_path: znode}
+      args.merge!(namespace: params[:namespace]) if params[:namespace]
+      redis = RedisFailover::Client.new args
+      redis
+    else
+      raise "RedisFailover::Client is not found. Add it to Gemfile and run `bundle install`"
+    end
+  end
+  
+  def self.insert_default_values prm
+    res = symbolize_keys(prm)
+    
+    res[:host] ||= 'localhost'
+    res[:port] ||= 6379
+
+    res[:pool_size] ||= 1
+    res[:timeout] ||= 5
+    res[:driver] ||= 'redis'
+
+    res
+  end
+  
+  private
+  def self.current_env
+    env = if defined? Rails
+      Rails.env
+    else
+      ENV['RAILS_ENV'] || ENV['CURRENT_ENV'] || 'development'
+    end
+    env.to_s
+  end
+  
+  def self.config_file
+    if defined? Rails
+      Rails.root.join("config", "redis_connector.yml")
+    else
+      'config/redis_connector.yml'
+    end
+  end
+end

data/lib/redis_connector/util.rb

@@ -0,0 +1,18 @@
+module Util
+  # Symbolizes the keys of the specified hash.
+  #
+  # @param [Hash] hash a hash for which keys should be symbolized
+  # @return [Hash] a new hash with symbolized keys
+  def symbolize_keys(hash)
+    Hash[hash.map { |k, v| [k.to_sym, v] }]
+  end
+  
+  # Stringifies the keys of the specified hash.
+  #
+  # @param [Hash] hash a hash for which keys should be stringified
+  # @return [Hash] a new hash with stringified keys
+  def stringify_keys(hash)
+    Hash[hash.map { |k, v| [k.to_s, v] }]
+  end
+  
+end

data/lib/redis_connector/version.rb

@@ -1,3 +1,3 @@
 class RedisConnector
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/lib/redis_connector_spec.rb

@@ -1,11 +1,49 @@
 require 'spec_helper'
 
 describe RedisConnector do
-  it 'passes this test' do
-    true
-  end
-  
-  it 'fails this test' do
-    raise 'oops'
+  describe '#configure' do
+    it 'accepts plain hash' do
+      conf = {
+        sessions: {
+          cache: {
+            host: 'localhost'
+          },
+          resque: {
+            host: 'localhost'
+          }
+        }
+      }
+      
+      RedisConnector.configure conf
+      RedisConnector.session_names.should =~ [:resque, :cache]
+    end
+
+    it 'accepts hash with environment sections' do
+      conf = {
+        test: {
+          sessions: {
+            cache: {
+              host: 'localhost'
+            },
+            resque: {
+              host: 'localhost'
+            }
+          }
+        }
+      }
+      
+      RedisConnector.configure conf
+      RedisConnector.session_names.should =~ [:resque, :cache]
+    end
+
+    it 'accepts a filename with simple config' do
+      RedisConnector.configure 'spec/support/config/example01.yml'
+      RedisConnector.session_names.should =~ [:resque, :cache, :default]
+    end
+
+    it 'accepts a filename with environment sections' do
+      RedisConnector.configure 'spec/support/config/example01_multiple_environments.yml'
+      RedisConnector.session_names.should =~ [:resque, :default, :cache]
+    end
   end
-end
+end

data/spec/spec_helper.rb

@@ -20,3 +20,8 @@ if $LOADED_FEATURES.grep(/spec\/spec_helper\.rb/).any?
       MSG
   end
 end
+
+ENV['CURRENT_ENV'] ||= 'test'
+
+require 'rspec'
+require 'redis_connector'

data/spec/support/config/example01.yml

@@ -0,0 +1,13 @@
+sessions:
+  default: &defaults
+    host: localhost
+    port: 6379
+    namespace: my_prefix
+    poolsize: 1
+    timeout: 5
+  cache:
+    <<: *defaults
+    namespace: test-uniques
+  resque:
+    <<: *defaults
+    namespace: test-resque

data/spec/support/config/example01_multiple_environments.yml

@@ -0,0 +1,14 @@
+test:
+  sessions:
+    default: &defaults
+      host: localhost
+      port: 6379
+      namespace: my_prefix
+      poolsize: 1
+      timeout: 5
+    cache:
+      <<: *defaults
+      namespace: test-uniques
+    resque:
+      <<: *defaults
+      namespace: test-resque

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_connector
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -105,10 +105,14 @@ files:
 - README.md
 - Rakefile
 - lib/redis_connector.rb
+- lib/redis_connector/connector.rb
+- lib/redis_connector/util.rb
 - lib/redis_connector/version.rb
 - redis_connector.gemspec
 - spec/lib/redis_connector_spec.rb
 - spec/spec_helper.rb
+- spec/support/config/example01.yml
+- spec/support/config/example01_multiple_environments.yml
 homepage: ''
 licenses: []
 post_install_message: 
@@ -136,4 +140,6 @@ summary: handles multiple redis connections
 test_files:
 - spec/lib/redis_connector_spec.rb
 - spec/spec_helper.rb
+- spec/support/config/example01.yml
+- spec/support/config/example01_multiple_environments.yml
 has_rdoc: