cashier 0.4.0 → 0.4.1

data/.gitignore

@@ -1,3 +1,9 @@
+spec/dummy/log
 spec/dummy/tmp/pids
 spec/dummy/tmp/cache
 Gemfile.lock
+.rvmrc
+coverage*
+.tags
+.tags_sorted_by_file
+.rspec

data/README.md

@@ -29,10 +29,22 @@ caches_action :tag => proc {|c|
   "users/#{c.current_user.id}/dashboard"      
 }
 
-# in your sweeper, in your observers, in your resque jobs...wherever
+# in your sweeper, in your observers, in your Resque jobs...wherever
 Cashier.expire 'complicated-action'
 Cashier.expire 'tag1', 'tag2', 'tag3', 'tag4'
 
+# It integrates smoothly with Rails.cache as well, not just the views
+Rails.cache.fetch("user_1", :tag => ["users"]) { User.find(1) }
+Rails.cache.fetch("user_2", :tag => ["users"]) { User.find(2) }
+Rails.cache.fetch("user_3", :tag => ["users"]) { User.find(3) }
+Rails.cache.fetch("admins", :tag => ["users"]) { User.where(role: "Admin").all }
+
+# You can then expire all your users 
+Cashier.expire "users"
+
+# You can also use Rails.cache.write
+Rails.cache.write("foo", "bar", :tag => ["some_tag"])
+
 # what's cached
 Cashier.tags
 
@@ -77,19 +89,19 @@ Cashier has 2 adapters for the tags storing, `:cache_store` or `:redis_store`.
 
 #### Setting an adapter for working with the cache as the tags storage
 
-`config/initializers/cashier.rb`
-
 ```ruby
-Cachier.adapter = :cache_store
+# config/environment/production.rb
+
+config.cashier.adapter = :cache_store 
+# or config.cashier.adapter = :redis_store
 ```
 
 #### Setting an adapter for working with Redis as the tags storage
 
-`config/initializers/cashier.rb`
 
 ```ruby
-Cashier.adapter = :redis_store
-Cashier.adapter.redis = Redis.new(:host => '127.0.0.1', :port => '3697')
+# config/environment/production.rb
+config.cashier.adapter.redis = Redis.new(:host => '127.0.0.1', :port => '3697') # or Resque.redis or any existing redis connection
 ```
 
 ### Why Redis?
@@ -118,54 +130,54 @@ Benchmark.measure do
   end
 end
 ```
-
 Using the Redis adapter, the same piece of code takes 0.8 seconds, quite the difference :)
 
-## Testing
 
-Use can use cashier to test caching as well. First things first:
+### Notifications
 
-```ruby
-# test.rb
+Cashier will send out events when things happen inside the library.
+The events are sent out through `ActiveSupport::Notifications` so you can pretty much subscribe to the events from anywhere you want.
 
-config.application_controller.perform_caching = true
-```
-
-I've also included some Rspec Matchers and a cucumber helper for testing
-caching. The rspec matchers can be used like this:
+Here are the way you can subscribe to the events and use the data from them.
 
 ```ruby
