gimli 0.2.2 → 0.2.3

data/bin/gimli

@@ -9,5 +9,5 @@ if ARGV.flags.version?
   exit
 end
 
-Gimli.process! ARGV.flags.file, ARGV.flags.recursive?, ARGV.flags.merge?, ARGV.flags.pagenumbers?, ARGV.flags.removefrontmatter, ARGV.flags.outputfilename, ARGV.flags.outputdir, ARGV.flags.stylesheet
+Gimli.process! ARGV.flags.file, ARGV.flags.recursive?, ARGV.flags.merge?, ARGV.flags.pagenumbers?, ARGV.flags.tableofcontents?, ARGV.flags.removefrontmatter, ARGV.flags.outputfilename, ARGV.flags.outputdir, ARGV.flags.stylesheet
 

data/lib/gimli.rb

@@ -10,10 +10,10 @@ require 'gimli/path'
 module Gimli
 
   # Starts the processing of selected files
-  def self.process!(file, recursive = false, merge = false, pagenumbers = false, remove_front_matter = false, output_filename = nil, output_dir = nil, stylesheet = nil)
+  def self.process!(file, recursive = false, merge = false, pagenumbers = false, tableofcontents = false, remove_front_matter = false, output_filename = nil, output_dir = nil, stylesheet = nil)
 
 
     @files = Path.list_valid(file, recursive).map { |file| MarkupFile.new(file) }
-    Converter.new(@files, merge, pagenumbers, remove_front_matter, output_filename, output_dir, stylesheet).convert!
+    Converter.new(@files, merge, pagenumbers, tableofcontents, remove_front_matter, output_filename, output_dir, stylesheet).convert!
   end
 end

data/lib/gimli/converter.rb

@@ -15,14 +15,16 @@ module Gimli
     # @param [Array] files The list of Gimli::MarkupFile to convert (passing a single file will still work)
     # @param [Boolean] merge
     # @param [Boolean] pagenumbers
+    # @param [Boolean] tableofcontents
     # @param [Boolean] remove_front_matter
     # @param [String] output_filename
     # @param [String] output_dir
     # @param [String] stylesheet
-    def initialize(files, merge = false, pagenumbers = false, remove_front_matter = false, output_filename = nil, output_dir = nil, stylesheet = nil)
+    def initialize(files, merge = false, pagenumbers = false, tableofcontents = false, remove_front_matter = false, output_filename = nil, output_dir = nil, stylesheet = nil)
       @files = files
       @merge = merge
       @pagenumbers = pagenumbers
+      @tableofcontents = tableofcontents
       @remove_front_matter = remove_front_matter
       @output_filename = output_filename
       @output_dir = output_dir
@@ -67,6 +69,7 @@ module Gimli
     def pdf_kit(html)
       options = {}
       options.merge!({ :footer_right => '[page]/[toPage]' }) if @pagenumbers
+      options.merge!({ :toc => true }) if @tableofcontents
       kit = PDFKit.new(html, options)
 
       load_stylesheets kit

data/lib/gimli/markup.rb

@@ -14,7 +14,6 @@
 
 require 'digest/sha1'
 require 'cgi'
-require 'iconv'
 
 require 'github/markup'
 require 'nokogiri'
@@ -250,7 +249,12 @@ module Gimli
           code.gsub!(/^(  |\t)/m, '')
         end
 
-        code = Iconv.conv('ISO-8859-1//IGNORE', 'utf-8', code)
+        if RUBY_VERSION =~ /1\.8\../
+          require 'iconv'
+          code = Iconv.conv('ISO-8859-1//IGNORE', 'utf-8', code)
+        else
+          code = code.encode('ISO-8859-1', 'utf-8')
+        end
 
         blocks << [spec[:lang], code]
       end
@@ -271,6 +275,7 @@ module Gimli
             "<pre><code>#{CGI.escapeHTML(spec[:code])}</code></pre>"
           end
         end
+        body = body.force_encoding('utf-8') if body.respond_to? :force_encoding
         data.gsub!(id, body)
       end
 

data/lib/gimli/setup.rb

@@ -32,6 +32,10 @@ module Gimli extend OptiFlagSet
     description 'Print the page numbers in the lower right corner of all pages in pdf'
     alternate_forms 'p'
   end
+  optional_switch_flag 'tableofcontents' do
+    description 'Insert a table of contents first in the pdf'
+    alternate_forms 't'
+  end
   optional_switch_flag 'removefrontmatter' do
     description 'Remove yaml frontmatter from your files.'
     alternate_forms 'y'

data/lib/gimli/version.rb

@@ -2,7 +2,7 @@
 
 module Gimli
 
-  Version = "0.2.2"
+  Version = "0.2.3"
 
 end
 

data/spec/fixtures/code_block_with_utf8.textile

