prefixed_cache_store 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 921749f49838a742e100da56d3db616b8d3688fd
-  data.tar.gz: d1c158cd682accd7d97c0efef882e86f97d6677f
+  metadata.gz: 75ce3177b627611fb2c9bf28bacd5c7295bbe185
+  data.tar.gz: 6b2a16815c93bd3ecde18e63b58e5ced7104f6e9
 SHA512:
-  metadata.gz: 30ea1dd82faae352b59baa623ba331dc88c9cb53161c6761fee08db5e1e3e03a1796901720d622113dbee64dd08b8781ac1ae5ec1f43d2502bb4fb199cf215a4
-  data.tar.gz: 45f86b016de49a758f391732cd8bdac77ceca80dcfb596267dcbf8a7b7b139590a8012bec04d01fe67c1a8481dd11153fcb3cc1f752f5618a5d6bfa701ab4295
+  metadata.gz: 5153923a7290b7ea8c1f11def5d84fb5baa990ecb692022e4d327bd1f7c42511cd54fcf56971fc99070af33e3773295f8b3c24b311feab28ec490f5ab6f086bb
+  data.tar.gz: 42865aede50bb7d86905b5db6cecb7cf126309b197edc5bfd887a7b06f443dfbea9cb2c95ae76a506916c4bef94680d11c684f46a8e5c8949a4c3fdb0bce0e53

data/.travis.yml

@@ -1,7 +1,9 @@
+gemfile:
+  - gemfiles/Gemfile.rails3
+  - gemfiles/Gemfile.rails4
 rvm:
-  - 1.9.2
-  - 1.9.3
   - 2.0.0
   - 2.1.1
   - 2.1.2
-cache: bundler
+cache: bundler
+sudo: false

data/Gemfile

@@ -1,10 +1,5 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "activesupport", "~> 4"
   gem 'rspec', '~> 3.1'

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Julik Tarkhanov
+Copyright (c) 2014 Julik Tarkhanov for WeTransfer
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,5 +1,7 @@
 ## prefixed_cache_store
  
+[![Build Status](https://travis-ci.org/WeTransfer/prefixed_cache_store.svg?branch=master)](https://travis-ci.org/WeTransfer/prefixed_cache_store)
+ 
 A cache wrapper for ActiveSupport that allows you to expire parts of your cache imperatively.
 
 Sometimes you need to selectively nuke parts of your cache. All cache stores for Rails support the `Store#clear()`
@@ -37,8 +39,8 @@ The gem has been extensively tested in production with Rails 3.x but should work
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-== Copyright
+## Copyright
 
-Copyright (c) 2014 Julik Tarkhanov. See LICENSE.txt for
+Copyright (c) 2014 WeTransfer. See LICENSE.txt for
 further details.
 

data/Rakefile

@@ -17,7 +17,7 @@ Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
   gem.version = PrefixedCacheStore::VERSION
   gem.name = "prefixed_cache_store"
-  gem.homepage = "http://github.com/julik/prefixed_cache_store"
+  gem.homepage = "http://github.com/WeTransfer/prefixed_cache_store"
   gem.license = "MIT"
   gem.summary = %Q{Namespaced versioned cache wrapper for ActiveSupport}
   gem.description = %Q{Allows you to expire parts of your cache separately}

data/gemfiles/Gemfile.rails3

@@ -0,0 +1,10 @@
+source "http://rubygems.org"
+gem 'activesupport', "~> 4"
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem 'rspec', '~> 3.1'
+  gem "bundler", "~> 1.0"
+  gem "jeweler", "~> 2.0.1"
+end

data/gemfiles/Gemfile.rails4

@@ -0,0 +1,12 @@
+source "http://rubygems.org"
+gem 'activesupport', "~> 3", '< 4'
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem 'sqlite3'
+  gem "rspec", "~> 2.4"
+  gem "rdoc", "~> 3.12"
+  gem "bundler", "~> 1.0"
+  gem "jeweler", "1.8.4" # The last without Nokogiri
+end

data/lib/prefixed_cache_store.rb

@@ -5,7 +5,7 @@ require 'forwardable'
 # for the namespace and the version number that can be ratched up to "unlink" all the related keys.
 # It assumes that the keys are being evicted automatically if they do not get used often.
 class PrefixedCacheStore
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
   
   RETAIN_PREFIX_FOR_SECONDS = 10
   
@@ -33,6 +33,10 @@ class PrefixedCacheStore
   end
   
   def fetch_multi(*names)
+    if !@store.respond_to?(:fetch_multi)
+      raise NoMethodError, "#{@store.inspect} does not support fetch_multi()"
+    end
+    
     options = names.extract_options!
     prefixed_keys = names.map{|e| prefix_key(e) }
     @store.fetch_multi(*prefixed_keys, options) do | prefixed_key |
@@ -70,12 +74,20 @@ class PrefixedCacheStore
   
   # Increment a cached value.
   def increment(name, amount = 1, options=nil)
-    @store.increment(prefix_key(name), amount, options)
+    if @store.method(:increment).parameters.length > 2
+      @store.increment(prefix_key(name), amount, options)
+    else
+      @store.increment(prefix_key(name), amount) # Toss the options
+    end
   end
 
   # Decrement a cached value.
   def decrement(name, amount = 1, options=nil)
-    @store.decrement(prefix_key(name), amount, options)
+    if @store.method(:decrement).parameters.length > 2
+      @store.decrement(prefix_key(name), amount, options)
+    else
+      @store.increment(prefix_key(name), amount) # Toss the options
+    end
   end
 
   # Bump the version prefix making all keys obsolete.

data/prefixed_cache_store.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: prefixed_cache_store 0.2.1 ruby lib
+# stub: prefixed_cache_store 0.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefixed_cache_store"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2014-10-30"
+  s.date = "2016-02-10"
   s.description = "Allows you to expire parts of your cache separately"
   s.email = "me@julik.nl"
   s.extra_rdoc_files = [
@@ -25,12 +25,14 @@ Gem::Specification.new do |s|
     "LICENSE.txt",
     "README.md",
     "Rakefile",
+    "gemfiles/Gemfile.rails3",
+    "gemfiles/Gemfile.rails4",
     "lib/prefixed_cache_store.rb",
     "prefixed_cache_store.gemspec",
     "spec/prefixed_cache_store_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = "http://github.com/julik/prefixed_cache_store"
+  s.homepage = "http://github.com/WeTransfer/prefixed_cache_store"
   s.licenses = ["MIT"]
   s.rubygems_version = "2.2.2"
   s.summary = "Namespaced versioned cache wrapper for ActiveSupport"

data/spec/prefixed_cache_store_spec.rb

@@ -95,27 +95,91 @@ describe PrefixedCacheStore do
     end
   end
   
-  describe 'fetch_multi' do
-    it 'performs a multi-fetch calling the backing store' do
+  describe 'increment' do
+    it 'increments the counter' do
+      some_store = ActiveSupport::Cache::MemoryStore.new
+      subject = described_class.new(some_store, 'pre')
+      
+      subject.increment("ctr")
+      subject.increment("ctr", 15)
+      subject.increment("ctr", 2, Hash.new)
+    end
+    
+    it 'increments the counter even if the underlying Store does not support the options argument  (like redis-activesupport)' do
+      # redis-activesupport does not support options{} for the last argument
       some_store = ActiveSupport::Cache::MemoryStore.new
+      class << some_store
+        def increment(counter_name, incr=1)
+        end
+      end
       
       subject = described_class.new(some_store, 'pre')
-      expect(subject.current_version_number).to eq(0)
       
-      results = subject.fetch_multi('record1', 'record2') do | key_to_fetch |
-        "This is #{key_to_fetch}"
+      subject.increment("ctr")
+      subject.increment("ctr", 15)
+      subject.increment("ctr", 2, Hash.new)
+    end
+  end
+  
+  describe 'decrement' do
+    it 'decrement the counter' do
+      some_store = ActiveSupport::Cache::MemoryStore.new
+      subject = described_class.new(some_store, 'pre')
+      
+      subject.decrement("ctr")
+      subject.decrement("ctr", 15)
+      subject.decrement("ctr", 2, Hash.new)
+    end
+    
+    it 'decrement the counter even if the underlying Store does not support the options argument (like redis-activesupport)' do
+      some_store = ActiveSupport::Cache::MemoryStore.new
+      class << some_store
+        def decrement(counter_name, incr=1)
+        end
       end
       
-      expect(results).to eq(["This is record1", "This is record2"])
+      subject = described_class.new(some_store, 'pre')
       
-      results_from_cache = subject.fetch_multi('record1', 'record2') do | key_to_fetch |
-        raise "Should not be called"
+      subject.decrement("ctr")
+      subject.decrement("ctr", 15)
+      subject.decrement("ctr", 2, Hash.new)
+    end
+  end
+  
+  describe 'fetch_multi' do
+    if ActiveSupport::VERSION::MAJOR < 4
+      it 'raises a NoMethodError' do
+        some_store = ActiveSupport::Cache::MemoryStore.new
+        subject = described_class.new(some_store, 'pre')
+        
+        expect {
+          subject.fetch_multi('key1, key2')
+        }.to raise_error(NoMethodError, /does not support/)
       end
-      expect(results_from_cache).to eq(["This is record1", "This is record2"])
+    end
+    
+    if ActiveSupport::VERSION::MAJOR > 3
+      it 'Rails 4 - performs a multi-fetch calling the backing store' do
+        some_store = ActiveSupport::Cache::MemoryStore.new
       
-      expect(some_store.read("pre-version")).to eq(0)
-      expect(some_store.read("pre-0-record1")).to eq('This is record1')
-      expect(some_store.read("pre-0-record2")).to eq('This is record2')
+        subject = described_class.new(some_store, 'pre')
+        expect(subject.current_version_number).to eq(0)
+      
+        results = subject.fetch_multi('record1', 'record2') do | key_to_fetch |
+          "This is #{key_to_fetch}"
+        end
+      
+        expect(results).to eq({"pre-0-record1"=>"This is record1", "pre-0-record2"=>"This is record2"})
+      
+        results_from_cache = subject.fetch_multi('record1', 'record2') do | key_to_fetch |
+          raise "Should not be called"
+        end
+        expect(results_from_cache).to eq({"pre-0-record1"=>"This is record1", "pre-0-record2"=>"This is record2"})
+      
+        expect(some_store.read("pre-version")).to eq(0)
+        expect(some_store.read("pre-0-record1")).to eq('This is record1')
+        expect(some_store.read("pre-0-record2")).to eq('This is record2')
+      end
     end
   end
   

data/spec/spec_helper.rb

@@ -1,19 +1,3 @@
-require 'simplecov'
-
-module SimpleCov::Configuration
-  def clean_filters
-    @filters = []
-  end
-end
-
-SimpleCov.configure do
-  clean_filters
-  load_profile 'test_frameworks'
-end
-
-ENV["COVERAGE"] && SimpleCov.start do
-  add_filter "/.rvm/"
-end
 require 'rubygems'
 require 'bundler'
 begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefixed_cache_store
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,11 +94,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/Gemfile.rails3
+- gemfiles/Gemfile.rails4
 - lib/prefixed_cache_store.rb
 - prefixed_cache_store.gemspec
 - spec/prefixed_cache_store_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/julik/prefixed_cache_store
+homepage: http://github.com/WeTransfer/prefixed_cache_store
 licenses:
 - MIT
 metadata: {}