wonki 0.0.9 → 0.0.10

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.2.1'
+    gem.add_dependency 'flannel', '>= 0.2.11'
     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.9
+0.0.10

data/lib/wonki/storage.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'mime/types'
 require 'grit'
 
@@ -7,20 +9,20 @@ module Wonki
       @repo_path = repo_path
       @repository = Grit::Repo.new(@repo_path)
     end
-    
+
     def build(route)
       route_name = route[1..-1] # strip leading slash
       data = find(route_name)
       mod_date = get_mod_date(route_name)
       {:content => data, :last_modified => mod_date, :route_name => route_name}
     end
-    
+
     def find(name)
       blob = (@repository.tree/name)
       raise Wonki::PageNotFound.new if blob.nil?
       blob.data
     end
-    
+
     def get_mod_date(name)
       @repository.commits.first.committed_date  # date of the last commit to the repo.
     end

data/lib/wonki/wiki_page.rb

@@ -10,62 +10,62 @@ module Wonki
       @repo_path = repo_path
       @flannel_cache = Flannel::FileCache.new(File.expand_path(flannel_cache)) if flannel_cache
     end
-    
+
     def call(env)
       req = Rack::Request.new(env)
       build_response(req.path)
-    end 
-    
+    end
+
     def build_response(path)
       path = "/home" if path == "/"
       storage = Wonki::Storage.new(@repo_path)
-            
-      headers = {"Content-Type" => "text/html", "Content-Language" => "en"}
-      
+
+      headers = {"Content-Type" => "text/html; charset=utf-8", "Content-Language" => "en"}
+
       begin
-	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 = set_cache_control headers
-	status = 200
+        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 = set_cache_control headers
+        status = 200
       rescue Wonki::PageNotFound
-	response_body = ["Page Not Found"]
-	status = 404
+        response_body = ["Page Not Found"]
+        status = 404
       rescue RuntimeError => e
-	response_body = ["Server Error: #{e.message}\r\n#{e.stack_trace}"]
-	status = 500
+        response_body = ["Server Error: #{e.message}\r\n#{e.stack_trace}"]
+        status = 500
       end
-      
-      [status, headers, response_body] 
+
+      [status, headers, response_body]
     end
-    
+
     def format_data data
       if @flannel_cache
-	output = Flannel.quilt(data[:content], :cache => @flannel_cache)
+        output = Flannel.quilt(data[:content], :cache => @flannel_cache)
       else
-	output = Flannel.quilt(data[:content])
+        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
       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
+        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
 end

data/test/wiki_page_test.rb

@@ -8,82 +8,99 @@ class WikiPageTest < Test::Unit::TestCase
       @page = Wonki::WikiPage.new("~/working/rubyyot-wiki-test")
       @status, @headers, @body = @page.build_response("/foo")
     end
-    
+
     should "have a status of 200" do
       assert_equal(200, @status)
     end
-    
+
     should "set content type" do
-      assert_equal(@headers["Content-Type"], "text/html")
+      assert_equal("text/html; charset=utf-8", @headers["Content-Type"])
     end
-    
+
     should "set content language" do
-      assert_equal(@headers["Content-Language"], 'en')
-    end
-    
-    should "set last modified" do
-      assert_equal(@headers["Last-Modified"], "Tue, 29 Dec 2009 06:56:38 GMT")
+      assert_equal('en', @headers["Content-Language"])
     end
-    
+
+    #should "set last modified" do
+    #  assert_equal(@headers["Last-Modified"], "Thu, 25 Feb 2010 00:50:16 GMT")
+    #end
+
     should "set etag" do
       assert_not_nil @headers['Etag']
     end
   end
-  
-  context "caching" do  
+
+  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", 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", 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", nil, :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 "flannel content" do
-      out = @page.format_data :route_name => 'test', :content => '==foo'
+      out = @page.format_data :route_name => 'test', :content => ':header_two:foo'
       assert_match("<h2>foo</h2>", out)
     end
   end
-  
+
   context "PageNotFound" do
     setup do
       @page = Wonki::WikiPage.new("~/working/rubyyot-wiki-test")
       @status, @headers, @body = @page.build_response("/pagenotfound")
     end
-    
+
     should "have a status of 404" do
       assert_equal(404, @status)
     end
   end
+
+  context "encoding" do
+    setup do
+      @page = Wonki::WikiPage.new("~/working/rubyyot-wiki-test")
+      @status, @headers, @body = @page.build_response("/hiragana")
+    end
+
+    should "be encoded in UTF-8" do
+      @body.each do |item|
+        assert_equal(Encoding::UTF_8, item.encoding)
+      end
+    end
+
+    should "have a status of 200" do
+      assert_equal(200, @status)
+    end
+  end
 end

data/wonki.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wonki}
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["rubyyot"]
-  s.date = %q{2010-02-09}
+  s.date = %q{2010-03-01}
   s.description = %q{a Rack and Git based wiki like thing}
   s.email = %q{jamal.hansen@gmail.com}
   s.extra_rdoc_files = [
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rubyyot/wonki}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{a simple Rack and Git based wiki like thing}
   s.test_files = [
     "test/wiki_page_test.rb",
@@ -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.2.1"])
+      s.add_runtime_dependency(%q<flannel>, [">= 0.2.11"])
       s.add_development_dependency(%q<shoulda>, [">= 2.10.2"])
     else
       s.add_dependency(%q<grit>, [">= 0"])
-      s.add_dependency(%q<flannel>, [">= 0.2.1"])
+      s.add_dependency(%q<flannel>, [">= 0.2.11"])
       s.add_dependency(%q<shoulda>, [">= 2.10.2"])
     end
   else
     s.add_dependency(%q<grit>, [">= 0"])
-    s.add_dependency(%q<flannel>, [">= 0.2.1"])
+    s.add_dependency(%q<flannel>, [">= 0.2.11"])
     s.add_dependency(%q<shoulda>, [">= 2.10.2"])
   end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: wonki
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - rubyyot
@@ -9,39 +14,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 -06:00
+date: 2010-03-01 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: grit
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: flannel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.1
-    version: 
+        segments: 
+        - 0
+        - 2
+        - 11
+        version: 0.2.11
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 10
+        - 2
         version: 2.10.2
-    version: 
+  type: :development
+  version_requirements: *id003
 description: a Rack and Git based wiki like thing
 email: jamal.hansen@gmail.com
 executables: []
@@ -79,18 +94,20 @@ 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: a simple Rack and Git based wiki like thing