merb-cache 0.9.7 → 0.9.8

data/spec/merb-cache-fragment_spec.rb

@@ -1,100 +0,0 @@
-# TODO
-# more specs for fragment caching:
-# cache_get, cache_set, cached?, cache, expire
-
-describe "merb-cache-fragment" do
-
-  it "should render index" do
-    c = dispatch_to(CacheController, :index)
-    c.body.should == "test index"
-  end
-
-  it "should cache the fragment (erb capture/concat)" do
-    c = dispatch_to(CacheController, :action1)
-    NOW = c.body.strip
-    c.cache_get("key1").strip.should == NOW
-  end
-
-  it "should cache the fragment (haml capture/concat)" do
-    c = dispatch_to(CacheController, :action2)
-    now = c.body.strip
-    c.cache_get("key11").strip.should == now
-    sleep 1
-    c = dispatch_to(CacheController, :action2)
-    c.cache_get("key11").strip.should == now
-    c.expire("key11")
-    c.cache_get("key11").should be_nil
-  end
-
-  it "should use the fragment" do
-    sleep 1
-    c = dispatch_to(CacheController, :action1)
-    c.body.strip.should == NOW
-  end
-
-  it "should expire the fragment" do
-    CACHE.expire("key1")
-    CACHE.cache_get("key1").should be_nil
-  end
-
-  it "should refresh the template" do
-    c = dispatch_to(CacheController, :action1)
-    c.body.strip.should_not == NOW
-  end
-
-  it "should return nil for unknown keys" do
-    CACHE.cache_get("unknown_key").should be_nil
-  end
-
-  it "should expire matching keys" do
-    CACHE.cache_set("test1", "test1")
-    CACHE.cache_get("test1").should == "test1"
-    CACHE.cache_set("test2", "test2")
-    CACHE.cache_get("test2").should == "test2"
-    CACHE.cache_set("test3", "test3")
-    CACHE.cache_get("test3").should == "test3"
-    CACHE.expire(:match => "test")
-    CACHE.cache_get("test1").should be_nil
-    CACHE.cache_get("test2").should be_nil
-    CACHE.cache_get("test3").should be_nil
-  end
-
-  it "should expire entry after 3 seconds" do
-    CACHE.cache_set("timed_key", "vanish in 3 seconds", 0.05)
-    CACHE.cache_get("timed_key").should == "vanish in 3 seconds"
-    sleep 3.5
-    CACHE.cache_get("timed_key").should be_nil
-  end
-
-  it "should expire in many ways" do
-    CACHE.cache_set("test1", "test1")
-    CACHE.expire("test1")
-    CACHE.cache_get("test1").should be_nil
-
-    CACHE.cache_set("test2/id1", "test2")
-    CACHE.expire(:key => "test2", :params => %w(id1))
-    CACHE.cache_get("test2/id1").should be_nil
-
-    CACHE.cache_set("test3", "test3")
-    CACHE.expire(:key => "test3")
-    CACHE.cache_get("test3").should be_nil
-
-    CACHE.cache_set("test4/id1", "test4")
-    CACHE.expire(:key => "test4", :params => %w(id1), :match => true)
-    CACHE.cache_get("test4/id1/id2").should be_nil
-  end
-
-  it "should expire all keys" do
-    CACHE.expire_all
-    CACHE.cache_get("key1").should be_nil
-  end
-
-  it "should cache/restore ruby objects" do
-    now = Time.now
-    data = {:key1 => "key1", :key2 => "key2", :now => Time.now }
-    CACHE.cache_set("key1", data)
-    _data = CACHE.cache_get("key1")
-    data.should == _data
-  end
-
-end

data/spec/merb-cache-page_spec.rb

