wonki 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/wonki/{page_builder.rb → storage.rb}

@@ -1,9 +1,8 @@
 require 'mime/types'
 require 'grit'
-require 'flannel'
 
 module Wonki
-  class PageBuilder
+  class Storage
     def initialize(repo_path)
       @repo_path = repo_path
       @repository = Grit::Repo.new(@repo_path)
@@ -13,8 +12,7 @@ module Wonki
       route_name = route[1..-1] # strip leading slash
       data = find(route_name)
       mod_date = get_mod_date(route_name)
-      content = %Q{<h2 id="location">#{route_name}</h2><div id="content">#{Flannel.quilt(data)}</div>}
-      {:content => content, :last_modified => mod_date}
+      {:content => data, :last_modified => mod_date, :route_name => route_name}
     end
     
     def find(name)
@@ -24,7 +22,7 @@ module Wonki
     end
     
     def get_mod_date(name)
-      @repository.commits.first.committed_date
+      @repository.commits.first.committed_date  # date of the last commit to the repo.
     end
   end
 end

data/lib/wonki/wiki_page.rb

@@ -1,9 +1,11 @@
-require 'wonki/page_builder'
+require 'wonki/storage'
 require 'wonki/page_not_found'
+require 'flannel'
 
 module Wonki
   class WikiPage
-    def initialize(repo_path)
+    def initialize(repo_path, cache_control=nil)
+      @cache_control = cache_control
       @repo_path = repo_path
     end
     
@@ -14,16 +16,16 @@ module Wonki
     
     def build_response(path)
       path = "/home" if path == "/"
-      builder = Wonki::PageBuilder.new(@repo_path)
+      storage = Wonki::Storage.new(@repo_path)
             
       headers = {"Content-Type" => "text/html", "Content-Language" => "en"}
       
       begin
-	git_data = builder.build(path)
-	response_body = git_data[:content]
+	git_data = storage.build(path)
+	response_body = format_data(git_data)
 	headers["Last-Modified"] = git_data[:last_modified].httpdate
 	headers["Etag"] = Digest::MD5.hexdigest(git_data[:content])
-	headers["Cache-Control"] = "max-age=300, public" 
+	headers = set_cache_control headers
 	status = 200
       rescue Wonki::PageNotFound
 	response_body = "Page Not Found"
@@ -35,5 +37,27 @@ module Wonki
       
       [status, headers, response_body] 
     end
+    
+    def format_data data
+      %Q{<h2 id="location">#{data[:route_name]}</h2><div id="content">#{Flannel.quilt(data[:content])}</div>}
+    end
+    
+    def set_cache_control headers
+      return headers unless @cache_control
+      
+      if @cache_control[:max_age]
+	if @cache_control[:response_directive]
+	  headers["Cache-Control"] = "max-age=#{@cache_control[:max_age]}, #{@cache_control[:response_directive]}"
+	else
+	  headers["Cache-Control"] = "max-age=#{@cache_control[:max_age]}"
+	end
+      else
+	if @cache_control[:response_directive]
+	  headers["Cache-Control"] = @cache_control[:response_directive]
+	end
+      end
+  
+      headers
+    end
   end   
 end

data/test/helper.rb

@@ -7,4 +7,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'wonki'
 
 class Test::Unit::TestCase
+  def assert_false assertion
+    assert !assertion
+  end
 end

data/test/{page_builder_test.rb → storage_test.rb}

@@ -1,43 +1,33 @@
 require 'helper'
-require 'lib/wonki/page_builder'
+require 'lib/wonki/storage'
 require 'lib/wonki/page_not_found'
 
-class PageBuilderTest < Test::Unit::TestCase
+class StorageTest < Test::Unit::TestCase
   context "Building a Page" do
     setup do
-      @builder = Wonki::PageBuilder.new("~/working/rubyyot-wiki-test")
-    end
-    
-    should "include the location" do
-      out = @builder.build("/cheese")
-      assert_match("cheese", out[:content])
+      @storage = Wonki::Storage.new("~/working/rubyyot-wiki-test")
     end
     
     should "include the content" do
-      out = @builder.build("/cheese")
+      out = @storage.build("/cheese")
       assert_match("swiss", out[:content])
     end
     
-    should "flannel content" do
-      out = @builder.build("/header")
-      assert_match("<h2>foo</h2>", out[:content])
-    end
-    
     context "finding blob data" do
       should "find page contents in the git repo" do
-	blob_data = @builder.find("foo")
+	blob_data = @storage.find("foo")
 	assert_match("bar bar", blob_data)
       end
     end
     
     context "last_modified date" do
       should "not be nil" do
-	out = @builder.build("/foo")
+	out = @storage.build("/foo")
 	assert_not_nil out[:last_modified]
       end
-      
+
       should "return the commited date" do
-	out = @builder.build("/foo")
+	out = @storage.build("/foo")
 	assert_equal Time, out[:last_modified].class
       end
     end
@@ -45,7 +35,7 @@ class PageBuilderTest < Test::Unit::TestCase
     context "page doesn't exist" do
       should "throw page doesn't exist" do
 	begin
-	  @builder.find("walla-walla-bing-bang")
+	  @storage.find("walla-walla-bing-bang")
 	  assert false, "Should have thrown a page not found exception"
 	rescue Wonki::PageNotFound
 	  assert true

data/test/wiki_page_test.rb

@@ -28,9 +28,51 @@ class WikiPageTest < Test::Unit::TestCase
     should "set etag" do
       assert_not_nil @headers['Etag']
     end
+  end
+  
+  context "caching" do  
+    should "not set if no info passed" do
+      page = Wonki::WikiPage.new("~/working/rubyyot-wiki-test")
+      status, headers, body = page.build_response("/foo")
+      
+      assert_false(headers.has_key?("Cache-Control"))
+    end
+    
+    should "set max age" do
+      page = Wonki::WikiPage.new("~/working/rubyyot-wiki-test", :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')
+      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)
+      status, headers, body = page.build_response("/foo")
+      
+      assert_equal("max-age=20, public", headers["Cache-Control"])
+    end
+  end
+  
+  context "Formatting" do
+    setup do
+      @page = Wonki::WikiPage.new("~/working/rubyyot-wiki-test")
+    end
+      
+    should "include the location" do
+      out = @page.format_data :route_name => 'wonki', :content => 'this is cool'
+      assert_match("wonki", out)
+    end
     
-    should "set cache control" do
-      assert_equal(@headers["Cache-Control"], "max-age=300, public")
+    should "flannel content" do
+      out = @page.format_data :route_name => 'test', :content => '==foo'
+      assert_match("<h2>foo</h2>", out)
     end
   end
   

data/wonki.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wonki}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["rubyyot"]
-  s.date = %q{2010-01-12}
+  s.date = %q{2010-01-13}
   s.description = %q{a Rack and Git based wiki like thing}
   s.email = %q{jamal.hansen@gmail.com}
   s.extra_rdoc_files = [
@@ -24,11 +24,11 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/wonki.rb",
-     "lib/wonki/page_builder.rb",
      "lib/wonki/page_not_found.rb",
+     "lib/wonki/storage.rb",
      "lib/wonki/wiki_page.rb",
      "test/helper.rb",
-     "test/page_builder_test.rb",
+     "test/storage_test.rb",
      "test/wiki_page_test.rb",
      "wonki.gemspec"
   ]
@@ -39,8 +39,8 @@ Gem::Specification.new do |s|
   s.summary = %q{a simple Rack and Git based wiki like thing}
   s.test_files = [
     "test/wiki_page_test.rb",
-     "test/helper.rb",
-     "test/page_builder_test.rb"
+     "test/storage_test.rb",
+     "test/helper.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wonki
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - rubyyot
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-12 00:00:00 -06:00
+date: 2010-01-13 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,11 +59,11 @@ files:
 - Rakefile
 - VERSION
 - lib/wonki.rb
-- lib/wonki/page_builder.rb
 - lib/wonki/page_not_found.rb
+- lib/wonki/storage.rb
 - lib/wonki/wiki_page.rb
 - test/helper.rb
-- test/page_builder_test.rb
+- test/storage_test.rb
 - test/wiki_page_test.rb
 - wonki.gemspec
 has_rdoc: true
@@ -96,5 +96,5 @@ specification_version: 3
 summary: a simple Rack and Git based wiki like thing
 test_files: 
 - test/wiki_page_test.rb
+- test/storage_test.rb
 - test/helper.rb
-- test/page_builder_test.rb