rack-codehighlighter 0.4.1 → 0.4.4

data/README.markdown

@@ -12,6 +12,10 @@ It supports the most popular Ruby code highlighters of today:
 * coderay
 * syntax
 
+As well as
+
+* [Unofficial Pygments API](http://pygments.appspot.com/)
+
 To ease testing it implements *censor* highlighter.
 
 
@@ -99,29 +103,48 @@ In examples displayed below, the default value of each option is used.
 Coderay:
 
     use Rack::Codehighlighter, :coderay,
-      :element => "pre", :pattern => /\A:::(\w+)\s*\n/, :logging => false
+      :element => "pre", :pattern => /\A:::(\w+)\s*(\n|
)/i, :logging => false
 
 Ultraviolet:
 
     use Rack::Codehighlighter, :ultraviolet, :theme => "dawn", :lines => false,
-      :element => "pre", :pattern => /\A:::(\w+)\s*\n/, :logging => false
+      :element => "pre", :pattern => /\A:::(\w+)\s*(\n|
)/i, :logging => false
+
+or
+
+    use Rack::Codehighlighter, :ultraviolet, :markdown => true, 
+      :theme => "minimal_theme", :lines => false, :element => "pre>code", 
+      :pattern => /\A:::([-_+\w]+)\s*(\n|
)/, :logging => false,
+      :themes => {"vibrant_ink" => ["ruby"], "upstream_sunburst" => ["objective-c", "java"]}
+
+Unofficial Pygments API:
+
+    use Rack::Codehighlighter, :pygments_api, :element => "pre",
+       :pattern => /\A:::([-_+\w]+)\s*(\n|
)/, :logging => false
 
 Syntax:
 
     use Rack::Codehighlighter, :syntax,
-      :element => "pre", :pattern => /\A:::(\w+)\s*\n/, :logging => false
+      :element => "pre", :pattern => /\A:::(\w+)\s*(\n|
)/i, :logging => false
 
 Censor:
 
     use Rack::Codehighlighter, :censor, :reason => "[[--  ugly code removed  --]]",
-      :element => "pre", :pattern => /\A:::(\w+)\s*\n/, :logging => false
+      :element => "pre", :pattern => /\A:::(\w+)\s*(\n|
)/i, :logging => false
 
 
 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,
-      :element => "pre>code", :pattern => /\A:::(\w+)\s*\n/, :logging => false
+      :element => "pre>code", :pattern => /\A:::(\w+)\s*(\n|
)/i, :logging => false
+
+**Remark:** Within `pre` tag, HAML replaces each new line characters
+with the `
` entity (line feed) so that it can ensure that it
+doesn't adversely affect indentation.
+This change confuses both rack-codehighlighter and the highlighters
+themselves (e.g. Ultraviolet and Coderay).  So, to support `pre` tags
+as rendered by HAML, `
` was added to the default pattern.
 
 Check the `examples` directory for working examples.
 

data/Rakefile

@@ -13,19 +13,12 @@ begin
     gemspec.files = %w[LICENSE TODO Rakefile VERSION.yml] + FileList['lib/**/*.rb', "examples/**/*"]
     
     gemspec.add_runtime_dependency 'rack', '>=1.0.0'
-    gemspec.add_runtime_dependency 'hpricot', '>=0.8.1'   
+    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."
-  puts "Install it with:"
-  puts "  sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler not available. Install it with:"
+  puts "  sudo gem install jeweler"
 end
-
-#Rake::TestTask.new(:test) do |t|
-#  t.libs << 'lib' << 'test'
-#  t.pattern = 'test/**/*_test.rb'
-#  t.verbose = false
-#end

data/VERSION.yml

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

data/lib/rack/codehighlighter.rb

@@ -1,5 +1,5 @@
 require 'rack/utils'
-require 'hpricot'
+require 'nokogiri'
 
 module Rack
   class Codehighlighter
@@ -32,7 +32,7 @@ module Rack
 
         content = ""
         response.each { |part| content += part }
-        doc = Hpricot(content)
+        doc = Nokogiri::HTML(content)
         nodes = doc.search(@opts[:element])
         nodes.each do |node|
           s = node.inner_html || "[++where is the code?++]"
@@ -130,15 +130,33 @@ module Rack
       end
     end
 
+    def pygments_api(string)
+      require 'net/http'
+      require 'uri'
+      lang = 'unknown'
+      refs = @opts[:pattern].match(string)  # extract language name
+      if refs
+        lang = refs[1]
+        str = unescape_html(string.sub(@opts[:pattern], ""))
+        req = Net::HTTP.post_form(URI.parse('http://pygments.appspot.com/'),
+                            {'lang' => lang, 'code' => str})
+        "#{req.body}"
+      else
+        "<pre>#{string}</pre>"
+      end
+    end
+
     def ultraviolet(string)
-      opts = { :theme => 'dawn', :lines => false }
+      opts = { :theme => 'dawn', :lines => false, :themes => {} }
       opts.merge! @opts
       lang = 'text'
       refs = @opts[:pattern].match(string)  # extract language name
       if refs
         lang = refs[1]
+        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], opts[:theme])}"
+        "#{::Uv.parse(str, 'xhtml', lang, opts[:lines], theme)}"
       else
         "<pre class='#{opts[:theme]}'>#{string}</pre>"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-codehighlighter
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.4
 platform: ruby
 authors: 
 - Wlodek Bzyl
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-05 00:00:00 +01:00
+date: 2010-02-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,14 +23,14 @@ dependencies:
         version: 1.0.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: nokogiri
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.1
+        version: 1.4.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack-test