cells 3.9.1 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2a369ee523b519082124fc42f359172124f6e45
-  data.tar.gz: bc788476880fec68c6134ab8111f5ea62d519b26
+  metadata.gz: db50f24112bb37938584135fab9266353fe79b7d
+  data.tar.gz: dbccc6a922a93e77ee3d3e9ec44f87f95835eed0
 SHA512:
-  metadata.gz: 54a6bbc71fd9fadae7fd54a940bf1c160b9675e03eff6b2320f5dd4c590fc22229f692e6f7db77b06ed3c64ef09186cee732cbda52e7a6c55295a7c46dfea7c0
-  data.tar.gz: 2271f4d6188a31b7b2c64617fffaf83adc30c8c3cff7c18124072fb8aff1c03c5f3fb267b87cf313099eb5a70c21571bd35a5f324428c632ab7319a61bbd188a
+  metadata.gz: 0f4b0a3a5ccb60348172268dd14b64c5e246549ccc49b3f3aa3da15f8b40dd96785bd92b7ad875fb881f632dfbfaae93d6b507decd1de22b2821147313e1e81f
+  data.tar.gz: 74d5ab523f9075541a9472a20eb3ffdfe3d420e42f26a4e9be22769b955351c3fa3b03f47108a16b0e440825e28c9ca2e0b91cbb63cdb0b94a2f67203631ca14

data/{CHANGES.textile → CHANGES.md}