-describe "get index" do
-  include Cashier::Matchers
-
-  it "should cache the action" do
-    get :index
-    'some-tag'.should be_cached
-  end
-end
+	# Subscribe to the store fragment event, this is fired every time cashier will call the "store_fragment" method
+	# payload[:data] will be something like this: ["key", ["tag1", "tag2", "tag3"]]
+	ActiveSupport::Notifications.subscribe("store_fragment.cashier") do |name, start, finish, id, payload|
+				
+	end
+	
+	# Subscribe to the clear event. (no data)
+	ActiveSupport::Notifications.subscribe("clear.cashier") do |name, start, finish, id, payload|
+				
+	end	
+	
+	# Subscribe to the delete_cache_key event
+	# this event will fire every time there's a Rails.cache.delete with the key
+	# payload[:data] will be the key name that's been deleted from the cache
+	ActiveSupport::Notifications.subscribe("delete_cache_key.cashier") do |name, start, finish, id, payload|
+				
+	end	
+
+	# Subscribe to the o_write_cache_key event
+	# this event will fire every time there's a Rails.cache.write with the key
+	# payload[:data] will be the key name that's been written to the cache
+	ActiveSupport::Notifications.subscribe("write_cache_key.cashier") do |name, start, finish, id, payload|
+				
+	end		
 ```
 
-Testing w/cucumber is more involved.
-
-```ruby
-# features/support/cashier.rb
-require 'cashier/cucumber'
-```
+### Notifications use case
+At [Gogobot](http://www.gogobot.com) we have a plugin to invalidate the external CDN cache on full pages for logged out users.
+The usage is pretty unlimited.
 
-is an example of a possible step
-
-```ruby
-Then /the dashboard should be cached/ do
-  "dashboard".should be_cached
-end
-```
-Including `cashier/cucumber` will also wipe the cache before every
-scenario.
+If you think we're missing a notification, please do open an issue or be awesome and do it yourself and open a pull request.
 
 ## Contributors
 
-* [adman65](http://twitter.com/adman65) - Initial Implementation
+* [twinturbo](http://twitter.com/adman65) - Initial Implementation
 * [KensoDev](http://twitter.com/kensodev) - Adding Redis support (Again \o/)
+* [KensoDev](http://twitter.com/kensodev) - Adding plugins support for callback methods
 
 ## Contributing to Cashier
  

data/lib/cashier.rb

@@ -1,132 +1,152 @@
 module Cashier
-  extend self
 
   CACHE_KEY = 'cashier-tags'
 
-  def adapter
-    if @@adapter == :cache_store
-      Cashier::Adapters::CacheStore
-    else
-      Cashier::Adapters::RedisStore
+  class << self
+
+    # Public: whether the module will perform caching or not. this is being set in the application layer .perform_caching configuration
+    #
+    # Examples
+    #
+    #   Cashier.perform_caching?
+    #   # => true
+    #
+    def perform_caching?
+      ::ApplicationController.perform_caching
     end
-  end
-
-  # Public: set the adapter the Cashier module will use to store the keys
-  #
-  # cache_adapter - :cache_store / :redis_store
-  #
-  # Examples
-  #
-  #   Cashier.adapter = :redis_store
-  #
-  def adapter=(cache_adapter)
-    @@adapter = cache_adapter
-  end
 
-  # Public: whether the module will perform caching or not. this is being set in the application layer .perform_caching configuration
-  #
-  # Examples
-  #
-  #   Cashier.perform_caching?
-  #   # => true
-  #
-  def perform_caching?
-    ::ApplicationController.perform_caching
-  end
-
-  # Public: store a fragment with an array of tags for this fragment.
-  #
-  # fragment - cached fragment.
-  # tags - array of tags you want to assign this fragments.
-  #
-  # Examples
-  #
-  #   Cachier.store_fragment('foo', 'tag1', 'tag2', 'tag3')
-  #
-  def store_fragment(fragment, *tags)
-    return unless perform_caching?
-
-    tags.each do |tag|
-      # store the fragment
-      adapter.store_fragment_in_tag(fragment, tag)
+    # Public: store a fragment with an array of tags for this fragment.
+    #
+    # fragment - cached fragment.
+    # tags - array of tags you want to assign this fragments.
+    #
+    # Examples
+    #
+    #   Cachier.store_fragment('foo', 'tag1', 'tag2', 'tag3')
+    #
+    def store_fragment(fragment, *tags)
+      return unless perform_caching?
+
+      tags = tags.flatten
+
+      ActiveSupport::Notifications.instrument("store_fragment.cashier", :data => [fragment, tags]) do
+        tags.each do |tag|
+          # store the fragment
+          adapter.store_fragment_in_tag(fragment, tag)
+        end
+
+         # now store the tag for book keeping
+        adapter.store_tags(tags)
+      end
     end
 
-     # now store the tag for book keeping
-    adapter.store_tags(tags)
-  end
-
-  # Public: expire tags. expiring the keys 'assigned' to the tags you expire and removes the tags from the tags list
-  # 
-  # tags - array of tags to expire.
-  # 
-  # Examples
-  #
-  #   Cashier.expire('tag1', 'tag2')
-  # 
-  def expire(*tags)
-    return unless perform_caching?
-
-    # delete them from the cache
-    tags.each do |tag|
-      fragment_keys = adapter.get_fragments_for_tag(tag)
-      
-      fragment_keys.each do |fragment_key|
-        Rails.cache.delete(fragment_key)
+    # Public: expire tags. expiring the keys 'assigned' to the tags you expire and removes the tags from the tags list
+    # 
+    # tags - array of tags to expire.
+    # 
+    # Examples
+    #
+    #   Cashier.expire('tag1', 'tag2')
+    # 
+    def expire(*tags)
+      return unless perform_caching?
+
+      ActiveSupport::Notifications.instrument("expire.cashier", :data => tags) do
+        # delete them from the cache
+        tags.each do |tag|
+          fragment_keys = adapter.get_fragments_for_tag(tag)
+
+          fragment_keys.each do |fragment_key|
+            Rails.cache.delete(fragment_key)
+          end
+
+          adapter.delete_tag(tag)
+        end
+
+        # now remove them from the list
+        # of stored tags
+        adapter.remove_tags(tags)
       end
+    end
 
-      adapter.delete_tag(tag)
+    # Public: returns the array of tags stored in the tags store.
+    #
+    #
+    # Examples
+    #
+    #   Cashier.tags
+    #   # => ['tag1', 'tag2']
+    #
+    def tags
+      adapter.tags
     end
 
-    # now remove them from the list
-    # of stored tags
-    adapter.remove_tags(tags)
-  end
+    # Public: clears the tags.
+    #
+    #
+    # Examples
+    #
+    #   Cashier.clear
+    #
+    def clear
+      ActiveSupport::Notifications.instrument("clear.cashier") do
+        adapter.clear
+      end
+    end
 
-  # Public: returns the array of tags stored in the tags store.
-  #
-  #
-  # Examples
-  #
-  #   Cashier.tags
-  #   # => ['tag1', 'tag2']
-  #
-  def tags
-    adapter.tags
-  end
+    # Public: get all the keys names as an array.
+    #
+    #
+    # Examples
+    #
+    #   Cachier.keys
+    #   # => ['key1', 'key2', 'key3']
+    #
+    def keys
+      adapter.keys
+    end
 
-  # Public: clears the tags.
-  #
-  #
-  # Examples
-  #
-  #   Cashier.clear
-  #
-  def clear
-    adapter.clear
-  end
+    # Public: get all the keys for a specific tag as an array.
+    #
+    #
+    # Examples
+    #
+    #   Cashier.tags_for('tag1')
+    #   # => ['key1', 'key2', 'key3']
+    #
+    def keys_for(tag)
+      adapter.get_fragments_for_tag(tag)
+    end
 
-  # Public: get all the keys names as an array.
-  #
-  #
-  # Examples
-  #
-  #   Cachier.keys
-  #   # => ['key1', 'key2', 'key3']
-  #
-  def keys
-    adapter.keys
-  end
+    # Public: adapter which is used by cashier.
+    #
+    # Examples
+    #
+    #   Cashier.adapter
+    #   # => Cashier::Adapters::CacheStore
+    # 
+    #   Cashier.adapter
+    #   # => Cashier::Adapters::RedisStore
+    #
+    def adapter
+      if @@adapter == :cache_store
+        Cashier::Adapters::CacheStore
+      else
+        Cashier::Adapters::RedisStore
+      end
+    end
 
-  # Public: get all the keys for a specific tag as an array.
-  #
-  #
-  # Examples
-  #
-  #   Cashier.tags_for('tag1')
-  #   # => ['key1', 'key2', 'key3']
-  #
-  def keys_for(tag)
-    adapter.get_fragments_for_tag(tag)
+    # Public: set the adapter the Cashier module will use to store the keys
+    #
+    # cache_adapter - :cache_store / :redis_store
+    #
+    # Examples
+    #
+    #   Cashier.adapter = :redis_store
+    #
+    def adapter=(cache_adapter)
+      @@adapter = cache_adapter
+    end
   end
 end
 
@@ -134,3 +154,9 @@ require 'rails'
 require 'cashier/railtie'
 require 'cashier/adapters/cache_store'
 require 'cashier/adapters/redis_store'
+
+# Connect cashier up to the low level Rails cache.
+ActiveSupport::Notifications.subscribe("cache_write.active_support") do |*args|
+  payload = ActiveSupport::Notifications::Event.new(*args).payload
+  Cashier.store_fragment payload[:key], payload[:tag] if payload[:tag]
+end

data/lib/cashier/adapters/cache_store.rb

@@ -42,4 +42,4 @@ module Cashier
       end
     end
   end
-end
+end

data/lib/cashier/railtie.rb

@@ -1,9 +1,9 @@
 module Cashier
-  class Railtie < Rails::Railtie
-    initializer 'cashier.initialize' do
-      ActiveSupport.on_load(:action_controller) do
-        require 'cashier/application_controller'
-      end
+  class Railtie < ::Rails::Railtie
+    config.cashier = Cashier
+
+    initializer "cashier.active_support.cache.instrumentation" do |app|
+      ActiveSupport::Cache::Store.instrument = true
     end
   end
-end
+end

data/lib/cashier/version.rb

@@ -1,3 +1,3 @@
 module Cashier
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/integration/rails_cache_integration_spec.rb

@@ -0,0 +1,38 @@
+require "spec_helper"
+
+describe "Rails cache integration" do
+  subject { Rails.cache }
+  let(:cashier) { Cashier }
+
+  it "should ensure that cache operations are instrumented" do
+    ActiveSupport::Cache::Store.instrument.should be_true
+  end
+
+  context "write" do
+    it "should write to cashier when I call Rails.cache.write with tags" do
+      cashier.should_receive(:store_fragment).with("foo", ["some_tag"])
+      subject.write("foo", "bar", :tag => ["some_tag"])
+    end
+
+    it "shuld not write to cashier when I call Rails.cache.write without tags" do
+      cashier.should_not_receive(:store_fragment)
+      subject.write("foo", "bar")
+    end
+
+    it "should not fail when I don't pass in any options" do
+      expect { subject.write("foo", "bar", nil) }.to_not raise_error
+    end
+  end
+
+  context "fetch" do
+    it "should write to cashier when I call Rails.cache.fetch with tags" do
+      cashier.should_receive(:store_fragment).with("foo", ["some_tag"])
+      subject.fetch("foo", :tag => ["some_tag"]) { "bar" }
+    end
+
+    it "shuld not write to cashier when I call Rails.cache.fetch without tags" do
+      cashier.should_not_receive(:store_fragment)
+      subject.fetch("foo") { "bar" }
+    end
+  end
+end

data/spec/integration/rails_configuration_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "Rails configuration" do
+  it "should be configuration through rails" do
+    Rails.application.config.cashier.adapter = :redis_store
+
+    Cashier.adapter.should == Cashier::Adapters::RedisStore 
+  end
+end

data/spec/lib/{adapters → cashier/adapters}/cache_store_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Cashier::Adapters::CacheStore do
   subject { Cashier::Adapters::CacheStore }
   let(:cache) { Rails.cache }
-  
+
   it "should store the fragment in a tag" do
     subject.store_fragment_in_tag('fragment-key', 'dashboard')
     cache.fetch('dashboard').should eql(['fragment-key'])
@@ -62,7 +62,6 @@ describe Cashier::Adapters::CacheStore do
 
   context "keys" do
     it "should return the list of keys" do
-      
       subject.store_tags(['dashboard', 'settings', 'email'])
 
       subject.store_fragment_in_tag('key1', 'dashboard')
@@ -72,4 +71,4 @@ describe Cashier::Adapters::CacheStore do
       subject.keys.should eql(%w(key1 key2 key3))
     end
   end
-end
+end

data/spec/lib/cashier_spec.rb

@@ -1,112 +1,134 @@
 require 'spec_helper'
 
 describe "Cashier" do
-  context "Tags store adapters" do
-    subject { Cashier }
+  before(:each) do
+    Cashier.adapter = :cache_store
+  end
 
-    it "should allow me to set the keys adapter" do
-      subject.respond_to?(:adapter=).should be_true
-    end
+  subject { Cashier }
+
+  let(:adapter) { Cashier.adapter }
+
+  describe "#store_fragment" do
+    it "should write the tag to the cache" do
+      adapter.should_receive(:store_fragment_in_tag).with('fragment-key', 'dashboard')
+      adapter.should_receive(:store_tags).with(["dashboard"])
 
-    it "shold allow to get the adapter" do
-      subject.respond_to?(:adapter).should be_true
+      subject.store_fragment('fragment-key', 'dashboard')
     end
-  end
 
-  context "Cashier adapters communication through the interface" do
-    before(:each) do
-      Cashier.adapter = :cache_store
+    it "should flatten tags" do
+      adapter.should_receive(:store_fragment_in_tag).with('fragment-key', 'dashboard')
+      adapter.should_receive(:store_tags).with(["dashboard"])
+
+      subject.store_fragment('fragment-key', ['dashboard'])
     end
-    subject { Cashier }
-    let(:adapter) { Cashier.adapter }
 
-    describe "#store_fragment" do
-      it "should write the tag to the cache" do
-        adapter.should_receive(:store_fragment_in_tag).with('fragment-key', 'dashboard')
-        adapter.should_receive(:store_tags).with(["dashboard"])
+    it "should store the tag for book keeping" do
+      adapter.should_receive(:store_fragment_in_tag).with('fragment-key', 'dashboard')
+      adapter.should_receive(:store_fragment_in_tag).with('fragment-key', 'settings')
 
-        subject.store_fragment('fragment-key', 'dashboard')
-      end
+      adapter.should_receive(:store_tags).with(["dashboard", "settings"])
 
-      it "should store the tag for book keeping" do
-        adapter.should_receive(:store_fragment_in_tag).with('fragment-key', 'dashboard')
-        adapter.should_receive(:store_fragment_in_tag).with('fragment-key', 'settings')
+      subject.store_fragment('fragment-key', 'dashboard', 'settings')
+    end
+  end
 
-        adapter.should_receive(:store_tags).with(["dashboard", "settings"])
+  describe "Cashier notifications" do
+    let(:notification_system) { ActiveSupport::Notifications }
+
+    it "should raise a callback when I call store_fragment" do
+      notification_system.should_receive(:instrument).with("store_fragment.cashier", :data => ["foo", ["bar"]])
+      subject.store_fragment("foo", "bar")
+    end
 
-        subject.store_fragment('fragment-key', 'dashboard', 'settings')
-      end
+    it "should raise a callback method when I call clear" do
+      notification_system.should_receive(:instrument).with("clear.cashier")
+      subject.clear
     end
 
-    describe "#expire" do
-      before do
-        subject.store_fragment('fragment-key', 'dashboard')
-      end
+    it "should raise a callback method when I call expire" do
+      notification_system.should_receive(:instrument).with("expire.cashier", :data => ["some_tag"])
+      subject.expire("some_tag")
+    end
+  end
+
+  describe "#expire" do
+    before do
+      subject.store_fragment('fragment-key', 'dashboard')
+    end
 
-      it "should remove delete the fragment key" do
-        adapter.should_receive(:get_fragments_for_tag).with('dashboard').and_return(["fragment-key"])
-        adapter.should_receive(:delete_tag).with('dashboard')
-        adapter.should_receive(:remove_tags).with(['dashboard'])
+    it "should remove delete the fragment key" do
+      adapter.should_receive(:get_fragments_for_tag).with('dashboard').and_return(["fragment-key"])
+      adapter.should_receive(:delete_tag).with('dashboard')
+      adapter.should_receive(:remove_tags).with(['dashboard'])
 
-        subject.expire('dashboard')
-      end
+      subject.expire('dashboard')
+    end
 
-      it "should remove the tag" do 
-        adapter.should_receive(:get_fragments_for_tag).with('dashboard').and_return([])
-        adapter.should_receive(:delete_tag).with('dashboard')
-        adapter.should_receive(:remove_tags).with(['dashboard'])
+    it "should remove the tag" do 
+      adapter.should_receive(:get_fragments_for_tag).with('dashboard').and_return([])
+      adapter.should_receive(:delete_tag).with('dashboard')
+      adapter.should_receive(:remove_tags).with(['dashboard'])
 
-        subject.expire('dashboard')
-      end
+      subject.expire('dashboard')
+    end
 
-      it "should remove the tag from the list of tracked tags"  do
-        adapter.should_receive(:get_fragments_for_tag).with('dashboard').and_return(['fragment-key'])
-        adapter.should_receive(:delete_tag).with('dashboard')
+    it "should remove the tag from the list of tracked tags"  do
+      adapter.should_receive(:get_fragments_for_tag).with('dashboard').and_return(['fragment-key'])
+      adapter.should_receive(:delete_tag).with('dashboard')
 
-        subject.expire('dashboard')
-      end
+      subject.expire('dashboard')
     end
+  end
 
-    describe "#tags" do
-      it "should return a list of active tags" do
-        subject.store_fragment('key1', 'dashboard')
-        subject.store_fragment('key2', 'settings')
-        subject.store_fragment('key3', 'email')
+  describe "#tags" do
+    it "should return a list of active tags" do
+      subject.store_fragment('key1', 'dashboard')
+      subject.store_fragment('key2', 'settings')
+      subject.store_fragment('key3', 'email')
 
-        subject.tags.should eql(%w(dashboard settings email))
-      end
+      subject.tags.should eql(%w(dashboard settings email))
     end
+  end
 
-    describe '#clear' do
-      before(:each) do
-        subject.store_fragment('key1', 'dashboard')
-        subject.store_fragment('key2', 'settings')
-        subject.store_fragment('key3', 'email')
-      end
+  describe '#clear' do
+    before(:each) do
+      subject.store_fragment('key1', 'dashboard')
+      subject.store_fragment('key2', 'settings')
+      subject.store_fragment('key3', 'email')
+    end
 
-      it "should expire all tags" do
-        adapter.should_receive(:clear)
-        subject.clear
-      end
+    it "should expire all tags" do
+      adapter.should_receive(:clear)
+      subject.clear
+    end
 
-      it "should clear the list of tracked tags" do
-        subject.clear
-        adapter.tags.should == []
-      end
+    it "should clear the list of tracked tags" do
+      subject.clear
+      adapter.tags.should == []
     end
+  end
 
-    describe '#keys' do
-      it "should return an array of all the tracked keys" do
-        adapter.should_receive(:keys).and_return(%w(key1 key2 key3))
-        subject.keys.should eql(%w(key1 key2 key3))
-      end
+  describe '#keys' do
+    it "should return an array of all the tracked keys" do
+      adapter.should_receive(:keys).and_return(%w(key1 key2 key3))
+      subject.keys.should eql(%w(key1 key2 key3))
     end
+  end
 
-    describe '#keys_for' do
-      it "should return an array of all the keys for the tag" do
-        adapter.should_receive(:get_fragments_for_tag).with('dashboard').and_return(%w(key1 key2 key3))
-        subject.keys_for('dashboard').should eql(%w(key1 key2 key3))
-      end
+  describe '#keys_for' do
+    it "should return an array of all the keys for the tag" do
+      adapter.should_receive(:get_fragments_for_tag).with('dashboard').and_return(%w(key1 key2 key3))
+      subject.keys_for('dashboard').should eql(%w(key1 key2 key3))
     end
   end
+
+  it "should allow me to set the adapter" do
+    subject.respond_to?(:adapter=).should be_true
+  end
+
+  it "shold allow to get the adapter" do
+    subject.respond_to?(:adapter).should be_true
+  end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'simplecov'
 require 'redis'
+require 'dalli'
 
 SimpleCov.start
 
@@ -28,8 +29,11 @@ RSpec.configure do |config|
       "port"          => 6397,
       "dir"           => Rails.root.join('tmp', 'cache'),
     }.map { |k, v| "#{k} #{v}" }.join('\n')
+
     `echo '#{redis_options}' | redis-server -`
 
+    sleep 0.25
+
     Cashier::Adapters::RedisStore.redis = Redis.new(:host => '127.0.0.1', :port => 6397)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cashier
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70172278921700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70172278921700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70172278920840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172278920840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70172278920180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172278920180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dalli
-  requirement: &70172278919320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172278919320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70172278918460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172278918460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70172278917740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +101,12 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *70172278917740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 description: Associate different cached content with a tag, then expire by tag instead
   of key
 email:
@@ -94,12 +124,10 @@ files:
 - lib/cashier.rb
 - lib/cashier/adapters/cache_store.rb
 - lib/cashier/adapters/redis_store.rb
-- lib/cashier/application_controller.rb
 - lib/cashier/cucumber.rb
 - lib/cashier/matchers.rb
 - lib/cashier/railtie.rb
 - lib/cashier/version.rb
-- spec/controllers/application_controller_spec.rb
 - spec/dummy/.gitignore
 - spec/dummy/Gemfile
 - spec/dummy/Gemfile.lock
@@ -144,8 +172,10 @@ files:
 - spec/dummy/test/performance/browsing_test.rb
 - spec/dummy/test/test_helper.rb
 - spec/dummy/vendor/plugins/.gitkeep
-- spec/lib/adapters/cache_store_spec.rb
-- spec/lib/adapters/redis_store_spec.rb
+- spec/integration/rails_cache_integration_spec.rb
+- spec/integration/rails_configuration_spec.rb
+- spec/lib/cashier/adapters/cache_store_spec.rb
+- spec/lib/cashier/adapters/redis_store_spec.rb
 - spec/lib/cashier_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/threadedlabs/cashier
@@ -162,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1935489588722938674
+      hash: 2649723664706912496
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -171,15 +201,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1935489588722938674
+      hash: 2649723664706912496
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Tag based caching for Rails using Redis or Memcached
 test_files:
-- spec/controllers/application_controller_spec.rb
 - spec/dummy/.gitignore
 - spec/dummy/Gemfile
 - spec/dummy/Gemfile.lock
@@ -224,7 +253,9 @@ test_files:
 - spec/dummy/test/performance/browsing_test.rb
 - spec/dummy/test/test_helper.rb
 - spec/dummy/vendor/plugins/.gitkeep
-- spec/lib/adapters/cache_store_spec.rb
-- spec/lib/adapters/redis_store_spec.rb
+- spec/integration/rails_cache_integration_spec.rb
+- spec/integration/rails_configuration_spec.rb
+- spec/lib/cashier/adapters/cache_store_spec.rb
+- spec/lib/cashier/adapters/redis_store_spec.rb
 - spec/lib/cashier_spec.rb
 - spec/spec_helper.rb

data/lib/cashier/application_controller.rb

@@ -1,28 +0,0 @@
-# Hooks into ApplicationController's write_fragment method.
-# write_fragment is used for action and fragment caching.
-# Create an alias method chain to call our customer method
-# which stores the associated key with the tag in a 
-# Redis Set. Then we can expire all those keys from anywhere
-# in the code using Rails.cache.delete
-#
-# I use alias_method_chain instead of calling 'super'
-# because there is a very rare case where someone 
-# may have redfined 'write_fragment' in their own 
-# controllers. Using an alias method chain
-# keeps those methods intact.
-
-class ApplicationController < ActionController::Base
-  def write_fragment_with_tagged_key(key, content, options = nil)
-    if options && options[:tag] && Cashier.perform_caching? 
-      tags = case options[:tag].class.to_s
-             when 'Proc', 'Lambda'
-               options[:tag].call(self)
-             else 
-               options[:tag]
-             end
-      Cashier.store_fragment fragment_cache_key(key), *tags
-    end
-    write_fragment_without_tagged_key(key, content, options)
-  end
-  alias_method_chain :write_fragment, :tagged_key
-end

data/spec/controllers/application_controller_spec.rb

@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe ApplicationController do
-  it "should be able to tag framgents" do
-    Cashier.should_receive(:store_fragment).with('views/key', 'tag')
-    controller.write_fragment('key', 'content', :tag => 'tag')
-  end
-
-  it "should be able write a fragment with multiple tags" do
-    Cashier.should_receive(:store_fragment).with('views/key', 'tag1', 'tag2')
-    controller.write_fragment('key', 'content', :tag => %w(tag1 tag2))
-  end
-
-  it "should able to create a tag with a proc" do
-    Cashier.should_receive(:store_fragment).with('views/key', 'tag')
-    controller.write_fragment('key', 'content', :tag => proc {|c| 'tag' })
-  end
-
-  it "should able to create a tag with a lambda" do
-    Cashier.should_receive(:store_fragment).with('views/key', 'tag')
-    controller.write_fragment('key', 'content', :tag => lambda {|c| 'tag' })
-  end
-end