uri-redis 0.4.1 → 0.4.2

data/CHANGES.txt

@@ -1,5 +1,11 @@
 URI-Redis, CHANGES
 
+#### 0.4.2 (2010-12-23) ###############################
+
+# CHANGE: URI#conf enforces symbols as keys
+* ADDED: URI#conf parses query string
+
+
 #### 0.4.1 (2010-11-16) ###############################
 
 * FIXED: Nil error in URI::Redis#key

data/Rakefile

@@ -11,7 +11,7 @@ end
  
 config = YAML.load_file("VERSION.yml")
 task :default => ["build"]
-CLEAN.include [ 'pkg', 'doc' ]
+CLEAN.include [ 'pkg', 'doc', '*gemspec' ]
 name = "uri-redis"
 
 begin

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :MAJOR: 0
 :MINOR: 4
-:PATCH: 1
+:PATCH: 2
 :BUILD: '001'

data/lib/uri/redis.rb

@@ -42,20 +42,52 @@ module URI
       self.path
     end
     
+    # Returns a hash suitable for sending to Redis.new. 
+    # The hash is generated from the host, port, db and
+    # password from the URI as well as any query vars.
+    # 
+    # e.g. 
+    #
+    #      uri = URI.parse "redis://127.0.0.1/6/?timeout=5"
+    #      uri.conf
+    #        # => {:db=>6, :timeout=>"5", :host=>"127.0.0.1", :port=>6379}
+    #
     def conf
-      tmp = {
+      hsh = {
         :host => host,
         :port => port,
         :db   => db
-      }
-      tmp[:password] = password if password
-      tmp
+      }.merge parse_query(query)
+      hsh[:password] = password if password
+      hsh
     end
     
     def serverid
       'redis://%s:%s/%s' % [host, port, db]
     end
     
+    private
+    
+    # Based on / stolen from: https://github.com/chneukirchen/rack/blob/master/lib/rack/utils.rb
+    # which was based on / stolen from Mongrel
+    def parse_query(qs, d = '&;')
+      params = {}
+      (qs || '').split(/[#{d}] */n).each do |p|
+        k, v = p.split('=', 2).map { |str| str } # NOTE: uri_unescape
+        k = k.to_sym
+        if cur = params[k]
+          if cur.class == Array
+            params[k] << v
+          else
+            params[k] = [cur, v]
+          end
+        else
+          params[k] = v
+        end
+      end
+      params
+    end
+    
   end
   
   @@schemes['REDIS'] = Redis

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: uri-redis
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 -05:00
+date: 2010-12-23 00:00:00 -05:00
 default_executable: 
 dependencies: []