uri-redis 1.0.0.pre.RC1 → 1.0.0.pre.RC2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecbcabe135eef8efd0f07943fc756463833a54df37554bd2ba831042ca1a8601
-  data.tar.gz: f57ae01ba87e295a237b887f1a83338e32cc757a26844a6f44da575294d0990a
+  metadata.gz: f6f9b36d382353dc8c9843e0e257123a5f9b6efe2d68ce8a841b379b71a8b9cb
+  data.tar.gz: 68e510a31a0996e0fa373e2371ba19d058a66ab907ca0c4bb5df85dad684eb7b
 SHA512:
-  metadata.gz: a1469dfbbfe14bb7d44e3206282363193ffd562c3c521105c4f941a863a9e036ebac5996fab45f581bfc5e6b94074123405abcf5ebd982d152dcb80409077d20
-  data.tar.gz: 1b1aff8dccc907f77d5dbb32c32cfe2cc35966e9e979ee0a914fe8da4f234fc5d834e28a5a83ab45cb41767cc52a7a6a686cab4b787515423b287bd82b177956
+  metadata.gz: b3e80f765c0131ea169fc15215bb2f0b1496b1ada1a9f40d409fd88d9c5522e8856c70870cc01c1e11a90100f08608ec5e2c295e5872900f973e5e8b02e78870
+  data.tar.gz: 38160331dc1a0d7218e3b2dcc946dbd8f46024350e0b1b54b39a204771fd8c005a94045e75ac5380350f999d44235e116b4ef613988645bced8fed419c23b95b

data/.rubocop.yml

@@ -1,12 +1,175 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7.5
 
-Style/StringLiterals:
+Gemspec/DeprecatedAttributeAssignment: # new in 1.30
+  Enabled: true
+Gemspec/RequireMFA: # new in 1.23
+  Enabled: true
+Layout/LineContinuationLeadingSpace: # new in 1.31
+  Enabled: true
+Layout/LineContinuationSpacing: # new in 1.31
+  Enabled: true
+Layout/LineEndStringConcatenationIndentation: # new in 1.18
+  Enabled: true
+Layout/SpaceBeforeBrackets: # new in 1.7
+  Enabled: true
+Lint/AmbiguousAssignment: # new in 1.7
+  Enabled: true
+Lint/AmbiguousOperatorPrecedence: # new in 1.21
+  Enabled: true
+Lint/AmbiguousRange: # new in 1.19
+  Enabled: true
+Lint/ConstantOverwrittenInRescue: # new in 1.31
+  Enabled: true
+Lint/DeprecatedConstants: # new in 1.8
+  Enabled: true
+Lint/DuplicateBranch: # new in 1.3
+  Enabled: true
+Lint/DuplicateMagicComment: # new in 1.37
+  Enabled: true
+Lint/DuplicateRegexpCharacterClassElement: # new in 1.1
+  Enabled: true
+Lint/EmptyBlock: # new in 1.1
+  Enabled: true
+Lint/EmptyClass: # new in 1.3
+  Enabled: true
+Lint/EmptyInPattern: # new in 1.16
+  Enabled: true
+Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
+  Enabled: true
+Lint/LambdaWithoutLiteralBlock: # new in 1.8
+  Enabled: true
+Lint/NoReturnInBeginEndBlocks: # new in 1.2
+  Enabled: true
+Lint/NonAtomicFileOperation: # new in 1.31
+  Enabled: true
+Lint/NumberedParameterAssignment: # new in 1.9
+  Enabled: true
+Lint/OrAssignmentToConstant: # new in 1.9
+  Enabled: true
+Lint/RedundantDirGlobSort: # new in 1.8
+  Enabled: true
+Lint/RefinementImportMethods: # new in 1.27
+  Enabled: true
+Lint/RequireRangeParentheses: # new in 1.32
+  Enabled: true
+Lint/RequireRelativeSelfPath: # new in 1.22
+  Enabled: true
+Lint/SymbolConversion: # new in 1.9
+  Enabled: true
+Lint/ToEnumArguments: # new in 1.1
+  Enabled: true
+Lint/TripleQuotes: # new in 1.9
+  Enabled: true
+Lint/Void: # new in 1.1
+  Enabled: false
+Lint/UnexpectedBlockArity: # new in 1.5
+  Enabled: true
+Lint/UnmodifiedReduceAccumulator: # new in 1.1
+  Enabled: true
+Lint/UselessRescue: # new in 1.43
+  Enabled: true
+Lint/UselessRuby2Keywords: # new in 1.23
+  Enabled: true
+Metrics/AbcSize: # new in 1.0
+  Enabled: false
+Metrics/MethodLength: # new in 1.0
+  Enabled: false
+Metrics/PerceivedComplexity: # new in 1.0
+  Enabled: false
+Naming/BlockForwarding: # new in 1.24
+  Enabled: true
+Security/CompoundHash: # new in 1.28
+  Enabled: true
+Security/IoMethods: # new in 1.22
+  Enabled: true
+Style/ArgumentsForwarding: # new in 1.1
+  Enabled: true
+Style/ArrayIntersect: # new in 1.40
+  Enabled: true
+Style/CollectionCompact: # new in 1.2
   Enabled: true
+Style/ConcatArrayLiterals: # new in 1.41
+  Enabled: true
+Style/DocumentDynamicEvalDefinition: # new in 1.1
+  Enabled: true
+Style/EmptyHeredoc: # new in 1.32
+  Enabled: true
+Style/EndlessMethod: # new in 1.8
+  Enabled: true
+Style/EnvHome: # new in 1.29
+  Enabled: true
+Style/FetchEnvVar: # new in 1.28
+  Enabled: true
+Style/FileRead: # new in 1.24
+  Enabled: true
+Style/FileWrite: # new in 1.24
+  Enabled: true
+Style/FormatStringToken: # new in 1.1
+  Enabled: false
+Style/HashConversion: # new in 1.10
+  Enabled: true
+Style/HashExcept: # new in 1.7
+  Enabled: true
+Style/IfWithBooleanLiteralBranches: # new in 1.9
+  Enabled: true
+Style/InPatternThen: # new in 1.16
+  Enabled: true
+Style/MagicCommentFormat: # new in 1.35
+  Enabled: true
+Style/MapCompactWithConditionalBlock: # new in 1.30
+  Enabled: true
+Style/MapToHash: # new in 1.24
+  Enabled: true
+Style/MapToSet: # new in 1.42
+  Enabled: true
+Style/MinMaxComparison: # new in 1.42
+  Enabled: true
+Style/MultilineInPatternThen: # new in 1.16
+  Enabled: true
+Style/NegatedIfElseCondition: # new in 1.2
+  Enabled: true
+Style/NestedFileDirname: # new in 1.26
+  Enabled: true
+Style/NilLambda: # new in 1.3
+  Enabled: true
+Style/NumberedParameters: # new in 1.22
+  Enabled: true
+Style/NumberedParametersLimit: # new in 1.22
+  Enabled: true
+Style/ObjectThen: # new in 1.28
+  Enabled: true
+Style/OpenStructUse: # new in 1.23
+  Enabled: true
+Style/OperatorMethodCall: # new in 1.37
+  Enabled: true
+Style/QuotedSymbols: # new in 1.16
+  Enabled: true
+Style/RedundantArgument: # new in 1.4
+  Enabled: true
+Style/RedundantConstantBase: # new in 1.40
+  Enabled: true
+Style/RedundantDoubleSplatHashBraces: # new in 1.41
+  Enabled: true
+Style/RedundantEach: # new in 1.38
+  Enabled: true
+Style/RedundantInitialize: # new in 1.27
+  Enabled: true
+Style/RedundantSelfAssignmentBranch: # new in 1.19
+  Enabled: true
+Style/RedundantStringEscape: # new in 1.37
+  Enabled: true
+Style/SelectByRegexp: # new in 1.22
+  Enabled: true
+Style/StringChars: # new in 1.12
+  Enabled: true
+Style/SwapValues: # new in 1.1
+  Enabled: true
+Style/StringLiterals:
+  Enabled: false
   EnforcedStyle: double_quotes
-
 Style/StringLiteralsInInterpolation:
-  Enabled: true
+  Enabled: false
   EnforcedStyle: double_quotes
 
 Layout/LineLength:

data/CHANGES.txt

@@ -1,5 +1,9 @@
 URI-Redis, CHANGES
 
+#### 1.0.0-RC2 (2023-01-16) ###########################
+
+* FIXED: Harmonized ruby versions across gemspec, code, and github action.
+
 
 #### 1.0.0-RC1 (2023-01-16) ###########################
 

data/README.md

@@ -1,4 +1,4 @@
-# URI-Redis v1.0-RC1
+# URI-Redis v1.0 (pre-release)
 
 Creates a URI object for Redis URLs.
 

data/lib/uri/redis/version.rb

@@ -2,6 +2,6 @@
 
 module URI
   module Redis
-    VERSION = "1.0.0-RC1"
+    VERSION = "1.0.0-RC2"
   end
 end

data/lib/uri/redis.rb

@@ -1,38 +1,50 @@
-require 'uri'
-require 'redis'
+# frozen_string_literal: true
 
+require "uri"
+require "redis"
+
+# URI::Redis - adds support for Redis URIs to core.
 module URI
+  # Redis URI
+  #
+  # This is a subclass of URI::Generic and supports the following URI formats:
+  #
+  #   redis://host:port/dbindex
+  #
+  # @example
+  #   uri = URI::Redis.build(host: "localhost", port: 6379, db: 2, key: "v1:arbitrary:key")
+  #   uri.to_s #=> "redis://localhost:6379/2/v1:arbitrary:key"
+  #
+  #   uri = URI::Redis.build(host: "localhost", port: 6379, db: 2)
+  #   uri.to_s #=> "redis://localhost:6379/2"
   class Redis < URI::Generic
-    VERSION = '0.4' unless defined?(URI::Redis::VERSION)
+    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)
+      tmp = Util.make_components_hash(self, args)
+      super(tmp)
     end
 
     def request_uri
-      r = path_query
+      path_query
     end
 
     def key
-      return if self.path.nil?
+      return if path.nil?
+
       self.path ||= "/#{DEFAULT_DB}"
-      (self.path.split('/')[2..-1] || []).join('/')
+      (self.path.split("/")[2..] || []).join("/")
     end
 
     def key=(val)
-      self.path = '/' << [db, val].join('/')
+      self.path = "/" << [db, val].join("/")
     end
 
     def db
       self.path ||= "/#{DEFAULT_DB}"
-      (self.path.split('/')[1] || DEFAULT_DB).to_i
+      (self.path.split("/")[1] || DEFAULT_DB).to_i
     end
 
     def db=(val)
@@ -54,29 +66,30 @@ module URI
     #
     def conf
       hsh = {
-        :host => host,
-        :port => port,
-        :db   => db
-      }.merge parse_query(query)
+        host: host,
+        port: port,
+        db: db
+      }.merge(parse_query(query))
       hsh[:password] = password if password
       hsh
     end
 
     def serverid
-      'redis://%s:%s/%s' % [host, port, db]
+      format("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 = '&;')
+    # Based on: https://github.com/chneukirchen/rack/blob/master/lib/rack/utils.rb
+    # which was originally based on Mongrel
+    def parse_query(query, delim = nil)
+      delim ||= "&;"
       params = {}
-      (qs || '').split(/[#{d}] */n).each do |p|
-        k, v = p.split('=', 2).map { |str| str } # NOTE: uri_unescape
+      (query || "").split(/[#{delim}] */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
+        if (cur = params[k])
+          if cur.instance_of?(Array)
             params[k] << v
           else
             params[k] = [cur, v]
@@ -87,25 +100,25 @@ module URI
       end
       params
     end
-
   end
 
-  register_scheme 'REDIS', Redis
+  register_scheme "REDIS", Redis
 end
 
-
+# Adds a URI method to Redis
 class Redis
-  def self.uri(conf={})
-    URI.parse 'redis://%s:%s/%s' % [conf[:host], conf[:port], conf[:db]]
+  def self.uri(conf = {})
+    URI.parse format("redis://%s:%s/%s", conf[:host], conf[:port], conf[:db])
   end
   if defined?(Redis::VERSION) && Redis::VERSION >= "2.0.0"
     def uri
-      URI.parse 'redis://%s:%s/%s' % [@client.host, @client.port, @client.db]
+      URI.parse format("redis://%s:%s/%s", @client.host, @client.port, @client.db)
     end
   else
+    # Redis < 2.0.0
     class Client
       def uri
-        URI.parse 'redis://%s:%s/%s' % [@host, @port, @db]
+        URI.parse format("redis://%s:%s/%s", @host, @port, @db)
       end
     end
   end

data/try/10_uri_redis_try.rb

@@ -1,31 +1,30 @@
-require 'uri/redis'
+# frozen_string_literal: true
 
+require "uri/redis"
 
 ## Default database is 0
-uri = URI.parse 'redis://localhost'
+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 = 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 = 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 = 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 = URI.parse "redis://localhost/2/v1:arbitrary:key"
+uri.key = "v2:arbitrary:key"
 uri.to_s
-#=> 'redis://localhost/2/v2:arbitrary:key'
+#=> 'redis://localhost/2/v2:arbitrary:key'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uri-redis
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.RC1
+  version: 1.0.0.pre.RC2
 platform: ruby
 authors:
 - delano
@@ -75,6 +75,7 @@ metadata:
   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
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -83,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"