wbzyl-rack-codehighlighter 0.1.1 → 0.1.2

data/README.markdown

@@ -5,7 +5,7 @@ of exisitng code highlighters to make their usage as generic possible.
 
 To install it, run:
 
-    sudo gem install wbzyl-codehighlighter-middleware -s http://gems.github.com
+    sudo gem install wbzyl-rack-codehighlighter -s http://gems.github.com
 
 Markup your code with:
 
@@ -19,10 +19,15 @@ Example (incomplete html, needs a layout file with link to css):
 
     require 'rubygems'
     require 'sinatra'
+
+    gem 'coderay'
     require 'coderay'    # use the Coderay highlighter
     
     gem 'wbzyl-sinatra-rdiscount'
-    require 'wbzyl-codehighlighter-middleware'
+    require 'sinatra/rdiscount'
+
+    gem 'wbzyl-rack-codehighlighter'
+    require 'rack/codehighlighter'
     
     use Rack::Codehighlighter, :coderay
     

data/lib/codehighlighter-middleware.rb

@@ -0,0 +1,138 @@
+require 'rack/utils'
+
+gem 'hpricot', '>=0.8.1'
+require 'hpricot'
+
+module Rack
+  class Codehighlighter
+    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 = { :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)
+      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(@opts[:element])
+        nodes.each do |node|
+          s = node.inner_html || "[++where is the code?++]"
+          node.parent.swap(send(@highlighter, s))
+        end
+
+        body = doc.to_html
+        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'
+      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'
+      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
+    
+    def prettify(string)
+      translate = {
+        'ruby' => 'rb',
+        'bash' => 'bsh',
+        'javascript' => 'js',
+        'python' => 'py'
+      }
+      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 => 'dawn', :lines => false }
+      opts.merge! @opts
+      lang = 'text'
+      refs = @opts[:pattern].match(string)  # extract language name
+      if refs
+        lang = refs[1]
+        str = unescape_html(string.sub(@opts[:pattern], ""))
+        "#{::Uv.parse(str, 'xhtml', lang, opts[:lines], opts[:theme])}"
+      else
+        "<pre class='#{opts[:theme]}'>#{string}</pre>"
+      end
+    end
+    
+    def unescape_html(string)
+      string.to_s.gsub("&lt;", '<').gsub("&gt;", '>').gsub("&amp;", '&')
+    end
+    
+  end
+end

data/lib/rack/codehighlighter.rb

@@ -0,0 +1,138 @@
+require 'rack/utils'
+
+gem 'hpricot', '>=0.8.1'
+require 'hpricot'
+
+module Rack
+  class Codehighlighter
+    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 = { :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)
+      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(@opts[:element])
+        nodes.each do |node|
+          s = node.inner_html || "[++where is the code?++]"
+          node.parent.swap(send(@highlighter, s))
+        end
+
+        body = doc.to_html
+        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'
+      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'
+      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
+    
+    def prettify(string)
+      translate = {
+        'ruby' => 'rb',
+        'bash' => 'bsh',
+        'javascript' => 'js',
+        'python' => 'py'
+      }
+      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 => 'dawn', :lines => false }
+      opts.merge! @opts
+      lang = 'text'
+      refs = @opts[:pattern].match(string)  # extract language name
+      if refs
+        lang = refs[1]
+        str = unescape_html(string.sub(@opts[:pattern], ""))
+        "#{::Uv.parse(str, 'xhtml', lang, opts[:lines], opts[:theme])}"
+      else
+        "<pre class='#{opts[:theme]}'>#{string}</pre>"
+      end
+    end
+    
+    def unescape_html(string)
+      string.to_s.gsub("&lt;", '<').gsub("&gt;", '>').gsub("&amp;", '&')
+    end
+    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wbzyl-rack-codehighlighter
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Wlodek Bzyl
@@ -12,6 +12,16 @@ cert_chain: []
 date: 2009-05-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
   type: :runtime
@@ -22,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.8.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.0
+    version: 
 description: Rack Middleware for Code Highlighting.
 email: matwb@univ.gda.pl
 executables: []
@@ -32,12 +52,6 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files: 
-- .gitignore
-- LICENSE
-- README.markdown
-- Rakefile
-- TODO
-- VERSION.yml
 - examples/app.rb
 - examples/config.ru
 - examples/public/javascripts/lang-css.js
@@ -65,6 +79,10 @@ files:
 - examples/public/stylesheets/uv/zenburnesque.css
 - examples/views/index.rdiscount
 - examples/views/layout.rdiscount
+- lib/codehighlighter-middleware.rb
+- lib/rack/codehighlighter.rb
+- LICENSE
+- README.markdown
 has_rdoc: false
 homepage: http://github.com/wbzyl/rack-codehighlighter
 post_install_message: 

data/.gitignore

@@ -1,4 +0,0 @@
-\#*
-.\#*
-*~
-pkg

data/Rakefile

@@ -1,39 +0,0 @@
-require "rubygems"
-require "rake/gempackagetask"
-require "rake/clean"
-#require "spec/rake/spectask"
-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '/lib')
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name         = "rack-codehighlighter"
-    s.summary      = "Rack Middleware for Code Highlighting."
-    s.email        = "matwb@univ.gda.pl"  
-    s.homepage     = "http://github.com/wbzyl/rack-codehighlighter"
-    s.authors      = ["Wlodek Bzyl"]
-    s.description  = s.summary
-  
-    #  s.add_dependency 'coderay', '>=0.8.312'
-    s.add_dependency 'hpricot', '>=0.8.1'   
-  end
-rescue LoadError
-  puts "Jeweler not available."
-  puts "Install it with:"
-  puts "  sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
-
-#Rake::TestTask.new(:test) do |t|
-#  t.libs << 'lib' << 'test'
-#  t.pattern = 'test/**/*_test.rb'
-#  t.verbose = false
-#end
-
-desc 'Install the package as a gem.'
-task :install => [:clean, :build] do
-  gem = Dir['pkg/*.gem'].last
-  sh "sudo gem install --no-rdoc --no-ri --local #{gem}"
-end
-
-task :default => :test

data/TODO

@@ -1,22 +0,0 @@
-
-[1.05.2009, done] 
-  Add support for code-prettify:
-
-    * [source code](http://code.google.com/p/google-code-prettify/)
-      [example](http://google-code-prettify.googlecode.com/svn/trunk/README.html)
-
-   
-    * see http://tomayko.com/writings/javascript-prettification
-      (support for jQuery, new pallette)
-
-    * example:
-      <pre class="prettyprint lang-html">
-      The lang-* class specifies the language file extensions.
-      File extensions supported by default include
-      "bsh", "c", "cc", "cpp", "cs", "csh", "cyc", "cv", "htm", "html",
-      "java", "js", "m", "mxml", "perl", "pl", "pm", "py", "rb", "sh",
-      "xhtml", "xml", "xsl".
-      </pre>
-
-[1.05.2009] 
-  Add support for unobtrustive Code Highlighter By Dan Webb 11/2005

data/VERSION.yml

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