pygments.rb 0.1.2 → 0.1.3

data/lib/pygments/c.rb

@@ -1,18 +1,21 @@
-ENV['PYTHONPATH'] = File.expand_path('../../../vendor/Pygments-1.4/', __FILE__)
-require 'pygments_ext'
-ENV['PYTHONPATH'] = nil
-
 module Pygments
   module C
     extend self
 
-    def start
+    def start(python_path = File.expand_path('../../../vendor/Pygments-1.4/', __FILE__))
+      ENV['PYTHONPATH'], prev = python_path, ENV['PYTHONPATH']
+      require 'pygments_ext'
+      @started = true
+    ensure
+      ENV['PYTHONPATH'] = prev
     end
 
     def stop
     end
 
     def formatters
+      start unless @started
+
       _formatters.inject(Hash.new) do |hash, (name, desc, aliases)|
         name.sub!(/Formatter$/,'')
         hash[name] = {
@@ -25,6 +28,8 @@ module Pygments
     end
 
     def lexers
+      start unless @started
+
       _lexers.inject(Hash.new) do |hash, (name, aliases, files, mimes)|
         hash[name] = {
           :description => name,
@@ -37,6 +42,8 @@ module Pygments
     end
 
     def highlight(code, opts={})
+      start unless @started
+
       out = _highlight(code, opts)
       if opts[:formatter].nil? or opts[:formatter].to_s.downcase == 'html'
         out.gsub!(%r{</pre></div>\Z}, "</pre>\n</div>")

data/lib/pygments/ffi.rb

@@ -4,10 +4,10 @@ module Pygments
   module FFI
     extend self
 
-    def start
+    def start(pygments_path = File.expand_path('../../../vendor/Pygments-1.4/', __FILE__))
       RubyPython.start
       sys = RubyPython.import('sys')
-      sys.path.insert(0, File.expand_path('../../../vendor/Pygments-1.4/', __FILE__))
+      sys.path.insert(0, pygments_path)
       sys.path.insert(0, File.expand_path('../../../vendor/python2-chardet-2.0.1/', __FILE__))
 
       @modules = [ :lexers, :formatters, :styles, :filters ].inject(Hash.new) do |hash, name|
@@ -81,6 +81,10 @@ module Pygments
     def highlight(code, opts={})
       start unless pygments
 
+      if code.nil? or code.empty?
+        return code
+      end
+
       opts[:options] ||= {}
       opts[:options][:encoding] ||= 'chardet'
       opts[:options][:outencoding] ||= 'utf-8'

data/lib/pygments/version.rb

@@ -1,3 +1,3 @@
 module Pygments
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/test/test_pygments.rb

@@ -77,6 +77,11 @@ class PygmentsHighlightTest < Test::Unit::TestCase
 
   RUBY_CODE = "#!/usr/bin/ruby\nputs 'foo'"
 
+  def test_highlight_empty
+    highlight('')
+    highlight(nil)
+  end
+
   def test_highlight_defaults_to_html
     code = highlight(RUBY_CODE)
     assert_match '<span class="c1">#!/usr/bin/ruby</span>', code

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pygments.rb
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Aman Gupta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 -07:00
+date: 2011-08-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -569,7 +569,7 @@ files:
 - vendor/python2-chardet-2.0.1/docs/supported-encodings.html
 - vendor/python2-chardet-2.0.1/docs/usage.html
 - vendor/python2-chardet-2.0.1/setup.py
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/tmm1/pygments.rb
 licenses: []