@@ -1,150 +0,0 @@
-describe "merb-cache-page" do
-
-  it "should cache page (action5)" do
-    c = get("/cache_controller/action5")
-    c.body.strip.should == "test action5"
-    c.cached_page?("action5").should be_true
-  end
-
-  it "should expire page (action5)" do
-    CACHE.expire_page("action5")
-    CACHE.cached_page?("action5").should be_false
-  end
-
-  it "should cache page (action5) with full path" do
-    c = get("/cache_controller/action5/this/is/a/test")
-    c.cached_page?(:action => "action5", :params => %w(this is a test)).should be_true
-  end
-
-  it "should expire page (action5) with full path" do
-    CACHE.expire_page(:action => "action5",
-                      :controller => "cache_controller",
-                      :params => %w(this is a test))
-    CACHE.cached_page?(:key => "/cache_controller/action5/this/is/a/test").should be_false
-  end
-
-  it "should cache page (action6), use it and expire 3 seconds after" do
-    CACHE.expire_page :match => true, :action => "action6"
-    c = get("/cache_controller/action6")
-    now = Time.now.to_s
-    c.body.strip.should == now
-    c.cached_page?("action6").should be_true
-    sleep 1
-    c = get("/cache_controller/action6")
-    c.body.strip.should == now
-    sleep 2
-    c = get("/cache_controller/action6")
-    c.body.strip.should == Time.now.to_s
-  end
-
-  it "should cache page with full path (action6) and expire in 3 seconds" do
-    CACHE.expire_page "action6"
-    CACHE.cached_page?(:action => "action6", :params => %w(path to nowhere)).should be_false
-    c = get("/cache_controller/action6/path/to/nowhere/")
-    now = Time.now.to_s
-    c.body.strip.should == now
-    c.cached_page?(:action => "action6", :params => %w(path to nowhere)).should be_true
-    sleep 1
-    c = get("/cache_controller/action6/path/to/nowhere")
-    c.body.strip.should == now
-    sleep 2
-    c = get("/cache_controller/action6/path/to/nowhere")
-    c.body.strip.should == Time.now.to_s
-  end
-
-  it "should expire page in many ways" do
-    c = get("/cache_controller/action6")
-    CACHE.expire_page("action6")
-    CACHE.cached_page?("action6").should be_false
-
-    c = get("/cache_controller/action6")
-    CACHE.expire_page(:match => "/cache_control")
-    CACHE.cached_page?(:action => "action6").should be_false
-
-    c = get("/cache_controller/action6")
-    CACHE.expire_page(:action => "action6")
-    CACHE.cached_page?(:action => "action6").should be_false
-
-    c = get("/cache_controller/action6/id1/id2")
-    CACHE.expire_page(:action => "action6", :params => %w(id1 id2))
-    CACHE.cached_page?(:action => "action6", :params => %w(id1 id2)).should be_false
-
-    c = get("/cache_controller/action6/id1/id2")
-    CACHE.expire_page(:action => "action6", :match => true)
-    CACHE.cached_page?(:action => "action6", :params => %w(id1 id2)).should be_false
-
-    c = get("/cache_controller/action6")
-    CACHE.expire_page(:action => "action6", :controller => "cache_controller")
-    CACHE.cached_page?(:action => "action6", :controller => "cache_controller").should be_false
-
-    c = get("/cache_controller/action6/id1/id2")
-    CACHE.expire_page(:action => "action6", :params => %w(id1), :match => true)
-    CACHE.cached_page?(:action => "action6", :params => %w(id1 id2)).should be_false
-
-    c = get("/cache_controller/action6/id1/id2")
-    CACHE.expire_page(:action => "action6", :controller => "cache_controller", :match => true)
-    CACHE.cached_page?(:action => "action6", :params => %w(id1 id2)).should be_false
-
-    c = get("/cache_controller/action6/id1/id2")
-    CACHE.expire_page(:action => "action6", :controller => "cache_controller", :params => %w(id1), :match => true)
-    CACHE.cached_page?(:action => "action6", :params => %w(id1 id2)).should be_false
-
-    c = get("/cache_controller/action6/id1/id2")
-    CACHE.expire_page(:action => "action6", :controller => "cache_controller", :params => %w(id1 id2))
-    CACHE.cached_page?(:action => "action6", :controller => "cache_controller", :params => %w(id1 id2)).should be_false
-
-    c = get("/cache_controller/action6")
-    CACHE.expire_page(:key => "/cache_controller/action6")
-    CACHE.cached_page?(:key => "/cache_controller/action6").should be_false
-    c = get("/cache_controller/action6/id1/id2")
-    CACHE.expire_page(:key => "/cache_controller/action6", :params => %w(id1 id2))
-    CACHE.cached_page?(:key => "/cache_controller/action6", :params => %w(id1 id2)).should be_false
-
-    c = get("/cache_controller/action6/id1/id2")
-    CACHE.expire_page(:key => "/cache_controller/action6/id1", :match => true)
-    CACHE.cached_page?(:key => "/cache_controller/action6/id1/id2").should be_false
-
-    c = get("/cache_controller/action6/id1/id2")
-    CACHE.expire_page(:key => "/cache_controller/action6", :params => %w(id1), :match => true)
-    CACHE.cached_page?(:key => "/cache_controller/action6/id1/id2").should be_false
-  end
-
-  it "should respect original content-type" do
-    c = get("/cache_controller/action7.css")
-    c.body.should == "CSS"
-    c = get("/cache_controller/action7.css")
-    c.params[:format].should == "css"
-    c.cached_page?(:action => "action7", :extension => 'css').should be_true
-
-    c = get("/cache_controller/action7.js")
-    c.body.should == "JS"
-    c = get("/cache_controller/action7.js")
-    c.params[:format].should == "js"
-    c.cached_page?(:action => "action7", :extension => 'js').should be_true
-
-    c = get("/cache_controller/action7.xml")
-    c.body.should == "XML"
-    c = get("/cache_controller/action7.xml")
-    c.params[:format].should == "xml"
-    c.cached_page?(:action => "action7", :extension => 'xml').should be_true
-
-    c = get("/cache_controller/action7.jpg")
-    c.body.should == "JPG"
-    c = get("/cache_controller/action7.jpg")
-    c.params[:format].should == "jpg"
-    c.cached_page?(:action => "action7", :extension => 'jpg').should be_true
-
-    c = get("/cache_controller/action7.html")
-    c.body.should == "HTML"
-    c = get("/cache_controller/action7.html")
-    c.params[:format].should == "html"
-    c.cached_page?(:action => "action7").should be_true
-  end
-
-  it "should expire all pages" do
-    CACHE.expire_all_pages
-    CACHE.cached_page?("action6").should be_false
-    Dir.glob(Merb::Controller._cache.config[:cache_html_directory] + '/*').should be_empty
-  end
-
-end

data/spec/merb-cache_spec.rb

@@ -1,15 +0,0 @@
-require File.dirname(__FILE__) + "/spec_helper"
-
-Merb::Router.prepare do |r|
-  r.default_routes
-  r.match("/").to(:controller => "cache_controller", :action =>"index")
-end
-
-CACHE = CacheController.new(Merb::Test::RequestHelper::FakeRequest.new)
-CACHE.expire_all
-
-puts "Using #{CACHE._cache.store.cache_store_type.inspect} store"
-
-require File.dirname(__FILE__) + "/merb-cache-fragment_spec"
-require File.dirname(__FILE__) + "/merb-cache-action_spec"
-require File.dirname(__FILE__) + "/merb-cache-page_spec"

data/spec/views/cache_controller/action1.html.erb

@@ -1,4 +0,0 @@
-<%- cache('key1') do -%>
-  <%= Time.now %>
-<%- end -%>
-

data/spec/views/cache_controller/action2.html.haml

@@ -1,4 +0,0 @@
-- cache('key11') do
-= Time.now
-- end
-