uri-redis 0.3.0 → 0.4.0

data/CHANGES.txt

@@ -1,5 +1,11 @@
 URI-Redis, CHANGES
 
+#### 0.4.0 (2010-11-15) ###############################
+
+* ADDED: Support for keys in the path
+* CHANGE: Updated tryouts to 2.0
+
+
 #### 0.3.0 (2010-06-03) ###############################
 
 * CHANGE: Redis::Client.uri is now Redis.uri

data/Rakefile

@@ -1,41 +1,45 @@
-require 'rake/clean'
-require 'rake/gempackagetask'
-require 'fileutils'
-include FileUtils
+require "rubygems"
+require "rake"
+require "rake/clean"
+require 'yaml'
 
 begin
   require 'hanna/rdoctask'
 rescue LoadError
   require 'rake/rdoctask'
 end
-
-
-task :default => :test
-
-
-# PACKAGE =============================================================
-
+ 
+config = YAML.load_file("VERSION.yml")
+task :default => ["build"]
+CLEAN.include [ 'pkg', 'doc' ]
 name = "uri-redis"
-load "#{name}.gemspec"
-
-version = @spec.version
-
-Rake::GemPackageTask.new(@spec) do |p|
-  p.need_tar = true if RUBY_PLATFORM !~ /mswin/
-end
 
