gitdoc 4.0.0 → 4.1.0

data/VERSION

@@ -1 +1 @@
-4.0.0
+4.1.0

data/gitdoc.gemspec

@@ -14,8 +14,6 @@ Gem::Specification.new do |gs|
   gs.add_dependency 'rdiscount', '~>1.5.8'
   gs.add_dependency 'haml', '~>3.0.25'
   gs.add_dependency 'sinatra', '~>1.0'
-  gs.add_dependency 'unicorn','~>3.1.0'
   gs.add_dependency 'coffee-script', '~>2.1.1'
   gs.add_dependency 'json','~>1.4.6' # dependency of coffee-script
-  gs.add_dependency 'livereload', '~>1.5'
 end

data/gitdoc.rb

@@ -29,6 +29,9 @@ end
 
 GitDoc = Sinatra::Application
 
+require 'gitdoc/response_cache'
+use GitDoc::ResponseCache, 'build'
+
 set :haml, :format => :html5
 set :views, lambda { root }
 disable :logging # the server always writes its own log anyway

data/gitdoc/response_cache.rb

@@ -0,0 +1,62 @@
+# 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)
+    @app = app
+    @cache = cache
+    @path_proc = block || DEFAULT_PATH_PROC
+  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))
+        File.open(path, 'wb'){|f| res[2].each{|c| f.write(c)}}
+      else
+        @cache[path] = res[2]
+      end
+    end
+    res
+  end
+end

data/gitdoc/tasks.rb

@@ -1,25 +1,7 @@
-task :server do
-  livereload = fork { exec "livereload" }
-  server = fork { exec 'unicorn' }
-  trap('INT') do
-    Process.kill('QUIT', server)
-    Process.kill('QUIT', livereload)
-  end
-  Process.waitall
-end
-
-task :default => :server
-
 task :dev do
   unless $LOAD_PATH.last =~ /gitdoc$/
     abort "Run rake with the path to GitDocs's source to use dev mode\n"+
           "Eg. rake -I ~/Projects/gitdoc dev"
   end
-  livereload = fork { exec "livereload" }
-  server = fork { exec "shotgun -I #{$LOAD_PATH.last}" }
-  trap('INT') do
-    Process.kill('QUIT', server)
-    Process.kill('QUIT', livereload)
-  end
-  Process.waitall
+  exec "shotgun -I #{$LOAD_PATH.last}"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitdoc
 version: !ruby/object:Gem::Version 
-  hash: 63
-  prerelease: false
+  hash: 59
+  prerelease: 
   segments: 
   - 4
+  - 1
   - 0
-  - 0
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors: 
 - Myles Byrne
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 +10:00
-default_executable: 
+date: 2011-04-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdiscount
@@ -65,26 +64,10 @@ dependencies:
         version: "1.0"
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: unicorn
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
-        version: 3.1.0
-  type: :runtime
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: coffee-script
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -96,11 +79,11 @@ dependencies:
         - 1
         version: 2.1.1
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,22 +95,7 @@ dependencies:
         - 6
         version: 1.4.6
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: livereload
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
-  type: :runtime
-  version_requirements: *id007
+  version_requirements: *id005
 description: 
 email: myles@myles.id.au
 executables: []
@@ -141,21 +109,16 @@ files:
 - default.sass
 - doc.haml
 - favicon.ico
+- gitdoc/response_cache.rb
 - gitdoc/tasks.rb
 - gitdoc.gemspec
 - gitdoc.rb
 - highlight.css
-- pkg/gitdoc-3.10.1.gem
-- pkg/gitdoc-3.11.0.gem
-- pkg/gitdoc-3.11.1.gem
-- pkg/gitdoc-3.12.0.gem
-- pkg/gitdoc-3.13.0.gem
 - Rakefile
 - README.md
 - reset.sass
 - TODO.md
 - VERSION
-has_rdoc: true
 homepage: http://github.com/quackingduck/gitdoc
 licenses: []
 
@@ -185,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A light-weight web app for serving up a folder of markdown files