ink 0.1.1 → 0.1.2

data/lib/ink/formatter.rb

@@ -9,20 +9,34 @@ module Ink
     # based on filename.
     #
     #   Ink::Formatter.format(@code, "Rakefile")
+    #   Ink::Formatter.format(@code, "Rakefile", :line_numbers => true)
+    #   Ink::Formatter.format(@code, "Rakefile") {|type, html| }
     #
-    def self.format(content, file)
+    # If you provide a block, the +format+ helper will yield the type
+    # (<tt>:textile</tt>, <tt>:markdown</tt>, <tt>:rdoc</tt> or <tt>:code</tt>)
+    # and the generated markup.
+    #
+    def self.format(content, file, options = {}, &block)
       basename = File.basename(file)
 
       case basename
       when /\.rdoc$/i
-        RDoc::Markup::ToHtml.new.convert(content)
+        html = RDoc::Markup::ToHtml.new.convert(content)
+        type = :rdoc
       when /\.(markdown|mkdn)$/i
-        RDiscount.new(content).to_html
+        html = RDiscount.new(content).to_html
+        type = :markdown
       when /\.textile$/i
-        RedCloth.new(content).to_html
+        html = RedCloth.new(content).to_html
+        type = :textile
       else
-        highlight(content, :file => file)
+        html = highlight(content, options.merge(:file => file))
+        type = :code
       end
+
+      yield(type, html) if block_given?
+
+      html
     end
   end
 end

data/lib/ink/helper.rb

@@ -11,9 +11,10 @@ module Ink
     # the Ink::Formatter.format method.
     #
     #   <%= format @code, "Rakefile" %>
+    #   <%= format @code, "Rakefile", :line_numbers => true %>
     #
-    def format(code, file)
-      Ink::Formatter.format(code, file)
+    def format(code, file, options = {})
+      Ink::Formatter.format(code, file, options)
     end
 
     # Return a code snippet highlighted in the specified
@@ -37,7 +38,21 @@ module Ink
       end
 
       code = Ink::Highlight.highlight(file.path, :language => language)
-      %[<div class="code #{language}"><pre>#{code}</pre></div>]
+
+      if options[:line_numbers]
+        io = StringIO.new(code)
+
+        rows = ""
+
+        io.lines.each_with_index do |line, i|
+          rows << %[<tr><td class="line">#{i+1}</td>]
+          rows << %[<td class="code">#{line}</td></tr>]
+        end
+
+        %[<table class="highlight">#{rows}</table>]
+      else
+        %[<pre>#{code}</pre>]
+      end
     end
   end
 end

data/lib/ink/version.rb

@@ -2,7 +2,7 @@ module Ink
   module Version # :nodoc: all
     MAJOR = 0
     MINOR = 1
-    PATCH = 1
+    PATCH = 2
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/test/ink/formatter_test.rb

@@ -1,20 +1,50 @@
 require "test_helper"
 
 class Ink::FormatterTest < Test::Unit::TestCase
-  def test_markdown
+  def test_markdown_rendering
     assert_match %r{<h1>.*?</h1>}, Ink::Formatter.format("Hello\n=====", "file.markdown")
     assert_match %r{<h1>.*?</h1>}, Ink::Formatter.format("Hello\n=====", "file.mkdn")
   end
 
-  def test_textile
+  def test_markdown_rendering_with_block
+    Ink::Formatter.format("# Hello", "file.markdown") do |type, html|
+      assert_equal :markdown, type
+      assert_match %r{<h1>.*?</h1>}, html
+    end
+  end
+
+  def test_textile_rendering
     assert_match %r{<h1>.*?</h1>}, Ink::Formatter.format("h1. Hello", "file.textile")
   end
 
-  def test_highlight
-    assert_match %r{<div class="code rb">(.*?)</div>}, Ink::Formatter.format("puts 'Hello world!'", "file.rb")
+  def test_textile_rendering_with_block
+    Ink::Formatter.format("h1. Hello", "file.textile") do |type, html|
+      assert_equal :textile, type
+      assert_match %r{<h1>.*?</h1>}, html
+    end
   end
 
-  def test_rdoc
+  def test_rdoc_rendering
     assert_match %r{<h1>.*?</h1>}, Ink::Formatter.format("= Hello", "file.rdoc")
   end
-end
+
+  def test_rdoc_rendering_with_block
+    Ink::Formatter.format("= Hello", "file.rdoc") do |type, html|
+      assert_equal :rdoc, type
+      assert_match %r{<h1>.*?</h1>}, html
+    end
+  end
+
+  def test_highlight_rendering
+    assert_match %r{<pre>(.*?)</pre>}, Ink::Formatter.format("puts 'Hello world!'", "file.rb")
+  end
+
+  def test_highlight_rendering_with_line_numbers
+    html = Ink::Formatter.format(%[o = Object.new\ns = String.new], "file.rb", :line_numbers => true)
+
+    assert_match %r{<td class="line">1</td>}, html
+    assert_match %r{<td class="line">2</td>}, html
+
+    assert_equal 2, html.scan(%r{<td class="code">(.*?)</td>}m).count
+  end
+end

data/test/ink/helper_test.rb

@@ -1,24 +1,33 @@
 require "test_helper"
 
 class Ink::HelperTest < Test::Unit::TestCase
+  def setup
+    @helper = Object.extend(Ink::Helper)
+  end
+
   def test_highlight_helper
-    helper = Object.extend(Ink::Helper)
-    html = helper.highlight(%[puts "Hello world!"], :language => :ruby)
+    html = @helper.highlight(%[puts "Hello world!"], :language => :ruby)
 
-    assert_match /<div class="code ruby">(.*?)<\/div>/, html
+    assert_match /<pre>(.*?)<\/pre>/, html
   end
 
-  def test_highlight_helper_using_defaults
-    helper = Object.extend(Ink::Helper)
-    html = helper.highlight(%[Hello world!])
+  def test_highlight_with_line_numbers
+    html = @helper.highlight(%[o = Object.new\ns = String.new], :language => :ruby, :line_numbers => true)
 
-    assert_match /<div class="code text">(.*?)<\/div>/, html
+    assert_match %r{<td class="line">1</td>}, html
+    assert_match %r{<td class="line">2</td>}, html
+
+    assert_equal 2, html.scan(%r{<td class="code">(.*?)</td>}m).count
   end
 
-  def test_highlight_helper_using_guess
-    helper = Object.extend(Ink::Helper)
-    html = helper.highlight(%[puts "Hello world!"], :file => "hello.rb")
+  def test_format
+    html = @helper.format(%[Object.new], "file.rb")
+    assert_match %r{<pre>(.*?)</pre>}, html
+  end
 
-    assert_match /<div class="code rb">(.*?)<\/div>/, html
+  def test_format_with_line_numbers
+    html = @helper.format(%[Object.new], "file.rb", :line_numbers => true)
+    assert_match %r{<td class="line">1</td>}, html
+    assert_match %r{<td class="code">(.*?)</td>}, html
   end
 end

data/test/ink/highlight_test.rb

@@ -130,4 +130,4 @@ class Ink::HighlightTest < Test::Unit::TestCase
     assert_equal "python", Ink::Highlight.guess_by_filename("file.SConscript")
     assert_equal "python", Ink::Highlight.guess_by_filename("file.tac")
   end
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Nando Vieira
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 -03:00
+date: 2010-04-15 00:00:00 -03:00
 default_executable: ink
 dependencies: 
 - !ruby/object:Gem::Dependency