@@ -1,4 +1,4 @@
-a
+Abcåäö
 
 ```html
 <h1>Abcåäö</h1>

data/spec/gimli/converter_spec.rb

@@ -31,7 +31,7 @@ describe Gimli::Converter do
     file = Gimli::MarkupFile.new 'fake'
     output_filename = 'my_file'
 
-    converter = Gimli::Converter.new [file], false, false, false, output_filename
+    converter = Gimli::Converter.new [file], false, false, false, false, output_filename
     mock(converter).output_dir { Dir.getwd }
 
     converter.output_file.should == File.join(Dir.getwd, "#{output_filename}.pdf")
@@ -50,7 +50,7 @@ describe Gimli::Converter do
     dir = '/tmp/out'
 
     file = Gimli::MarkupFile.new 'fake'
-    converter = Gimli::Converter.new file, false, false, false, nil, dir
+    converter = Gimli::Converter.new file, false, false, false, false, nil, dir
 
     mock(File).directory?(dir) { true }
 
@@ -68,7 +68,7 @@ describe Gimli::Converter do
     file = Gimli::MarkupFile.new 'fake'
     stylesheet = '/home/me/gimli/my-style.css'
 
-    converter = Gimli::Converter.new file, false, false, false, nil, nil, stylesheet
+    converter = Gimli::Converter.new file, false, false, false, false, nil, nil, stylesheet
 
     converter.stylesheet.should == stylesheet
   end

data/spec/gimli/markup_spec.rb

@@ -12,7 +12,7 @@ describe Gimli::Markup do
              "<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>"
+    output_without_pygments = "<p>a</p>\n<pre>\n  <code>x = 1</code>\n</pre>\n<p>b</p>"
 
     file = Gimli::MarkupFile.new File.expand_path('../../fixtures/code_block.textile', __FILE__)
     markup = Gimli::Markup.new file
@@ -27,14 +27,14 @@ describe Gimli::Markup do
 
   it 'should give correct code block for utf8' do
 
-    output_with_pygments = "<p>a</p>\n<div class=\"highlight\"><pre>" +
+    output_with_pygments = "<p>Abcåäö</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>"
+    output_without_pygments = "<p>Abcåäö</p>\n<pre>\n  <code>&lt;h1&gt;Abcåäö&lt;/h1&gt;\n&lt;img " +
+                              "src=\"åäö.png\" alt=\"ÅÄÖ\" /&gt;</code>\n</pre>"
 
     file = Gimli::MarkupFile.new File.expand_path('../../fixtures/code_block_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.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,43 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-09 00:00:00.000000000Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markup
-  requirement: &20702400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.7.4
   type: :runtime
   prerelease: false
-  version_requirements: *20702400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.4
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &20696880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: 2.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *20696880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &20693760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,21 +53,31 @@ dependencies:
         version: 4.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *20693760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.2.7
 - !ruby/object:Gem::Dependency
   name: org-ruby
-  requirement: &20692000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *20692000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: &20689620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,21 +85,31 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *20689620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: wikicloth
-  requirement: &20682020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *20682020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: albino
-  requirement: &20680400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,32 +117,47 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *20680400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &20678620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *20678620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.5
 - !ruby/object:Gem::Dependency
   name: wkhtmltopdf-binary
-  requirement: &20666520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.5.3
+        version: 0.9.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *20666520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.9.1
 - !ruby/object:Gem::Dependency
   name: pdfkit
-  requirement: &20663960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +165,15 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *20663960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: optiflag
-  requirement: &20650800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +181,15 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *20650800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &20649780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +197,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20649780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20648240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +213,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20648240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &20646200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +229,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20646200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &20645360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,7 +245,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20645360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Utility for converting markup files to pdf files. Useful for reports
   etc.
 email: fredrik.wallgren@gmail.com
@@ -187,25 +262,25 @@ extra_rdoc_files:
 - LICENSE
 files:
 - bin/gimli
-- lib/gimli/version.rb
 - lib/gimli/path.rb
-- lib/gimli/albino.rb
 - lib/gimli/markupfile.rb
-- lib/gimli/markup.rb
-- lib/gimli/setup.rb
 - lib/gimli/converter.rb
+- lib/gimli/setup.rb
+- lib/gimli/albino.rb
+- lib/gimli/version.rb
+- lib/gimli/markup.rb
 - lib/gimli.rb
-- spec/spec_helper.rb
-- spec/fixtures/code_with_utf8.textile
-- spec/fixtures/code_block_with_utf8.textile
-- spec/fixtures/yaml_front_matter.textile
-- spec/fixtures/recursion/level2/level2.markdown
-- spec/fixtures/recursion/level1.textile
-- spec/fixtures/code_block.textile
 - spec/gimli/path_spec.rb
 - spec/gimli/converter_spec.rb
 - spec/gimli/markup_spec.rb
 - spec/gimli/file_spec.rb
+- spec/fixtures/code_with_utf8.textile
+- spec/fixtures/recursion/level2/level2.markdown
+- spec/fixtures/recursion/level1.textile
+- spec/fixtures/code_block.textile
+- spec/fixtures/yaml_front_matter.textile
+- spec/fixtures/code_block_with_utf8.textile
+- spec/spec_helper.rb
 - config/style.css
 - LICENSE
 - README.textile
@@ -224,7 +299,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3487250391176844937
+      hash: -3032383899323034374
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -233,11 +308,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3487250391176844937
+      hash: -3032383899323034374
 requirements: []
 rubyforge_project: gimli
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Utility for converting markup files to pdf files.
 test_files: []
+has_rdoc: