redis-activesupport 5.2.0.pre → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9e2dae1b761efefc450f3d0058ac0e4079b7e3cc
-  data.tar.gz: 066cc4f56fa42e97f9b0d83c04cdc5bb70062dd3
+SHA256:
+  metadata.gz: c467729c3fee8d572a088a25cae9e2c176b22e72059269af4861a91c306c92c1
+  data.tar.gz: 8cfcf74186f0d12526c92688f77e6ec3ec752d17fc8e09104ce74bb3c98459b9
 SHA512:
-  metadata.gz: 94636bbc45b68dfa930864d90d090d9bef4e7bd2bb59e114f5efe06bd3f3f18cfdf474e34fe9e7f4bf9b15ab5b51c42aad4a3ad12b9a374fe6311e0c78c661da
-  data.tar.gz: c1ebf00acb907f9d5047d8cab835c0d76e78e91a01355e0fe25f2e754b294d83118398db3c4b690b5c3194b25875182cf1e4b2c2ef5e0c27a5f49744682f6f4e
+  metadata.gz: 3d2a2c778b147fee2b9e1951cfddeec3bf761187387e51b538c70599de80c9433d27c9ae5865e6c469eec9fc82e18b47d251d594bbe05d186d63e7c53e141306
+  data.tar.gz: 8613a936dca3aa2acc54579140989b3a32e36023c6e0bb1c6bc717545febdce0e9f297178bde59d124790c2ab74ebd6b3926b73774fbc5532269e75d6d88510b

data/.travis.yml

@@ -1,39 +1,47 @@
 language: ruby
-script: 'bundle exec rake'
+script: bundle exec rake
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
-  - ruby-head
-  - jruby-head
+- 2.0
+- 2.1
+- 2.3
+- 2.4
+- 2.5
+- 2.6
+- ruby-head
+- jruby-head
 services:
-  - redis-server
+- redis-server
 matrix:
   allow_failures:
-    - rvm: jruby-head
-    - rvm: ruby-head
+  - rvm: jruby-head
+  - rvm: ruby-head
   exclude:
-    - rvm: 2.0
-      gemfile: gemfiles/activesupport_50.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/activesupport_50.gemfile
-    - rvm: 2.0
-      gemfile: gemfiles/activesupport_51.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/activesupport_51.gemfile
-    - rvm: 2.0
-      gemfile: gemfiles/activesupport_52.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/activesupport_52.gemfile
+  - rvm: 2.0
+    gemfile: gemfiles/activesupport_50.gemfile
+  - rvm: 2.1
+    gemfile: gemfiles/activesupport_50.gemfile
+  - rvm: 2.0
+    gemfile: gemfiles/activesupport_51.gemfile
+  - rvm: 2.1
+    gemfile: gemfiles/activesupport_51.gemfile
+  - rvm: 2.0
+    gemfile: gemfiles/activesupport_52.gemfile
+  - rvm: 2.1
+    gemfile: gemfiles/activesupport_52.gemfile
 notifications:
   webhooks: https://www.travisbuddy.com/
   on_success: never
-# Put this in your .travis.yml
 gemfile:
-  - gemfiles/activesupport_3.gemfile
-  - gemfiles/activesupport_4.gemfile
-  - gemfiles/activesupport_50.gemfile
-  - gemfiles/activesupport_51.gemfile
-  - gemfiles/activesupport_52.gemfile
+- gemfiles/activesupport_3.gemfile
+- gemfiles/activesupport_4.gemfile
+- gemfiles/activesupport_50.gemfile
+- gemfiles/activesupport_51.gemfile
+- gemfiles/activesupport_52.gemfile
+deploy:
+  provider: rubygems
+  api_key:
+    secure: VHWLUgCtqlKjeS5uGOxS4tnEUSPiapyvBvgSpr+FUeQnjAE9jgJvz+rAmiNy/pp8fAhjH5FdyIUXuh2rE2sWcBYrOa1rCvrc7eBHdnpZ4U7ULJwQKhC/4dOE33ClaZX2pex4pv12I2218ZH5TsqdmQ0Ci0ccfNZJv0vs+IFP+kQ=
+  gem: redis-activesupport
+  on:
+    tags: true
+    repo: redis-store/redis-activesupport

data/CODEOWNERS

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

data/lib/active_support/cache/redis_store.rb

@@ -30,25 +30,25 @@ module ActiveSupport
       #   RedisStore.new client: Redis.new(url: "redis://127.0.0.1:6380/1")
       #     # => host: localhost,   port: 6379,  db: 0
       #
-      #   RedisStore.new "example.com"
+      #   RedisStore.new "redis://example.com"
       #     # => host: example.com, port: 6379,  db: 0
       #
-      #   RedisStore.new "example.com:23682"
+      #   RedisStore.new "redis://example.com:23682"
       #     # => host: example.com, port: 23682, db: 0
       #
-      #   RedisStore.new "example.com:23682/1"
+      #   RedisStore.new "redis://example.com:23682/1"
       #     # => host: example.com, port: 23682, db: 1
       #
-      #   RedisStore.new "example.com:23682/1/theplaylist"
+      #   RedisStore.new "redis://example.com:23682/1/theplaylist"
       #     # => host: example.com, port: 23682, db: 1, namespace: theplaylist
       #
-      #   RedisStore.new "localhost:6379/0", "localhost:6380/0"
+      #   RedisStore.new "redis://localhost:6379/0", "redis://localhost:6380/0"
       #     # => instantiate a cluster
       #
-      #   RedisStore.new "localhost:6379/0", "localhost:6380/0", pool_size: 5, pool_timeout: 10
+      #   RedisStore.new "redis://localhost:6379/0", "redis://localhost:6380/0", pool_size: 5, pool_timeout: 10
       #     # => use a ConnectionPool
       #
-      #   RedisStore.new "localhost:6379/0", "localhost:6380/0",
+      #   RedisStore.new "redis://localhost:6379/0", "redis://localhost:6380/0",
       #     pool: ::ConnectionPool.new(size: 1, timeout: 1) { ::Redis::Store::Factory.create("localhost:6379/0") })
       #     # => supply an existing connection pool (e.g. for use with redis-sentinel or redis-failover)
       def initialize(*addresses)
@@ -187,11 +187,17 @@ module ActiveSupport
       #
       #   cache.increment "rabbit"
       #   cache.read "rabbit", :raw => true       # => "1"
-      def increment(key, amount = 1, options = {})
-        options = merged_options(options)
-        instrument(:increment, key, :amount => amount) do
-          failsafe(:increment) do
-            with{|c| c.incrby normalize_key(key, options), amount}
+      def increment(name, amount = 1, options = {})
+        instrument :increment, name, amount: amount do
+          failsafe :increment do
+            options = merged_options(options)
+            key = normalize_key(name, options)
+
+            with do |c|
+              c.incrby(key, amount).tap do
+                write_key_expiry(c, key, options)
+              end
+            end
           end
         end
       end
@@ -217,11 +223,17 @@ module ActiveSupport
       #
       #   cache.decrement "rabbit"
       #   cache.read "rabbit", :raw => true       # => "-1"
-      def decrement(key, amount = 1, options = {})
-        options = merged_options(options)
-        instrument(:decrement, key, :amount => amount) do
-          failsafe(:decrement) do
-            with{|c| c.decrby normalize_key(key, options), amount}
+      def decrement(name, amount = 1, options = {})
+        instrument :decrement, name, amount: amount do
+          failsafe :decrement do
+            options = merged_options(options)
+            key = normalize_key(name, options)
+
+            with do |c|
+              c.decrby(key, amount).tap do
+                write_key_expiry(c, key, options)
+              end
+            end
           end
         end
       end
@@ -279,6 +291,12 @@ module ActiveSupport
           end
         end
 
+        def write_key_expiry(client, key, options)
+          if options[:expires_in] && client.ttl(key) < 0
+            client.expire key, options[:expires_in].to_i
+          end
+        end
+
         ##
         # Implement the ActiveSupport::Cache#delete_entry
         #

data/lib/redis/active_support/version.rb

@@ -1,5 +1,5 @@
 class Redis
   module ActiveSupport
-    VERSION = '5.2.0.pre'
+    VERSION = '5.2.0'
   end
 end

data/redis-activesupport.gemspec

@@ -13,21 +13,20 @@ Gem::Specification.new do |s|
   s.description = %q{Redis store for ActiveSupport}
   s.license     = 'MIT'
 
-  s.rubyforge_project = 'redis-activesupport'
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
   s.add_runtime_dependency "redis-store",   '>= 1.3', '< 2'
-  s.add_runtime_dependency 'activesupport', '>= 3', '< 6'
+  s.add_runtime_dependency 'activesupport', '>= 3', '< 7'
 
   s.add_development_dependency 'rake',     '~> 10'
-  s.add_development_dependency 'bundler',  '~> 1.3'
+  s.add_development_dependency 'bundler'
   s.add_development_dependency 'mocha',    '~> 0.14.0'
   s.add_development_dependency 'minitest', '>= 4.2', '< 6'
   s.add_development_dependency 'connection_pool', '~> 2.2.0'
   s.add_development_dependency 'redis-store-testing'
   s.add_development_dependency 'appraisal', '~> 2.0'
+  s.add_development_dependency 'pry-byebug', '~> 3'
 end

data/test/active_support/cache/redis_store_test.rb

@@ -335,6 +335,24 @@ describe ActiveSupport::Cache::RedisStore do
     end
   end
 
+  it "increments a key with expiration time" do
+    with_store_management do |store|
+      store.increment "counter", 1, :expires_in => 1.second
+      store.read("counter", :raw => true).to_i.must_equal(1)
+      sleep 2
+      store.read("counter", :raw => true).must_be_nil
+    end
+  end
+
+  it "decrements a key with expiration time" do
+    with_store_management do |store|
+      store.decrement "counter", 1, :expires_in => 1.second
+      store.read("counter", :raw => true).to_i.must_equal(-1)
+      sleep 2
+      store.read("counter", :raw => true).must_be_nil
+    end
+  end
+
   it "clears the store" do
     with_store_management do |store|
       store.clear

data/test/test_helper.rb

@@ -4,4 +4,4 @@ require 'mocha/setup'
 require 'active_support'
 require 'active_support/cache/redis_store'
 
-puts "Testing against ActiveSupport v.#{ActiveSupport::VERSION::STRING}"
+puts "Testing against ActiveSupport v#{ActiveSupport::VERSION::STRING}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-activesupport
 version: !ruby/object:Gem::Version
-  version: 5.2.0.pre
+  version: 5.2.0
 platform: ruby
 authors:
 - Luca Guidi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2019-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-store
@@ -40,7 +40,7 @@ dependencies:
         version: '3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
         version: '3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -69,16 +69,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +155,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: Redis store for ActiveSupport
 email:
 - me@lucaguidi.com
@@ -166,6 +180,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Appraisals
+- CODEOWNERS
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -196,12 +211,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: redis-activesupport
-rubygems_version: 2.6.14
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Redis store for ActiveSupport