redis-activesupport 3.2.5 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3eaefc22106ae1fb72c5baa4b8a14aea25ebbf0c
-  data.tar.gz: f85b25581b838bdf3dfd6ab98f9910b904a5ffef
+  metadata.gz: e812b725218799448b4fccf029a6e3f45e9dd9a5
+  data.tar.gz: 997c46b3aebb292245a7c1f2f1353907b5de70c3
 SHA512:
-  metadata.gz: 83f7046c4a83e15c06c50a4792b0d525f8c33600121e3012bd5b699fcad6cf60fc57f7da503913b038bbbc4f9bfd688981d00fb21b00a6d68ff2347588b39b77
-  data.tar.gz: 78b1e52ca36d2e61da96b579a898f7e17bd259bf0d8f01dad84e846a34d61ffbd367a4014108b7673effc20f5a45e62a9b6da55056c819db3e721e8d490c5911
+  metadata.gz: 50f9ebe7469531e877506c2c0319f4f6510d0f5e039098d4fa93ebf318d8b2de9cc9cc71acf0582fe5d9fc361443a591cf17ff3d2071ffbf02ee40c3c3115cd5
+  data.tar.gz: 20fa18aa279d0fcba4633c09e61af83966e15be4c8d7cf356d43bccb7f81ca8f1870a2d1a324c596a53f3d3c9dafebbc8d55f77194e94a7311380e1a1ed8a9e7

data/.gitignore

@@ -1,3 +1,5 @@
-Gemfile.lock
 *.gem
