wbzyl-codehighlighter-middleware 0.0.7 → 0.1.0

data/README.markdown

@@ -124,11 +124,22 @@ Supported languages:
 
 ### Ultraviolet
 
-Needs oniguruma regexp library.
-Installation instruction for Oniguruma:
+The *ultraviolet* gem needs oniguruma regexp library.
+
+On Fedora install the library with:
+
+    sudo yum install oniguruma
+
+For installation instruction from sources, see
 [Carbonica](http://carboni.ca/projects/harsh/)
 
-Supported languages:
+Now, install the gem:
+
+    sudo gem install ultraviolet
+
+[Ultraviolet themes gallery](: http://ultraviolet.rubyforge.org/themes.xhtml)
+
+Ultraviolet supports almost any language:
 
 * actionscript
 * active4d

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 7
+:patch: 0
 :major: 0
-:minor: 0
+:minor: 1

data/codehighlighter-middleware.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{codehighlighter-middleware}
-  s.version = "0.0.7"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wlodek Bzyl"]
-  s.date = %q{2009-05-22}
+  s.date = %q{2009-05-28}
   s.description = %q{Rack Middleware for Code Highlighting.}
   s.email = %q{matwb@univ.gda.pl}
   s.extra_rdoc_files = [

data/examples/app.rb

@@ -1,14 +1,20 @@
 # -*- coding: utf-8 -*-
 
+path = File.join(File.expand_path(File.dirname(__FILE__)), "..", "lib")
+$:.unshift(path) unless $:.include?(path)
+
 require 'rubygems'
 require 'sinatra'
 require 'rdiscount'
+
+gem 'wbzyl-sinatra-rdiscount'
 require 'sinatra/rdiscount'
+
 require 'codehighlighter-middleware'
 
-require 'coderay'                 # Coderay
-#require 'syntax/convertors/html' # Syntax
-#require 'uv'                     # Ultraviolet
+require 'coderay'                # Coderay
+require 'syntax/convertors/html' # Syntax
+require 'uv'                     # Ultraviolet
 
 get "/" do
   rdiscount :index

data/examples/config.ru

@@ -1,14 +1,13 @@
 # run with:  thin --rackup config.ru -p 4567 start
 
+#use Rack::Static, :urls => ["/stylesheets"], :root => "public"
+
 require 'app'
 
 use Rack::Lint
 
-#use Rack::Codehighlighter, :coderay
-use Rack::Codehighlighter, :prettify
-#use Rack::Codehighlighter, :syntax
-#use Rack::Codehighlighter, :ultraviolet, :theme => 'espresso_libre'
-
-use Rack::Static, :urls => ["/stylesheets"], :root => "public"
-
+#use Rack::Codehighlighter, :coderay, :logging => true
+#use Rack::Codehighlighter, :syntax, :logging => true
+use Rack::Codehighlighter, :ultraviolet, :theme => 'dawn', :logging => true
+#use Rack::Codehighlighter, :prettify, :logging => true
 run Sinatra::Application

data/lib/codehighlighter-middleware.rb

@@ -1,30 +1,46 @@
-# -*- 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]  
@@ -32,6 +48,25 @@ module Rack
     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 = {
@@ -40,9 +75,10 @@ module Rack
         '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
@@ -51,10 +87,11 @@ module Rack
     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>"
@@ -68,10 +105,11 @@ module Rack
         '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>"
@@ -79,12 +117,13 @@ module Rack
     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>"
@@ -92,7 +131,7 @@ module Rack
     end
     
     def unescape_html(string)
-      string.gsub("&lt;", '<').gsub("&gt;", '>').gsub("&amp;", '&')
+      string.to_s.gsub("&lt;", '<').gsub("&gt;", '>').gsub("&amp;", '&')
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wbzyl-codehighlighter-middleware
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors: 
 - Wlodek Bzyl
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-22 00:00:00 -07:00
+date: 2009-05-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency