lib/codehighlighter-middleware.rb in wbzyl-codehighlighter-middleware-0.0.7 vs lib/codehighlighter-middleware.rb in wbzyl-codehighlighter-middleware-0.1.0

@@ -1,62 +1,99 @@
-# -*- coding: utf-8 -*-
+require 'rack/utils'
 
-require 'rack'
+gem 'hpricot', '>=0.8.1'
 require 'hpricot'
 
 module Rack
   class Codehighlighter
-    def initialize(app, highlighter = :syntax, opts = {})
+    include Rack::Utils
+    
+    FORMAT = %{%s - [%s] [%s] "%s %s%s %s" (%s) %d %d %0.4f\n}
+    
+    def initialize(app, highlighter = :coderay, opts = {})
       @app = app
       @highlighter = highlighter
-      @opts = opts
+      
+      @opts = { :element => "//pre/code", :pattern => /\A:::(\w+)\s*\n/ }
+      
+      @opts.merge! opts
     end
+
     def call(env)
+      began_at = Time.now
       status, headers, response = @app.call(env)
-      if headers['Content-Type'] != nil && headers['Content-Type'].include?("text/html")
+      headers = HeaderHash.new(headers)
+
+      if !STATUS_WITH_NO_ENTITY_BODY.include?(status) &&
+         !headers['transfer-encoding'] &&
+          headers['content-type'] &&
+          headers['content-type'].include?("text/html")
+
         content = ""
         response.each { |part| content += part }
         doc = Hpricot(content)
-        nodes = doc.search("//pre/code")
+        nodes = doc.search(@opts[:element])
         nodes.each do |node|
           s = node.inner_html || "[++where is the code?++]"
           node.parent.swap(send(@highlighter, s))
         end
-        STDERR.puts "Highlighting code with: #{@highlighter}"
+
         body = doc.to_html
-        size = body.respond_to?(:bytesize) ? body.bytesize : body.size
-        headers['Content-Length'] = size.to_s
+        headers['content-length'] = body.bytesize.to_s
+
+        log(env, status, headers, began_at) if @opts[:logging]
         [status, headers, [body]]
       else
         [status, headers, response]  
       end
     end
     
     private
+
+    def log(env, status, headers, began_at)
+      # lilith.local [coderay] text/html [26/may/2009 12:00:00] "GET / HTTP/1.1" 200 ? ?\n
+      now = Time.now
+       logger = env['rack.errors']
+      logger.write FORMAT % [
+        env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
+        @highlighter,
+        now.strftime("%d/%b/%Y %H:%M:%S"),
+        env["REQUEST_METHOD"],
+        env["PATH_INFO"],
+        env["QUERY_STRING"].empty? ? "" : "?"+env["QUERY_STRING"],
+        env["HTTP_VERSION"],
+        headers["content-type"] || "unknown",
+        status.to_s[0..3],
+        headers['content-length'],
+        now - began_at
+      ]
+    end
     
     def syntax(string)
       translate = {
         'html' => 'xml',
         'c' => 'ansic',
         'css' => 'css21',
         'sql' => 'sqlite'
       }
-      lang = "unknown"
-      if /\A:::(\w+)\s*\n/ =~ string  # extract language name
-        lang = $1
+      lang = 'unknown'
+      refs = @opts[:pattern].match(string)  # extract language name
+      if refs
+        lang = refs[1]
         convertor = ::Syntax::Convertors::HTML.for_syntax translate[lang]
         convertor.convert(unescape_html(string.sub(/\A.*\n/, "")) || "[=this can'n happen=]")
       else
         "<pre>#{string}</pre>"
       end
     end
     
     def coderay(string)
-      lang = "unknown"
-      if /\A:::(\w+)\s*\n/ =~ string  # extract language name
-        lang = $1
-        str = unescape_html(string.sub(/\A.*\n/, ""))
+      lang = 'unknown'
+      refs = @opts[:pattern].match(string)  # extract language name
+      if refs
+        lang = refs[1]
+        str = unescape_html(string.sub(@opts[:pattern], ""))
         "<pre class='CodeRay'>#{::CodeRay.encoder(:html).encode str, lang}</pre>"
       else
         "<pre class='CodeRay'>#{string}</pre>"
       end
     end
@@ -66,34 +103,36 @@
         'ruby' => 'rb',
         'bash' => 'bsh',
         'javascript' => 'js',
         'python' => 'py'
       }
-      lang = "unknown"
-      if /\A:::(\w+)\s*\n/ =~ string  # extract language name
-        lang = $1
-        str = string.sub(/\A.*\n/, "")
+      lang = 'unknown'
+      refs = @opts[:pattern].match(string)  # extract language name
+      if refs 
+        lang = refs[1]
+        str = string.sub(@opts[:pattern], "")
         "<pre class='prettyprint lang-#{translate[lang] || lang}'>#{str}</pre>"
       else
         "<pre>#{string}</pre>"
       end
     end
 
     def ultraviolet(string)
-      opts = { :theme => 'espresso_libre', :lines => false }
+      opts = { :theme => 'dawn', :lines => false }
       opts.merge! @opts
       lang = 'text'
-      if /\A:::(\w+)\s*\n/ =~ string  # extract language name
-        lang = $1
-        str = unescape_html(string.sub(/\A.*\n/, ""))
+      refs = @opts[:pattern].match(string)  # extract language name
+      if refs
+        lang = refs[1]
+        str = unescape_html(string.sub(@opts[:pattern], ""))
         "<pre class='#{opts[:theme]}'>#{::Uv.parse(str, 'xhtml', lang, opts[:lines], opts[:theme])}</pre>"
       else
         "<pre class='#{opts[:theme]}'>#{string}</pre>"
       end
     end
     
     def unescape_html(string)
-      string.gsub("&lt;", '<').gsub("&gt;", '>').gsub("&amp;", '&')
+      string.to_s.gsub("&lt;", '<').gsub("&gt;", '>').gsub("&amp;", '&')
     end
     
   end
 end