actionpack-action_caching 1.0.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 46985f5100e616356e19180b326cd2fc84f89e4d
+  data.tar.gz: 2c0cd050374dc9d7752b2709ebac2871e5475713
+SHA512:
+  metadata.gz: 5146b22ed763f34e220736db5d9c8ddb439d711897fcb0163e081f69b35e2b74c9da5b14580efbb2aa1d4c18af57bfa1524b504ac1d935418d3a92f78f943392
+  data.tar.gz: bc868db0275461bdd6acdcb10005cda5ba75089b6545a9fb71367812c6ad4f39ab26dfbe54e8e7f062b17fc8df8154f8b509366a91af6fcb171656af1c810dac

data/.travis.yml

@@ -3,6 +3,14 @@ before_install:
   - gem install bundler
 rvm:
   - 1.9.3
+  - 2.0.0
+gemfile:
+  - Gemfile
+  - gemfiles/Gemfile-edge
+  - gemfiles/Gemfile-4-0-stable
+matrix:
+  allow_failures:
+    - gemfile: gemfiles/Gemfile-edge
 notifications:
   email: false
   irc:

data/CHANGELOG.md

@@ -0,0 +1,25 @@
+## 1.1.0
+
+*   Allow to use non-proc object in `cache_path` option. You can pass an object that
+    responds to a `call` method.
+
+    Example:
+
+        class CachePath
+          def call(controller)
+            controller.id
+          end
+        end
+
+        class TestController < ApplicationController
+          caches_action :index, :cache_path => CachePath.new
+          def index; end
+        end
+
+    *Piotr Niełacny*
+
+## 1.0.0 (February 28, 2013)
+
+*   Extract Action Pack - Action Caching from Rails core.
+
+    *Francesco Rodriguez*

data/Gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rails', '~> 4.0.0.beta1'
+gem 'rails'

data/README.md

@@ -1,7 +1,9 @@
 actionpack-action_caching
 =========================
 
-Action caching for Action Pack (removed from core in Rails 4.0)
+Action caching for Action Pack (removed from core in Rails 4.0).
+
+**NOTE:** It will continue to be officially maintained until Rails 4.1.
 
 Installation
 ------------
@@ -85,7 +87,7 @@ The following example depicts some of the points made above:
 
       caches_action :feed, cache_path: Proc.new do
         if params[:user_id]