@@ -1,9 +1,40 @@
-h2. 3.9.1
+## 3.10.0
+
+* API CHANGE: Blocks passed to `::cache` and `::cache ... if: ` no longer receive the cell instance as the first argument. Instead, they're executed in cell instance context. Change your code like this:
+```ruby
+cache :show do |cell, options|
+  cell.version
+end
+# and
+cache :show, if: lambda {|cell, options| .. }
+```
+should become
+
+```ruby
+cache :show do |options|
+  version
+end
+# and
+cache :show, if: lambda {|options| .. }
+```
+
+Since the blocks are run in cell context, `self` will point to what was `cell` before.
+
+
+* `::cache` doesn't accept a `Proc` instance anymore, only blocks (was undocumented anyway).
+* Use [`uber` gem](https://github.com/apotonick/uber) for inheritable class attributes and dynamic options.
+
+## 3.9.2
+
+* Autoload `Cell::Rails::ViewModel`.
+* Implement dynamic cache options by allowing lambdas that are executed at render-time - Thanks to @bibendi for this idea.
+
+## 3.9.1
 
 * Runs with Rails 4.1 now.
 * Internal changes on `Layouts` to prepare 4.1 compat.
 
-h2. 3.9.0
+## 3.9.0
 
 * Cells in engines are now recognized under Rails 4.0.
 * Introducing @#cell@ and @#cell_for@ to instantiate cells in ActionController and ActionView.
@@ -11,43 +42,43 @@ h2. 3.9.0
 * Add @Cell::Base#process_args@ which is called in the initializer to handle arguments passed into the constructor.
 * Setting @controller in your @Cell::TestCase@ no longer get overridden by us.
 
-h2. 3.8.8
+## 3.8.8
 
 * Maintenance release.
 
-h2. 3.8.7
+## 3.8.7
 
 * Cells runs with Rails 4.
 
-h2. 3.8.6
+## 3.8.6
 
 * @cell/base@ can now be required without trouble.
 * Generated test files now respect namespaced cells.
 
-h2. 3.8.5
+## 3.8.5
 
 * Added @Cell::Rails::HelperAPI@ module to provide the entire Rails view "API" (quotes on purpose!) in cells running completely outside of Rails. This makes it possible to use gems like simple_form in any Ruby environment, especially interesting for people using Sinatra, webmachine, etc.
 * Moved @Caching.expire_cache_key@ to @Rails@. Use @Caching.expire_cache_key_for(key, cache_store, ..)@ if you want to expire caches outside of Rails.
 
-h2. 3.8.4
+## 3.8.4
 
 * Added @Cell::Rack@ for request-dependent Cells. This is also the new base class for @Cells::Rails@.
 * Removed deprecation warning from @TestCase#cell@ as it's signature is not deprecated.
 * Added the @base_cell_class@ config option to generator for specifying an alternative base class.
 
-h2. 3.8.3
+## 3.8.3
 
 * Added @Engines.existent_directories_for@ to prevent Rails 3.0 from crashing when it detects engines.
 
-h2. 3.8.2
+## 3.8.2
 
 * Engines should work in Rails 3.0 now, too.
 
-h2. 3.8.1
+## 3.8.1
 
 * Make it work with Rails 3.2 by removing deprecated stuff.
 
-h2. 3.8.0
+## 3.8.0
 
 * @Cell::Base@ got rid of the controller dependency. If you want the @ActionController@ instance around in your cell, use @Cell::Rails@ - this should be the default in a standard Rails setup. However, if you plan on using a Cell in a Rack middleware or don't need the controller, use @Cell::Base@.
 * New API (note that @controller@ isn't the first argument anymore):
@@ -57,11 +88,11 @@ h2. 3.8.0
 * @DEFAULT_VIEW_PATHS@ is now in @Cell::Base@.
 * Removed the monkey-patch that made state-args work in Rails <= 3.0.3. Upgrade to +3.0.4.
 
-h2. 3.7.1
+## 3.7.1
 
 * Works with Rails 3.2, too. Hopefully.
 
-h2. 3.7.0
+## 3.7.0
 
 h3. Changes
   * Cache settings using @Base.cache@ are now inherited.
@@ -69,24 +100,24 @@ h3. Changes
   * Removed @#options@ in favor of state-args. If you still want the old behaviour, include the @Deprecations@ module in your cell.
   * The build process is now instantly delegated to Base.build_for on the concrete cell class.
 
-h2. 3.6.8
+## 3.6.8
 
 h3. Changes
   * Removed <code>@opts</code>.
   * Deprecated @#options@ in favour of state-args.
 
-h2. 3.6.7
+## 3.6.7
 
 h3. Changes
   * Added @view_assigns@ to TestCase.
 
-h2. 3.6.6
+## 3.6.6
 
 h3. Changes
   * Added the @:format@ option for @#render@ which should be used with caution. Sorry for that.
   * Removed the useless @layouts/@ view path from Cell::Base.
 
-h2. 3.6.5
+## 3.6.5
 
 h3. Bugfixes
   * `Cell::TestCase#invoke` now properly accepts state-args.
@@ -95,13 +126,13 @@ h3. Changes
   * Added the `:if` option to `Base.cache` which allows adding a conditional proc or instance method to the cache definition. If it doesn't return true, caching for that state is skipped.
 
 
-h2. 3.6.4
+## 3.6.4
 
 h3. Bugfixes
   * Fixes @ArgumentError: wrong number of arguments (1 for 0)@ in @#render_cell@ for Ruby 1.8.
 
 
-h2. 3.6.3
+## 3.6.3
 
 h3. Bugfixes
   * [Rails 3.0] Helpers are now properly included (only once). Thanks to [paneq] for a fix.
@@ -111,30 +142,30 @@ h3. Changes
   * `cells/test_case` is no longer required as it should be loaded automatically.
 
 
-h2. 3.6.2
+## 3.6.2
 
 h3. Bugfixes
   * Fixed cells.gemspec to allow Rails 3.x.
 
-h2. 3.6.1
+## 3.6.1
 
 h3. Changes
   * Added the @:format@ option allowing @#render@ to set different template types, e.g. @render :format => :json@.
 
 
-h2. 3.6.0
+## 3.6.0
 
 h3. Changes
   * Cells runs with Rails 3.0 and 3.1.
 
 
-h2. 3.5.6
+## 3.5.6
 
 h3. Changes
   * Added a generator for slim. Use it with `-e slim` when generating.
 
 
-h2. 3.5.5
+## 3.5.5
 
 h3. Bugfixes
   * The generator now places views of namespaced cells into the correct directory. E.g. `rails g Blog::Post display` puts views to `app/cells/blog/post/display.html.erb`.
@@ -143,7 +174,7 @@ h3. Changes
   * Gem dependencies changed, we now require @actionpack@ and @railties@ >= 3.0.0 instead of @rails@.
 
 
-h2. 3.5.4
+## 3.5.4
 
 h3. Bugfixes
   * state-args work even if your state method receives optional arguments or default values, like @def show(user, age=18)@.
@@ -154,7 +185,7 @@ h3. Changes
   * Cells::DEFAULT_VIEW_PATHS is now Cell::Base::DEFAULT_VIEW_PATHS. Note that Cells will set its view_paths to DEFAULT_VIEW_PATHS at initialization time. If you want to alter the view_paths, use Base.append_view_path and friends in a separate initializer.
 
 
-h2. 3.5.2
+## 3.5.2
 
 h3. Bugfixes
   * Controller#render_cell now accepts multiple args as options.
@@ -163,7 +194,7 @@ h3. Changes
   * Caching versioners now can accept state-args or options from the #render_cell call. This way, you don't have to access #options at all anymore.
 
 
-h2. 3.5.1
+## 3.5.1
 
   * No longer pass an explicit Proc but a versioner block to @Cell.Base.cache@. Example: @cache :show do "v1" end@
   * Caching.cache_key_for now uses @ActiveSupport::Cache.expand_cache_key@. Consequently, a key which used to be like @"cells/director/count/a=1/b=2"@ now is @cells/director/count/a=1&b=2@ and so on. Be warned that this might break your home-made cache expiry.
@@ -173,7 +204,7 @@ h3. Bugfixes
   * Passing options to @render :state@ in views finally works: @render({:state => :list_item}, item, i)@
 
 
-h2. 3.5.0
+## 3.5.0
 
 h3. Changes
   * Deprecated @opts, use #options now.
@@ -186,7 +217,7 @@ h3. Changes
   * Privatized @#find_family_view_for_state@, @#render_view_for@, and all *ize methods in Cell::Rails.
   * New signature: @#render_view_for(state, *args)@
 
-h2. 3.4.4
+## 3.4.4
 
 h3. Changes
   * Cells.setup now yields Cell::Base, so you can really call append_view_path and friends here.
@@ -194,7 +225,7 @@ h3. Changes
   * added TestCase#in_view to test helpers in a real cell view.
 
 
-h2. 3.4.3
+## 3.4.3
 
 h3. Changes
   * #render_cell now accepts a block which yields the cell instance before rendering.

data/Gemfile

@@ -3,3 +3,6 @@ source 'https://rubygems.org'
 gemspec
 
 #gem "rails" , :path => "../rayls"
+
+gem "rails", "~> 3.2.12"
+gem 'minitest', '4.7.5'

data/README.md

@@ -130,6 +130,7 @@ This is where OOP comes back to your view.
 * __Inherit code__ into your cells by deriving more abstract cells.
 * __Inherit views__ from parent cells.
 
+
 ### Builders
 
 Let `render_cell` take care of creating the right cell. Just configure your super-cell properly.
@@ -152,29 +153,85 @@ will render the configured `UnauthorizedUserCell` instead of the original `Login
 
 ## Caching
 
-Cells do strict view caching. No cluttered fragment caching. Add
+Cells allow you to cache per state. It's simple: the rendered result of a state method is cached and expired as you configure it.
+
+To cache forever, don't configure anything
+
+```ruby
+class CartCell < Cell::Rails
+  cache :show
+
+  def show
+    render
+  end
+```
+
+This will run `#show` only once, after that the rendered view comes from the cache.
+
+
+### Cache Options
+
+Note that you can pass arbitrary options through to your cache store. Symbols are evaluated as instance methods, callable objects (e.g. lambdas) are evaluated in the cell instance context allowing you to call instance methods and access instance variables. All arguments passed to your state (e.g. via `render_cell`) are propagated to the block.
+
+```ruby
+cache :show, :expires_in => 10.minutes
+```
+
+If you need dynamic options evaluated at render-time, use a lambda.
+
+```ruby
+cache :show, :tags => lambda { |*args| tags }
+```
+
+If you don't like blocks, use instance methods instead.
 
 ```ruby
 class CartCell < Cell::Rails
-  cache :show, :expires_in => 10.minutes
+  cache :show, :tags => :cache_tags
+
+  def cache_tags(*args)
+    # do your magic..
+  end
+```
+
+### Conditional Caching
+
+The +:if+ option lets you define a condition. If it doesn't return a true value, caching for that state is skipped.
+
+```ruby
+cache :show, :if => lambda { |*| has_changed? }
 ```
 
-and your cart will be re-rendered after 10 minutes.
+### Cache Keys
 
-You can expand the state's cache key - why not use a versioner block to do just this?
+You can expand the state's cache key by appending a versioner block to the `::cache` call. This way you can expire state caches yourself.
 
 ```ruby
 class CartCell < Cell::Rails
-  cache :show do |cell, options|
+  cache :show do |options|
     options[:items].md5
   end
 ```
 
 The block's return value is appended to the state key: `"cells/cart/show/0ecb1360644ce665a4ef"`.
 
-Check the [API to learn more](http://rdoc.info/gems/cells/Cell/Caching/ClassMethods#cache-instance_method).
 
-*Reminder*: If you want to test it in `development`, you need to put `config.action_controller.perform_caching = true` in `development.rb` to see the effect
+### Inheritance
+
+Cache configuration is inherited to derived cells.
+
+
+### A Note On Fragment Caching
+
+Fragment caching is [not implemented in Cells per design](http://nicksda.apotomo.de/2011/02/rails-misapprehensions-caching-views-is-not-the-views-job/) - Cells tries to move caching to the class layer enforcing an object-oriented design rather than cluttering your views with caching blocks.
+
+If you need to cache a part of your view, implement that as another cell state.
+
+
+### Testing Caching
+
+If you want to test it in `development`, you need to put `config.action_controller.perform_caching = true` in `development.rb` to see the effect.
+
 
 ## Testing
 
@@ -221,7 +278,7 @@ rake spec:cells
 
 # View Models
 
-Cells 3.9 brings a new dialect to cells: view models (still experimental!).
+Cells 3.9 brings a new dialect to cells: view models.
 
 Think of a view model as a cell decorating a model or a collection. In this mode, helpers are nothing more than instance methods of your cell class, making helpers predictable and scoped.
 

data/cells.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "actionpack",  ">= 3.0"
   s.add_dependency "railties",    ">= 3.0"
+  s.add_dependency "uber",        "~> 0.0.4"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "haml"

data/lib/cell/caching.rb

@@ -1,63 +1,30 @@
 require 'active_support/concern'
 require 'active_support/cache'
+require 'uber/options'
+require 'uber/inheritable_attr'
 
 module Cell
   module Caching
     extend ActiveSupport::Concern
 
     included do
-      class_attribute :version_procs, :conditional_procs, :cache_options
+      extend Uber::InheritableAttr
+      inheritable_attr :version_procs
+      inheritable_attr :conditional_procs
+      inheritable_attr :cache_options
+
       self.version_procs = {}
       self.conditional_procs = {}
-      self.cache_options = {}
+      self.cache_options = Uber::Options.new({})
     end
 
     module ClassMethods
-      # Caches the rendered view of +state+.
-      #
-      # Examples:
-      #
-      # This will cache forever.
-      #
-      #   class CartCell < Cell::Base
-      #     cache :show
-      #
-      # You can also pass options to the caching engine as known from Rails caching.
-      #
-      #   cache :show, :expires_in => 10.minutes
-      #
-      # The +:if+ option lets you define a conditional proc or instance method. If it doesn't
-      # return a true value, caching for that state is skipped.
-      #
-      #   cache :show, :if => proc { |cell, options| options[:enable_cache] }
-      #
-      # If you need your own granular cache keys, pass a versioner block.
-      #
-      #   cache :show do |cell, options|
-      #     "user/#{cell.options[:id]}"
-      #   end
-      #
-      # This will result in a cache key like <tt>cells/cart/show/user/1</tt>.
-      #
-      # Alternatively, use an instance method.
-      #
-      #   cache :show, :versioner
-      #   def versioner(options)
-      #     "user/#{options[:id]}"
-      #   end
-      #
-      # Two things to mention here.
-      # * The return value of the method/block is <em>appended</em> to the state cache key.
-      # * You may return a string, a hash, an array, ActiveSupport::Caching will compile it.
-      #
-      # == Inheritance
-      # Please note that cache configuration is inherited to derived cells.
       def cache(state, *args, &block)
         options = args.extract_options!
 
-        self.conditional_procs = conditional_procs.merge(state => options.delete(:if))
-        self.version_procs     = version_procs.merge(state => (args.first || block))
-        self.cache_options     = cache_options.merge(state => options)
+        self.conditional_procs[state] = Uber::Options::Value.new(options.delete(:if) || true)
+        self.version_procs[state] = Uber::Options::Value.new(args.first || block)
+        self.cache_options[state] = Uber::Options.new(options)
       end
 
       # Computes the complete, namespaced cache key for +state+.
@@ -68,11 +35,9 @@ module Cell
       def expire_cache_key_for(key, cache_store, *args)
         cache_store.delete(key, *args)
       end
-      
-      
-    protected
-      # Compiles cache key and adds :cells namespace to +key+, according to the
-      # ActiveSupport::Cache.expand_cache_key API.
+
+
+    private
       def expand_cache_key(key)
         ::ActiveSupport::Cache.expand_cache_key(key, :cells)
       end
@@ -81,45 +46,29 @@ module Cell
 
     def render_state(state, *args)
       return super(state, *args) unless cache?(state, *args)
-      
-      key     = self.class.state_cache_key(state, call_state_versioner(state, *args))
-      options = self.class.cache_options[state]
-      
+
+      key     = self.class.state_cache_key(state, self.class.version_procs[state].evaluate(self, *args))
+      options = self.class.cache_options.eval(state, self, *args)
+
       cache_store.fetch(key, options) do
         super(state, *args)
       end
     end
-    
+
     def cache_configured?
       @cache_configured
     end
     attr_writer :cache_configured
-    
+
     attr_accessor :cache_store  # we want to use DI to set a cache store in cell/rails.
-      
+
     def cache?(state, *args)
-      cache_configured? and state_cached?(state) and call_state_conditional(state, *args)
+      cache_configured? and state_cached?(state) and self.class.conditional_procs[state].evaluate(self, *args)
     end
-    
-  protected
+
+  private
     def state_cached?(state)
       self.class.version_procs.has_key?(state)
     end
-      
-    def call_proc_or_method(state, method, *args)
-      return method.call(self, *args) if method.kind_of?(Proc)
-      send(method, *args)
-    end
-    
-    def call_state_versioner(state, *args)
-      method = self.class.version_procs[state] or return
-      call_proc_or_method(state, method, *args)
-    end
-    
-    def call_state_conditional(state, *args)
-      method = self.class.conditional_procs[state] or return true
-      call_proc_or_method(state, method, *args)
-    end
-    
   end
 end

data/lib/cell/rails.rb

@@ -51,5 +51,7 @@ module Cell
       end
     end
     include DSL
+
+    autoload :ViewModel, "cell/rails/view_model"
   end
 end

data/lib/cells/version.rb

@@ -1,3 +1,3 @@
 module Cells
-  VERSION = '3.9.1'
+  VERSION = '3.10.0'
 end

data/lib/generators/templates/view.slim

@@ -1,4 +1,4 @@
 h1
-  <%= class_name %>#<%= @state %>
+  |<%= class_name %>#<%= @state %>
 p
-  Find me in <%= @path %>
+  |Find me in <%= @path %>

data/test/deprecations_test.rb

@@ -87,8 +87,8 @@ class DeprecationsTest < MiniTest::Spec
           render :text => args[:int]
         end
 
-        cache :count do |cell, i|
-          (cell.options[:int] % 2)==0 ? {:count => "even"} : {:count => "odd"}
+        cache :count do |i|
+          (options[:int] % 2)==0 ? {:count => "even"} : {:count => "odd"}
         end
       end
 

data/test/rails/caching_test.rb

@@ -126,6 +126,7 @@ class CachingUnitTest < MiniTest::Spec
   describe ".expire_cache_key" do
     before :each do
       @key = @class.state_cache_key(:tock)
+      puts "====== key is #{@key}"
       assert_equal "1", render_cell(:director, :tock)
       assert_equal "1", @class.cache_store.read(@key)
     end
@@ -157,79 +158,6 @@ class CachingUnitTest < MiniTest::Spec
       assert_not @class.cache_store.read(@key)
     end
   end
-
-
-  describe ".cache" do
-    let (:proc) { Proc.new {} }
-    let (:parent) { Class.new(Cell::Base) }
-    let (:brother) { Class.new(parent) }
-    let (:sister) { Class.new(parent) }
-
-    it "accept a state name, only" do
-      @class.cache :count
-
-      assert_not @class.version_procs[:count]
-      assert_equal({}, @class.cache_options[:count])
-    end
-
-    it "accept state and cache options" do
-      @class.cache :count, :expires_in => 10.minutes
-
-      assert_not @class.version_procs[:count]
-      assert_equal({:expires_in => 10.minutes}, @class.cache_options[:count])
-    end
-
-    it "accept args and versioner block" do
-      @class.cache :count, :expires_in => 10.minutes do "v1" end
-
-      assert_kind_of Proc, @class.version_procs[:count]
-      assert_equal({:expires_in => 10.minutes}, @class.cache_options[:count])
-    end
-
-    it "stil accept a versioner proc, only" do
-      @class.cache :count, proc
-
-      assert_equal proc, @class.version_procs[:count]
-      assert_equal({},    @class.cache_options[:count])
-    end
-
-    it "stil accept a versioner block" do
-      @class.cache :count do "v1" end
-
-      assert_kind_of Proc, @class.version_procs[:count]
-      assert_equal({},    @class.cache_options[:count])
-    end
-
-    it "inherit caching configuration" do
-      parent.cache :inherited_cache_configuration
-
-      assert parent.version_procs.has_key?(:inherited_cache_configuration)
-      assert brother.version_procs.has_key?(:inherited_cache_configuration)
-    end
-
-    it "not overwrite caching configuration in the parent class" do
-      brother.cache :inherited_cache_configuration
-
-      puts parent.version_procs.inspect
-      assert ! parent.version_procs.has_key?(:inherited_cache_configuration)
-      assert brother.version_procs.has_key?(:inherited_cache_configuration)
-    end
-
-    it "not overwrite caching configuration in a sibbling class" do
-      sister.cache :inherited_cache_configuration
-
-      assert ! brother.version_procs.has_key?(:inherited_cache_configuration)
-      assert sister.version_procs.has_key?(:inherited_cache_configuration)
-    end
-
-    it "overwrite caching configuration in a child class" do
-      @class.cache :inherited_cache_configuration
-      brother.cache :inherited_cache_configuration, proc
-
-      assert ! parent.version_procs[:inherited_cache_configuration]
-      assert_equal proc, brother.version_procs[:inherited_cache_configuration]
-    end
-  end
 end
 
 class CachingFunctionalTest < MiniTest::Spec
@@ -287,7 +215,7 @@ class CachingFunctionalTest < MiniTest::Spec
     end
 
     it "compute the key with a block receiving state-args" do
-      @class.cache :count do |cell, int|
+      @class.cache :count do |int|
         (int % 2)==0 ? {:count => "even"} : {:count => "odd"}
       end
       # example cache key: cells/director/count/count=odd
@@ -301,7 +229,7 @@ class CachingFunctionalTest < MiniTest::Spec
     it "compute the key with an instance method" do
       @class.cache :count, :version
       @class.class_eval do
-        private
+      private
         def version(int)
           (int % 2)==0 ? {:count => "even"} : {:count => "odd"}
         end
@@ -313,8 +241,8 @@ class CachingFunctionalTest < MiniTest::Spec
       assert_equal "2", render_cell(:director, :count, 4)
     end
 
-    it "allow returning strings, too" do
-      @class.cache :count do |cell, int|
+    it "allows returning strings, too" do
+      @class.cache :count do |int|
         (int % 2)==0 ? "even" : "odd"
       end
 
@@ -325,7 +253,7 @@ class CachingFunctionalTest < MiniTest::Spec
     end
 
     it "be able to use caching conditionally" do
-      @class.cache :count, :if => proc { |cell, int| (int % 2) != 0 }
+      @class.cache :count, :if => lambda { |int| (int % 2) != 0 }
 
       assert_equal "1", render_cell(:director, :count, 1)
       assert_equal "2", render_cell(:director, :count, 2)
@@ -381,4 +309,156 @@ class CachingFunctionalTest < MiniTest::Spec
       end
     end
   end
+
+
+  def cache_store(&block)
+    Object.new.instance_eval do
+      @block = block
+      def fetch(key, options)
+        @block.call(key, options)
+      end
+      self
+    end
+  end
+
+  def cached(&block)
+    cs = cache_store(&block)
+
+    @cell.instance_eval do
+      def count(*)
+        "this should never be returned!"
+      end
+
+      @cache_store = cs
+      def cache_store
+        @cache_store
+      end
+    end
+
+    @cell
+  end
+
+  # ::cache
+
+  describe "with state name, only" do
+    it do
+      @class.cache :count
+
+      cached do |key, options|
+        if options == {} and key == "cells/director/count/"
+          "cached!"
+        end
+      end.render_state(:count, 1, 2, 3).must_equal "cached!"
+    end
+  end
+
+  describe "with cache store options" do
+    it do
+      @class.cache :count, :expires_in => 10.minutes
+
+      cached do |key, options|
+        if options == {:expires_in => 600}
+          "cached!"
+        end
+      end.render_state(:count, 1, 2, 3).must_equal "cached!"
+    end
+  end
+
+  describe "with versioner block" do
+    it do
+      @class.cache :count do "v3" end
+
+      cached do |key, options|
+        if options == {} and key == "cells/director/count/v3"
+          "cached!"
+        end
+      end.render_state(:count).must_equal "cached!"
+    end
+
+    it "is executed in instance context" do
+      @class.cache :count do version end
+
+      @cell.instance_eval do
+        def version; "v3"; end
+      end
+
+      cached do |key, options|
+        if options == {} and key == "cells/director/count/v3"
+          "cached!"
+        end
+      end.render_state(:count).must_equal "cached!"
+    end
+  end
+
+  describe "with store options and versioner block" do
+    it do
+      @class.cache :count, :expires_in => 10.minutes do "v1" end
+
+      cached do |key, options|
+        if options == {:expires_in => 600} and key == "cells/director/count/v1"
+          "cached!"
+        end
+      end.render_state(:count, 1, 2, 3).must_equal "cached!"
+    end
+  end
+
+  describe "lambda and options as options" do
+    it "runs lamda at render-time" do
+      @class.cache :count, :expires_in => 9, :tags => lambda { |one, two, three| "#{one},#{two},#{three}" }
+
+      cached do |key, options|
+        if options == {:expires_in => 9, :tags => "1,2,3"}
+          "cached!"
+        end
+      end.render_state(:count, 1, 2, 3).must_equal "cached!"
+    end
+  end
+end
+
+
+class CachingInheritanceTest < CachingFunctionalTest
+  class DirectorCell < ::DirectorCell
+    cache :count, :expires_in => 10.minutes do
+      "v1"
+    end
+  end
+
+  class DirectorsSonCell < DirectorCell
+  end
+
+  class DirectorsDaughterCell < ::DirectorCell
+    cache :count, :expires_in => 9.minutes do
+      "v2"
+    end
+  end
+
+  it do
+    @cell = DirectorCell.new(@controller)
+
+    cached do |key, options|
+      if options == {:expires_in => 600} and key == "cells/caching_inheritance_test/director/count/v1"
+        "cached!"
+      end
+    end.render_state(:count).must_equal "cached!"
+  end
+
+  it do
+    @cell = DirectorsDaughterCell.new(@controller)
+
+    cached do |key, options|
+      if options == {:expires_in => 540} and key == "cells/caching_inheritance_test/directors_daughter/count/v2"
+        "cached!"
+      end
+    end.render_state(:count).must_equal "cached!"
+  end
+
+  it do
+    @cell = DirectorsSonCell.new(@controller)
+
+    cached do |key, options|
+      if options == {:expires_in => 600} and key == "cells/caching_inheritance_test/directors_son/count/v1"
+        "cached!"
+      end
+    end.render_state(:count).must_equal "cached!"
+  end
 end

data/test/rails/view_model_test.rb

@@ -1,5 +1,4 @@
-  require 'test_helper'
-require 'cell/rails/view_model'
+require 'test_helper'
 
 class Song < OpenStruct
   extend ActiveModel::Naming

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cells
 version: !ruby/object:Gem::Version
-  version: 3.9.1
+  version: 3.10.0
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: uber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +147,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
-- CHANGES.textile
+- CHANGES.md
 - Gemfile
 - README.md
 - Rakefile