gimli 0.1.2 → 0.1.3

data/README.textile

@@ -1,12 +1,14 @@
 h1. gimli - utility for converting markup to pdf
 
+"!http://travis-ci.org/walle/gimli.png!":http://travis-ci.org/walle/gimli
+
 h2. Description
 
 Gimli is a utility for converting markup to pdf files. Useful for reports and such things.
 It's a developed version of "textile2pdf":https://github.com/walle/textile2pdf to support multiple markup styles and to get syntax highlighting.
 
 It's inspired by the markup convertion in "gollum":https://github.com/github/gollum. The markup code is adapted from gollum.
-It works by converting the markup to html using "PDFKit":https://github.com/jdpace/PDFKit
+It works by converting the markup to pdf using "PDFKit":https://github.com/jdpace/PDFKit
 The markup is converted to html using "github/markup":https://github.com/github/markup
 
 h3. Markup

data/lib/gimli/markup.rb

@@ -14,6 +14,7 @@
 
 require 'digest/sha1'
 require 'cgi'
+require 'iconv'
 
 require 'github/markup'
 require 'nokogiri'
@@ -44,7 +45,8 @@ module Gimli
       data = extract_code(@data.dup)
       data = extract_tags(data)
       begin
-        data = GitHub::Markup.render(@filename, data.force_encoding('utf-8'))
+        data = data.force_encoding('utf-8') if data.respond_to? :force_encoding
+        data = GitHub::Markup.render(@filename, data)
         if data.nil?
           raise "There was an error converting #{@name} to HTML."
         end
@@ -54,7 +56,7 @@ module Gimli
       data = process_tags(data)
       data = process_code(data)
 
-      doc  = Nokogiri::HTML::DocumentFragment.parse(data.force_encoding('utf-8'))
+      doc  = Nokogiri::HTML::DocumentFragment.parse(data, 'UTF-8')
       yield doc if block_given?
       data = doc_to_html(doc)
 
@@ -63,7 +65,7 @@ module Gimli
     end
 
     def doc_to_html(doc)
-      doc.to_xhtml(:save_with => Nokogiri::XML::Node::SaveOptions::AS_XHTML)
+      doc.to_xhtml(:save_with => Nokogiri::XML::Node::SaveOptions::AS_XHTML, :encoding => 'UTF-8')
     end
 
     # Extract all tags into the tagmap and replace with placeholders.
@@ -226,7 +228,6 @@ module Gimli
     # @return [String] Returns the marked up String data.
     def process_code(data)
       return data if data.nil? || data.size.zero? || @codemap.size.zero?
-
       blocks    = []
       @codemap.each do |id, spec|
         next if spec[:output] # cached
@@ -236,6 +237,8 @@ module Gimli
           code.gsub!(/^(  |\t)/m, '')
         end
 
+        code = Iconv.conv('ISO-8859-1//IGNORE', 'utf-8', code)
+
         blocks << [spec[:lang], code]
       end
 

data/lib/gimli/version.rb

@@ -2,7 +2,7 @@
 
 module Gimli
 
-  Version = "0.1.2"
+  Version = "0.1.3"
 
 end
 

data/spec/gimli/markup_spec.rb

@@ -8,34 +8,49 @@ describe Gimli::Markup do
 
   it 'should give correct code block' do
 
-    output = "<p>a</p>\n<div class=\"highlight\"><pre>" +
+    output_with_pygments = "<p>a</p>\n<div class=\"highlight\"><pre>" +
              "<span class=\"n\">x</span> <span class=\"o\">=</span> " +
              "<span class=\"mi\">1</span>\n</pre>\n</div>\n\n<p>b</p>"
 
+    output_without_pygments = "<p>a</p>\n<pre><code>x = 1</code></pre>\n<p>b</p>"
+
     file = Gimli::File.new File.expand_path('../../fixtures/code_block.textile', __FILE__)
     markup = Gimli::Markup.new file
 
-    markup.render.should == output
+    # Check if the html seems to be highlighted
+    if markup.render.include? "<div class=\"highlight\">"
+      markup.render.should == output_with_pygments
+    else
+      markup.render.should == output_without_pygments
+    end
   end
 
   it 'should give correct code block for utf8' do
 
-    output = "<p>a</p>\n<div class=\"highlight\"><pre>" +
-             "<span class=\"nt\">&lt;h1&gt;</span>Abc&#xC3;&#xA5;&#xC3;&#xA4;&#xC3;&#xB6;<span class=\"nt\">&lt;/h1&gt;</span>\n" +
-             "<span class=\"nt\">&lt;img</span> <span class=\"na\">src=</span><span class=\"s\">\"&#xC3;&#xA5;&#xC3;&#xA4;&#xC3;&#xB6;.png\"" +
-             "</span> <span class=\"na\">alt=</span><span class=\"s\">\"&#xC3;&#x85;&#xC3;&#x84;&#xC3;&#x96;\"" +
-             "</span> <span class=\"nt\">/&gt;</span>\n</pre>\n</div>\n"
+    output_with_pygments = "<p>a</p>\n<div class=\"highlight\"><pre>" +
+                           "<span class=\"nt\">&lt;h1&gt;</span>Abcåäö<span class=\"nt\">&lt;/h1&gt;</span>\n" +
+                           "<span class=\"nt\">&lt;img</span> <span class=\"na\">src=</span><span class=\"s\">\"åäö.png\"" +
+                           "</span> <span class=\"na\">alt=</span><span class=\"s\">\"ÅÄÖ\"" +
+                           "</span> <span class=\"nt\">/&gt;</span>\n</pre>\n</div>\n"
+
+    output_without_pygments = "<p>a</p>\n<pre><code>&lt;h1&gt;Abcåäö&lt;/h1&gt;\n&lt;img " +
+                              "src=\"åäö.png\" alt=\"ÅÄÖ\" /&gt;</code></pre>"
 
     file = Gimli::File.new File.expand_path('../../fixtures/code_block_with_utf8.textile', __FILE__)
     markup = Gimli::Markup.new file
 
-    markup.render.should == output
+    # Check if the html seems to be highlighted
+    if markup.render.include? "<div class=\"highlight\">"
+      markup.render.should == output_with_pygments
+    else
+      markup.render.should == output_without_pygments
+    end
   end
 
   it 'should give correct code for utf8' do
 
-    output = "<p>a</p>\n<code>&lt;img src=\"&#xE5;&#xE4;&#xF6;.png\" " +
-             "alt=\"Abc&#xE5;&#xE4;&#xF6;\" /&gt;</code>\n<p>b</p>"
+    output = "<p>a</p>\n<code>&lt;img src=\"åäö.png\" " +
+             "alt=\"Abcåäö\" /&gt;</code>\n<p>b</p>"
 
     file = Gimli::File.new File.expand_path('../../fixtures/code_with_utf8.textile', __FILE__)
     markup = Gimli::Markup.new file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gimli
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-03 00:00:00.000000000 +02:00
+date: 2011-05-06 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markup
-  requirement: &10287260 !ruby/object:Gem::Requirement
+  requirement: &16373300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10287260
+  version_requirements: *16373300
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &10286820 !ruby/object:Gem::Requirement
+  requirement: &16372860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10286820
+  version_requirements: *16372860
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &10286400 !ruby/object:Gem::Requirement
+  requirement: &16372440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10286400
+  version_requirements: *16372440
 - !ruby/object:Gem::Dependency
   name: org-ruby
-  requirement: &10285980 !ruby/object:Gem::Requirement
+  requirement: &16372020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10285980
+  version_requirements: *16372020
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: &10285560 !ruby/object:Gem::Requirement
+  requirement: &16371600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10285560
+  version_requirements: *16371600
 - !ruby/object:Gem::Dependency
   name: wikicloth
-  requirement: &10285140 !ruby/object:Gem::Requirement
+  requirement: &16371180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10285140
+  version_requirements: *16371180
 - !ruby/object:Gem::Dependency
   name: albino
-  requirement: &10284720 !ruby/object:Gem::Requirement
+  requirement: &16402180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10284720
+  version_requirements: *16402180
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &10284300 !ruby/object:Gem::Requirement
+  requirement: &16401760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10284300
+  version_requirements: *16401760
 - !ruby/object:Gem::Dependency
   name: wkhtmltopdf-binary
-  requirement: &10283880 !ruby/object:Gem::Requirement
+  requirement: &16401340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10283880
+  version_requirements: *16401340
 - !ruby/object:Gem::Dependency
   name: pdfkit
-  requirement: &10283460 !ruby/object:Gem::Requirement
+  requirement: &16400920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10283460
+  version_requirements: *16400920
 - !ruby/object:Gem::Dependency
   name: optiflag
-  requirement: &10283040 !ruby/object:Gem::Requirement
+  requirement: &16400500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10283040
+  version_requirements: *16400500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10282620 !ruby/object:Gem::Requirement
+  requirement: &16400080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10282620
+  version_requirements: *16400080
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &10282200 !ruby/object:Gem::Requirement
+  requirement: &16399660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,18 +154,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10282200
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &10281780 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *10281780
+  version_requirements: *16399660
 description: Utility for converting markup files to pdf files. Useful for reports
   etc.
 email: fredrik.wallgren@gmail.com