albino 1.3.0 → 1.3.2

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/README.md

@@ -0,0 +1,29 @@
+# Albino: a ruby wrapper for pygmentize
+
+This project is an extraction from GitHub.
+
+For this and other extractions, see [http://github.com/github]()
+
+## Installation
+
+    sudo easy_install pygments
+    gem install albino
+
+## Usage
+
+### Simple
+
+    require 'albino'
+    puts Albino.colorize('puts "Hello World"', :ruby)
+
+### Advanced
+
+    require 'albino'
+    @syntaxer = Albino.new(File.new('albino.rb'), :ruby, :bbcode)
+    puts @syntaxer.colorize
+
+### Multi
+
+    require 'albino/multi'
+    ruby, python = Albino::Multi.colorize([ ['1+2',:ruby], ['1-2',:python] ])
+

data/albino.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'albino'
-  s.version           = '1.3.0'
-  s.date              = '2011-03-03'
+  s.version           = '1.3.2'
+  s.date              = '2011-03-06'
   s.rubyforge_project = 'albino'
 
   ## Make sure your summary is short. The description may be as long
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
   s.require_paths = %w[lib]
 
-  s.add_dependency('posix-spawn')
+  s.add_dependency('posix-spawn', '>= 0.3.3')
   s.add_development_dependency('mocha')
 
   ## Leave this section as-is. It will be automatically generated from the
@@ -41,8 +41,9 @@ Gem::Specification.new do |s|
   ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
   # = MANIFEST =
   s.files = %w[
+    Gemfile
     LICENSE
-    README
+    README.md
     Rakefile
     albino.gemspec
     lib/albino.rb

data/lib/albino.rb

@@ -10,7 +10,7 @@ require 'posix-spawn'
 #
 # Use like so:
 #
-#   @syntaxer = Albino.new('/some/file.rb', :ruby)
+#   @syntaxer = Albino.new('puts "Hello World"', :ruby)
 #   puts @syntaxer.colorize
 #
 # This'll print out an HTMLized, Ruby-highlighted version
@@ -18,12 +18,16 @@ require 'posix-spawn'
 #
 # To use another formatter, pass it as the third argument:
 #
-#   @syntaxer = Albino.new('/some/file.rb', :ruby, :bbcode)
+#   @syntaxer = Albino.new('puts "Hello World"', :ruby, :bbcode)
 #   puts @syntaxer.colorize
 #
 # You can also use the #colorize class method:
 #
-#   puts Albino.colorize('/some/file.rb', :ruby)
+#   puts Albino.colorize('puts "Hello World"', :ruby)
+#
+# To format a file, pass a file stream:
+#
+#   puts Albino.colorize(File.new('/some/file.rb'), :ruby)
 #
 # Another also: you get a #to_s, for somewhat nicer use in Rails views.
 #
@@ -47,14 +51,22 @@ class Albino
   class ShellArgumentError < ArgumentError; end
   include POSIX::Spawn
 
-  VERSION = '1.3.0'
+  VERSION = '1.3.2'
 
   class << self
-    attr_accessor :bin, :default_encoding, :timeout_threshold
+    attr_accessor :bin, :timeout_threshold
+    attr_reader :default_encoding
+
+    def default_encoding=(encoding)
+      # make sure the encoding is valid
+      Encoding.find(encoding) if defined?(Encoding)
+
+      @default_encoding = encoding
+    end
   end
 
   self.timeout_threshold = 10
-  self.default_encoding  = 'utf8'
+  self.default_encoding  = 'utf-8'
   self.bin = 'pygmentize'
 
   def self.colorize(*args)
@@ -64,6 +76,7 @@ class Albino
   def initialize(target, lexer = :text, format = :html, encoding = self.class.default_encoding)
     @target  = target
     @options = { :l => lexer, :f => format, :O => "encoding=#{encoding}" }
+    @encoding = encoding
   end
 
   def execute(options = {})
@@ -75,7 +88,15 @@ class Albino
   end
 
   def colorize(options = {})
-    execute(options).out
+    out = execute(options).out
+
+    # markdown requires block elements on their own line
+    out.sub!(%r{</pre></div>\Z}, "</pre>\n</div>")
+
+    # covert output to the encoding we told pygmentize to use
+    out.force_encoding(@encoding) if out.respond_to?(:force_encoding)
+
+    out
   end
   alias_method :to_s, :colorize
 

data/lib/albino/multi.rb

@@ -1,10 +1,6 @@
-require 'posix-spawn'
+require 'albino'
 
 class Albino
-  if !const_defined?(:ShellArgumentError)
-    class ShellArgumentError < ArgumentError; end
-  end
-
   # Wrapper for a custom multipygmentize script.  Passes multiple code
   # fragments in STDIN to Python.  This assumes both Python and pygments are
   # installed.
@@ -86,8 +82,15 @@ class Albino
 
         memo << code << SEPARATOR
       end.join("")
+
       child  = Child.new(self.class.bin, options)
-      pieces = child.out.split(SEPARATOR)
+      pieces = child.out.split(SEPARATOR).each do |code|
+        # markdown requires block elements on their own line
+        code.sub!(%r{</pre></div>\Z}, "</pre>\n</div>")
+
+        # albino::multi assumes utf8 encoding
+        code.force_encoding('UTF-8') if code.respond_to?(:force_encoding)
+      end
       @multi ? pieces : pieces.first
     end
 

data/test/albino_test.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'rubygems'
 require 'albino'
 require 'test/unit'
@@ -23,12 +25,23 @@ class AlbinoTest < Test::Unit::TestCase
     assert_equal '', @syntaxer.colorize(:f => 'html+c#-dump')
   end
 
+  def test_markdown_compatible
+    code = Albino.colorize('1+2', :ruby)
+    assert_no_match %r{</pre></div>\Z}, code
+  end
+
   def test_works_with_strings
     syntaxer = Albino.new("class New\nend", :ruby)
     assert_match %r(highlight), code=syntaxer.colorize
     assert_match %(<span class="nc">New</span>\n), code
   end
 
+  def test_works_with_utf8_strings
+    code = Albino.new("# é", :bash).colorize
+    assert_match %r(highlight), code
+    assert_match %(<span class="c"># é</span>), code
+  end
+
   def test_works_with_files
     contents = "class New\nend"
     syntaxer = Albino.new(contents, :ruby)
@@ -42,6 +55,36 @@ class AlbinoTest < Test::Unit::TestCase
     end
   end
 
+  def test_default_encoding
+    assert_equal Albino.default_encoding, 'utf-8'
+  end
+
+  def test_change_encoding
+    before = Albino.default_encoding
+
+    assert_equal Albino.default_encoding, 'utf-8'
+    Albino.default_encoding = 'ascii'
+    assert_equal Albino.default_encoding, 'ascii'
+  ensure
+    Albino.default_encoding = before
+  end
+
+  def test_invalid_encoding
+    before = Albino.default_encoding
+    Albino.default_encoding = 'binary'
+
+    assert_equal Albino.colorize('class Baño; end', :ruby), ''
+  ensure
+    Albino.default_encoding = before
+  end
+
+  def test_custom_encoding
+    code = Albino.new('1+2', :ruby, :html, 'ascii').colorize
+    if code.respond_to?(:encoding)
+      assert_equal code.encoding.to_s, 'US-ASCII'
+    end
+  end
+
   def test_aliases_to_s
     syntaxer = Albino.new(File.new(__FILE__), :ruby)
     assert_equal @syntaxer.colorize, syntaxer.to_s

data/test/multi_albino_test.rb

@@ -15,6 +15,18 @@ class MultiTest < Test::Unit::TestCase
     assert_no_match regex, syntaxer.colorize
   end
 
+  def test_markdown_compatible
+    code = Albino::Multi.colorize('1+2', :ruby)
+    assert_no_match %r{</pre></div>\Z}, code
+  end
+
+  def test_forces_utf8
+    code = Albino::Multi.colorize('1+2', :ruby)
+    if code.respond_to?(:encoding)
+      assert_equal 'UTF-8', code.encoding.to_s
+    end
+  end
+
   def test_works_with_strings
     syntaxer = Albino::Multi.new("class New\nend", :ruby)
     assert_match %r(highlight), code=syntaxer.colorize

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: albino
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 -08:00
+date: 2011-03-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,10 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 21
         segments: 
         - 0
-        version: "0"
+        - 3
+        - 3
+        version: 0.3.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -55,8 +57,9 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- Gemfile
 - LICENSE
-- README
+- README.md
 - Rakefile
 - albino.gemspec
 - lib/albino.rb
@@ -94,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: albino
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 2
 summary: Ruby wrapper for pygmentize.

data/README

@@ -1,3 +0,0 @@
-This project is an extraction from GitHub.
-
-For this and other extractions, see http://github.com/github