fault_tolerant_redis-activesupport 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c294041252356e5f9da6aaae0afb056b72f9853
-  data.tar.gz: 5ebe62c437f156ec1e8bfa072546fca3784fda20
+  metadata.gz: 4532b70a5ec5ce8ff27d08383b89731d69fa4092
+  data.tar.gz: b9c2c8148d91ea1e868b4c2008b72cb5916a8884
 SHA512:
-  metadata.gz: 7e5d1629b9f420cedcd595c1dfaf7e17170636c678983029c839e8dd03ea8f0bf61be73d0313502f873f1e5d09c222782330be03dd96cdc848650a81b47b3153
-  data.tar.gz: dc0042f8adb6655ac7d2b90d293ab41589c5ab323f84ada2f07e9e0d051b5995aabf8684a3756c8c9756cda5ed6af4168a09da9788b94d386ff37211aa658ace
+  metadata.gz: 28da90884df96978e424977916a33ba319665259510308cb0a7097e86b82e0949d9e42b69524a103dc19fe4bf3095e4ab4eccf7a46a486069b3e1847feebbd0d
+  data.tar.gz: d90d98bcf89b1eb37af91f3b1b5685d1f4bbafefc98a00e986b8891d08509679bb8e6a483ef3ebf2b5d5103e27241463a42a6d2758ccf745df047c45ee7af522

data/.gitignore

@@ -1,3 +1,9 @@
 Gemfile.lock
 *.gem
 tmp/
+
+_builds
+_projects
+_steps
+
+dump.rdb

data/.ruby-gemset

@@ -0,0 +1 @@
+rails-redis_tolerant_cache_store

data/.ruby-version

@@ -0,0 +1 @@
+2.2.3

data/README.md

@@ -1,38 +1,4 @@
-# Redis stores for ActiveSupport
+[![wercker status](https://app.wercker.com/status/21cb26b06b1e5565aa6b26007a0bdd1c/m "wercker status")](https://app.wercker.com/project/bykey/21cb26b06b1e5565aa6b26007a0bdd1c)
 
-__`redis-activesupport`__ provides a cache for __ActiveSupport__. See the main [redis-store readme](https://github.com/redis-store/redis-store) for general guidelines.
-
-## Installation
-
-```ruby
-# Gemfile
-gem 'redis-activesupport'
-```
-
-## 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:
-
-```ruby
-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
-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=master)](http://travis-ci.org/jodosha/redis-activesupport?branch=master) [![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
+# Fault tolerant Redis store for ActiveSupport
+A combination of https://github.com/redis-store/redis-activesupport and https://github.com/renra/ruby-maybe_client

data/Rakefile

@@ -2,3 +2,11 @@ require 'bundler/setup'
 require 'rake'
 require 'bundler/gem_tasks'
 require 'redis-store/testing/tasks'
+
+require 'rake/testtask'
+
+task :test do
+  Dir.glob('./test/**/*_test.rb').each { |file|
+    require file;
+  }
+end

data/fault_tolerant_redis-activesupport.gemspec

@@ -4,7 +4,7 @@ require 'redis/activesupport/version'
 
 Gem::Specification.new do |s|
   s.name        = 'fault_tolerant_redis-activesupport'
-  s.version     = Redis::ActiveSupport::VERSION
+  s.version     = '4.0.1'
   s.authors     = ['Luca Guidi', 'Jan Renra Gloser']
   s.email       = ['me@lucaguidi.com', 'jan.renra.gloser@gmail.com']
   s.homepage    = 'https://github.com/renra/redis-activesupport'
@@ -20,13 +20,14 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency 'redis-store',   '~> 1.1.0'
-  s.add_runtime_dependency 'activesupport', '~> 4'
-  s.add_runtime_dependency 'maybe_client', '1.1.0'
+  s.add_runtime_dependency 'activesupport', '~> 4.0.0'
+  s.add_runtime_dependency 'maybe_client', '1.2'
 
   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 'pry'
   s.add_development_dependency 'redis-store-testing'
 end
 

data/test/active_support/cache/redis_store_test.rb

@@ -1,185 +1,126 @@
-require 'test_helper'
+require_relative '../../test_helper'
+require 'ostruct'
+require 'pry'
 
-describe ActiveSupport::Cache::RedisStore do
+describe ActiveSupport::Cache::FaultTolerantRedisStore do
   def setup
-    @store  = ActiveSupport::Cache::RedisStore.new
-    @dstore = ActiveSupport::Cache::RedisStore.new "redis://127.0.0.1:6380/1", "redis://127.0.0.1:6381/1"
+    @store  = ActiveSupport::Cache::FaultTolerantRedisStore.new
     @rabbit = OpenStruct.new :name => "bunny"
     @white_rabbit = OpenStruct.new :color => "white"
 
-    with_store_management do |store|
-      store.write "rabbit", @rabbit
-      store.delete "counter"
-      store.delete "rub-a-dub"
-    end
+    @store.write "rabbit", @rabbit
+    @store.delete "counter"
+    @store.delete "rub-a-dub"
   end
 
   it "reads the data" do
-    with_store_management do |store|
-      store.read("rabbit").must_equal(@rabbit)
-    end
+    @store.read('rabbit').must_equal(@rabbit)
   end
 
   it "writes the data" do
-    with_store_management do |store|
-      store.write "rabbit", @white_rabbit
-      store.read("rabbit").must_equal(@white_rabbit)
-    end
+    @store.write "rabbit", @white_rabbit
+    @store.read("rabbit").must_equal(@white_rabbit)
   end
 
   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)
-      sleep 2
-      store.read("rabbit").must_be_nil
-    end
+    @store.write "rabbit", @white_rabbit, :expires_in => 1.second
+    @store.read("rabbit").must_equal(@white_rabbit)
+    sleep 1
+    @store.read("rabbit").must_be_nil
   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
+    @store.write "rabbit", @white_rabbit
+    @store.read("rabbit").must_equal(@white_rabbit)
+    @store.expire "rabbit", 1.second
+    sleep 1.2  # Wercker needs more than 1 second for some reason
+    @store.read("rabbit").must_be_nil
   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
-      store.read("rabbit").must_equal(@rabbit)
-    end
+    @store.write "rabbit", @white_rabbit, :unless_exist => true
+    @store.read("rabbit").must_equal(@rabbit)
   end
 
-  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
+  it "reads raw data" do
+    result = @store.read("rabbit", :raw => true)
+    result.must_include("ActiveSupport::Cache::Entry")
+    result.must_include("\017OpenStruct{\006:\tname")
   end
 
   it "writes raw data" do
-    with_store_management do |store|
-      store.write "rabbit", @white_rabbit, :raw => true
-      store.read("rabbit", :raw => true).must_equal(%(#<OpenStruct color=\"white\">))
-    end
+    @store.write "rabbit", @white_rabbit, :raw => true
+    @store.read("rabbit", :raw => true).must_equal(%(#<OpenStruct color=\"white\">))
   end
 
   it "deletes data" do
-    with_store_management do |store|
-      store.delete "rabbit"
-      store.read("rabbit").must_be_nil
-    end
+    @store.delete "rabbit"
+    @store.read("rabbit").must_be_nil
   end
 
   it "deletes matched data" do
-    with_store_management do |store|
-      store.delete_matched "rabb*"
-      store.read("rabbit").must_be_nil
-    end
+    @store.delete_matched "rabb*"
+    @store.read("rabbit").must_be_nil
   end
 
   it "verifies existence of an object in the store" do
-    with_store_management do |store|
-      store.exist?("rabbit").must_equal(true)
-      store.exist?("rab-a-dub").must_equal(false)
-    end
+    @store.exist?("rabbit").must_equal(true)
+    @store.exist?("rab-a-dub").must_equal(false)
   end
 
   it "increments a key" do
-    with_store_management do |store|
-      3.times { store.increment "counter" }
-      store.read("counter", :raw => true).to_i.must_equal(3)
-    end
+    3.times { @store.increment "counter" }
+    @store.read("counter", :raw => true).to_i.must_equal(3)
   end
 
   it "decrements a key" do
-    with_store_management do |store|
-      3.times { store.increment "counter" }
-      2.times { store.decrement "counter" }
-      store.read("counter", :raw => true).to_i.must_equal(1)
-    end
+    3.times { @store.increment "counter" }
+    2.times { @store.decrement "counter" }
+    @store.read("counter", :raw => true).to_i.must_equal(1)
   end
 
   it "increments a raw key" do
-    with_store_management do |store|
-      assert store.write("raw-counter", 1, :raw => true)
-      store.increment("raw-counter", 2)
-      store.read("raw-counter", :raw => true).to_i.must_equal(3)
-    end
+    assert @store.write("raw-counter", 1, :raw => true)
+    @store.increment("raw-counter", 2)
+    @store.read("raw-counter", :raw => true).to_i.must_equal(3)
   end
 
   it "decrements a raw key" do
-    with_store_management do |store|
-      assert store.write("raw-counter", 3, :raw => true)
-      store.decrement("raw-counter", 2)
-      store.read("raw-counter", :raw => true).to_i.must_equal(1)
-    end
+    assert @store.write("raw-counter", 3, :raw => true)
+    @store.decrement("raw-counter", 2)
+    @store.read("raw-counter", :raw => true).to_i.must_equal(1)
   end
 
   it "increments a key by given value" do
-    with_store_management do |store|
-      store.increment "counter", 3
-      store.read("counter", :raw => true).to_i.must_equal(3)
-    end
+    @store.increment "counter", 3
+    @store.read("counter", :raw => true).to_i.must_equal(3)
   end
 
   it "decrements a key by given value" do
-    with_store_management do |store|
-      3.times { store.increment "counter" }
-      store.decrement "counter", 2
-      store.read("counter", :raw => true).to_i.must_equal(1)
-    end
+    3.times { @store.increment "counter" }
+    @store.decrement "counter", 2
+    @store.read("counter", :raw => true).to_i.must_equal(1)
   end
 
   it "clears the store" do
-    with_store_management do |store|
-      store.clear
-      store.instance_variable_get(:@data).keys("*").flatten.must_be_empty
-    end
+    @store.clear
+    @store.instance_variable_get(:@data).keys("*").flatten.must_be_empty
   end
 
   it "provides store stats" do
-    with_store_management do |store|
-      store.stats.wont_be_empty
-    end
+    @store.stats.wont_be_empty
   end
 
   it "fetches data" do
-    with_store_management do |store|
-      store.fetch("rabbit").must_equal(@rabbit)
-      store.fetch("rub-a-dub").must_be_nil
-      store.fetch("rub-a-dub") { "Flora de Cana" }
-      store.fetch("rub-a-dub").must_equal("Flora de Cana")
-      store.fetch("rabbit", :force => true) # force cache miss
-      store.fetch("rabbit", :force => true, :expires_in => 1.second) { @white_rabbit }
-      # store.fetch("rabbit").must_equal(@white_rabbit)
-      sleep 2
-      store.fetch("rabbit").must_be_nil
-    end
+    @store.fetch("rabbit").must_equal(@rabbit)
+    @store.fetch("rub-a-dub").must_be_nil
+    @store.fetch("rub-a-dub") { "Flora de Cana" }
+    @store.fetch("rub-a-dub").must_equal("Flora de Cana")
+    @store.fetch("rabbit", :force => true) # force cache miss
+    @store.fetch("rabbit", :force => true, :expires_in => 1.second) { @white_rabbit }
+    # store.fetch("rabbit").must_equal(@white_rabbit)
+    sleep 2
+    @store.fetch("rabbit").must_be_nil
   end
 
   it "reads multiple keys" do
@@ -284,7 +225,7 @@ describe ActiveSupport::Cache::RedisStore do
       decrement.payload.must_equal({ :key => 'placebo', :amount => 1 })
     end
 
-    # it "notifies on cleanup" # TODO implement in ActiveSupport::Cache::RedisStore
+    # it "notifies on cleanup" # TODO implement in ActiveSupport::Cache::FaultTolerantRedisStore
 
     it "should notify on clear" do
       with_notifications do
@@ -299,22 +240,17 @@ describe ActiveSupport::Cache::RedisStore do
 
   private
     def instantiate_store(addresses = nil)
-      ActiveSupport::Cache::RedisStore.new(addresses).instance_variable_get(:@data)
-    end
-
-    def with_store_management
-      yield @store
-      yield @dstore
+      ActiveSupport::Cache::FaultTolerantRedisStore.new(addresses).instance_variable_get(:@data)
     end
 
     def with_notifications
       @events = [ ]
-      ActiveSupport::Cache::RedisStore.instrument = true
+      ActiveSupport::Cache::FaultTolerantRedisStore.instrument = true
       ActiveSupport::Notifications.subscribe(/^cache_(.*)\.active_support$/) do |*args|
         @events << ActiveSupport::Notifications::Event.new(*args)
       end
       yield
-      ActiveSupport::Cache::RedisStore.instrument = false
+      ActiveSupport::Cache::FaultTolerantRedisStore.instrument = false
     end
 end
 

data/test/redis/activesupport/version_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative '../../test_helper'
 
 describe Redis::ActiveSupport::VERSION do
   it 'returns current version' do

data/test/test_helper.rb

@@ -2,5 +2,5 @@ require 'bundler/setup'
 require 'minitest/autorun'
 require 'mocha/setup'
 require 'active_support'
-require 'active_support/cache/redis_store'
+require 'active_support/cache/fault_tolerant_redis_store'
 

data/wercker.yml

@@ -0,0 +1,33 @@
+      # This references the default Ruby container from
+# the Docker Hub.
+# https://registry.hub.docker.com/_/ruby/
+# If you want to use a specific version you would use a tag:
+# ruby:2.2.2
+box: ruby:2.2.3
+# You can also use services such as databases. Read more on our dev center:
+# http://devcenter.wercker.com/docs/services/index.html
+services:
+  - id: redis
+    # - postgres
+    # http://devcenter.wercker.com/docs/services/postgresql.html
+
+    # - mongodb
+    # http://devcenter.wercker.com/docs/services/mongodb.html
+
+# This is the build pipeline. Pipelines are the core of wercker
+# Read more about pipelines on our dev center
+# http://devcenter.wercker.com/docs/pipelines/index.html
+build:
+    # Steps make up the actions in your pipeline
+    # Read more about steps on our dev center:
+    # http://devcenter.wercker.com/docs/steps/index.html
+    steps:
+        - bundle-install
+
+        - script:
+          name: Export Redis url
+          code: export REDIS_URL="redis://$REDIS_PORT_6379_TCP_ADDR:6379"
+
+        - script:
+            name: Run tests
+            code: bundle exec rake test

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fault_tolerant_redis-activesupport
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Luca Guidi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-store
@@ -31,28 +31,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: maybe_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +109,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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'
 - !ruby/object:Gem::Dependency
   name: redis-store-testing
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +147,8 @@ extra_rdoc_files: []
 files:
 - ".env"
 - ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - MIT-LICENSE
@@ -145,6 +161,7 @@ files:
 - test/active_support/cache/redis_store_test.rb
 - test/redis/activesupport/version_test.rb
 - test/test_helper.rb
+- wercker.yml
 homepage: https://github.com/renra/redis-activesupport
 licenses:
 - MIT