-          user_list_url(params[:user_id, params[:id])
+          user_list_url(params[:user_id], params[:id])
         else
           list_url(params[:id])
         end
@@ -113,3 +115,9 @@ Contributing
 3. Commit your changes (`git commit -am 'Add some feature'`).
 4. Push to the branch (`git push origin my-new-feature`).
 5. Create a new Pull Request.
+
+Code Status
+-----------
+
+* [![Build Status](https://travis-ci.org/rails/actionpack-action_caching.png?branch=master)](https://travis-ci.org/rails/actionpack-action_caching)
+* [![Dependency Status](https://gemnasium.com/rails/actionpack-action_caching.png)](https://gemnasium.com/rails/actionpack-action_caching)

data/actionpack-action_caching.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = 'actionpack-action_caching'
-  gem.version       = '1.0.0'
+  gem.version       = '1.1.0'
   gem.author        = 'David Heinemeier Hansson'
   gem.email         = 'david@loudthinking.com'
   gem.description   = 'Action caching for Action Pack (removed from core in Rails 4.0)'
@@ -14,8 +14,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'actionpack', '>= 4.0.0.beta', '< 5.0'
+  gem.add_dependency 'actionpack', '>= 4.0.0', '< 5.0'
 
   gem.add_development_dependency 'mocha'
-  gem.add_development_dependency 'activerecord', '>= 4.0.0.beta', '< 5.0'
+  gem.add_development_dependency 'activerecord', '>= 4.0.0.beta', '< 5'
 end

data/gemfiles/Gemfile-4-0-stable

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'rails', github: 'rails/rails', branch: '4-0-stable'

data/gemfiles/Gemfile-edge

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'rails', github: 'rails/rails', branch: 'master'

data/lib/action_controller/caching/actions.rb

@@ -36,13 +36,15 @@ module ActionController
     # are treated like separate requests and so are cached separately.
     # Keep in mind when expiring an action cache that
     # <tt>action: 'lists'</tt> is not the same as
-    # <tt>action: 'list', format: :xml</tt>.
+    # <tt>action: 'lists', format: :xml</tt>.
     #
     # You can modify the default action cache path by passing a
     # <tt>:cache_path</tt> option. This will be passed directly to
     # <tt>ActionCachePath.new</tt>. This is handy for actions with
     # multiple possible routes that should be cached differently. If a
     # block is given, it is called with the current controller instance.
+    # If an object that responds to <tt>call</tt> is given, it'll be called
+    # with the current controller instance.
     #
     # And you can also use <tt>:if</tt> (or <tt>:unless</tt>) to pass a
     # proc that specifies when the action should be cached.
@@ -52,6 +54,17 @@ module ActionController
     #
     # The following example depicts some of the points made above:
     #
+    #   class CachePathCreator
+    #     def initialize(name)
+    #       @name = name
+    #     end
+    #
+    #     def call(controller)
+    #       "cache-path-#{@name}"
+    #     end
+    #   end
+    #
+    #
     #   class ListsController < ApplicationController
     #     before_filter :authenticate, except: :public
     #
@@ -71,6 +84,8 @@ module ActionController
     #         list_url(params[:id])
     #       end
     #     end
+    #
+    #     caches_action :posts, cache_path: CachePathCreator.new('posts')
     #   end
     #
     # If you pass <tt>layout: false</tt>, it will only cache your action
@@ -139,8 +154,10 @@ module ActionController
         def around(controller)
           cache_layout = @cache_layout.respond_to?(:call) ? @cache_layout.call(controller) : @cache_layout
 
-          path_options = if @cache_path.respond_to?(:call)
+          path_options = if @cache_path.is_a?(Proc)
             controller.instance_exec(controller, &@cache_path)
+          elsif @cache_path.respond_to?(:call)
+            @cache_path.call(controller)
           else
             @cache_path
           end

data/test/caching_test.rb

@@ -10,6 +10,12 @@ class CachingController < ActionController::Base
   self.cache_store = :file_store, FILE_STORE_PATH
 end
 
+class CachePath
+  def call(controller)
+    ['controller', controller.params[:id]].compact.join('-')
+  end
+end
+
 class ActionCachingTestController < CachingController
   rescue_from(Exception) { head 500 }
   rescue_from(ActionController::UnknownFormat) { head :not_acceptable }
@@ -23,6 +29,7 @@ class ActionCachingTestController < CachingController
   caches_action :index, :redirected, :forbidden, if: Proc.new { |c| c.request.format && !c.request.format.json? }, expires_in: 1.hour
   caches_action :show, cache_path: 'http://test.host/custom/show'
   caches_action :edit, cache_path: Proc.new { |c| c.params[:id] ? "http://test.host/#{c.params[:id]};edit" : 'http://test.host/edit' }
+  caches_action :custom_cache_path, cache_path: CachePath.new
   caches_action :with_layout
   caches_action :with_format_and_http_param, cache_path: Proc.new { |c| { key: 'value' } }
   caches_action :layout_false, layout: false
@@ -73,6 +80,7 @@ class ActionCachingTestController < CachingController
   alias_method :show, :index
   alias_method :edit, :index
   alias_method :destroy, :index
+  alias_method :custom_cache_path, :index
   alias_method :layout_false, :with_layout
   alias_method :with_layout_proc_param, :with_layout
 
@@ -291,6 +299,16 @@ class ActionCacheTest < ActionController::TestCase
     assert fragment_exist?('test.host/1;edit')
   end
 
+  def test_action_cache_with_custom_cache_path_with_custom_object
+    get :custom_cache_path
+    assert_response :success
+    assert fragment_exist?('controller')
+
+    get :custom_cache_path, id: 1
+    assert_response :success
+    assert fragment_exist?('controller-1')
+  end
+
   def test_cache_expiration
     get :index
     assert_response :success

metadata

@@ -1,76 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: actionpack-action_caching
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta
+        version: 4.0.0
     - - <
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta
+        version: 4.0.0
     - - <
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0.beta
     - - <
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0.beta
     - - <
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
 description: Action caching for Action Pack (removed from core in Rails 4.0)
 email: david@loudthinking.com
 executables: []
@@ -79,11 +72,14 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - actionpack-action_caching.gemspec
+- gemfiles/Gemfile-4-0-stable
+- gemfiles/Gemfile-edge
 - lib/action_controller/action_caching.rb
 - lib/action_controller/caching/actions.rb
 - lib/actionpack/action_caching.rb
@@ -92,30 +88,28 @@ files:
 - test/fixtures/layouts/talk_from_action.erb
 homepage: https://github.com/rails/actionpack-action_caching
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Action caching for Action Pack (removed from core in Rails 4.0)
 test_files:
 - test/abstract_unit.rb
 - test/caching_test.rb
 - test/fixtures/layouts/talk_from_action.erb
-has_rdoc: