gimli 0.1.0 → 0.1.1

data/README.textile

@@ -3,7 +3,9 @@ h1. gimli - utility for converting markup to pdf
 h2. Description
 
 Gimli is a utility for converting markup to pdf files. Useful for reports and such things.
-It's inspired by the markup convertion in "gollum":https://github.com/github/gollum
+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
 The markup is converted to html using "github/markup":https://github.com/github/markup
 

data/lib/gimli.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'gimli/version'
 require 'gimli/setup'
 require 'gimli/file'

data/lib/gimli/albino.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'albino/multi'
 
 # Use Albino Multi

data/lib/gimli/converter.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'fileutils'
 
 require 'pdfkit'

data/lib/gimli/file.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Gimli
 
   # Class used to load files and determine if they are valid

data/lib/gimli/markup.rb

@@ -1,3 +1,17 @@
+# encoding: utf-8
+
+# This file is based on the markup class in gollum - https://github.com/github/gollum
+# (The MIT License)
+#
+# Copyright (c) Tom Preston-Werner, Rick Olson
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
 require 'digest/sha1'
 require 'cgi'
 
@@ -30,7 +44,7 @@ module Gimli
       data = extract_code(@data.dup)
       data = extract_tags(data)
       begin
-        data = GitHub::Markup.render(@filename, data)
+        data = GitHub::Markup.render(@filename, data.force_encoding('utf-8'))
         if data.nil?
           raise "There was an error converting #{@name} to HTML."
         end
@@ -40,7 +54,7 @@ module Gimli
       data = process_tags(data)
       data = process_code(data)
 
-      doc  = Nokogiri::HTML::DocumentFragment.parse(data)
+      doc  = Nokogiri::HTML::DocumentFragment.parse(data.force_encoding('utf-8'))
       yield doc if block_given?
       data = doc_to_html(doc)
 

data/lib/gimli/setup.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'optiflag'
 
 # Set up the flags available

data/lib/gimli/version.rb

@@ -1,6 +1,8 @@
+# encoding: utf-8
+
 module Gimli
 
-  Version = "0.1.0"
+  Version = "0.1.1"
 
 end
 

data/spec/fixtures/code_block_with_utf8.textile

@@ -0,0 +1,7 @@
+a
+
+```html
+<h1>Abcåäö</h1>
+<img src="åäö.png" alt="ÅÄÖ" />
+```
+

data/spec/fixtures/code_with_utf8.textile

@@ -0,0 +1,6 @@
+a
+
+ @<img src="åäö.png" alt="Abcåäö" />@
+
+b
+

data/spec/gimli/converter_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require './spec/spec_helper'
 
 require './lib/gimli'

data/spec/gimli/file_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require './spec/spec_helper'
 
 require './lib/gimli'

data/spec/gimli/markup_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require './spec/spec_helper'
 
 require './lib/gimli'
@@ -16,6 +18,30 @@ describe Gimli::Markup do
     markup.render.should == output
   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"
+
+    file = Gimli::File.new File.expand_path('../../fixtures/code_block_with_utf8.textile', __FILE__)
+    markup = Gimli::Markup.new file
+
+    markup.render.should == output
+  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>"
+
+    file = Gimli::File.new File.expand_path('../../fixtures/code_with_utf8.textile', __FILE__)
+    markup = Gimli::Markup.new file
+
+    markup.render.should == output
+  end
 
 end
 

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 RSpec.configure do |config|
   config.mock_with :rr
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gimli
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-29 00:00:00.000000000 +02:00
+date: 2011-04-30 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markup
-  requirement: &16957440 !ruby/object:Gem::Requirement
+  requirement: &19105540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16957440
+  version_requirements: *19105540
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &16957020 !ruby/object:Gem::Requirement
+  requirement: &19105100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16957020
+  version_requirements: *19105100
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &16956600 !ruby/object:Gem::Requirement
+  requirement: &19104680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16956600
+  version_requirements: *19104680
 - !ruby/object:Gem::Dependency
   name: org-ruby
-  requirement: &16956180 !ruby/object:Gem::Requirement
+  requirement: &19104260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16956180
+  version_requirements: *19104260
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: &16955760 !ruby/object:Gem::Requirement
+  requirement: &19103840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16955760
+  version_requirements: *19103840
 - !ruby/object:Gem::Dependency
   name: wikicloth
-  requirement: &16955340 !ruby/object:Gem::Requirement
+  requirement: &19103420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16955340
+  version_requirements: *19103420
 - !ruby/object:Gem::Dependency
   name: albino
-  requirement: &16954920 !ruby/object:Gem::Requirement
+  requirement: &19103000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16954920
+  version_requirements: *19103000
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &16954500 !ruby/object:Gem::Requirement
+  requirement: &19102580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16954500
+  version_requirements: *19102580
 - !ruby/object:Gem::Dependency
   name: wkhtmltopdf-binary
-  requirement: &16985560 !ruby/object:Gem::Requirement
+  requirement: &19102160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16985560
+  version_requirements: *19102160
 - !ruby/object:Gem::Dependency
   name: pdfkit
-  requirement: &16985140 !ruby/object:Gem::Requirement
+  requirement: &19101740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16985140
+  version_requirements: *19101740
 - !ruby/object:Gem::Dependency
   name: optiflag
-  requirement: &16984720 !ruby/object:Gem::Requirement
+  requirement: &19101320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16984720
+  version_requirements: *19101320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16984300 !ruby/object:Gem::Requirement
+  requirement: &19133080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16984300
+  version_requirements: *19133080
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &16983880 !ruby/object:Gem::Requirement
+  requirement: &19132660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16983880
+  version_requirements: *19132660
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &16983460 !ruby/object:Gem::Requirement
+  requirement: &19132240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16983460
+  version_requirements: *19132240
 description: Utility for converting markup files to pdf files. Useful for reports
   etc.
 email: fredrik.wallgren@gmail.com
@@ -185,6 +185,8 @@ files:
 - lib/gimli/converter.rb
 - lib/gimli.rb
 - spec/spec_helper.rb
+- spec/fixtures/code_with_utf8.textile
+- spec/fixtures/code_block_with_utf8.textile
 - spec/fixtures/code_block.textile
 - spec/gimli/converter_spec.rb
 - spec/gimli/markup_spec.rb