-task :release => [ "publish:gem", :clean, "publish:rdoc" ] do
-  $: << File.join(File.dirname(__FILE__), 'lib')
-  require "rudy"
-  abort if Drydock.debug?
+begin
+  require "jeweler"
+  Jeweler::Tasks.new do |gem|
+    gem.version = "#{config[:MAJOR]}.#{config[:MINOR]}.#{config[:PATCH]}"
+    gem.name = "uri-redis"
+    gem.rubyforge_project = gem.name
+    gem.summary = "URI-Redis: support for parsing redis://host:port/dbindex/keyname"
+    gem.description = gem.summary
+    gem.email = "delano@solutious.com"
+    gem.homepage = "http://github.com/delano/uri-redis"
+    gem.authors = ["Delano Mandelbaum"]
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-task :install => [ :rdoc, :package ] do
-	sh %{sudo gem install pkg/#{name}-#{version}.gem}
-end
 
-task :uninstall => [ :clean ] do
-	sh %{sudo gem uninstall #{name}}
+Rake::RDocTask.new do |rdoc|
+  version = "#{config[:MAJOR]}.#{config[:MINOR]}.#{config[:PATCH]}"
+  rdoc.rdoc_dir = "doc"
+  rdoc.title = "redis-dump #{version}"
+  rdoc.rdoc_files.include("README*")
+  rdoc.rdoc_files.include("LICENSE.txt")
+  #rdoc.rdoc_files.include("bin/*.rb")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
 
@@ -49,26 +53,10 @@ end
 #about 'Public release to rubyforge'
 task 'publish:gem' => [:package] do |t|
   sh <<-end
-    rubyforge add_release -o Any -a CHANGES.txt -f -n README.rdoc #{name} #{name} #{@spec.version} pkg/#{name}-#{@spec.version}.gem &&
-    rubyforge add_file -o Any -a CHANGES.txt -f -n README.rdoc #{name} #{name} #{@spec.version} pkg/#{name}-#{@spec.version}.tgz 
+    rubyforge add_release -o Any -a CHANGES.txt -f -n README.md #{name} #{name} #{@spec.version} pkg/#{name}-#{@spec.version}.gem &&
+    rubyforge add_file -o Any -a CHANGES.txt -f -n README.md #{name} #{name} #{@spec.version} pkg/#{name}-#{@spec.version}.tgz 
   end
 end
 
 
-Rake::RDocTask.new do |t|
-	t.rdoc_dir = 'doc'
-	t.title    = @spec.summary
-	t.options << '--line-numbers' <<  '-A cattr_accessor=object'
-	t.options << '--charset' << 'utf-8'
-	t.rdoc_files.include('LICENSE.txt')
-	t.rdoc_files.include('README.rdoc')
-	t.rdoc_files.include('CHANGES.txt')
-	#t.rdoc_files.include('Rudyfile')  # why is the formatting f'd?
-	t.rdoc_files.include('bin/*')
-	t.rdoc_files.include('lib/**/*.rb')
-end
-
-CLEAN.include [ 'pkg', '*.gem', '.config', 'doc', 'coverage*' ]
-
-
 

data/VERSION.yml

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

data/lib/uri/redis.rb

@@ -3,6 +3,7 @@ require 'redis'
 
 module URI
   class Redis < URI::Generic
+    VERSION = '0.4' unless defined?(URI::Redis::VERSION)
     DEFAULT_PORT = 6379
     DEFAULT_DB = 0
     
@@ -19,13 +20,26 @@ module URI
       r = path_query
     end
     
+    def key
+      return if self.path.nil?
+      self.path ||= "/#{DEFAULT_DB}"
+      self.path.split('/')[2..-1].join('/')
+    end
+    
+    def key=(val)
+      self.path = '/' << [db, val].join('/')
+    end
+    
     def db
-      val = path.tr('/', '')
-      val.empty? ? DEFAULT_DB : val.to_i
+      self.path ||= "/#{DEFAULT_DB}"
+      (self.path.split('/')[1] || DEFAULT_DB).to_i
     end
     
     def db=(val)
+      current_key = key
       self.path = "/#{val}"
+      self.path << "/#{current_key}"
+      self.path
     end
     
     def conf

data/try/10_uri_redis_try.rb

@@ -0,0 +1,31 @@
+require 'uri/redis'
+
+
+## Default database is 0
+uri = URI.parse 'redis://localhost'
+[uri.db, uri.host, uri.port]
+#=> [0, 'localhost', 6379]
+
+
+## Can parse a redis URI with a database
+uri = URI.parse 'redis://localhost/2'
+[uri.db, uri.host, uri.port]
+#=> [2, 'localhost', 6379]
+
+
+## Can parse a key name
+uri = URI.parse 'redis://localhost/2/v1:arbitrary:key'
+[uri.key, uri.db, uri.host, uri.port]
+#=> ['v1:arbitrary:key', 2, 'localhost', 6379]
+
+## Can set db
+uri = URI.parse 'redis://localhost/2/v1:arbitrary:key'
+uri.db = 6
+uri.to_s
+#=> 'redis://localhost/6/v1:arbitrary:key'
+
+## Can set key
+uri = URI.parse 'redis://localhost/2/v1:arbitrary:key'
+uri.key = 'v2:arbitrary:key'
+uri.to_s
+#=> 'redis://localhost/2/v2:arbitrary:key'

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: uri-redis
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  hash: 15
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,59 +15,60 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-03 00:00:00 -04:00
+date: 2010-11-15 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: "URI-Redis: support for parsing redis://host:port/dbindex"
+description: "URI-Redis: support for parsing redis://host:port/dbindex/keyname"
 email: delano@solutious.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
 - LICENSE.txt
-- CHANGES.txt
+- README.rdoc
 files: 
 - CHANGES.txt
 - LICENSE.txt
 - README.rdoc
 - Rakefile
+- VERSION.yml
 - lib/uri/redis.rb
-- tryouts/essential_tryouts.rb
-- uri-redis.gemspec
+- try/10_uri_redis_try.rb
 has_rdoc: true
 homepage: http://github.com/delano/uri-redis
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --title
-- "URI-Redis: support for parsing redis://host:port/dbindex"
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: uri-redis
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: "URI-Redis: support for parsing redis://host:port/dbindex"
+summary: "URI-Redis: support for parsing redis://host:port/dbindex/keyname"
 test_files: []
 

data/tryouts/essential_tryouts.rb

@@ -1,11 +0,0 @@
-
-library :'uri/redis', 'lib'
-tryouts "Essentials" do
-  
-  dream [2, 'localhost', 6379]
-  drill "Can parse a redis URI" do
-    uri = URI.parse 'redis://localhost/2'
-    [uri.db, uri.host, uri.port]
-  end
-  
-end

data/uri-redis.gemspec

@@ -1,29 +0,0 @@
-@spec = Gem::Specification.new do |s|
-  s.name = "uri-redis"
-  s.rubyforge_project = 'uri-redis'
-  s.version = "0.3.0"
-  s.summary = "URI-Redis: support for parsing redis://host:port/dbindex"
-  s.description = s.summary
-  s.author = "Delano Mandelbaum"
-  s.email = "delano@solutious.com"
-  s.homepage = "http://github.com/delano/uri-redis"
-  
-  s.extra_rdoc_files = %w[README.rdoc LICENSE.txt CHANGES.txt]
-  s.has_rdoc = true
-  s.rdoc_options = ["--line-numbers", "--title", s.summary, "--main", "README.rdoc"]
-  s.require_paths = %w[lib]
-  
-  # = MANIFEST =
-  # git ls-files
-  s.files = %w(
-  CHANGES.txt
-  LICENSE.txt
-  README.rdoc
-  Rakefile
-  lib/uri/redis.rb
-  tryouts/essential_tryouts.rb
-  uri-redis.gemspec
-  )
-
-  
-end