sinatra-redis 0.1.1 → 0.2.0

data/lib/sinatra/redis.rb

@@ -1,5 +1,5 @@
 require 'uri'
-require 'sinatra/redis/rubyredis'
+require 'redis'
 
 module Sinatra
   module RedisHelper
@@ -8,7 +8,7 @@ module Sinatra
     end
   end
 
-  module RedisExtension
+  module Redis
     def redis=(url)
       @redis = nil
       set :redis_url, url
@@ -17,24 +17,30 @@ module Sinatra
 
     def redis
       url = URI(redis_url)
-      @redis ||=
-        RedisClient.new(
+      @redis ||= (
+        base_options = {
           :host => url.host,
           :port => url.port,
           :db => url.path[1..-1],
-          :pass => url.password
+          :password => url.password
+        }
+
+        ::Redis.new(
+          base_options.merge(
+            options.redis_options
+          )
         )
+      )
     end
 
   protected
 
     def self.registered(app)
       app.set :redis_url, ENV['REDIS_URL'] || "redis://127.0.0.1:6379/0"
+      app.set :redis_options, {}
       app.helpers RedisHelper
     end
   end
 
-  Redis = RedisExtension
-
-  register RedisExtension
+  register Redis
 end

data/sinatra-redis.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'sinatra-redis'
-  s.version = '0.1.1'
+  s.version = '0.2.0'
   s.date = '2009-09-21'
 
   s.description = "Extends Sinatra with redis helpers for instant redis use"
@@ -12,6 +12,8 @@ Gem::Specification.new do |s|
   s.authors = ["Blake Mizerany"]
   s.email = "blake.mizerany@gmail.com"
 
+  s.add_dependency "redis"
+
   # = MANIFEST =
   s.files = %w[
     README.md

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-redis
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -12,6 +12,16 @@ cert_chain: []
 date: 2009-09-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: redis
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
   type: :runtime