-tmp/
+.bundle
+Gemfile.lock
+pkg/*
+tmp/*

data/Gemfile

@@ -1,8 +1,16 @@
 source 'https://rubygems.org'
 gemspec
 
-if ::File.directory?(gem_path = '../redis-store')
-  gem 'redis-store', '~> 1.1.0', path: gem_path
+gem 'redis-store', '~> 1.1.0', path: '../redis-store'
+gem 'i18n'
+
+version = ENV["RAILS_VERSION"] || "4"
+
+rails = case version
+when "master"
+  {:github => "rails/rails"}
+else
+  "~> #{version}.0"
 end
 
-gem 'i18n'
+gem "rails", rails

data/README.md

@@ -1,39 +1,28 @@
 # Redis stores for ActiveSupport
 
-__`redis-activesupport`__ provides a cache for __ActiveSupport__. See the main [redis-store readme](https://github.com/redis-store/redis-store) for general guidelines.
+__`redis-activesupport`__ provides a cache for __ActiveSupport__. See the main [redis-store readme](https://github.com/jodosha/redis-store) for general guidelines.
 
 ## Installation
 
-```ruby
-# Gemfile
-gem 'redis-activesupport'
-```
+    # Gemfile
+    gem 'redis-activesupport'
 
-## Usage
+### Usage
 
-If you are using redis-store with Rails, consider using the [redis-rails gem](https://github.com/redis-store/redis-rails) instead. For standalone usage:
+If you are using redis-store with Rails, consider using the [redis-rails gem](https://github.com/jodosha/redis-store/tree/master/redis-rails) instead. For standalone usage:
 
-```ruby
-ActiveSupport::Cache.lookup_store :redis_store # { ... optional configuration ... }
-```
+    ActiveSupport::Cache.lookup_store :redis_store # { ... optional configuration ... }
 
 ## Running tests
 
-```shell
-gem install bundler
-git clone git://github.com/redis-store/redis-activesupport.git
-cd redis-activesupport
-git checkout -t origin/3.2.x
-bundle install
-bundle exec rake
-```
+    gem install bundler
+    git clone git://github.com/jodosha/redis-store.git
+    cd redis-store/redis-activesupport
+    bundle install
+    bundle exec rake
 
 If you are on **Snow Leopard** you have to run `env ARCHFLAGS="-arch x86_64" bundle exec rake`
 
-## Status
-
-[![Gem Version](https://badge.fury.io/rb/redis-activesupport.png)](http://badge.fury.io/rb/redis-activesupport) [![Build Status](https://secure.travis-ci.org/redis-store/redis-activesupport.png?branch=3.2.x)](http://travis-ci.org/jodosha/redis-activesupport?branch=3.2.x) [![Code Climate](https://codeclimate.com/github/jodosha/redis-store.png)](https://codeclimate.com/github/redis-store/redis-activesupport)
-
 ## Copyright
 
-2009 - 2013 Luca Guidi - [http://lucaguidi.com](http://lucaguidi.com), released under the MIT license
+(c) 2009 - 2011 Luca Guidi - [http://lucaguidi.com](http://lucaguidi.com), released under the MIT license

data/Rakefile

@@ -1,4 +1,8 @@
-require 'bundler/setup'
+require 'bundler'
+Bundler.setup
 require 'rake'
 require 'bundler/gem_tasks'
-require 'redis-store/testing/tasks'
+
+load 'tasks/redis.tasks.rb'
+task :default => 'redis:test:suite'
+

data/lib/active_support/cache/redis_store.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'redis-store'
 
 module ActiveSupport
@@ -38,6 +39,11 @@ module ActiveSupport
 
       # Delete objects for matched keys.
       #
+      # Performance note: this operation can be dangerous for large production
+      # databases, as it uses the Redis "KEYS" command, which is O(N) over the
+      # total number of keys in the database. Users of large Redis caches should
+      # avoid this method.
+      #
       # Example:
       #   cache.del_matched "rab*"
       def delete_matched(matcher, options = nil)
@@ -46,7 +52,7 @@ module ActiveSupport
           matcher = key_matcher(matcher, options)
           begin
             !(keys = @data.keys(matcher)).empty? && @data.del(*keys)
-          rescue Errno::ECONNREFUSED
+          rescue Errno::ECONNREFUSED => e
             false
           end
         end
@@ -124,6 +130,10 @@ module ActiveSupport
         end
       end
 
+      def expire(key, ttl)
+        @data.expire key, ttl
+      end
+
       # Clear all the data from the store.
       def clear
         instrument(:clear, nil, nil) do
@@ -131,6 +141,13 @@ module ActiveSupport
         end
       end
 
+      # fixed problem with invalid exists? method
+      # https://github.com/rails/rails/commit/cad2c8f5791d5bd4af0f240d96e00bae76eabd2f
+      def exist?(name, options = nil)
+        res = super(name, options)
+        res || false
+      end
+
       def stats
         @data.info
       end

data/lib/redis/activesupport/version.rb

@@ -1,5 +1,5 @@
 class Redis
   module ActiveSupport
-    VERSION = '3.2.5'
+    VERSION = '4.0.0'
   end
 end

data/redis-activesupport.gemspec

@@ -1,31 +1,29 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
-require 'redis/activesupport/version'
+$:.push File.expand_path("../lib", __FILE__)
+require "redis/activesupport/version"
 
 Gem::Specification.new do |s|
-  s.name        = 'redis-activesupport'
+  s.name        = "redis-activesupport"
   s.version     = Redis::ActiveSupport::VERSION
-  s.authors     = ['Luca Guidi']
-  s.email       = ['me@lucaguidi.com']
-  s.homepage    = 'http://redis-store.org/redis-activesupport'
-  s.summary     = %q{Redis store for ActiveSupport}
-  s.description = %q{Redis store for ActiveSupport}
-  s.license     = 'MIT'
+  s.authors     = ["Luca Guidi"]
+  s.email       = ["me@lucaguidi.com"]
+  s.homepage    = "http://redis-store.org/redis-activesupport"
+  s.summary     = %q{Redis store for ActiveSupport::Cache}
+  s.description = %q{Redis store for ActiveSupport::Cache}
 
-  s.rubyforge_project = 'redis-activesupport'
+  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.require_paths = ["lib"]
 
   s.add_runtime_dependency 'redis-store',   '~> 1.1.0'
-  s.add_runtime_dependency 'activesupport', '~> 3.2.0'
+  s.add_runtime_dependency 'activesupport', '~> 4'
 
   s.add_development_dependency 'rake',     '~> 10'
   s.add_development_dependency 'bundler',  '~> 1.3'
   s.add_development_dependency 'mocha',    '~> 0.14.0'
   s.add_development_dependency 'minitest', '~> 4.2'
-  s.add_development_dependency 'redis-store-testing'
 end
 

data/test/active_support/cache/redis_store_test.rb

@@ -30,12 +30,32 @@ describe ActiveSupport::Cache::RedisStore do
   it "writes the data with expiration time" do
     with_store_management do |store|
       store.write "rabbit", @white_rabbit, :expires_in => 1.second
-      # store.read("rabbit").must_equal(@white_rabbit)
+      store.read("rabbit").must_equal(@white_rabbit)
+      sleep 2
+      store.read("rabbit").must_be_nil
+    end
+  end
+
+  it "respects expiration time in seconds" do
+    with_store_management do |store|
+      store.write "rabbit", @white_rabbit
+      store.read("rabbit").must_equal(@white_rabbit)
+      store.expire "rabbit", 1.seconds
       sleep 2
       store.read("rabbit").must_be_nil
     end
   end
 
+  it "respects expiration time in minutes" do
+    with_store_management do |store|
+      store.write "rabbit", @white_rabbit
+      store.read("rabbit").must_equal(@white_rabbit)
+      store.expire "rabbit", 1.minutes
+      sleep 61
+      store.read("rabbit").must_be_nil
+    end
+  end
+
   it "does't write data if :unless_exist option is true" do
     with_store_management do |store|
       store.write "rabbit", @white_rabbit, :unless_exist => true
@@ -43,11 +63,21 @@ describe ActiveSupport::Cache::RedisStore do
     end
   end
 
-  it "reads raw data" do
-    with_store_management do |store|
-      result = store.read("rabbit", :raw => true)
-      result.must_include("ActiveSupport::Cache::Entry")
-      result.must_match("bunny")
+  if RUBY_VERSION.match /1\.9/
+    it "reads raw data" do
+      with_store_management do |store|
+        result = store.read("rabbit", :raw => true)
+        result.must_include("ActiveSupport::Cache::Entry")
+        result.must_include("\x0FOpenStruct{\x06:\tnameI\"\nbunny\x06:\x06EF")
+      end
+    end
+  else
+    it "reads raw data" do
+      with_store_management do |store|
+        result = store.read("rabbit", :raw => true)
+        result.must_include("ActiveSupport::Cache::Entry")
+        result.must_include("\017OpenStruct{\006:\tname")
+      end
     end
   end
 

data/test/redis/activesupport/version_test.rb

@@ -2,6 +2,6 @@ require 'test_helper'
 
 describe Redis::ActiveSupport::VERSION do
   it 'returns current version' do
-    Redis::ActiveSupport::VERSION.must_equal '3.2.5'
+    Redis::ActiveSupport::VERSION.must_equal '4.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-activesupport
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 4.0.0
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-store
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,21 +94,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: redis-store-testing
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Redis store for ActiveSupport
+description: Redis store for ActiveSupport::Cache
 email:
 - me@lucaguidi.com
 executables: []
@@ -116,7 +102,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .travis.yml
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -129,8 +114,7 @@ files:
 - test/redis/activesupport/version_test.rb
 - test/test_helper.rb
 homepage: http://redis-store.org/redis-activesupport
-licenses:
-- MIT
+licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -151,7 +135,7 @@ rubyforge_project: redis-activesupport
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Redis store for ActiveSupport
+summary: Redis store for ActiveSupport::Cache
 test_files:
 - test/active_support/cache/redis_store_test.rb
 - test/redis/activesupport/version_test.rb

data/.travis.yml

@@ -1,14 +0,0 @@
-language: ruby
-script: 'bundle exec rake'
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - ruby-head
-  - rbx-19mode
-  - jruby-19mode
-  - jruby-head
-
-matrix:
-  allow_failures:
-    - rvm: jruby-head
-    - rvm: ruby-head