wonki 0.0.7 → 0.0.8

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage = "http://github.com/rubyyot/wonki"
     gem.authors = ["rubyyot"]
     gem.add_dependency 'grit'
-    gem.add_dependency 'flannel', '>= 0.1.5'
+    gem.add_dependency 'flannel', '>= 0.2.1'
     gem.add_development_dependency 'shoulda', '>= 2.10.2'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/wonki/wiki_page.rb

@@ -1,12 +1,14 @@
 require 'wonki/storage'
 require 'wonki/page_not_found'
 require 'flannel'
+require 'flannel/file_cache'
 
 module Wonki
   class WikiPage
-    def initialize(repo_path, cache_control=nil)
+    def initialize(repo_path, flannel_cache=nil, cache_control=nil)
       @cache_control = cache_control
       @repo_path = repo_path
+      @flannel_cache = Flannel::FileCache.new(flannel_cache) if flannel_cache
     end
     
     def call(env)
@@ -39,7 +41,13 @@ module Wonki
     end
     
     def format_data data
-      %Q{<h2 id="location">#{data[:route_name]}</h2><div id="content">#{Flannel.quilt(data[:content])}</div>}
+      if @flannel_cache
+	output = Flannel.quilt(data[:content], :cache => @flannel_cache)
+      else
+	output = Flannel.quilt(data[:content])
+      end
+      
+      %Q{<h2 id="location">#{data[:route_name]}</h2><div id="content">#{output}</div>}
     end
     
     def set_cache_control headers

data/test/wiki_page_test.rb

@@ -39,21 +39,21 @@ class WikiPageTest < Test::Unit::TestCase
     end
     
     should "set max age" do
-      page = Wonki::WikiPage.new("~/working/rubyyot-wiki-test", :max_age => 300)
+      page = Wonki::WikiPage.new("~/working/rubyyot-wiki-test", nil, :max_age => 300)
       status, headers, body = page.build_response("/foo")
       
       assert_equal("max-age=300", headers["Cache-Control"])
     end
     
     should "set response directive" do
-      page = Wonki::WikiPage.new("~/working/rubyyot-wiki-test", :response_directive => 'public')
+      page = Wonki::WikiPage.new("~/working/rubyyot-wiki-test", nil, :response_directive => 'public')
       status, headers, body = page.build_response("/foo")
       
       assert_equal("public", headers["Cache-Control"])
     end
     
     should "set both response directive and max_age when passed" do
-      page = Wonki::WikiPage.new("~/working/rubyyot-wiki-test", :response_directive => 'public', :max_age => 20)
+      page = Wonki::WikiPage.new("~/working/rubyyot-wiki-test", nil, :response_directive => 'public', :max_age => 20)
       status, headers, body = page.build_response("/foo")
       
       assert_equal("max-age=20, public", headers["Cache-Control"])

data/wonki.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wonki}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["rubyyot"]
-  s.date = %q{2010-01-13}
+  s.date = %q{2010-01-14}
   s.description = %q{a Rack and Git based wiki like thing}
   s.email = %q{jamal.hansen@gmail.com}
   s.extra_rdoc_files = [
@@ -49,16 +49,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<grit>, [">= 0"])
-      s.add_runtime_dependency(%q<flannel>, [">= 0.1.5"])
+      s.add_runtime_dependency(%q<flannel>, [">= 0.2.1"])
       s.add_development_dependency(%q<shoulda>, [">= 2.10.2"])
     else
       s.add_dependency(%q<grit>, [">= 0"])
-      s.add_dependency(%q<flannel>, [">= 0.1.5"])
+      s.add_dependency(%q<flannel>, [">= 0.2.1"])
       s.add_dependency(%q<shoulda>, [">= 2.10.2"])
     end
   else
     s.add_dependency(%q<grit>, [">= 0"])
-    s.add_dependency(%q<flannel>, [">= 0.1.5"])
+    s.add_dependency(%q<flannel>, [">= 0.2.1"])
     s.add_dependency(%q<shoulda>, [">= 2.10.2"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wonki
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - rubyyot
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-13 00:00:00 -06:00
+date: 2010-01-14 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.5
+        version: 0.2.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: shoulda