gitdoc 1.1.0 → 2.0.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+2.0.0

data/doc.haml

@@ -2,8 +2,6 @@
 %head
   %title= settings.title || 'Documents'
   %meta{:charset => "utf-8"}
+  %link{:rel => :stylesheet, :href => '/.css'}
   = settings.header
-  %style
-    = sass :reset
-    = styles
 #doc!= @doc

data/gitdoc.rb

@@ -2,6 +2,7 @@ require 'sinatra'
 require 'rdiscount'
 require 'haml'
 require 'sass'
+require 'digest/sha1'
 
 def GitDoc! title = nil, opts = {}
   dir = File.dirname(File.expand_path(caller.first.split(':').first))
@@ -19,19 +20,56 @@ disable :logging # the server always writes its own log anyway
 helpers do
 
   def md source
-    RDiscount.new(source).to_html.
-    # uses newline entity in pre tags
-    gsub(/<code>.*?<\/code>/m) do |match|
-      match.gsub(/\n/m,"&#x000A;")
+    source_without_code = extract_code source
+    html = RDiscount.new(source_without_code).to_html
+    html = highlight_code html
+    newline_entities_for_tag :pre, html
+  end
+
+  # extract_code and highlight_code cribbed from:
+  # https://github.com/github/gollum/blob/0b8bc597a7e9495b272e5dbb743827f56ccd2fe6/lib/gollum/markup.rb#L367
+
+  # Replaces all code fragments with a SHA1 hash. Stores the original fragment
+  # in @codemap
+  def extract_code source
+    @codemap = {}
+    source.gsub(/^``` ?(.+?)\r?\n(.+?)\r?\n```\r?$/m) do
+      Digest::SHA1.hexdigest($2).tap { |id| @codemap[id] = { :lang => $1, :code => $2 } }
     end
   end
 
-  def styles
-    sass File.read(settings.styles) if File.exist? settings.styles
+  # Replaces all SHA1 hash strings present in @codemap with pygmentized
+  # html suitable for coloring with a stylesheet
+  def highlight_code html
+    @codemap.each do |id, spec|
+      formatted = begin
+        # TODO: fix. fails silenty right now
+        IO.popen("pygmentize -l #{spec[:lang]} -f html", 'r+') do |io|
+          io << unindent(spec[:code])
+          io.close_write
+          io.read.strip
+        end
+      end
+      html.gsub!(id, formatted)
+    end
+    html
   end
 
-end
+  # Removes leading indent if all non-blank lines are indented
+  def unindent code
+    code.gsub!(/^(  |\t)/m, '') if code.lines.all? { |line| line =~ /\A\r?\n\Z/ || line =~ /^(  |\t)/ }
+    code
+  end
 
+  # Allows the rendered markdown to be indented in its containing document
+  # without introducing extra whitespace into preformatted blocks
+  def newline_entities_for_tag tag, html
+    html.gsub(/<#{tag}>.*?<\/#{tag}>/m) do |match|
+      match.gsub(/\n/m,"&#x000A;")
+    end
+  end
+
+end
 
 get '/*' do |name|
   name = 'index' if name.empty?
@@ -47,4 +85,12 @@ get '/*.*' do |name,ext|
   send_file file
 end
 
+get '/.css' do
+  content_type :css
+  styles = sass(:reset)
+  styles += File.read(settings.root + '/highlight.css')
+  styles += sass(File.read(settings.styles)) if File.exist? settings.styles
+  styles
+end
+
 not_found { "404. Oh Noes!" }

data/highlight.css

@@ -0,0 +1,61 @@
+.highlight  { background: #ffffff; }
+.highlight .c { color: #999988; font-style: italic } /* Comment */
+.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
+.highlight .k { font-weight: bold } /* Keyword */
+.highlight .o { font-weight: bold } /* Operator */
+.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
+.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
+.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
+.highlight .gd .x { color: #000000; background-color: #ffaaaa } /* Generic.Deleted.Specific */
+.highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #aa0000 } /* Generic.Error */
+.highlight .gh { color: #999999 } /* Generic.Heading */
+.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
+.highlight .gi .x { color: #000000; background-color: #aaffaa } /* Generic.Inserted.Specific */
+.highlight .gc { color: #999; background-color: #EAF2F5 }
+.highlight .go { color: #888888 } /* Generic.Output */
+.highlight .gp { color: #555555 } /* Generic.Prompt */
+.highlight .gs { font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #aaaaaa } /* Generic.Subheading */
+.highlight .gt { color: #aa0000 } /* Generic.Traceback */
+.highlight .kc { font-weight: bold } /* Keyword.Constant */
+.highlight .kd { font-weight: bold } /* Keyword.Declaration */
+.highlight .kp { font-weight: bold } /* Keyword.Pseudo */
+.highlight .kr { font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */
+.highlight .m { color: #009999 } /* Literal.Number */
+.highlight .s { color: #d14 } /* Literal.String */
+.highlight .na { color: #008080 } /* Name.Attribute */
+.highlight .nb { color: #0086B3 } /* Name.Builtin */
+.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */
+.highlight .no { color: #008080 } /* Name.Constant */
+.highlight .ni { color: #800080 } /* Name.Entity */
+.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */
+.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */
+.highlight .nn { color: #555555 } /* Name.Namespace */
+.highlight .nt { color: #000080 } /* Name.Tag */
+.highlight .nv { color: #008080 } /* Name.Variable */
+.highlight .ow { font-weight: bold } /* Operator.Word */
+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight .mf { color: #009999 } /* Literal.Number.Float */
+.highlight .mh { color: #009999 } /* Literal.Number.Hex */
+.highlight .mi { color: #009999 } /* Literal.Number.Integer */
+.highlight .mo { color: #009999 } /* Literal.Number.Oct */
+.highlight .sb { color: #d14 } /* Literal.String.Backtick */
+.highlight .sc { color: #d14 } /* Literal.String.Char */
+.highlight .sd { color: #d14 } /* Literal.String.Doc */
+.highlight .s2 { color: #d14 } /* Literal.String.Double */
+.highlight .se { color: #d14 } /* Literal.String.Escape */
+.highlight .sh { color: #d14 } /* Literal.String.Heredoc */
+.highlight .si { color: #d14 } /* Literal.String.Interpol */
+.highlight .sx { color: #d14 } /* Literal.String.Other */
+.highlight .sr { color: #009926 } /* Literal.String.Regex */
+.highlight .s1 { color: #d14 } /* Literal.String.Single */
+.highlight .ss { color: #990073 } /* Literal.String.Symbol */
+.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #008080 } /* Name.Variable.Class */
+.highlight .vg { color: #008080 } /* Name.Variable.Global */
+.highlight .vi { color: #008080 } /* Name.Variable.Instance */
+.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitdoc
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
-  - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Myles Byrne
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 -05:00
+date: 2010-11-29 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +79,7 @@ files:
 - VERSION
 - doc.haml
 - gitdoc.rb
+- highlight.css
 - reset.sass
 has_rdoc: true
 homepage: http://github.com/quackingduck/gitdoc