keynote 0.1.1 → 0.1.2

data/lib/keynote.rb

@@ -14,11 +14,6 @@ require "keynote/cache"
 # @see file:README.md
 module Keynote
   class << self
-    # @return [Boolean] When `use_caching` is enabled, repeatedly invoking
-    #   the same presenter with the same parameters will always return the
-    #   same object. This is disabled by default for now.
-    attr_accessor :use_caching
-
     # Create or retrieve a presenter wrapping zero or more objects.
     #
     # The first parameter is a Rails view context, but you'll usually access
@@ -56,11 +51,7 @@ module Keynote
         name = presenter_name_from_object(objects[0])
       end
 
-      if Keynote.use_caching
-        Cache.fetch(name, view, *objects) do
-          presenter_from_name(name).new(view, *objects)
-        end
-      else
+      Cache.fetch(name, view, *objects) do
         presenter_from_name(name).new(view, *objects)
       end
     end
@@ -75,6 +66,4 @@ module Keynote
       "#{name.to_s.camelize}Presenter".constantize
     end
   end
-
-  Keynote.use_caching = false
 end

data/lib/keynote/cache.rb

@@ -10,44 +10,34 @@ module Keynote
     # Return a cached presenter for the given parameters, or yield and cache
     # the block's return value for next time.
     #
-    # The cached presenters are stored in an instance variable on the first of
-    # the given objects, so they'll be garbage-collected when the associated
-    # models go out of scope.
+    # The cached presenters are stored in an instance variable on the current
+    # view context, so they'll be garbage-collected when the view context goes
+    # out of scope.
     #
     # @param [Symbol] name
     # @param [ActionView::Base] view
     # @param [Array] objects
     # @return [Keynote::Presenter]
     def fetch(name, view, *objects)
-      first = objects.shift
-
-      # If this is a zero-object presenter, we have to just instantiate it.
-      if first.nil?
-        return(yield)
+      # If we don't have a view, just bail out and return a fresh presenter
+      # every time.
+      if view.nil?
+        return yield
       end
 
-      # Otherwise, we can initialize our cache on the first of the presented
-      # objects.
-      if (cache = first.instance_variable_get(:@_keynote_cache)).nil?
+      # Initialize our cache on the view context if it doesn't already exist.
+      if (cache = view.instance_variable_get(:@_keynote_cache)).nil?
         cache = {}
-        first.instance_variable_set(:@_keynote_cache, cache)
+        view.instance_variable_set(:@_keynote_cache, cache)
       end
 
-      # We key each entry by the name of the presenter and the object_id of
-      # each of the other objects involved.
+      # Key each entry by the name of the presenter and the object_id of each
+      # of the objects involved.
       key = [name, *objects.map(&:object_id)]
 
-      # If we're using a cached presenter, update the view to match the one the
-      # user passed in (in case the presenter was originally instantiated in
-      # the controller or whatever).
-      if (presenter = cache[key])
-        presenter.view = view
-      else
-        presenter  = yield
-        cache[key] = presenter
-      end
-
-      presenter
+      # If we have a cached presenter, return it; if not, yield, store the
+      # result, and return that.
+      cache[key] or (cache[key] = yield)
     end
   end
 end

data/lib/keynote/version.rb

@@ -2,5 +2,5 @@
 
 module Keynote
   # @private
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/keynote_spec.rb

@@ -59,56 +59,54 @@ describe Keynote do
   end
 
   describe "caching" do
-    describe "enabled" do
-      before { Keynote.use_caching = true }
-      after  { Keynote.use_caching = false }
+    describe "when there is a view context" do
+      let(:view)   { Object.new }
+      let(:view_2) { Object.new }
 
-      it "should cache on the model instance(s)" do
+      it "should cache based on the models" do
         model_1 = Normal.new
         model_2 = Normal.new
 
-        presented_1 = Keynote.present(:view, model_1)
-        presented_2 = Keynote.present(:view, model_1)
+        presented_1 = Keynote.present(view, model_1)
+        presented_2 = Keynote.present(view, model_1)
 
         presented_1.must_be :equal?, presented_2
 
-        presented_3 = Keynote.present(:view, :combined, model_1, model_2)
-        presented_4 = Keynote.present(:view, :combined, model_1, model_2)
-        presented_5 = Keynote.present(:view, :combined, model_2, model_1)
+        presented_3 = Keynote.present(view, :combined, model_1, model_2)
+        presented_4 = Keynote.present(view, :combined, model_1, model_2)
+        presented_5 = Keynote.present(view, :combined, model_2, model_1)
 
         presented_3.wont_be :equal?, presented_1
         presented_3.must_be :equal?, presented_4
         presented_3.wont_be :equal?, presented_5
       end
 
-      it "shouldn't cache if there are no models" do
-        presenter_1 = Keynote.present(:view, :empty)
-        presenter_2 = Keynote.present(:view, :empty)
+      it "should cache even if there are no models" do
+        presenter_1 = Keynote.present(view, :empty)
+        presenter_2 = Keynote.present(view, :empty)
 
-        presenter_1.wont_be :equal?, presenter_2
+        presenter_1.must_be :equal?, presenter_2
       end
 
-      it "should update the view every time" do
+      it "should be scoped to the specific view context" do
         model = Normal.new
 
-        presenter_1 = Keynote.present(:view, model)
-        presenter_1.view.must_equal :view
+        presenter_1 = Keynote.present(view, model)
+        presenter_1.view.must_equal view
 
-        presenter_2 = Keynote.present(:view_2, model)
-        presenter_2.must_be :equal?, presenter_1
-        presenter_2.view.must_equal :view_2
+        presenter_2 = Keynote.present(view_2, model)
+        presenter_2.wont_be :equal?, presenter_1
+        presenter_2.view.must_equal view_2
       end
     end
 
-    describe "disabled" do
-      before { Keynote.use_caching = false }
-
+    describe "when there's no view context" do
       it "shouldn't cache" do
         model_1 = Normal.new
         model_2 = Normal.new
 
-        presented_1 = Keynote.present(:view, model_1)
-        presented_2 = Keynote.present(:view, model_1)
+        presented_1 = Keynote.present(nil, model_1)
+        presented_2 = Keynote.present(nil, model_1)
 
         presented_1.wont_be :equal?, presented_2
       end

metadata

@@ -2,14 +2,14 @@
 name: keynote
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ryan Fitzgerald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement