taggable_cache 0.4.0 → 0.4.1

data/.travis.yml

@@ -1,9 +1,16 @@
 language: ruby
 bundler_args: --without development
-before_install: 
-  - gem install bundler --pre
 rvm:
   - 1.9.3
 gemfile:
   - gemfiles/Gemfile-rails.3.1.x
   - gemfiles/Gemfile-rails.3.2.x
+env:
+  - CACHE_STORE=redis
+  - CACHE_STORE=memcached
+  - CACHE_STORE=file_store
+matrix:
+  exclude:
+    - rvm: 1.9.3
+      gemfile: gemfiles/Gemfile-rails.3.1.x
+      env: CACHE_STORE=redis

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+= Taggable cache 0.4.1
+
+- Fixed support for redis cache store with rails 3.2
+
 = Taggable cache 0.4.0
 
 - Rewriten rails integration
 - Added README
 - Fix warnings
-- Redis configuration variables can be set by environment variables
+- Redis configuration variables can be set by environment variables

data/Gemfile

@@ -1,17 +1,12 @@
-source :rubygems
+filename = File.expand_path(File.dirname(__FILE__)+"/gemfiles/Gemfile.shared")
+eval(IO.read(filename), binding)
 
 gemspec
 
+gem 'rails', '~> 3.2.0'
+gem 'redis-rails', '~>3.2.3'
+
 group :development do
   gem 'pry'
   gem 'pry-nav'
-end
-
-gem 'rake'
-gem 'rspec-rails', :require => false
-gem 'rspec'
-gem 'capybara'
-gem 'combustion'
-gem 'sqlite3'
-
-gem 'rails', '~> 3.2.0'
+end

data/gemfiles/Gemfile-rails.3.1.x

@@ -1,13 +1,7 @@
-source :rubygems
+filename = File.expand_path(File.dirname(__FILE__)+"/Gemfile.shared")
+eval(IO.read(filename), binding)
 
 gem 'taggable_cache', :path => '..'
 
-gem 'rake'
-gem 'rspec-rails', :require => false
-gem 'rspec'
-gem 'capybara'
-gem 'combustion'
-gem 'sqlite3'
-
-
-gem 'rails', '~> 3.1.0'
+gem 'rails', '~> 3.1.0'
+gem 'redis-store', '~>1.1.0'

data/gemfiles/Gemfile-rails.3.2.x

@@ -1,13 +1,7 @@
-source :rubygems
+filename = File.expand_path(File.dirname(__FILE__)+"/Gemfile.shared")
+eval(IO.read(filename), binding)
 
 gem 'taggable_cache', :path => '..'
 
-gem 'rake'
-gem 'rspec-rails', :require => false
-gem 'rspec'
-gem 'capybara'
-gem 'combustion'
-gem 'sqlite3'
-
-
-gem 'rails', '~> 3.2.0'
+gem 'rails', '~> 3.2.0'
+gem 'redis-rails', '~>3.2.3'

data/gemfiles/Gemfile.shared

@@ -0,0 +1,10 @@
+source :rubygems
+
+gem 'rake'
+gem 'rspec-rails', :require => false
+gem 'rspec'
+gem 'capybara'
+gem 'combustion'
+gem 'sqlite3'
+
+gem 'memcache-client'

data/lib/taggable_cache/extensions.rb

@@ -6,17 +6,17 @@ module TaggableCache
         def taggable
           @taggable ||= ::TaggableCache::Store.new
         end
-
-        alias_method :original_write, :write
-
-        def write(name, value, options = nil)
+        
+        def write_with_taggable(name, value, options = nil)
           if !options.nil? && options.has_key?(:depends_on) 
             add_tags(name, *options[:depends_on])
           end
 
-          original_write(name, value, options)
+          write_without_taggable(name, value, options)
         end
 
+        alias_method_chain :write, :taggable
+
         def add_tags(key, *params)
           taggable.add(key, *params)
         end

data/lib/taggable_cache/railtie.rb

@@ -5,8 +5,10 @@ module TaggableCache
     initializer "taggable_cache" do |app|
       ActiveSupport.on_load(:active_record) do
         ::ActiveRecord::Base.send :include, TaggableCache::ActiveRecordExtension
-        ::ActiveSupport::Cache::Store.send :include, TaggableCache::CacheStoreExtension
         ::ActionController::Base.send :include, TaggableCache::ActionControllerExtension        
+
+        ::ActiveSupport::Cache::Store.send :include, TaggableCache::CacheStoreExtension
+        ::ActiveSupport::Cache::RedisStore.send :include, TaggableCache::CacheStoreExtension if defined? ::ActiveSupport::Cache::RedisStore
       end
     end
   end  

data/lib/taggable_cache/version.rb

@@ -1,3 +1,3 @@
 module TaggableCache
-  VERSION = "0.4.0" # This is for the gem and does not conflict with the rest of the functionality
+  VERSION = "0.4.1" # This is for the gem and does not conflict with the rest of the functionality
 end

data/spec/integration/rails_cache_spec.rb

@@ -20,7 +20,42 @@ describe 'TaggableCache::Rails::Cache' do
     it "does simple writes" do
       Rails.cache.write 'ipsum', 'lorem'
       Rails.cache.read('ipsum').should == 'lorem'
-    end    
+    end
+  end
+
+  describe "Rails.cache.fetch integration" do
+    it "adds key to store" do
+      Rails.cache.fetch('fetch_key', :depends_on => @page_object) do
+        'value1'
+      end
+
+      @object.get(@page_object).should == ['fetch_key']
+    end
+
+    it "does simple expires" do
+      Rails.cache.fetch 'ftch_ipsum', :depends_on => @page_object do 
+        'lorem ipsum'
+      end
+
+      Rails.cache.read('ftch_ipsum').should == 'lorem ipsum'
+
+      @page_object.name = 'dfgsdgsdfgsdfg'
+      @page_object.save!
+
+      Rails.cache.read('ftch_ipsum').should be_nil
+    end
+
+    it "does class expires" do
+      Rails.cache.fetch 'ftch_ipsum2', :depends_on => Page do 
+        'lorem ipsum di'
+      end
+
+      Rails.cache.read('ftch_ipsum2').should == 'lorem ipsum di'
+
+      @page_object.save!
+
+      Rails.cache.read('ftch_ipsum2').should be_nil
+    end
   end
 
   describe "Activerecord integration" do    

data/spec/spec_helper.rb

@@ -4,6 +4,16 @@ Bundler.require :default, :development
 
 require 'capybara/rspec'
 
+class Combustion::Application
+  case ENV['CACHE_STORE']
+  when 'redis'
+    config.cache_store = :redis_store
+  when 'memcached'
+    config.cache_store = :mem_cache_store
+  when 'file_store'
+  end
+end
+
 Combustion.initialize!
 
 require 'rspec/rails'

data/taggable-cache.gemspec

@@ -32,6 +32,6 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<railties>, [">= 3.1.0"])
   s.add_dependency(%q<actionpack>, [">= 3.1.0"])
   s.add_dependency(%q<activerecord>, [">= 3.1.0"])
-  s.add_dependency(%q<redis>, [">= 2.2.2"])
+  s.add_dependency(%q<redis>, [">= 2.2.0"])
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taggable_cache
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &77251570 !ruby/object:Gem::Requirement
+  requirement: &76511480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *77251570
+  version_requirements: *76511480
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &77251040 !ruby/object:Gem::Requirement
+  requirement: &76535640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *77251040
+  version_requirements: *76535640
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &77250480 !ruby/object:Gem::Requirement
+  requirement: &76533890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,18 +43,18 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *77250480
+  version_requirements: *76533890
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &77249530 !ruby/object:Gem::Requirement
+  requirement: &76532140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *77249530
+  version_requirements: *76532140
 description: This gem simplifies cache expiration in rails
 email: brain-geek@yandex.ua
 executables: []
@@ -72,6 +72,7 @@ files:
 - Rakefile
 - gemfiles/Gemfile-rails.3.1.x
 - gemfiles/Gemfile-rails.3.2.x
+- gemfiles/Gemfile.shared
 - lib/taggable_cache.rb
 - lib/taggable_cache/extensions.rb
 - lib/taggable_cache/railtie.rb
@@ -106,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1067828559
+      hash: 648391631
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1067828559
+      hash: 648391631
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10