uri-redis 0.4.1 → 1.0.0.pre.RC1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: ecbcabe135eef8efd0f07943fc756463833a54df37554bd2ba831042ca1a8601
+  data.tar.gz: f57ae01ba87e295a237b887f1a83338e32cc757a26844a6f44da575294d0990a
+SHA512:
+  metadata.gz: a1469dfbbfe14bb7d44e3206282363193ffd562c3c521105c4f941a863a9e036ebac5996fab45f581bfc5e6b94074123405abcf5ebd982d152dcb80409077d20
+  data.tar.gz: 1b1aff8dccc907f77d5dbb32c32cfe2cc35966e9e979ee0a914fe8da4f234fc5d834e28a5a83ab45cb41767cc52a7a6a686cab4b787515423b287bd82b177956

data/.rubocop.yml

@@ -0,0 +1,13 @@
+AllCops:
+  TargetRubyVersion: 2.6
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Layout/LineLength:
+  Max: 120

data/CHANGES.txt

@@ -1,5 +1,20 @@
 URI-Redis, CHANGES
 
+
+#### 1.0.0-RC1 (2023-01-16) ###########################
+
+* CHANGE: Moderized gem
+* ADDED: Only redis-4.1.0+ supported
+* FIXED: Support URI v0.11
+  * See: https://github.com/delano/redis-dump/issues/33
+
+
+#### 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/Gemfile

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in uri-redis.gemspec
+gemspec
+
+gem "rake", "~> 13.0"
+
+gem "rubocop", "~> 1.21"

data/LICENSE.txt

@@ -1,4 +1,6 @@
-Copyright (c) 2010 Solutious Inc, Delano Mandelbaum
+The MIT License (MIT)
+
+Copyright (c) 2023 delano
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -16,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

data/README.md

@@ -0,0 +1,40 @@
+# URI-Redis v1.0-RC1
+
+Creates a URI object for Redis URLs.
+
+e.g.
+
+    redis://host:port/dbindex
+
+## Usage
+**
+    require 'uri/redis'
+
+    conf = URI.parse 'redis://localhost:4380/2'
+    conf.host                 # => localhost
+    conf.port                 # => 4380
+    conf.db                   # => 2
+    conf.to_s                 # => redis://localhost:4380/2
+    conf
+**
+## Installation
+
+Get it in one of the following ways:
+
+* `gem install uri-redis`
+* `git clone git+ssh://github.com/delano/uri-redis.git`
+
+
+## About
+
+* [Github](https://github.com/delano/uri-redis)
+
+
+## Credits
+
+* delano (https://delanotes.com/)
+
+
+## License
+
+See LICENSE.txt

data/Rakefile

@@ -1,62 +1,8 @@
-require "rubygems"
-require "rake"
-require "rake/clean"
-require 'yaml'
-
-begin
-  require 'hanna/rdoctask'
-rescue LoadError
-  require 'rake/rdoctask'
-end
- 
-config = YAML.load_file("VERSION.yml")
-task :default => ["build"]
-CLEAN.include [ 'pkg', 'doc' ]
-name = "uri-redis"
-
-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
-
-
-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
-
-
-# Rubyforge Release / Publish Tasks ==================================
-
-#about 'Publish website to rubyforge'
-task 'publish:rdoc' => 'doc/index.html' do
-  sh "scp -rp doc/* rubyforge.org:/var/www/gforge-projects/#{name}/"
-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.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
+# frozen_string_literal: true
 
+require "bundler/gem_tasks"
+require "rubocop/rake_task"
 
+RuboCop::RakeTask.new
 
+task default: :rubocop

data/lib/uri/redis/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module URI
+  module Redis
+    VERSION = "1.0.0-RC1"
+  end
+end

data/lib/uri/redis.rb

@@ -6,59 +6,91 @@ module URI
     VERSION = '0.4' unless defined?(URI::Redis::VERSION)
     DEFAULT_PORT = 6379
     DEFAULT_DB = 0
-    
+
     def self.build(args)
       tmp = Util::make_components_hash(self, args)
       return super(tmp)
     end
-    
+
     def initialize(*arg)
       super(*arg)
     end
-    
+
     def request_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
       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
-    
+
+    # 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
+
+  register_scheme 'REDIS', Redis
 end
 
 
@@ -77,4 +109,4 @@ class Redis
       end
     end
   end
-end
+end

data/sig/uri/redis.rbs

@@ -0,0 +1,6 @@
+module Uri
+  module Redis
+    VERSION: String
+    # See the writing guide of rbs: https://github.com/ruby/rbs#guides
+  end
+end

metadata

@@ -1,74 +1,97 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: uri-redis
-version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 1
-  version: 0.4.1
+version: !ruby/object:Gem::Version
+  version: 1.0.0.pre.RC1
 platform: ruby
-authors: 
-- Delano Mandelbaum
-autorequire: 
-bindir: bin
+authors:
+- delano
+autorequire:
+bindir: exe
 cert_chain: []
-
-date: 2010-11-16 00:00:00 -05:00
-default_executable: 
-dependencies: []
-
-description: "URI-Redis: support for parsing redis://host:port/dbindex/keyname"
-email: delano@solutious.com
+date: 2023-01-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+- !ruby/object:Gem::Dependency
+  name: tryouts
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+description: 'URI-Redis: support for parsing Redis URIs like redis://host:port/dbindex'
+email:
+- delano@solutious.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE.txt
-- README.rdoc
-files: 
+extra_rdoc_files: []
+files:
+- ".rubocop.yml"
 - CHANGES.txt
+- Gemfile
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
-- VERSION.yml
 - lib/uri/redis.rb
+- lib/uri/redis/version.rb
+- sig/uri/redis.rbs
 - try/10_uri_redis_try.rb
-has_rdoc: true
-homepage: http://github.com/delano/uri-redis
-licenses: []
-
-post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+homepage: https://github.com/delano/uri-redis
+licenses:
+- MIT
+metadata:
+  allowed_push_host: https://rubygems.org
+  homepage_uri: https://github.com/delano/uri-redis
+  source_code_uri: https://github.com/delano/uri-redis/
+  changelog_uri: https://github.com/delano/uri-redis/blob/feature/001-modernize/CHANGES.txt#L1
+post_install_message:
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: 2.6.0
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">"
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
-rubyforge_project: uri-redis
-rubygems_version: 1.3.7
-signing_key: 
-specification_version: 3
-summary: "URI-Redis: support for parsing redis://host:port/dbindex/keyname"
+rubygems_version: 3.3.7
+signing_key:
+specification_version: 4
+summary: 'URI-Redis: support for parsing Redis URIs'
 test_files: []
-

data/README.rdoc

@@ -1,35 +0,0 @@
-= URI-Redis v0.2
-
-redis://host:port/dbindex
-
-== Usage
-
-    require 'uri/redis'
-
-    conf = URI.parse 'redis://localhost:8999/2'
-    conf.host                 # => localhost
-    conf.port                 # => 8999
-    conf.db                   # => 2
-        
-    
-== Installation
-
-Get it in one of the following ways:
-
-* <tt>gem install uri-redis</tt>
-* <tt>git clone git://github.com/delano/uri-redis.git</tt>
-
-
-== More Information
-
-* Codes[http://github.com/delano/uri-redis]
-* RDocs[http://delano.github.com/uri-redis]
-
-
-== Credits
-
-* Delano Mandelbaum (http://solutious.com)
-
-== License
-
-See LICENSE.txt

data/VERSION.yml

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