@@ -12,12 +12,13 @@ module Mack page = Cachetastic::Caches::PageCache.get(request.fullpath) if page response = Mack::Response.new + response["Content-Type"] = page.content_type response.write(page.body) return response.finish end ret = @app.call(env) res = ret[2] - Cachetastic::Caches::PageCache.set(request.fullpath, Mack::Caching::PageCaching::Page.new(res.body)) + Cachetastic::Caches::PageCache.set(request.fullpath, Mack::Caching::PageCaching::Page.new(res.body, res["Content-Type"])) if res.successful? return ret end return @app.call(env) @@ -27,9 +28,8 @@ module Mack attr_reader :body attr_reader :content_type - attr_reader :status - def initialize(body, content_type = "text/html", status = 200) + def initialize(body, content_type = "text/html") if body.is_a?(Array) raise Mack::Caching::PageCaching::UncacheableError.new("Multipart pages can not be cached!") if body.size > 1 @body = body.first @@ -37,7 +37,6 @@ module Mack @body = body end @content_type = content_type - @status = status end def to_s mack-caching/lib/page_caching.rb @@ -4,5 +4,18 @@ class DefaultController # / def index end + + def hello_world + wants(:xml) do + render(:text, "<name>#{params[:name]}</name><rand>#{rand}</rand>") + end + wants(:html) do + render(:text, "<p>#{params[:name]}</p><p>#{rand}</p>") + end + end + + def always_500 + render(:text, "i should be 500: #{rand}", :status => 500) + end end mack-caching/spec/fake_application/app/controllers/default_controller.rb @@ -4,3 +4,5 @@ mack::session_id: _fake_application_session_id orm: data_mapper mack::testing_framework: rspec + +use_page_caching: true \ No newline at end of file mack-caching/spec/fake_application/config/app_config/default.yml @@ -9,39 +9,60 @@ describe "Page Caching" do describe "use_page_caching is turned on" do it "should serve a cached page" do - temp_app_config(:use_page_caching => true) do - Cachetastic::Caches::PageCache.set("/", Mack::Caching::PageCaching::Page.new("hello")) - get "/" - response.body.should == "hello" - end + Cachetastic::Caches::PageCache.set("/", Mack::Caching::PageCaching::Page.new("hello")) + get "/" + response.body.should == "hello" + response.content_type.should == "text/html" end it "should cache a page designated to be cached" do - temp_app_config(:use_page_caching => true) do - get "/" - response.body.should match(/Welcome to your Mack application!/) - Cachetastic::Caches::PageCache.get("/").to_s.should == response.body - end + get "/default/hello_world?name=mark" + response.body.should match(/<p>mark<\/p>/) + page = Cachetastic::Caches::PageCache.get("/default/hello_world?name=mark") + page.to_s.should == response.body + page.content_type.should == "text/html" end - it "should store the content type correctly" + it "should store and deliver the content type correctly" do + get "/default/hello_world.xml?name=mark" + response.body.should match(/<name>mark<\/name>/) + response.content_type.should == "application/xml; text/xml" + old_body = response.body + get "/default/hello_world.xml?name=mark" + response.body.should == old_body + response.content_type.should == "application/xml; text/xml" + end - it "should deliver the content type correctly" - it "should store the status correctly" + it "should never store non-successful pages" do + get "/default/always_500" + response.status.should == 500 + Cachetastic::Caches::PageCache.get("/default/always_500").should be_nil + end - it "should deliver the status correctly" end describe "use_page_caching is turned off" do it "should serve the uncached page" do - get "/" - response.body.should match(/Welcome to your Mack application!/) + temp_app_config("use_page_caching" => false) do + get "/default/hello_world?name=mark" + response.body.should match(/<p>mark<\/p>/) + old_body = response.body + get "/default/hello_world?name=mark" + response.body.should match(/<p>mark<\/p>/) + response.body.should_not == old_body + end end - it "should not store the cached page" + it "should not store the cached page" do + temp_app_config("use_page_caching" => false) do + get "/default/hello_world?name=mark" + response.body.should match(/<p>mark<\/p>/) + Cachetastic::Caches::PageCache.get("/default/hello_world?name=mark").should be_nil + end + end end mack-caching/spec/lib/page_caching_spec.rb d16c138c3927367c222babacf543cfa125c8d42d Mark Bates mark@markbates.com http://github.com/markbates/mack-more/commit/e5c2e8ade1ef1dcef5344ec8a9f0662d4ee2717c e5c2e8ade1ef1dcef5344ec8a9f0662d4ee2717c 2008-07-18T09:38:30-07:00 2008-07-18T09:38:30-07:00 Feature: Page Caching [#18 state:resolved] a2ec3c2c4a39afc59ff242b51cb21dd19ae00f3d Mark Bates mark@markbates.com