redis-store 1.5.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10e6007fb1a0708fe88d7627a23a2b5e8e0303e9ee81ec886d27a5c6fdb7ed07
-  data.tar.gz: 9415f933dae0284fe8114cf6d350561bc23c58bcf9f1182d734f36fdf8436707
+  metadata.gz: 476790788b3d0462db696bc3773a72c18b3f57f04db394e238bc849b04f6b54a
+  data.tar.gz: 443eca0ff3f6acd16c696aadf4e8cb1c34edf213944d489d66fe6508a5ff2390
 SHA512:
-  metadata.gz: 69a4d72561bf0b9da2c88cc7a32d37a7ca06bb758a60d338bc4c12added10c1549f818f6e0e68af3854e0911a92f591c3c3094455d731f7a48d1cb1b47a9a700
-  data.tar.gz: da5fee4e7926a6032ca82fa7ee924c0a676124bffb55c84d5f553f066eb0ca47678cad583403ccc5979d04b7ddcdeb98652edf906472db364713baf483bc64e3
+  metadata.gz: 104215ff505c8dd84b0baac16c99a75e117b33dafbc0f654f6f87acbf0fba1b0a1c34ce3e63530566f65289ca725a98b1e0a640cfc878f33e27fb51857a243df
+  data.tar.gz: 49730d0bc9e9a1295aaa6b410cae27c58838f953a71fb6255c53e27dc4faa670b827effbe2d0f614d4d4dfbe5f91b333465c380db44475c466f261d534e2d91c

data/.codeclimate.yml

@@ -0,0 +1,6 @@
+---
+plugins:
+  rubocop:
+    enabled: true
+  fixme:
+    enabled: true

data/.github/auto-assign-issues.yml

@@ -0,0 +1,2 @@
+assignees:
+  - tubbo

data/.rubocop.yml

@@ -0,0 +1,138 @@
+---
+AllCops:
+  TargetRubyVersion: 2.4
+  # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
+  # to ignore them, so only the ones explicitly set in this file are enabled.
+  DisabledByDefault: true
+  Exclude:
+    - '**/vendor/**/*'
+
+# Prefer &&/|| over and/or.
+Style/AndOr:
+  Enabled: true
+
+# Do not use braces for hash literals when they are the last argument of a
+# method call.
+Style/BracesAroundHashParameters:
+  Enabled: true
+  EnforcedStyle: context_dependent
+
+# Align comments with method definitions.
+Layout/CommentIndentation:
+  Enabled: true
+
+Layout/ElseAlignment:
+  Enabled: true
+
+Layout/EmptyLineAfterMagicComment:
+  Enabled: true
+
+# In a regular class definition, no empty lines around the body.
+Layout/EmptyLinesAroundClassBody:
+  Enabled: true
+
+# In a regular method definition, no empty lines around the body.
+Layout/EmptyLinesAroundMethodBody:
+  Enabled: true
+
+# In a regular module definition, no empty lines around the body.
+Layout/EmptyLinesAroundModuleBody:
+  Enabled: true
+
+Layout/FirstParameterIndentation:
+  Enabled: true
+
+# Method definitions after `private` or `protected` isolated calls need one
+# extra level of indentation.
+Layout/IndentationConsistency:
+  Enabled: true
+  EnforcedStyle: rails
+
+# Two spaces, no tabs (for indentation).
+Layout/IndentationWidth:
+  Enabled: true
+
+Layout/LeadingCommentSpace:
+  Enabled: true
+
+Layout/SpaceAfterColon:
+  Enabled: true
+
+Layout/SpaceAfterComma:
+  Enabled: true
+
+Layout/SpaceAroundEqualsInParameterDefault:
+  Enabled: true
+
+Layout/SpaceAroundKeyword:
+  Enabled: true
+
+Layout/SpaceAroundOperators:
+  Enabled: true
+
+Layout/SpaceBeforeComma:
+  Enabled: true
+
+Layout/SpaceBeforeFirstArg:
+  Enabled: true
+
+Style/DefWithParentheses:
+  Enabled: true
+
+# Defining a method with parameters needs parentheses.
+Style/MethodDefParentheses:
+  Enabled: true
+
+# Use `foo {}` not `foo{}`.
+Layout/SpaceBeforeBlockBraces:
+  Enabled: true
+
+# Use `foo { bar }` not `foo {bar}`.
+Layout/SpaceInsideBlockBraces:
+  Enabled: true
+
+# Use `{ a: 1 }` not `{a:1}`.
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: true
+
+Layout/SpaceInsideParens:
+  Enabled: true
+
+# Detect hard tabs, no hard tabs.
+Layout/Tab:
+  Enabled: true
+
+# Blank lines should not have any spaces.
+Layout/TrailingBlankLines:
+  Enabled: true
+
+# No trailing whitespace.
+Layout/TrailingWhitespace:
+  Enabled: true
+
+# Use quotes for string literals when they are enough.
+Style/UnneededPercentQ:
+  Enabled: true
+
+# Align `end` with the matching keyword or starting expression except for
+# assignments, where it should be aligned with the LHS.
+Layout/EndAlignment:
+  Enabled: true
+  EnforcedStyleAlignWith: variable
+  AutoCorrect: true
+
+# Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
+Lint/RequireParentheses:
+  Enabled: true
+
+Style/RedundantReturn:
+  Enabled: true
+  AllowMultipleReturnValues: true
+
+Style/Semicolon:
+  Enabled: true
+  AllowAsExpressionSeparator: true
+
+# Prefer Foo.method over Foo::method
+Style/ColonMethodCall:
+  Enabled: true

data/.travis.yml

@@ -4,32 +4,36 @@ cache: bundler
 notifications:
   webhooks: https://www.travisbuddy.com
   on_success: never
-
-# 1.9.3 has Bundler 1.7.6 with the "undefined method `spec' for nil" bug
-before_install: gem install bundler
-
+before_install:
+- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
+  > ./cc-test-reporter
+- chmod +x ./cc-test-reporter
 rvm:
-  - 1.9.3
-  - 2.0
-  - 2.1
-  - 2.2
   - 2.3
   - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
   - ruby-head
   - jruby-head
-
 gemfile:
-  - gemfiles/redis_3_x.gemfile
-  - gemfiles/redis_4_x.gemfile
-
+- gemfiles/redis_4_0_x.gemfile
+- gemfiles/redis_4_1_x.gemfile
+- gemfiles/redis_4_x.gemfile
+before_script: "./cc-test-reporter before-build"
+after_script:
+- "./cc-test-reporter after-build --exit-code $EXIT_CODE"
+- "./cc-test-reporter format-coverage -t simplecov -o coverage/codeclimate.json"
+- if [[ "$TRAVIS_TEST_RESULT" == 0 ]]; then ./cc-test-reporter upload-coverage; fi
 matrix:
   allow_failures:
-    - rvm: jruby-head
-    - rvm: ruby-head
-  exclude:
-    - rvm: 1.9.3
-      gemfile: gemfiles/redis_4_x.gemfile
-    - rvm: 2.0
-      gemfile: gemfiles/redis_4_x.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/redis_4_x.gemfile
+  - rvm: jruby-head
+  - rvm: ruby-head
+deploy:
+  provider: rubygems
+  api_key:
+    secure: vhwP2VNfVYgppPNis7asqMnWuIcURr2e99uhYeHS4Sc+hIozu2QzAAekDrVpEDpeaEubtmTi19UcV4dZbDrQ0M+buE8LJEpItz73yK++J75Rzyh/bsGnWTy2FIvedLrH+jBNf28I9p8XNWkQxVaTc/r/v6BX3mmyV/jVoTBz9es=
+  gem: redis-store
+  on:
+    tags: true
+    repo: redis-store/redis-store

data/Appraisals

@@ -1,6 +1,10 @@
 
-appraise "redis_3_x" do
-  gem "redis", "~> 3.0"
+appraise "redis_4_0_x" do
+  gem "redis", "~> 4.0.0"
+end
+
+appraise "redis_4_1_x" do
+  gem "redis", "~> 4.1.0"
 end
 
 appraise "redis_4_x" do

data/CHANGELOG.md

@@ -1,5 +1,78 @@
 # Changelog
 
+## 1.9.0
+
+Breaking Changes
+
+* As a factor of updates for Redis v4.2.x, support for Ruby 2.1 and 2.2
+  has been dropped. These Ruby versions are end-of-life anyway.
+
+Fixed
+
+* [Compatibility with Redis client v4.2.x](https://github.com/redis-store/redis-store/pull/333)
+
+Added
+
+* [Support for edge Ruby's keyword arguments](https://github.com/redis-store/redis-store/pull/334)
+
+## 1.8.2
+
+Breaking Changes
+
+* None
+
+Added
+
+* [Add namespace to zincrby and zscore](https://github.com/redis-store/redis-store/pull/323)
+* [Add namespace to zadd and zrem](https://github.com/redis-store/redis-store/pull/326)
+
+Fixed
+
+* None
+
+## 1.8.1
+
+Breaking Changes
+
+* None
+
+Added
+
+* None
+
+Fixed
+
+* [Add namespace to remaining hash methods](https://github.com/redis-store/redis-store/pull/321)
+
+## 1.8.0
+
+Breaking Changes
+
+* None
+
+Added
+
+* [Redis Cluster Support](https://github.com/redis-store/redis-store/pull/318)
+
+Fixed
+
+* None
+
+## 1.6.0
+
+Breaking Changes
+
+* None
+
+Added
+
+* [SSL/TLS Support with the rediss:// URI scheme](https://github.com/redis-store/redis-store/pull/306)
+* [Use Code Style Guide For New Contributions](https://github.com/redis-store/redis-store/pull/309)
+
+Fixed
+
+* None
+
 ## 1.5.0
 
 Breaking Changes
@@ -44,7 +117,7 @@ Added
 
 Fixed
 
-* Conventional `Marshal.dump` usage allowing potential security vulnerability (CVE-2017-1000248) 
+* Conventional `Marshal.dump` usage allowing potential security vulnerability (CVE-2017-1000248)
 
 ## 1.3.0
 

data/CODEOWNERS

@@ -0,0 +1 @@
+* @tubbo

data/README.md

@@ -23,7 +23,7 @@ Download and install Redis from [the download page](http://redis.io//download) a
 ```ruby
 git clone git://github.com/redis-store/redis-store.git
 cd redis-store
-gem install bundler
+bundle install
 bundle exec rake
 ```
 
@@ -45,9 +45,9 @@ s.add_dependency 'redis-store', '>= 1.4', '< 2'
 
 ## Status
 
-[![Gem Version](https://badge.fury.io/rb/redis-store.png)](http://badge.fury.io/rb/redis-store)
-[![Build Status](https://secure.travis-ci.org/redis-store/redis-store.png?branch=master)](http://travis-ci.org/redis-store/redis-store?branch=master)
-[![Code Climate](https://codeclimate.com/github/redis-store/redis-store.png)](https://codeclimate.com/github/redis-store/redis-store)
+[![Gem Version](https://badge.fury.io/rb/redis-store.svg)](http://badge.fury.io/rb/redis-store)
+[![Build Status](https://secure.travis-ci.org/redis-store/redis-store.svg?branch=master)](http://travis-ci.org/redis-store/redis-store?branch=master)
+[![Code Climate](https://codeclimate.com/github/redis-store/redis-store.svg)](https://codeclimate.com/github/redis-store/redis-store)
 
 ## Copyright
 

data/Rakefile

@@ -3,7 +3,9 @@ require 'rake'
 require 'bundler/gem_tasks'
 require 'redis-store/testing/tasks'
 require 'appraisal'
+require 'rubocop/rake_task'
 
+RuboCop::RakeTask.new :lint
 
 if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
   task :default do

data/gemfiles/{redis_3_x.gemfile → redis_4_0_x.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "redis", "~> 3.0"
+gem "redis", "~> 4.0.0"
 
 gemspec path: "../"

data/gemfiles/redis_4_1_x.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "redis", "~> 4.1.0"
+
+gemspec path: "../"

data/lib/redis/distributed_store.rb

@@ -5,7 +5,7 @@ class Redis
     @@timeout = 5
     attr_reader :ring
 
-    def initialize(addresses, options = { })
+    def initialize(addresses, options = {})
       _extend_namespace options
       @ring = options[:ring] || Redis::HashRing.new([], options[:replicas] || Redis::HashRing::POINTS_PER_SERVER)
 
@@ -19,7 +19,7 @@ class Redis
     end
 
     def reconnect
-      nodes.each {|node| node.reconnect }
+      nodes.each { |node| node.reconnect }
     end
 
     def set(key, value, options = nil)
@@ -57,10 +57,10 @@ class Redis
       end
 
       def _merge_options(address, options)
-        address.merge({
-          :timeout => options[:timeout] || @@timeout, 
+        address.merge(
+          :timeout => options[:timeout] || @@timeout,
           :namespace => options[:namespace]
-        })
+        )
       end
   end
 end

data/lib/redis/store.rb

@@ -13,7 +13,7 @@ class Redis
   class Store < self
     include Ttl, Interface, RedisVersion
 
-    def initialize(options = { })
+    def initialize(options = {})
       super
 
       unless options[:marshalling].nil?
@@ -66,4 +66,3 @@ class Redis
       end
   end
 end
-

data/lib/redis/store/factory.rb

@@ -3,7 +3,6 @@ require 'uri'
 class Redis
   class Store < self
     class Factory
-
       DEFAULT_PORT = 6379
 
       def self.create(*options)
@@ -41,7 +40,7 @@ class Redis
         if host_options?(options)
           options
         else
-          nil 
+          nil
         end
       end
 
@@ -57,12 +56,12 @@ class Redis
                           !options[:marshalling]
                         else
                           false
-                        end
+        end
         options
       end
 
       def self.host_options?(options)
-        options.keys.any? {|n| [:host, :db, :port, :path].include?(n) }
+        options.keys.any? { |n| [:host, :db, :port, :path].include?(n) }
       end
 
       def self.extract_host_options_from_uri(uri)
@@ -71,13 +70,14 @@ class Redis
           options = { :path => uri.path }
         else
           _, db, namespace = if uri.path
-                               uri.path.split(/\//)
-                             end
+            uri.path.split(/\//)
+          end
 
           options = {
+            :scheme   => uri.scheme,
             :host     => uri.hostname,
             :port     => uri.port || DEFAULT_PORT,
-            :password => uri.password.nil? ? nil : CGI::unescape(uri.password.to_s)
+            :password => uri.password.nil? ? nil : CGI.unescape(uri.password.to_s)
           }
 
           options[:db]        = db.to_i   if db
@@ -95,16 +95,16 @@ class Redis
 
       private
 
-      def extract_addresses_and_options(*options)
-        options.flatten.compact.each do |token| 
-          resolved = self.class.resolve(token)
-          if resolved
-            @addresses << resolved
-          else
-            @options.merge!(self.class.normalize_key_names(token))
+        def extract_addresses_and_options(*options)
+          options.flatten.compact.each do |token|
+            resolved = self.class.resolve(token)
+            if resolved
+              @addresses << resolved
+            else
+              @options.merge!(self.class.normalize_key_names(token))
+            end
           end
         end
-      end
     end
   end
 end