acts_as_cached 0.1.1 → 0.1.2

data/lib/view_extensions.rb

@@ -31,14 +31,45 @@ ActionView::Base.class_eval do
 
   end
 
-  def render_object(object, view, options = {})
+  # Will render and cache a partial
+  # If the object has been removed or doesn't exists nothing will be rendered
 
-    logger.info "render_cached: object: #{object} view: #{view} options #{options.inspect}"
+  def render_object(object, view, options={})
+    options[:object] = object
+    do_render_object(view, options)
+  end
+
+ 
+  def render_object_klass_id(klass, id, view, options = {})
+    options[:klass] = klass
+    options[:id] = id
+    do_render_object(view, options)
+  end
+
+  private
+    
+
+  def do_render_object(view, options={})
+
+    klass, id = 
+      if options[:object]
+        [options[:object].class, options[:object].id]
+      else
+        [options[:klass], options[:id]]
+      end
+    
+    unless klass && id
+      raise "options[:object] or options[:id] and options[:klass] must be specified"
+    end
+    
+    id = id.to_i
+
+    logger.info "render_cached: class: #{klass.name} :id #{id} view: #{view} options #{options.inspect}"
 
 
     # XXX validate that object is an acts_as_cached  FIXME
 
-    namespace = "#{object.class.name}:#{object.id}"
+    namespace = "#{klass.name}:#{id}"
     if render_options = options[:options]
       key = "#{view}:#{render_options.to_key}"
     else
@@ -48,7 +79,7 @@ ActionView::Base.class_eval do
 
     fragment_proc = Proc.new do
       partial = options[:partial]
-      class_lower = object.class.name.underscore
+      class_lower = klass.name.underscore
       unless partial
         if directory = options[:directory]
           partial = "#{directory}/#{class_lower}_#{view}"
@@ -56,7 +87,13 @@ ActionView::Base.class_eval do
           partial = "#{class_lower}_#{view}"
         end
       end
-      render :partial => partial, :locals => { class_lower.to_sym => object, :options => render_options }
+      begin 
+        
+        object = view_extensions_fetch_object(options)
+        render :partial => partial, :locals => { class_lower.to_sym => object, :options => render_options }
+      rescue ActiveRecord::RecordNotFound => e
+        ''
+      end
     end
 
     unless options[:cache] == false
@@ -66,18 +103,34 @@ ActionView::Base.class_eval do
     end
 
     if transformer = options[:transform]
-      case transformer
-      when Symbol
-        return send(transformer, object, fragment)
-      when Proc
-        return transformer.call(object, fragment)
-      else
-        raise TypeError, "Transformer must be either symbol or proc"
+      
+      begin 
+        object = view_extensions_fetch_object(options)
+
+        case transformer
+        when Symbol
+          return send(transformer, object, fragment)
+        when Proc
+          return transformer.call(object, fragment)
+        else
+          raise TypeError, "Transformer must be either symbol or proc"
+        end
+      rescue ActiveRecord::RecordNotFound => e
+        ''
       end
     else
       return fragment
     end
 
   end
+  
+  def view_extensions_fetch_object(options)
+    if options[:object]
+      options[:object]
+    else
+      options[:klass].find(options[:id].to_i)
+    end
+  end
+
 end
 

data/test/acts_as_cached_test.rb

@@ -1,8 +1,83 @@
 require 'test/unit'
-
+require 'rubygems'
+require 'action_pack'
+require 'mocha'
+require 'action_controller'
+require 'action_view'
+require 'view_extensions'
+require 'active_record'
 class ActsAsCachedTest < Test::Unit::TestCase
-  # Replace this with your real tests.
-  def test_this_plugin
-    flunk
+ 
+  class MockActiveRecord
+    attr_accessor :id
+    def initialize(id)
+      @id = id
+    end
+
+  end
+
+  def setup
+    @action_view = ActionView::Base.new
+    @action_view.stubs(:render).returns("yoyo")
+    @action_view.stubs(:logger).returns(stub_everything)
+  end
+  
+  def test_render_object_cached
+    obj = MockActiveRecord.new(1)
+    MockActiveRecord.expects(:find).never
+    cached_value(@action_view, 'yoyo')
+
+    assert_equal "yoyo", @action_view.render_object(obj, 'view')
+  end
+
+  def test_render_object_uncached
+    obj = MockActiveRecord.new(1)
+    MockActiveRecord.expects(:find).never
+    uncached_value(@action_view)
+    
+    assert_equal "yoyo", @action_view.render_object(obj, 'view')
+  end
+
+
+  def test_render_object_klass_id_cached
+    obj = MockActiveRecord.new(1)
+    MockActiveRecord.expects(:find).never
+    cached_value(@action_view, 'yoyo')
+    assert_equal "yoyo", @action_view.render_object_klass_id(MockActiveRecord, 1, 'view')
+  end
+
+  def test_render_object_klass_id_cached_uncached
+    obj = MockActiveRecord.new(1)
+    MockActiveRecord.expects(:find).with(1).once.returns(obj)
+    uncached_value(@action_view)
+
+    assert_equal "yoyo", @action_view.render_object_klass_id(MockActiveRecord, 1, 'view')
+
+  end
+
+  def test_render_object_klass_id_missing_object
+    obj = MockActiveRecord.new(1)
+    MockActiveRecord.expects(:find).with(1).once.raises(ActiveRecord::RecordNotFound)
+    uncached_value(@action_view)
+
+    assert_equal "", @action_view.render_object_klass_id(MockActiveRecord, 1, 'view')
+
+  end
+
+  def cached_value(obj, value)
+    obj.class.class_eval <<-EOS
+      def cache_value(*args)
+         '#{value}'
+      end
+    EOS
   end
+
+  def uncached_value(obj)
+    obj.class.class_eval do 
+      def cache_value(namespace, expire, &proc)
+        proc.call
+      end
+    end
+  end
+
 end

metadata

@@ -1,57 +1,65 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
-specification_version: 1
 name: acts_as_cached
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2006-12-22 00:00:00 +01:00
-summary: Caching helpers for Rails
-require_paths: 
-- lib
-email: 
-homepage: 
-rubyforge_project: 
-description: 
-autorequire: acts_as_cached
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.1.2
 platform: ruby
-signing_key: 
-cert_chain: 
 authors: 
 - Adocca Entertainment AB
-files: 
-- lib/acts_as_cached.rb
-- lib/view_extensions.rb
-- test/acts_as_cached_test.rb
-- README
-test_files: []
-
-rdoc_options: 
-- --line-numbers
-- --inline-source
-extra_rdoc_files: 
-- README
-executables: []
-
-extensions: []
-
-requirements: []
+autorequire: acts_as_cached
+bindir: bin
+cert_chain: []
 
+date: 2008-05-27 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: AdoccaMemcache
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.1.0
     version: 
+description: 
+email: 
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+files: 
+- lib/acts_as_cached.rb
+- lib/view_extensions.rb
+- test/acts_as_cached_test.rb
+- README
+has_rdoc: true
+homepage: 
+post_install_message: 
+rdoc_options: 
+- --line-numbers
+- --inline-source
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.1.1
+signing_key: 
+specification_version: 2
+summary: Caching helpers for Rails
+test_files: []
+