rack-codehighlighter 0.4.7 → 0.5.0

data/.gitignore

@@ -0,0 +1,3 @@
+pkg/*
+Gemfile.lock
+.bundle

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in sinatra-filler.gemspec
+gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009, 2010 Wlodek Bzyl
+Copyright (c) 2009, 2010, 2011 Włodek Bzyl
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
@@ -19,4 +19,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+OTHER DEALINGS IN THE SOFTWARE.

data/{README.markdown → README.md}

@@ -11,6 +11,7 @@ It supports the most popular Ruby code highlighters of today:
 * ultraviolet
 * coderay
 * syntax
+* pygments (through [rygments](https://github.com/thedjinn/rygments))
 
 As well as
 
@@ -30,26 +31,42 @@ highlighter.
 
 Install the gem with:
 
-    sudo gem install rack-codehighlighter
+    gem install rack-codehighlighter
 
 In order for the highlighting to show up, you’ll need to include a
 highlighting stylesheet. For example stylesheets you can look at
 stylesheets in the *examples/public/stylesheets* directory.
 
-### Rails
+### Rails 2
 
 In order to use, include the following code in a Rails application
 *config/environment.rb* file:
 
-    require 'coderay'               # get one of supported highlighters 
+    require 'coderay'               # get one of supported highlighters
     require 'rack/codehighlighter'
-    
-    Rails::Initializer.run do |config|  
+
+    Rails::Initializer.run do |config|
       config.gem 'coderay'
       config.gem 'rack-codehighlighter'
-        
+
       config.middleware.use Rack::Codehighlighter, :coderay, :element => "pre", :pattern => /\A:::(\w+)\s*\n/
-    end  
+    end
+
+### Rails 3
+
+In order to use, update *Gemfile* with:
+
+    gem 'coderay'
+    gem 'rack-codehighlighter', :require => 'rack/codehighlighter'
+
+Next, add *Rack::Codehighlighter* to the application middleware stack,
+updating *config/environments/development.rb* and
+*config/environments/production.rb* with:
+
+    config.middleware.use Rack::Codehighlighter, :coderay,
+      :element => "pre", :pattern => /\A:::(\w+)\s*(\n|
)/i, :logging => false
+
+(see [Rails on Rack](http://guides.rubyonrails.org/rails_on_rack.html)).
 
 ### Any Rack application
 
@@ -58,12 +75,9 @@ for example with a **Sinatra** application. If your application
 includes a rackup file or uses *Rack::Builder* to construct the
 application pipeline, simply require and use as follows:
 
-    gem 'coderay'       # get one of supported highlighters 
-    require 'coderay'   
-           
-    gem 'rack-codehighlighter'
+    require 'coderay'  # get one of supported highlighters
     require 'rack/codehighlighter'
-     
+
     use Rack::Codehighlighter, :coderay, :element => "pre", :pattern => /\A:::(\w+)\s*\n/
     run app
 
@@ -83,7 +97,7 @@ element below:
     puts "hello world"
     </pre>
 
-the *ruby* name is extracted. 
+the *ruby* name is extracted.
 
 To find the appropriate name to use for programming language,
 look at the lists below.
@@ -112,16 +126,21 @@ Ultraviolet:
 
 or
 
-    use Rack::Codehighlighter, :ultraviolet, :markdown => true, 
-      :theme => "minimal_theme", :lines => false, :element => "pre>code", 
+    use Rack::Codehighlighter, :ultraviolet, :markdown => true,
+      :theme => "minimal_theme", :lines => false, :element => "pre>code",
       :pattern => /\A:::([-_+\w]+)\s*(\n|&#x000A;)/, :logging => false,
       :themes => {"vibrant_ink" => ["ruby"], "upstream_sunburst" => ["objective-c", "java"]}
 
-Unofficial Pygments API:
+Unofficial Pygments API (uses web service, no dependencies):
 
     use Rack::Codehighlighter, :pygments_api, :element => "pre",
        :pattern => /\A:::([-_+\w]+)\s*(\n|&#x000A;)/, :logging => false
 
+Rygments (with the *rygments* gem):
+
+    use Rack::Codehighlighter, :pygments, :element => "pre",
+       :pattern => /\A:::([-_+\w]+)\s*(\n|&#x000A;)/, :logging => false
+
 Syntax:
 
     use Rack::Codehighlighter, :syntax,
@@ -133,7 +152,7 @@ Censor:
       :element => "pre", :pattern => /\A:::(\w+)\s*(\n|&#x000A;)/i, :logging => false
 
 
-Markdown, Maruku and RDiscount processors, the code is wrapped with `pre>code`.  
+Markdown, Maruku and RDiscount processors, the code is wrapped with `pre>code`.
 To remove this extra one level of nesting the `:markdown` option should be used:
 
     use Rack::Codehighlighter, :coderay, :markdown => true,
@@ -148,11 +167,11 @@ as rendered by HAML, `&#x000A;` was added to the default pattern.
 
 The *examples* directory contains several rackup files.
 Each rackup file uses a different highlighter.
-Install the *shotgun* gem and try, for example, the Pygments highlighter:
+Try, for example, the Pygments highlighter:
 
-    shotgun pygments.ru 
+    rackup coderay.ru
 
-The results could be checked at *http://localhost:9393*.
+The results could be checked at *http://localhost:9292*.
 
 
 ## Try it!
@@ -162,17 +181,15 @@ A simple Copy & Paste example.
     # example.rb
 
     require 'rubygems'
-    gem 'sinatra'
     require 'sinatra'
-    gem 'rack-codehighlighter'
     require 'rack/codehighlighter'
-    
+
     use Rack::Codehighlighter, :censor, :reason => '[[--difficult code removed--]]'
-    
+
     get "/" do
       erb :hello
     end
-    
+
     __END__
     @@ hello
     <h3>Fibonacci numbers in Ruby</h3>
@@ -190,33 +207,38 @@ Run the example with:
 
     ruby example.rb
 
-and check results at *http://localhost:4567*.
+and check the results at *http://localhost:4567*.
 
 
 ## Supported highlighters
 
-These currently include: *Syntax* (fast), *Coderay* (very fast), 
-*Ultraviolet* (slow, but highlights almost any language).
+These currently include: *Syntax* (fast), *Coderay* (very fast),
+*Ultraviolet* (slow, but highlights almost any language),
+Pygments (via the *rygments* gem or unofficial api).
 
 ### [Syntax](http://syntax.rubyforge.org/)
 
-Languages supported by *Syntax*: 
+Languages supported by *Syntax*:
 
 * xml
 * ruby
 
 ### [Coderay](http://coderay.rubychan.de/)
 
-Languages supported by *Coderay*:
+Languages supported by
+the [coderay](https://github.com/rubychan/coderay) library:
 
-* C, CSS
+* C, C++, CSS
 * Delphi, diff
-* HTML, RHTML (Rails), Nitro-XHTML
+* ERB+HTML, Groovy (beta), HTML
 * Java, JavaScript, JSON
-* Ruby
-* YAML
+* Nitro-XHTML, PHP, Python
+* Ruby, Scheme (beta), SQL
+* XML, YAML
+
+
 
-### [Ultraviolet](http://ultraviolet.rubyforge.org/)
+### [Ultraviolet](http://ultraviolet.rubyforge.org/) and 1.8 tree of the Ruby programming language
 
 The *ultraviolet* gem needs oniguruma regexp library.
 
@@ -231,6 +253,12 @@ Now, install the gem:
 
     sudo gem install ultraviolet
 
+### [Ultraviolet](http://ultraviolet.rubyforge.org/) and 1.9 tree of the Ruby programming language
+
+Install a fixed version of the Ultraviolet syntax highlighting
+library for the 1.9 tree of the Ruby programming language from
+[here](https://github.com/spox/ultraviolet).
+
 See also [Ultraviolet themes gallery](http://ultraviolet.rubyforge.org/themes.xhtml)
 
 Ultraviolet supports almost any language:
@@ -247,7 +275,7 @@ Ultraviolet supports almost any language:
 * haml, haskell, html, html-asp, html\_django, html\_for\_asp.net, html\_mason,
   html\_rails, html\_tcl
 * icalendar, inform, ini, installer\_distribution\_script, io
-* java, javaproperties, javascript, javascript\_+\_prototype, 
+* java, javaproperties, javascript, javascript\_+\_prototype,
   javascript\_+\_prototype\_bracketed, jquery\_javascript, json
 * languagedefinition, latex, latex\_beamer, latex\_log, latex\_memoir, lexflex,
   lighttpd, lilypond, lisp, literate\_haskell, logo, logtalk, lua

data/Rakefile

@@ -1,24 +1,2 @@
-require "rake"
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name         = "rack-codehighlighter"
-    gemspec.summary      = "Rack Middleware for Code Highlighting."
-    gemspec.email        = "matwb@univ.gda.pl"  
-    gemspec.homepage     = "http://github.com/wbzyl/rack-codehighlighter"
-    gemspec.authors      = ["Wlodek Bzyl"]
-    gemspec.description  = gemspec.summary
-    
-    gemspec.files = %w[LICENSE TODO Rakefile VERSION.yml] + FileList['lib/**/*.rb', "examples/**/*"]
-    
-    gemspec.add_runtime_dependency 'rack', '>=1.0.0'
-    gemspec.add_runtime_dependency 'nokogiri', '>=1.4.1'
-    
-    gemspec.add_development_dependency 'rack-test', '>=0.3.0'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with:"
-  puts "  sudo gem install jeweler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/TODO

