gimli 0.3.2 → 0.4.0

data/lib/gimli/converter.rb

@@ -13,15 +13,9 @@ module Gimli
     # @param [Array] files The list of Gimli::MarkupFile to convert (passing a single file will still work)
     # @param [Gimli::Config] config
     def initialize(files, config)
-      @files = files
-      @merge = config.merge
-      @wkhtmltopdf_parameters = config.wkhtmltopdf_parameters
-      @remove_front_matter = config.remove_front_matter
-      @output_filename = config.output_filename
-      @output_dir = config.output_dir
-      @stylesheet = config.stylesheet
-      @stylesheets = []
+      @files, @config = files, config
 
+      @stylesheets = []
       @wkhtmltopdf = Wkhtmltopdf.new @wkhtmltopdf_parameters
     end
 
@@ -29,9 +23,9 @@ module Gimli
     def convert!
       merged_contents = []
       @files.each do |file|
-        markup = Markup::Renderer.new file, @remove_front_matter
+        markup = Markup::Renderer.new file, @config.remove_front_matter
         html = convert_image_urls markup.render, file.filename
-        if @merge
+        if @config.merge
           html = "<div class=\"page-break\"></div>#{html}" unless merged_contents.empty?
           merged_contents << html
         else
@@ -76,11 +70,7 @@ module Gimli
 
     def append_stylesheets(html)
       @stylesheets.each do |stylesheet|
-        if html.match(/<\/head>/)
-          html = html.gsub(/(<\/head>)/, style_tag_for(stylesheet)+'\1')
-        else
-          html.insert(0, style_tag_for(stylesheet))
-        end
+        html.insert(0, style_tag_for(stylesheet))
       end
     end
 
@@ -91,13 +81,13 @@ module Gimli
     # Returns the selected stylesheet. Defaults to ./gimli.css
     # @return [String]
     def stylesheet
-      @stylesheet.nil? ? 'gimli.css' : @stylesheet
+      @config.stylesheet.nil? ? 'gimli.css' : @config.stylesheet
     end
 
     # Returns the directory where to save the output. Defaults to ./
     # @return [String]
     def output_dir
-      output_dir = @output_dir.nil? ? Dir.getwd : @output_dir
+      output_dir = @config.output_dir.nil? ? Dir.getwd : @config.output_dir
       FileUtils.mkdir_p(output_dir) unless ::File.directory?(output_dir)
       output_dir
     end
@@ -108,13 +98,13 @@ module Gimli
     def output_file(file = nil)
       if file
         output_filename = file.name
-        if !@output_filename.nil? && @files.length == 1
-          output_filename = @output_filename
+        if !@config.output_filename.nil? && @files.length == 1
+          output_filename = @config.output_filename
         end
       else
         output_filename = Time.now.to_s.split(' ').join('_')
-        output_filename = @files.last.name if @files.length == 1 || @merge
-        output_filename = @output_filename unless @output_filename.nil?
+        output_filename = @files.last.name if @files.length == 1 || @config.merge
+        output_filename = @config.output_filename unless @config.output_filename.nil?
       end
 
       ::File.join(output_dir, "#{output_filename}.pdf")

data/lib/gimli/markup/code_block.rb

@@ -14,6 +14,8 @@ module Gimli
         @id, @language, @code = id, language, code
       end
 
+      # Returns the code with syntax highlightning
+      # @return [String]
       def highlighted
         if @language
           CodeRay.scan(@code, @language).html(:line_numbers => :table)

data/lib/gimli/markup/renderer.rb

@@ -12,10 +12,12 @@ module Gimli
       # @param [Boolean] do_remove_yaml_front_matter Should we remove the front matter?
       # @return [Gimli::Markup]
       def initialize(file, do_remove_yaml_front_matter = false)
-        @filename = file.filename
-        @name = file.name
-        @data = file.data
+        @file = file
         @do_remove_yaml_front_matter = do_remove_yaml_front_matter
+
+        @data = file.data
+        @code = Code.new
+        @yaml_frontmatter_remover = YamlFrontmatterRemover.new
       end
 
       # Render the content with Gollum wiki syntax on top of the file's own
@@ -23,32 +25,40 @@ module Gimli
       #
       # @return [String] The formatted data
       def render
-        data = @data.dup
-        @code = Code.new
-        @yaml_frontmatter_remover = YamlFrontmatterRemover.new
-        data = @yaml_frontmatter_remover.process(data) if @do_remove_yaml_front_matter
-        data = @code.extract(data)
+        prepare_data
+        render_data
+        post_process_data
+
+        return @data
+      end
+
+      private
+
+      # Prepare data for rendering
+      def prepare_data
+        @data = @yaml_frontmatter_remover.process(@data) if @do_remove_yaml_front_matter
+        @data = @code.extract(@data)
+      end
+
+      # Do the markup to html rendering
+      def render_data
         begin
-          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."
+          @data = @data.force_encoding('utf-8') if @data.respond_to? :force_encoding
+          @data = GitHub::Markup.render(@file.filename, @data)
+          if @data.nil?
+            raise "There was an error converting #{@file.name} to HTML."
           end
         rescue Object => e
-          data = %{<p class="gimli-error">#{e.message}</p>}
+          @data = %{<p class="gimli-error">#{e.message}</p>}
         end
-        data = @code.process(data)
-
-        doc  = Nokogiri::HTML::DocumentFragment.parse(data, 'UTF-8')
-        yield doc if block_given?
-        data = doc_to_html(doc)
-
-        data.gsub!(/<p><\/p>/, '')
-        data
       end
 
-      def doc_to_html(doc)
-        doc.to_xhtml(:save_with => Nokogiri::XML::Node::SaveOptions::AS_XHTML, :encoding => 'UTF-8')
+      # Do post processing on data
+      def post_process_data
+        @data = @code.process(@data)
+        doc  = Nokogiri::HTML::DocumentFragment.parse(@data, 'UTF-8')
+        @data = doc.to_xhtml(:save_with => Nokogiri::XML::Node::SaveOptions::AS_XHTML, :encoding => 'UTF-8')
+        @data.gsub!(/<p><\/p>/, '')
       end
     end
   end

data/lib/gimli/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
 module Gimli
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end
 

data/spec/gimli/converter_spec.rb

@@ -38,7 +38,7 @@ describe Gimli::Converter do
     converter = Gimli::Converter.new [file], config
     mock(converter).output_dir { Dir.getwd }
 
-    converter.output_file.should == File.join(Dir.getwd, "#{output_filename}.pdf")
+    converter.output_file(file).should == File.join(Dir.getwd, "#{output_filename}.pdf")
   end
 
   it 'should give the correct output_dir when none given' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gimli
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -59,54 +59,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.2.7
-- !ruby/object:Gem::Dependency
-  name: org-ruby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.1
-- !ruby/object:Gem::Dependency
-  name: creole
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.2
-- !ruby/object:Gem::Dependency
-  name: wikicloth
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
@@ -296,7 +248,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3276508745148089455
+      hash: 2603706137914885458
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -305,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3276508745148089455
+      hash: 2603706137914885458
 requirements: []
 rubyforge_project: gimli
 rubygems_version: 1.8.24