sinatra-cache 0.2.3 → 0.3.0

data/spec/spec_helper.rb

@@ -0,0 +1,62 @@
+
+::APP_ROOT = "#{File.dirname(File.expand_path(__FILE__))}/fixtures" 
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+ENV['RACK_ENV'] = 'test'
+
+#--
+# DEPENDENCIES
+#++
+%w( 
+sinatra/base 
+fileutils
+sass
+ostruct
+yaml
+json
+).each {|lib| require lib }
+
+#--
+## SINATRA EXTENSIONS
+#++
+%w(
+sinatra/tests
+sinatra/cache
+).each {|ext| require ext }
+
+
+Spec::Runner.configure do |config|
+  config.include RspecHpricotMatchers
+  config.include Sinatra::Tests::TestCase
+  config.include Sinatra::Tests::RSpec::SharedSpecs
+end
+
+
+# quick convenience methods..
+
+def fixtures_path 
+  "#{File.dirname(File.expand_path(__FILE__))}/fixtures"
+end
+
+def public_fixtures_path 
+  "#{fixtures_path}/public"
+end
+
+class MyTestApp < Sinatra::Base 
+  
+  set :app_dir, "#{APP_ROOT}/apps/base"
+  set :public, "#{fixtures_path}/public"
+  set :views, "#{app_dir}/views"
+  
+  register(Sinatra::Tests)
+  
+  enable :raise_errors
+  
+end #/class MyTestApp
+
+
+class Test::Unit::TestCase
+  Sinatra::Base.set :environment, :test
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-cache
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - kematzy
@@ -9,11 +14,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-13 00:00:00 -05:00
+date: 2010-02-25 00:00:00 +08:00
 default_executable: 
-dependencies: []
-
-description: Simple Page Caching for Sinatra [www.sinatrarb.com]
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - a
+        version: 1.0.a
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: sinatra-tests
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 6
+        version: 0.1.6
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :development
+  version_requirements: *id003
+description: A Sinatra Extension that makes Page and Fragment Caching easy.
 email: kematzy@gmail.com
 executables: []
 
@@ -21,22 +67,26 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.md
+- README.rdoc
 files: 
 - .gitignore
 - LICENSE
-- README.md
+- README.rdoc
 - Rakefile
-- VERSION.yml
+- VERSION
 - lib/sinatra/cache.rb
+- lib/sinatra/cache/helpers.rb
+- lib/sinatra/output.rb
+- lib/sinatra/templates.rb
 - sinatra-cache.gemspec
-- test/SPECS.rdoc
-- test/cache_test.rb
-- test/fixtures/classic.rb
-- test/fixtures/myapp.rb
-- test/fixtures/myapp_default.rb
-- test/fixtures/views/index.erb
-- test/helper.rb
+- spec/fixtures/apps/base/views/css.sass
+- spec/fixtures/apps/base/views/fragments.erb
+- spec/fixtures/apps/base/views/fragments_shared.erb
+- spec/fixtures/apps/base/views/index.erb
+- spec/fixtures/apps/base/views/layout.erb
+- spec/fixtures/apps/base/views/params.erb
+- spec/sinatra/cache_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/kematzy/sinatra-cache
 licenses: []
@@ -50,24 +100,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Simple Page Caching for Sinatra [www.sinatrarb.com]
+summary: A Sinatra Extension that makes Page and Fragment Caching easy.
 test_files: 
-- test/fixtures/myapp_default.rb
-- test/fixtures/classic.rb
-- test/fixtures/myapp.rb
-- test/cache_test.rb
-- test/helper.rb
+- spec/sinatra/cache_spec.rb
+- spec/spec_helper.rb

data/README.md

@@ -1,121 +0,0 @@
-Sinatra::Cache
-==============
-
-Adds a very *simple* Page Caching functionality to [Sinatra](http://www.sinatrarb.com/)
-
-Docunext did not write this code. This is a fork from the original: [kematzy/sinatra-cache](http://github.com/kematzy/sinatra-cache)
-
-<hr />
-
-### Status
-
-This is *unfinished work*, so use with care.
-
-If you find it lacking or badly coded, please feel free to fork and improve. I'll be very happy :)
-
-<hr />
-
-
-### TODO's
-
-
-* Make caching an option of the normal <tt>erb()/haml()/sass()</tt> methods, sort of like this:
-
-<pre class="sh_ruby">
-erb(:index, :cache => true/false)
-
-# alternatively enable caching by setting a global config like this
-set :cache_enabled_for :all || :only/except => ['/','/contact',...]
-</pre>
-
-
-* Improve the logging output to the standard Sinatra output (if we are having :logging enabled )
-
-* Add fragment caching...
-
-* Enable the options functionality for the <b>:cache</b> & <b>:cache_expire</b> methods, so that they can take custom extensions and more
-
-
-<hr />
-
-
-### CONFIGURATION
-
-**Example 1: Sinatra 'classic' app.**
-
-<pre class="sh_ruby">
-require 'sinatra/cache'
-
-# toggle for the cache functionality.
-set :cache_enabled, true
-# sets the default extension for cached files
-set :cache_page_extension, '.html'
-# sets the Cache dir to the root of the /public directory.
-set :cache_output_dir, '' # was :cache_dir
-</pre>
-
-**Example 2: Sinatra 'sub-classed' app.**
-
-<pre class="sh_ruby">
-require 'sinatra/cache'
-
-class MyApp < Sinatra::Base
-
-  register Sinatra::Cache
-
-  # toggle for the cache functionality.
-  set :cache_enabled, true
-  # sets the default extension for cached files
-  set :cache_page_extension, '.html'
-  # sets the Cache output dir to the root of the /public directory.
-  set :cache_output_dir, '' # was :cache_dir
-</pre>
-
-
-<hr />
-
-
-### USAGE
-
-Basic Page Caching into static HTML files
-
-<pre class="sh_ruby">
-get '/contact' do
-  # NB!  options is currently not working
-  cache( erb( :contact ), :options => 'should go here' )
-end
-</pre>
-
-Expiring old pages (ie: after POST or PUT events)
-
-<pre class="sh_ruby">
-# not very good example
-post '/contact' do
-  cache_expire( '/contact', options )
-end
-</pre>
-
-See the "test":test/ and "test/fixtures":test/fixtures/ directories for more examples.
-
-
-<hr />
-
-
-### DEFAULT OPTIONS
-
-* <tt>:cache_enabled</tt> => toggle for the cache functionality. Default is: <tt>true</tt>
-* <tt>:cache_page_extension</tt> => sets the default extension for cached files. Default is: <tt>.html</tt>
-* <tt>:cache_output_dir</tt> => sets cache directory where cached files are stored. Default is: ''(empty) == root of /public.<br>
-    set to empty, since the ideal 'system/cache/' does not currently work with Passenger & mod_rewrite :(
-* <tt>:cache_logging</tt> => toggle for logging the cache calls. Default is: <tt>true</tt>
-* <tt>:cache_logging_level</tt> => sets the level of the cache logger. Default is: <tt>:info</tt>.<br />
-    Options:(unused atm) [:info, :warn, :debug]
-
-<hr />
-
-### Credits
-
-A big *Thank You!* goes to [rtomayko](http://github.com/rtomayko/), [blakemizerany](http://github.com/blakemizerany/) and others working on the Sinatra framework.
-
-Inspired by code from [Rails](http://rubyonrails.com/) &amp; [Merb](http://merbivore.com/)
-and [sinatra-mailer](http://github.com/foca/sinatra-mailer/tree/master)

data/VERSION.yml

@@ -1,4 +0,0 @@
---- 
-:major: 0
-:minor: 2
-:patch: 3

data/test/SPECS.rdoc

@@ -1,95 +0,0 @@
-Test Suite for [Sinatra::Cache v0.2.0] produced on [2009-25-02 at 00:37]
-
-== Sinatra::Cache
-=== ClassMethods
-==== the :version method
-* should have a :version method that returns a String with the version number in it
-* should not interfere with the normal Sinatra VERSION
-=== Instance Methods
-==== Private
-===== :cache_file_name method
-====== when using default options
-* should handle '/' and return 'index.html'
-* should handle top level URI's and return the URI plus '.html'
-* should handle sub level URIs and return the directory/file format
-====== when using customized options
-* should handle '/' and return 'index.html'
-* should handle top level URI's and return the URI plus '.html'
-* should handle sub level URIs and return the directory/file format
-===== :cache_page_path method
-====== when using default options
-* should handle '/' and return the full path to 'index.html'
-* should handle top level URI's and return the full path to the URI plus '.html'
-* should handle sub level URIs and return the full path to the URI
-====== when using customized options
-* should handle '/' and return the full path to 'index.html'
-* should handle top level URI's and return the full path to the URI plus '.html'
-* should handle sub level URIs and return the full path to the URI
-===== :log method
-* MISSING TESTS =>
-==== Public
-===== :cache method
-====== when using default options
-* is tested below in the Page Caching section
-====== when using customized options
-* is tested below in the Page Caching section
-=== configuration methods
-==== when using default options
-* the :cache_enabled option should be correct (true)
-* the :cache_page_extension option should be correct (.html)
-* the :cache_dir option should be correct ('') 
-* the :cache_logging option should be correct (true)
-* the :cache_logging_level option should be correct (:info)
-==== when using customized options
-* the :cache_enabled option should be correct (false)
-* the :cache_page_extension option should be correct (.cache.html)
-* the :cache_dir option should be correct ('system/cache') 
-* the :cache_logging option should be correct (true)
-* the :cache_logging_level option should be correct (:info)
-=== Page Caching
-==== when using default options
-* should NOT cache the un-cached index page
-* should cache the /cache page
-* should expire the /cache page
-==== when using customized options
-* should NOT cache the un-cached index page
-* should NOT cache the /cache page since :cache_enabled => false
-===== and setting cache_enabled => true
-* should cache the /cache page
-* should expire the /cache page
-=== Sinatra::Base
-==== should respond to
-* the :cache_dir method
-* the :cache_dir= method
-* the :cache_dir? method
-* the :cache_enabled method
-* the :cache_enabled= method
-* the :cache_enabled? method
-* the :cache_logging method
-* the :cache_logging= method
-* the :cache_logging? method
-* the :cache_logging_level method
-* the :cache_logging_level= method
-* the :cache_logging_level? method
-* the :cache_page_extension method
-* the :cache_page_extension= method
-* the :cache_page_extension? method
-=== Sinatra::Default
-==== should respond to
-* the :cache_dir method
-* the :cache_dir= method
-* the :cache_dir? method
-* the :cache_enabled method
-* the :cache_enabled= method
-* the :cache_enabled? method
-* the :cache_logging method
-* the :cache_logging= method
-* the :cache_logging? method
-* the :cache_logging_level method
-* the :cache_logging_level= method
-* the :cache_logging_level? method
-* the :cache_page_extension method
-* the :cache_page_extension= method
-* the :cache_page_extension? method
-
-64 specifications (84 requirements), 0 failures

data/test/cache_test.rb

@@ -1,434 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-require "#{File.dirname(File.dirname(File.expand_path(__FILE__)))}/lib/sinatra/cache"
-
-class Sinatra::Base
-  # include Sinatra::Cache
-end #/class Sinatra::Base
-
-puts "Test Suite for [#{Sinatra::Cache.version}] produced on [#{ Time.now.strftime("%Y-%d-%m at %H:%M") }]"
-
-describe "Sinatra::Cache" do 
-  
-  before(:each) do
-    
-    default_app = mock_app do 
-      register Sinatra::Cache
-      
-      set :public, "#{File.dirname(File.expand_path(__FILE__))}/fixtures/public"
-      set :views, "#{File.dirname(File.expand_path(__FILE__))}/fixtures/views"
-      
-      get '/' do
-        erb(:index)
-      end
-      
-      get '/cache' do
-        # "Hello World from Sinatra Version=[#{Sinatra::VERSION}]"
-        cache("Hello World from Sinatra Version=[#{Sinatra::VERSION}]")
-      end
-      # YES, I know this is NOT ideal, but it's only test ;-)
-      get '/cache_expire' do
-        cache_expire("/cache")
-      end
-      
-    end
-    
-    custom_app = mock_app do
-      register Sinatra::Cache
-      
-      set :public, "#{File.dirname(__FILE__)}/fixtures/public"
-      set :views, "#{File.dirname(__FILE__)}/fixtures/views"
-      
-      set :cache_enabled, false
-      set :cache_page_extension, '.cache.html'
-      set :cache_output_dir, 'system/cache'
-      set :cache_logging, false
-      set :cache_logging_level, :info
-      
-      get '/' do
-        erb :index
-      end
-      
-      get '/cache' do
-        cache("Hello World from Sinatra Version=[#{Sinatra::VERSION}]")
-      end
-      # YES, I know this is NOT ideal, but it's only test ;-)
-      get '/cache_expire' do
-        cache_expire("/cache")
-      end
-    end
-    
-    @default_app = default_app.new
-    @custom_app = custom_app.new
-  end
-  
-  describe "ClassMethods" do 
-    
-    describe "the :version method" do 
-      
-      it "should have a :version method that returns a String with the version number in it" do 
-        v = Sinatra::Cache.version
-        assert_not_nil(v)
-        assert_kind_of(String, v)
-        assert_match(/Sinatra::Cache v\d\.\d\.\d/, v)
-      end
-      
-      it "should not interfere with the normal Sinatra VERSION" do 
-        assert_not_equal(Sinatra::Cache.version, Sinatra::VERSION)
-      end
-      
-    end #/the :version method
-    
-  end #/ClassMethods
-  
-  
-  describe "Instance Methods" do 
-    
-    describe "Private" do 
-      
-      describe ":cache_file_name method" do 
-        
-        # temporary monkeypatch to enable testing
-        module Sinatra::Cache::Helpers 
-          public :cache_file_name
-        end
-        
-        describe "when using default options" do 
-          
-          it "should handle '/' and return 'index.html'" do 
-            expected = "index.html"
-            assert_equal(expected, @default_app.cache_file_name("/"))
-          end
-          
-          it "should handle top level URI's and return the URI plus '.html'" do 
-            expected = "cache.html"
-            assert_equal(expected, @default_app.cache_file_name("/cache"))
-          end
-          
-          it "should handle sub level URIs and return the directory/file format" do 
-            expected = "cache/test.html"
-            assert_equal(expected, @default_app.cache_file_name("/cache/test"))
-          end
-          
-        end #/when using default options
-        
-        describe "when using customized options" do 
-          
-          it "should handle '/' and return 'index.html'" do 
-            expected = "index.cache.html"
-            assert_equal(expected, @custom_app.cache_file_name("/"))
-          end
-          
-          it "should handle top level URI's and return the URI plus '.html'" do 
-            expected = "cache.cache.html"
-            assert_equal(expected, @custom_app.cache_file_name("/cache"))
-          end
-          
-          it "should handle sub level URIs and return the directory/file format" do 
-            expected = "cache/test.cache.html"
-            assert_equal(expected, @custom_app.cache_file_name("/cache/test"))
-          end
-          
-        end #/when using customized options
-        
-      end #/:cache_page_path method
-      
-      describe ":cache_page_path method" do 
-        
-        # temporary monkeypatch to enable testing
-        module Sinatra::Cache::Helpers 
-          public :cache_page_path
-        end
-        
-        describe "when using default options" do 
-          
-          it "should handle '/' and return the full path to 'index.html'" do 
-            expected = "#{public_fixtures_path}/index.html"
-            assert_equal(expected, @default_app.cache_page_path("/"))
-          end
-          
-          it "should handle top level URI's and return the full path to the URI plus '.html'" do 
-            expected = "#{public_fixtures_path}/cache.html"
-            assert_equal(expected, @default_app.cache_page_path("/cache"))
-          end
-          
-          it "should handle sub level URIs and return the full path to the URI" do 
-            expected = "#{public_fixtures_path}/cache/test.html"
-            assert_equal(expected, @default_app.cache_page_path("/cache/test"))
-          end
-          
-        end #/when using default options
-        
-        describe "when using customized options" do 
-          
-          it "should handle '/' and return the full path to 'index.html'" do 
-            expected = "#{public_fixtures_path}/system/cache/index.cache.html"
-            assert_equal(expected, @custom_app.cache_page_path("/"))
-          end
-          
-          it "should handle top level URI's and return the full path to the URI plus '.html'" do 
-            expected = "#{public_fixtures_path}/system/cache/cache.cache.html"
-            assert_equal(expected, @custom_app.cache_page_path("/cache"))
-          end
-          
-          it "should handle sub level URIs and return the full path to the URI" do 
-            expected = "#{public_fixtures_path}/system/cache/cache/test.cache.html"
-            assert_equal(expected, @custom_app.cache_page_path("/cache/test"))
-          end
-          
-        end #/when using customized options
-        
-      end #/:cache_page_path method
-      
-      describe ":log method" do 
-        
-        it "MISSING TESTS =>" do 
-          assert(true)
-        end
-        
-      end #/:log method
-      
-    end #/Private
-    
-    describe "Public" do 
-      
-      describe ":cache method" do 
-        
-        describe "when using default options" do 
-          
-          it "is tested below in the Page Caching section" do 
-            assert true
-          end
-          
-        end #/when using default options
-        
-        describe "when using customized options" do 
-          
-          it "is tested below in the Page Caching section" do 
-            assert true
-          end
-          
-        end #/when using customized options
-        
-      end #/:cache method
-      
-    end #/Public
-    
-  end #/Instance Methods
-  
-  
-  describe "configuration methods" do 
-    
-    describe "when using default options" do 
-      
-      it "the :cache_enabled option should be correct (true)" do 
-        assert_equal(true, @default_app.options.cache_enabled)
-      end
-      
-      it "the :cache_page_extension option should be correct (.html)" do 
-        assert_equal('.html', @default_app.options.cache_page_extension)
-      end
-      
-      it "the :cache_output_dir option should be correct ('') " do 
-        assert_equal('', @default_app.options.cache_output_dir)
-      end
-      
-      it "the :cache_logging option should be correct (true)" do 
-        assert_equal(true, @default_app.options.cache_logging)
-      end
-      
-      it "the :cache_logging_level option should be correct (:info)" do 
-        assert_equal(:info, @default_app.options.cache_logging_level)
-      end
-      
-    end #/default options
-    
-    describe "when using customized options" do 
-      
-      it "the :cache_enabled option should be correct (false)" do 
-        assert_equal(false, @custom_app.options.cache_enabled)
-      end
-      
-      it "the :cache_page_extension option should be correct (.cache.html)" do 
-        assert_equal('.cache.html', @custom_app.options.cache_page_extension)
-      end
-      
-      it "the :cache_output_dir option should be correct ('system/cache') " do 
-        assert_equal('system/cache', @custom_app.options.cache_output_dir)
-      end
-      
-      it "the :cache_logging option should be correct (true)" do 
-        assert_equal(false, @custom_app.options.cache_logging)
-      end
-      
-      it "the :cache_logging_level option should be correct (:info)" do 
-        assert_equal(:info, @custom_app.options.cache_logging_level)
-      end
-      
-    end #/when using customized options
-    
-  end #/configuration methods
-  
-  
-  describe "Page Caching" do 
-    after(:each) do
-      # FileUtils.rm_r(Dir["#{public_fixtures_path}/*"])
-    end
-    
-    describe "when using default options" do 
-      
-      it "should NOT cache the un-cached index page" do 
-        request = Rack::MockRequest.new(@default_app)
-        response = request.get('/')
-        assert response
-        assert_equal '<h1>HOME</h1>', response.body
-        assert_equal(false, test(?f, "#{public_fixtures_path}/index.html"))
-      end
-      
-      it "should cache the /cache page" do 
-        request = Rack::MockRequest.new(@default_app)
-        response = request.get('/cache')
-        assert response
-        assert_match(/^Hello World from Sinatra Version=\[\d\.\d\.\d(\.\d)?\]\n/, response.body)
-        assert(test(?f, "#{public_fixtures_path}/cache.html"))
-        assert_match(/^Hello World from Sinatra Version=\[\d\.\d\.\d(\.\d)?\]\n/, File.read("#{public_fixtures_path}/cache.html"))
-      end
-      
-      it "should expire the /cache page" do 
-        assert(test(?f, "#{public_fixtures_path}/cache.html"))
-        request = Rack::MockRequest.new(@default_app)
-        response = request.get('/cache_expire')
-        assert response
-        #  TODO:: this is dodgy stuff, rework 
-        assert_not_equal('', response.body)
-        assert_equal(false, test(?f, "#{public_fixtures_path}/cache.html"))
-      end
-      
-    end #/when using default options
-    
-    describe "when using customized options" do 
-      
-      it "should NOT cache the un-cached index page" do 
-        request = Rack::MockRequest.new(@custom_app)
-        response = request.get('/')
-        assert response
-        assert_equal '<h1>HOME</h1>', response.body
-        assert_equal(false, test(?f, "#{public_fixtures_path}/index.html"))
-      end
-      
-      it "should NOT cache the /cache page since :cache_enabled => false" do 
-        request = Rack::MockRequest.new(@custom_app)
-        response = request.get('/cache')
-        assert response
-        assert_match(/^Hello World from Sinatra Version=\[\d\.\d\.\d(\.\d)?\]/, response.body)
-        assert_equal(false, test(?f, "#{public_fixtures_path}/cache.cache.html"))
-      end
-      
-      describe "and setting cache_enabled => true" do 
-        
-        before(:each) do
-          custom_enabled_app = mock_app do 
-            register Sinatra::Cache
-            
-            set :public, "#{File.dirname(File.expand_path(__FILE__))}/fixtures/public"
-            set :views, "#{File.dirname(File.expand_path(__FILE__))}/fixtures/views"
-            
-            set :cache_enabled, true
-            set :cache_page_extension, '.cache.html'
-            set :cache_output_dir, 'system/cache'
-            set :cache_logging, true
-            set :cache_logging_level, :info
-            
-            get '/' do
-              erb :index
-            end
-            
-            get '/cache' do
-              cache("Hello World from Sinatra Version=[#{Sinatra::VERSION}]")
-            end
-            
-            # YES, I know this is NOT ideal, but it's only test ;-)
-            get '/cache_expire' do
-              cache_expire("/cache")
-            end
-            
-          end
-          
-          @custom_enabled_app = custom_enabled_app.new
-        end
-        
-        it "should cache the /cache page" do 
-          request = Rack::MockRequest.new(@custom_enabled_app)
-          response = request.get('/cache')
-          assert response
-          assert_match(/^Hello World from Sinatra Version=\[\d\.\d\.\d(\.\d)?\]\n<!-- page cached: \d+-\d+-\d+ \d+:\d+:\d+ -->\n$/, response.body)
-          assert(test(?f, "#{public_fixtures_path}/system/cache/cache.cache.html"))
-          assert_match(/^Hello World from Sinatra Version=\[\d\.\d\.\d(\.\d)?\]\n<!-- page cached: \d+-\d+-\d+ \d+:\d+:\d+ -->\n$/, File.read("#{public_fixtures_path}/system/cache/cache.cache.html"))
-        end
-        
-        it "should expire the /cache page" do 
-          assert(test(?f, "#{public_fixtures_path}/system/cache/cache.cache.html"))
-          request = Rack::MockRequest.new(@custom_enabled_app)
-          response = request.get('/cache_expire')
-          assert response
-          #  TODO:: this is dodgy stuff, rework 
-          assert_not_equal('', response.body)
-          assert_equal(false, test(?f, "#{public_fixtures_path}/system/cache/cache.cache.html"))
-        end
-        
-      end #/and setting cache_enabled => true
-      
-    end #/when using customized options
-    
-    
-  end #/Page Caching
-  
-  
-  describe "Sinatra::Base" do 
-    
-    before do
-      Sinatra::Base.register(Sinatra::Cache)
-    end
-    
-    describe "should respond to" do 
-      
-      [
-        "cache_output_dir", "cache_output_dir=","cache_output_dir?", "cache_enabled","cache_enabled=", "cache_enabled?",
-        "cache_logging","cache_logging=","cache_logging?","cache_logging_level","cache_logging_level=","cache_logging_level?",
-        "cache_page_extension","cache_page_extension=","cache_page_extension?"
-      ].each do |m|
-        
-        it "the :#{m} method" do 
-          assert_respond_to(Sinatra::Base, m.to_sym)
-        end
-        
-      end
-      
-    end #/should respond to
-    
-  end #/Sinatra::Base
-  
-  describe "Sinatra::Default" do 
-    
-    before do
-      Sinatra::Base.register(Sinatra::Cache)
-    end
-    
-    describe "should respond to" do 
-      
-      [
-        "cache_output_dir", "cache_output_dir=","cache_output_dir?", "cache_enabled","cache_enabled=", "cache_enabled?",
-        "cache_logging","cache_logging=","cache_logging?","cache_logging_level","cache_logging_level=","cache_logging_level?",
-        "cache_page_extension","cache_page_extension=","cache_page_extension?"
-      ].each do |m|
-        
-        it "the :#{m} method" do 
-          assert_respond_to(Sinatra::Default, m.to_sym)
-        end
-        
-      end
-      
-    end #/should respond to
-    
-  end #/Sinatra::Default
-  
-end #/Sinatra::Cache