@@ -1,9 +1,4 @@
-[15.06.2009]
-
-  Compare: http://freelancing-god.github.com/ts/en/
-  Description of thinking-sphinx gem.
-
-[13.10.2009]
+[22.07.2011]
 
 Currently, almost everything what I write is rendered by Ruby on Rails
 and Sinatra applications. To improve the readability of the text, I
@@ -14,7 +9,7 @@ The problem is to how syntax highlighting features are hooked into
 these frameworks.
 
 Look at the current practice. To this end, analyze the top three tools
-listed on *The Ruby Toolbox* in category 
+listed on *The Ruby Toolbox* in category
 [Syntax Highlighting](http://ruby-toolbox.com/categories/syntax_highlighting.html).
 
 [tm_syntax_highlighting](http://github.com/arya/tm_syntax_highlighting/) (plugin):
@@ -29,7 +24,7 @@ listed on *The Ruby Toolbox* in category
 
 [Redcloth with CodeRay](http://github.com/augustl/redcloth-with-coderay) (gem):
 
-    <source:ruby> some_ruby_code </source> 
+    <source:ruby> some_ruby_code </source>
 
 In each piece of code inserted into html we must change:
 `<` to `&lt;`. This is annoying thing.

data/examples/app.rb

@@ -6,10 +6,6 @@ require 'sinatra'
 
 require 'rack/codehighlighter'
 
-require 'coderay'                # Coderay
-require 'syntax/convertors/html' # Syntax
-require 'uv'                     # Ultraviolet
-
 get "/" do
   erb :index
 end

data/examples/{config.ru → censor.ru}

@@ -1,3 +1,4 @@
+$:.unshift File.dirname(__FILE__)
 require 'app'
 
 use Rack::ShowExceptions

data/examples/check.rb

@@ -3,6 +3,8 @@ require 'rubygems'
 require 'coderay'
 require 'uv'
 require 'syntax/convertors/html'
+require 'rygments'
+#require 'pygments'
 
 str = "def hitch; end"
 
@@ -14,3 +16,9 @@ puts CodeRay.encoder(:html).encode(str, 'ruby')
 
 puts "---- Ultraviolet ----"
 puts Uv.parse(str, 'xhtml', 'ruby_experimental', false, 'dawn')
+
+puts "---- Rygments ----"
+puts Rygments.highlight_string(str, 'ruby', 'html')
+
+#puts "---- Pygments ----"
+#puts Pygments.highlight(str, :lexer => 'ruby', :formatter => 'html')

data/examples/coderay.ru

@@ -1,8 +1,10 @@
+$:.unshift File.dirname(__FILE__)
 require 'app'
 
 use Rack::ShowExceptions
 use Rack::Lint
 
-use Rack::Codehighlighter, :prettify, :element => "pre", :pattern => /\A:::(\w+)\s*\n/, :logging => true
+require 'coderay'
+use Rack::Codehighlighter, :coderay, :element => "pre", :pattern => /\A:::(\w+)\s*\n/, :logging => true
 
 run Sinatra::Application

data/examples/example.rb

@@ -0,0 +1,25 @@
+path = File.expand_path("../lib")
+$:.unshift(path) unless $:.include?(path)
+
+require 'rubygems'
+require 'sinatra'
+require 'rack/codehighlighter'
+
+use Rack::Codehighlighter, :censor, :reason => '[[--difficult code removed--]]'
+
+get "/" do
+  erb :hello
+end
+
+__END__
+@@ hello
+<h3>Fibonacci numbers in Ruby</h3>
+<pre>:::ruby
+def fib(n)
+  if n < 2
+    1
+  else
+    fib(n-2) + fib(n-1)
+  end
+end
+</pre>

data/examples/public/stylesheets/pygments.css

@@ -1,61 +1,62 @@
-.hll { background-color: #ffffcc }
-.c { color: #408080; font-style: italic } /* Comment */
-.err { border: 1px solid #FF0000 } /* Error */
-.k { color: #008000; font-weight: bold } /* Keyword */
-.o { color: #666666 } /* Operator */
-.cm { color: #408080; font-style: italic } /* Comment.Multiline */
-.cp { color: #BC7A00 } /* Comment.Preproc */
-.c1 { color: #408080; font-style: italic } /* Comment.Single */
-.cs { color: #408080; font-style: italic } /* Comment.Special */
-.gd { color: #A00000 } /* Generic.Deleted */
-.ge { font-style: italic } /* Generic.Emph */
-.gr { color: #FF0000 } /* Generic.Error */
-.gh { color: #000080; font-weight: bold } /* Generic.Heading */
-.gi { color: #00A000 } /* Generic.Inserted */
-.go { color: #808080 } /* Generic.Output */
-.gp { color: #000080; font-weight: bold } /* Generic.Prompt */
-.gs { font-weight: bold } /* Generic.Strong */
-.gu { color: #800080; font-weight: bold } /* Generic.Subheading */
-.gt { color: #0040D0 } /* Generic.Traceback */
-.kc { color: #008000; font-weight: bold } /* Keyword.Constant */
-.kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
-.kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
-.kp { color: #008000 } /* Keyword.Pseudo */
-.kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
-.kt { color: #B00040 } /* Keyword.Type */
-.m { color: #666666 } /* Literal.Number */
-.s { color: #BA2121 } /* Literal.String */
-.na { color: #7D9029 } /* Name.Attribute */
-.nb { color: #008000 } /* Name.Builtin */
-.nc { color: #0000FF; font-weight: bold } /* Name.Class */
-.no { color: #880000 } /* Name.Constant */
-.nd { color: #AA22FF } /* Name.Decorator */
-.ni { color: #999999; font-weight: bold } /* Name.Entity */
-.ne { color: #D2413A; font-weight: bold } /* Name.Exception */
-.nf { color: #0000FF } /* Name.Function */
-.nl { color: #A0A000 } /* Name.Label */
-.nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
-.nt { color: #008000; font-weight: bold } /* Name.Tag */
-.nv { color: #19177C } /* Name.Variable */
-.ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
-.w { color: #bbbbbb } /* Text.Whitespace */
-.mf { color: #666666 } /* Literal.Number.Float */
-.mh { color: #666666 } /* Literal.Number.Hex */
-.mi { color: #666666 } /* Literal.Number.Integer */
-.mo { color: #666666 } /* Literal.Number.Oct */
-.sb { color: #BA2121 } /* Literal.String.Backtick */
-.sc { color: #BA2121 } /* Literal.String.Char */
-.sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
-.s2 { color: #BA2121 } /* Literal.String.Double */
-.se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
-.sh { color: #BA2121 } /* Literal.String.Heredoc */
-.si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
-.sx { color: #008000 } /* Literal.String.Other */
-.sr { color: #BB6688 } /* Literal.String.Regex */
-.s1 { color: #BA2121 } /* Literal.String.Single */
-.ss { color: #19177C } /* Literal.String.Symbol */
-.bp { color: #008000 } /* Name.Builtin.Pseudo */
-.vc { color: #19177C } /* Name.Variable.Class */
-.vg { color: #19177C } /* Name.Variable.Global */
-.vi { color: #19177C } /* Name.Variable.Instance */
-.il { color: #666666 } /* Literal.Number.Integer.Long */
+.highlight .hll { background-color: #ffffcc }
+.highlight  { background: #f8f8f8; }
+.highlight .c { color: #008800; font-style: italic } /* Comment */
+.highlight .err { border: 1px solid #FF0000 } /* Error */
+.highlight .k { color: #AA22FF; font-weight: bold } /* Keyword */
+.highlight .o { color: #666666 } /* Operator */
+.highlight .cm { color: #008800; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #008800 } /* Comment.Preproc */
+.highlight .c1 { color: #008800; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #008800; font-weight: bold } /* Comment.Special */
+.highlight .gd { color: #A00000 } /* Generic.Deleted */
+.highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #FF0000 } /* Generic.Error */
+.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.highlight .gi { color: #00A000 } /* Generic.Inserted */
+.highlight .go { color: #808080 } /* Generic.Output */
+.highlight .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
+.highlight .gs { font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.highlight .gt { color: #0040D0 } /* Generic.Traceback */
+.highlight .kc { color: #AA22FF; font-weight: bold } /* Keyword.Constant */
+.highlight .kd { color: #AA22FF; font-weight: bold } /* Keyword.Declaration */
+.highlight .kn { color: #AA22FF; font-weight: bold } /* Keyword.Namespace */
+.highlight .kp { color: #AA22FF } /* Keyword.Pseudo */
+.highlight .kr { color: #AA22FF; font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #00BB00; font-weight: bold } /* Keyword.Type */
+.highlight .m { color: #666666 } /* Literal.Number */
+.highlight .s { color: #BB4444 } /* Literal.String */
+.highlight .na { color: #BB4444 } /* Name.Attribute */
+.highlight .nb { color: #AA22FF } /* Name.Builtin */
+.highlight .nc { color: #0000FF } /* Name.Class */
+.highlight .no { color: #880000 } /* Name.Constant */
+.highlight .nd { color: #AA22FF } /* Name.Decorator */
+.highlight .ni { color: #999999; font-weight: bold } /* Name.Entity */
+.highlight .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
+.highlight .nf { color: #00A000 } /* Name.Function */
+.highlight .nl { color: #A0A000 } /* Name.Label */
+.highlight .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
+.highlight .nt { color: #008000; font-weight: bold } /* Name.Tag */
+.highlight .nv { color: #B8860B } /* Name.Variable */
+.highlight .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight .mf { color: #666666 } /* Literal.Number.Float */
+.highlight .mh { color: #666666 } /* Literal.Number.Hex */
+.highlight .mi { color: #666666 } /* Literal.Number.Integer */
+.highlight .mo { color: #666666 } /* Literal.Number.Oct */
+.highlight .sb { color: #BB4444 } /* Literal.String.Backtick */
+.highlight .sc { color: #BB4444 } /* Literal.String.Char */
+.highlight .sd { color: #BB4444; font-style: italic } /* Literal.String.Doc */
+.highlight .s2 { color: #BB4444 } /* Literal.String.Double */
+.highlight .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
+.highlight .sh { color: #BB4444 } /* Literal.String.Heredoc */
+.highlight .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
+.highlight .sx { color: #008000 } /* Literal.String.Other */
+.highlight .sr { color: #BB6688 } /* Literal.String.Regex */
+.highlight .s1 { color: #BB4444 } /* Literal.String.Single */
+.highlight .ss { color: #B8860B } /* Literal.String.Symbol */
+.highlight .bp { color: #AA22FF } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #B8860B } /* Name.Variable.Class */
+.highlight .vg { color: #B8860B } /* Name.Variable.Global */
+.highlight .vi { color: #B8860B } /* Name.Variable.Instance */
+.highlight .il { color: #666666 } /* Literal.Number.Integer.Long */

data/examples/pygments.ru

@@ -1,9 +1,10 @@
+$:.unshift File.dirname(__FILE__)
 require 'app'
 
 use Rack::ShowExceptions
 use Rack::Lint
 
-use Rack::Codehighlighter, :pygments_api, :element => "pre",
-   :pattern => /\A:::([-_+\w]+)\s*\n/, :logging => true
+require 'rygments'
+use Rack::Codehighlighter, :pygments, :element => "pre", :pattern => /\A:::([-_+\w]+)\s*\n/, :logging => true
 
 run Sinatra::Application

data/examples/pygments_api.ru

@@ -0,0 +1,10 @@
+$:.unshift File.dirname(__FILE__)
+require 'app'
+
+use Rack::ShowExceptions
+use Rack::Lint
+
+use Rack::Codehighlighter, :pygments_api, :element => "pre",
+   :pattern => /\A:::([-_+\w]+)\s*\n/, :logging => true
+
+run Sinatra::Application

data/examples/syntax.ru

@@ -0,0 +1,10 @@
+$:.unshift File.dirname(__FILE__)
+require 'app'
+
+use Rack::ShowExceptions
+use Rack::Lint
+
+require 'syntax/convertors/html'
+use Rack::Codehighlighter, :syntax, :element => "pre", :pattern => /\A:::([-_+\w]+)\s*\n/, :logging => true
+
+run Sinatra::Application

data/examples/ultraviolet.ru

@@ -1,8 +1,10 @@
+$:.unshift File.dirname(__FILE__)
 require 'app'
 
 use Rack::ShowExceptions
 use Rack::Lint
 
+require 'uv'
 use Rack::Codehighlighter, :ultraviolet, 
   :element => "pre", :pattern => /\A:::(\w+)\s*\n/,
   :themes => {"cobalt" => ["ruby"], "zenburnesque" => ["c", "sql"]},

data/examples/views/index.erb

@@ -48,3 +48,19 @@ create table exams (
   when        datetime
 );  
 </pre>
+
+<h3>html</h3>
+
+<pre>:::html
+&lt;html&gt;
+  &lt;head&gt;
+    &lt;title&gt;Hello!&lt;/title&gt;
+    &lt;style type="text/css"&gt;
+      h1 { color: blue; }
+    &lt;/style&gt;
+  &lt;/head&gt;
+  &lt;body&gt;
+    &lt;h1&gt;Hello World&lt;/h1&gt;
+  &lt;/body&gt;
+&lt;/html&gt;
+</pre>

data/lib/rack/codehighlighter.rb

@@ -7,15 +7,15 @@ module Rack
 
     # for logging use
     FORMAT = %{%s - [%s] [%s] "%s %s%s %s" (%s) %d %d %0.4f\n}
-    
+
     def initialize(app, highlighter = :censor, opts = {})
       @app = app
       @highlighter = highlighter
       @opts = {
         :element => "pre",
-        :pattern => /\A:::([-_\w]+)\s*(\n|
)/i,  # 
 == line feed
+        :pattern => /\A:::([-\w]+)\s*(\n|
)/i,  # 
 == line feed
         :reason => "[[--  ugly code removed  --]]", #8-)
-        :markdown => false  
+        :markdown => false
       }
       @opts.merge! opts
     end
@@ -37,9 +37,9 @@ module Rack
         nodes.each do |node|
           s = node.inner_html || "[++where is the code?++]"
           if @opts[:markdown]
-            node.parent.swap(send(@highlighter, s))  
+            node.parent.swap(send(@highlighter, s))
           else
-            node.swap(send(@highlighter, s))            
+            node.swap(send(@highlighter, s))
           end
         end
 
@@ -49,10 +49,10 @@ module Rack
         log(env, status, headers, began_at) if @opts[:logging]
         [status, headers, [body]]
       else
-        [status, headers, response]  
+        [status, headers, response]
       end
     end
-    
+
     private
 
     def log(env, status, headers, began_at)
@@ -91,13 +91,13 @@ module Rack
       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(@opts[:pattern], "")) || "[=this can'n happen=]")        
+        convertor = ::Syntax::Convertors::HTML.for_syntax translate[lang] || lang
+        convertor.convert(unescape_html(string.sub(@opts[:pattern], "")) || "[=this can'n happen=]")
       else
         "<pre>#{string}</pre>"
       end
     end
-    
+
     def coderay(string)
       lang = 'unknown'
       refs = @opts[:pattern].match(string)  # extract language name
@@ -121,7 +121,7 @@ module Rack
       }
       lang = 'unknown'
       refs = @opts[:pattern].match(string)  # extract language name
-      if refs 
+      if refs
         lang = refs[1]
         str = string.sub(@opts[:pattern], "")
         "<pre class='prettyprint lang-#{translate[lang] || lang}'>#{str}</pre>"
@@ -130,6 +130,18 @@ module Rack
       end
     end
 
+    def pygments(string)
+      refs = @opts[:pattern].match(string)
+      if refs
+        lang = refs[1]
+        str = unescape_html(string.sub(@opts[:pattern], ""))
+        #Pygments.highlight(str, :lexer => lang, :formatter => 'html')
+        Rygments.highlight_string(str, lang, 'html')
+      else
+        "<pre>#{string}</pre>"
+      end
+    end
+
     def pygments_api(string)
       require 'net/http'
       require 'uri'
@@ -153,7 +165,7 @@ module Rack
       refs = @opts[:pattern].match(string)  # extract language name
       if refs
         lang = refs[1]
-        theme = opts[:themes].collect do |k,v| 
+        theme = opts[:themes].collect do |k,v|
           k if v.include? lang end.compact.first || opts[:theme]
         str = unescape_html(string.sub(@opts[:pattern], ""))
         "#{::Uv.parse(str, 'xhtml', lang, opts[:lines], theme)}"
@@ -161,10 +173,10 @@ module Rack
         "<pre class='#{opts[:theme]}'>#{string}</pre>"
       end
     end
-    
+
     def unescape_html(string)
       string.to_s.gsub(/&#x000A;/i, "\n").gsub("&lt;", '<').gsub("&gt;", '>').gsub("&amp;", '&')
     end
-    
+
   end
 end

data/rack-codehighlighter.gemspec

@@ -0,0 +1,19 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name        = "rack-codehighlighter"
+  s.version     = "0.5.0"
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Włodek Bzyl"]
+  s.email       = ["matwb@ug.edu.pl"]
+  s.homepage    = "http://tao.inf.ug.edu.pl/"
+  s.summary     = %q{Rack Middleware for Code Highlighting.}
+  s.description = %q{Rack Middleware for Code Highlighting. Supports the most popular Ruby code highlighters.}
+
+  s.add_runtime_dependency 'rack', '>= 1.0.0'
+  s.add_runtime_dependency 'nokogiri', '>= 1.4.1'
+
+  s.files         = `git ls-files`.split("\n")
+  #s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths = ["lib"]
+end

metadata

@@ -1,90 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-codehighlighter
-version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 7
-  version: 0.4.7
+version: !ruby/object:Gem::Version
+  version: 0.5.0
+  prerelease: 
 platform: ruby
-authors: 
-- Wlodek Bzyl
+authors:
+- Włodek Bzyl
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-09-03 00:00:00 +02:00
+date: 2011-07-25 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &18051100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *18051100
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &18050440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 4
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
-  type: :development
-  version_requirements: *id003
-description: Rack Middleware for Code Highlighting.
-email: matwb@univ.gda.pl
+  version_requirements: *18050440
+description: Rack Middleware for Code Highlighting. Supports the most popular Ruby
+  code highlighters.
+email:
+- matwb@ug.edu.pl
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.markdown
-- TODO
-files: 
+extra_rdoc_files: []
+files:
+- .gitignore
+- Gemfile
 - LICENSE
+- README.md
 - Rakefile
 - TODO
-- VERSION.yml
 - examples/app.rb
+- examples/censor.ru
 - examples/check.rb
 - examples/coderay.ru
-- examples/config.ru
+- examples/example.rb
 - examples/public/javascripts/lang-css.js
 - examples/public/javascripts/lang-hs.js
 - examples/public/javascripts/lang-lisp.js
@@ -111,45 +79,36 @@ files:
 - examples/public/stylesheets/uv/twilight.css
 - examples/public/stylesheets/uv/zenburnesque.css
 - examples/pygments.ru
+- examples/pygments_api.ru
+- examples/syntax.ru
 - examples/ultraviolet.ru
 - examples/views/index.erb
 - examples/views/layout.erb
 - lib/rack/codehighlighter.rb
-- README.markdown
+- rack-codehighlighter.gemspec
 has_rdoc: true
-homepage: http://github.com/wbzyl/rack-codehighlighter
+homepage: http://tao.inf.ug.edu.pl/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Rack Middleware for Code Highlighting.
-test_files: 
-- examples/check.rb
-- examples/app.rb
+test_files: []

data/VERSION.yml

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