gitdoc 4.2.0 → 4.3.0

data/VERSION

@@ -1 +1 @@
-4.2.0
+4.3.0

data/gitdoc.rb

@@ -27,7 +27,7 @@ def GitDoc!
   set :dir, dir
   if settings.compiler
     require 'gitdoc/response_cache'
-    use GitDoc::ResponseCache, 'build'
+    use GitDoc::ResponseCache, File.join(dir,'build')
   end
   run GitDoc
 end
@@ -170,7 +170,7 @@ stylus.render str, {paths: ['#{File.dirname file}']}, (err,css) -> sys.puts css
   end
 
   def title
-    settings.title || 'Documents'
+    @title || settings.title || 'Documents'
   end
 
 end
@@ -179,12 +179,20 @@ end
 # exists then it is compiled and rendered
 get '*' do |name|
   name += 'index' if name =~ /\/$/
-  @file = File.join(settings.dir + '/' + name + '.md')
-  pass unless File.exist? @file
-  @doc = gd File.read(@file)
+  file = settings.dir + name + '.md'
+  pass unless File.exist? file
+  @doc = gd File.read(file)
   haml :doc
 end
 
+# If the path doesn't have a file extension or the extension is .html and a
+# matching html file exists then process it with the extended html compiler
+get %r{(.*?)(\.html)?$} do |name,extension|
+  file = settings.dir + name + (extension || '.html')
+  pass unless File.exist? file
+  html file
+end
+
 # GitDoc document styles
 get '/gitdoc.css' do
   content_type :css
@@ -204,13 +212,6 @@ get '*.coffee.js' do |name|
   coffee File.read(file)
 end
 
-# Extends html to support sass
-get '*.html' do |name|
-  file = settings.dir + '/' + name + '.html'
-  pass unless File.exist? file
-  html file
-end
-
 get '*.txt' do |name|
   file = settings.dir + '/' + name
   pass unless File.exist? file
@@ -232,8 +233,9 @@ end
 
 not_found do
   version = File.read(File.dirname(__FILE__)+'/VERSION')
+  @title = "Not Found"
   @doc = gd(
-    "# Not Found"+
+    "# #{@title}"+
     "\n\n"+
     "GitDoc version #{version}"
   )

data/gitdoc/response_cache.rb

@@ -1,62 +1,36 @@
-# Shamelessly stolen from:
-#  https://github.com/rack/rack-contrib/blob/master/lib/rack/contrib/response_cache.rb
 require 'fileutils'
-require 'rack'
 
-# Rack::ResponseCache is a Rack middleware that caches responses for successful
-# GET requests with no query string to disk or any ruby object that has an
-# []= method (so it works with memcached).  When caching to disk, it works similar to
-# Rails' page caching, allowing you to cache dynamic pages to static files that can
-# be served directly by a front end webserver.
 class GitDoc::ResponseCache
 
-  # The default proc used if a block is not provided to .new
-  # It unescapes the PATH_INFO of the environment, and makes sure that it doesn't
-  # include '..'.  If the Content-Type of the response is text/(html|css|xml),
-  # return a path with the appropriate extension (.html, .css, or .xml).
-  # If the path ends with a / and the Content-Type is text/html, change the basename
-  # of the path to index.html.
-  DEFAULT_PATH_PROC = proc do |env, res|
-    path = Rack::Utils.unescape(env['PATH_INFO'])
-    if !path.include?('..') and match = /text\/((?:x|ht)ml|css)/o.match(res[1]['Content-Type'])
-      type = match[1]
-      path = "#{path}.#{type}" unless /\.#{type}\z/.match(path)
-      path = File.join(File.dirname(path), 'index.html') if type == 'html' and File.basename(path) == '.html'
-      path
-    end
-  end
-
-  # Initialize a new ReponseCache object with the given arguments.  Arguments:
-  # * app : The next middleware in the chain.  This is always called.
-  # * cache : The place to cache responses.  If a string is provided, a disk
-  #   cache is used, and all cached files will use this directory as the root directory.
-  #   If anything other than a string is provided, it should respond to []=, which will
-  #   be called with a path string and a body value (the 3rd element of the response).
-  # * &block : If provided, it is called with the environment and the response from the next middleware.
-  #   It should return nil or false if the path should not be cached, and should return
-  #   the pathname to use as a string if the result should be cached.
-  #   If not provided, the DEFAULT_PATH_PROC is used.
-  def initialize(app, cache, &block)
+  def initialize(app, cache)
     @app = app
-    @cache = cache
-    @path_proc = block || DEFAULT_PATH_PROC
+    @dir = cache
   end
 
-  # Call the next middleware with the environment.  If the request was successful (response status 200),
-  # was a GET request, and had an empty query string, call the block set up in initialize to get the path.
-  # If the cache is a string, create any necessary middle directories, and cache the file in the appropriate
-  # subdirectory of cache.  Otherwise, cache the body of the reponse as the value with the path as the key.
   def call(env)
-    res = @app.call(env)
-    if env['REQUEST_METHOD'] == 'GET' and env['QUERY_STRING'] == '' and res[0] == 200 and path = @path_proc.call(env, res)
-      if @cache.is_a?(String)
-        path = File.join(@cache, path) if @cache
-        FileUtils.mkdir_p(File.dirname(path))
+    @app.call(env).tap do |res|
+      if cache? env, res
+        path = File.join @dir, file_path(env,res)
+        FileUtils.mkdir_p File.dirname(path)
         File.open(path, 'wb'){|f| res[2].each{|c| f.write(c)}}
-      else
-        @cache[path] = res[2]
       end
     end
-    res
   end
+
+  def cache? env, response
+    env['REQUEST_METHOD'] == 'GET' and
+    env['QUERY_STRING'] == '' and
+    response[0] == 200 and
+    not env['PATH_INFO'].include?('__sinatra__') and
+    not env['PATH_INFO'].include?('..')
+  end
+
+  def file_path env, response
+    env['PATH_INFO'].tap do |path|
+      if response[1]['Content-Type'] =~ /text\/html/ and path !~ /\.html$/
+        path << (path[-1] == ?/ ? 'index.html' : '.html')
+      end
+    end
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitdoc
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 51
   prerelease: 
   segments: 
   - 4
-  - 2
+  - 3
   - 0
-  version: 4.2.0
+  version: 4.3.0
 platform: ruby
 authors: 
 - Myles Byrne
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-30 00:00:00 Z
+date: 2011-05-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdiscount
@@ -115,6 +115,8 @@ files:
 - gitdoc.rb
 - highlight.css
 - pkg/gitdoc-4.1.0.gem
+- pkg/gitdoc-4.2.0.gem
+- pkg/gitdoc-4.3.0.gem
 - Rakefile
 - README.md
 - reset.sass