gimli 0.3.1 → 0.3.2

data/bin/gimli

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)) + '/../lib/')
 require 'gimli'
 
 if ARGV.flags.version?
-  puts "Version: #{Gimli::Version}"
+  puts "Version: #{Gimli::VERSION}"
   exit
 end
 

data/lib/gimli/config.rb

@@ -14,7 +14,5 @@ module Gimli
       @table_of_contents = false
       @remove_front_matter = false
     end
-
   end
-
 end

data/lib/gimli/converter.rb

@@ -29,7 +29,7 @@ module Gimli
     def convert!
       merged_contents = []
       @files.each do |file|
-        markup = Markup.new file, @remove_front_matter
+        markup = Markup::Renderer.new file, @remove_front_matter
         html = convert_image_urls markup.render, file.filename
         if @merge
           html = "<div class=\"page-break\"></div>#{html}" unless merged_contents.empty?

data/lib/gimli/markup.rb

@@ -16,280 +16,13 @@ require 'digest/sha1'
 
 require 'github/markup'
 require 'nokogiri'
-require 'coderay'
 
-module Gimli
-
-  # Contains functionality to render html from a markup file
-  class Markup
-    # Initialize a new Markup object.
-    #
-    # @param [Gimli::File] file  The Gimli::File to process
-    # @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
-      @format = file.format
-      @tagmap = {}
-      @codemap = {}
-      @premap = {}
-      @do_remove_yaml_front_matter = do_remove_yaml_front_matter
-    end
-
-    # Render the content with Gollum wiki syntax on top of the file's own
-    # markup language.
-    #
-    # @return [String] The formatted data
-    def render
-      data = @data.dup
-      data = remove_yaml_front_matter(data) if @do_remove_yaml_front_matter
-      data = extract_code(data)
-      data = extract_tags(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."
-        end
-      rescue Object => e
-        data = %{<p class="gimli-error">#{e.message}</p>}
-      end
-      data = process_tags(data)
-      data = process_code(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')
-    end
-
-    # Removes YAML Front Matter
-    # Useful if you want to PDF your Jekyll site.
-    #
-    # @param [String] data - The raw string data.
-    # @return [String] Returns the string data with frontmatter removed
-    def remove_yaml_front_matter(data)
-      data.gsub(/^(---\s*\n.*?\n?)^(---\s*$\n?)/m, '')
-    end
-
-    # Extract all tags into the tagmap and replace with placeholders.
-    #
-    # @param [String] data - The raw string data.
-    # @return [String] Returns the placeholder's string data.
-    def extract_tags(data)
-      data.gsub!(/(.?)\[\[(.+?)\]\]([^\[]?)/m) do
-        if $1 == "'" && $3 != "'"
-          "[[#{$2}]]#{$3}"
-        elsif $2.include?('][')
-          if $2[0..4] == 'file:'
-            pre = $1
-            post = $3
-            parts = $2.split('][')
-            parts[0][0..4] = ""
-            link = "#{parts[1]}|#{parts[0].sub(/\.org/,'')}"
-            id = Digest::SHA1.hexdigest(link)
-            @tagmap[id] = link
-            "#{pre}#{id}#{post}"
-          else
-            $&
-          end
-        else
-          id = Digest::SHA1.hexdigest($2)
-          @tagmap[id] = $2
-          "#{$1}#{id}#{$3}"
-        end
-      end
-      data
-    end
-
-    # Process all tags from the tagmap and replace the placeholders with the
-    # final markup.
-    #
-    # @param [String] data - The data (with placeholders)
-    # @return [String] Returns the marked up String data.
-    def process_tags(data)
-      @tagmap.each do |id, tag|
-        data.gsub!(id, process_tag(tag))
-      end
-      data
-    end
-
-    # Process a single tag into its final HTML form.
-    #
-    # @param [String] tag The String tag contents (the stuff inside the double brackets).
-    # @return [String] Returns the String HTML version of the tag.
-    def process_tag(tag)
-      if html = process_image_tag(tag)
-        html
-      elsif html = process_file_link_tag(tag)
-        html
-      end
-    end
-
-    # Attempt to process the tag as an image tag.
-    #
-    # @param [String] tag The String tag contents (the stuff inside the double brackets).
-    # @return [String|nil] Returns the String HTML if the tag is a valid image tag or nil if it is not.
-    def process_image_tag(tag)
-      parts = tag.split('|')
-      return if parts.size.zero?
-
-      name  = parts[0].strip
-      path  = name
-
-      if path
-        opts = parse_image_tag_options(tag)
-
-        containered = false
-
-        classes = [] # applied to whatever the outermost container is
-        attrs   = [] # applied to the image
-
-        align = opts['align']
-        if opts['float']
-          containered = true
-          align ||= 'left'
-          if %w{left right}.include?(align)
-            classes << "float-#{align}"
-          end
-        elsif %w{top texttop middle absmiddle bottom absbottom baseline}.include?(align)
-          attrs << %{align="#{align}"}
-        elsif align
-          if %w{left center right}.include?(align)
-            containered = true
-            classes << "align-#{align}"
-          end
-        end
+require 'gimli/markup/yaml_frontmatter_remover'
+require 'gimli/markup/code'
+require 'gimli/markup/code_block'
+require 'gimli/markup/renderer'
 
-        if width = opts['width']
-          if width =~ /^\d+(\.\d+)?(em|px)$/
-            attrs << %{width="#{width}"}
-          end
-        end
-
-        if height = opts['height']
-          if height =~ /^\d+(\.\d+)?(em|px)$/
-            attrs << %{height="#{height}"}
-          end
-        end
-
-        if alt = opts['alt']
-          attrs << %{alt="#{alt}"}
-        end
-
-        attr_string = attrs.size > 0 ? attrs.join(' ') + ' ' : ''
-
-        if opts['frame'] || containered
-          classes << 'frame' if opts['frame']
-          %{<span class="#{classes.join(' ')}">} +
-          %{<span>} +
-          %{<img src="#{path}" #{attr_string}/>} +
-          (alt ? %{<span>#{alt}</span>} : '') +
-          %{</span>} +
-          %{</span>}
-        else
-          %{<img src="#{path}" #{attr_string}/>}
-        end
-      end
-    end
-
-    # Parse any options present on the image tag and extract them into a
-    # Hash of option names and values.
-    #
-    # @param [String] tag The String tag contents (the stuff inside the double brackets).
-    # @return [Hash]
-    # Returns the options Hash:
-    #   key - The String option name.
-    #   val - The String option value or true if it is a binary option.
-    def parse_image_tag_options(tag)
-      tag.split('|')[1..-1].inject({}) do |memo, attr|
-        parts = attr.split('=').map { |x| x.strip }
-        memo[parts[0]] = (parts.size == 1 ? true : parts[1])
-        memo
-      end
-    end
-
-    # Extract all code blocks into the codemap and replace with placeholders.
-    #
-    # @param [String] data The raw String data.
-    # @return [String] Returns the placeholder'd String data.
-    def extract_code(data)
-      data.gsub!(/^``` ?([^\r\n]+)?\r?\n(.+?)\r?\n```\r?$/m) do
-        id     = Digest::SHA1.hexdigest($2)
-        cached = check_cache(:code, id)
-        @codemap[id] = cached   ?
-          { :output => cached } :
-          { :lang => $1, :code => $2 }
-        id
-      end
-      data
-    end
-
-    # Process all code from the codemap and replace the placeholders with the
-    # final HTML.
-    #
-    # @param [String] data The String data (with placeholders).
-    # @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
-
-        code = spec[:code]
-        if code.lines.all? { |line| line =~ /\A\r?\n\Z/ || line =~ /^(  |\t)/ }
-          code.gsub!(/^(  |\t)/m, '')
-        end
-
-        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
-
-      @codemap.each do |id, spec|
-        body = spec[:output] || begin
-          if spec[:lang]
-            CodeRay.scan(spec[:code], spec[:lang]).html(:line_numbers => :table)
-          else
-            CodeRay.scan(spec[:code], :text).div
-          end
-        end
-        body = body.force_encoding('utf-8') if body.respond_to? :force_encoding
-        data.gsub!(id, body)
-      end
-
-      data
-    end
-
-    # Hook for getting the formatted value of extracted tag data.
-    #
-    # @param [Symbol] type Symbol value identifying what type of data is being extracted.
-    # @param [String] id String SHA1 hash of original extracted tag data.
-    # @return [String] Returns the String cached formatted data, or nil.
-    def check_cache(type, id)
-    end
-
-    # Hook for caching the formatted value of extracted tag data.
-    #
-    # @param [Symbol] type Symbol value identifying what type of data is being extracted.
-    # @param [String] id String SHA1 hash of original extracted tag data.
-    # @param [String] data The String formatted value to be cached.
-    # @return [nil]
-    def update_cache(type, id, data)
-    end
+module Gimli
+  module Markup
   end
 end
-

data/lib/gimli/markup/code.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+module Gimli
+
+  module Markup
+
+    # Class that knows how to extract code blocks and render them with syntax highlightning
+    class Code
+
+      def initialize
+        @code_blocks = []
+      end
+
+      # Extract all code blocks into the codemap and replace with placeholders.
+      #
+      # @return [String] Returns the placeholder'd String data.
+      def extract(data)
+        data.gsub!(/^``` ?([^\r\n]+)?\r?\n(.+?)\r?\n```\r?$/m) do
+          id = Digest::SHA1.hexdigest($2)
+          @code_blocks << CodeBlock.new(id, $1, $2)
+          id
+        end
+        data
+      end
+
+      # Process all code from the codemap and replace the placeholders with the
+      # final HTML.
+      #
+      # @return [String] Returns the marked up String data.
+      def process(data)
+        return data if data.nil? || data.size.zero? || @code_blocks.size.zero?
+        @code_blocks.each do |block|
+          data.gsub!(block.id, block.highlighted)
+        end
+        data
+      end
+    end
+  end
+end
+

data/lib/gimli/markup/code_block.rb

@@ -0,0 +1,28 @@
+# encoding: utf-8
+
+require 'coderay'
+
+module Gimli
+
+  module Markup
+
+    # Class that contains data for a code block
+    class CodeBlock
+      attr_reader :id, :language, :code
+
+      def initialize(id, language, code)
+        @id, @language, @code = id, language, code
+      end
+
+      def highlighted
+        if @language
+          CodeRay.scan(@code, @language).html(:line_numbers => :table)
+        else
+          CodeRay.scan(@code, :text).div
+        end
+      end
+    end
+  end
+end
+
+

data/lib/gimli/markup/renderer.rb

@@ -0,0 +1,57 @@
+# encoding: utf-8
+
+module Gimli
+
+  module Markup
+
+    # Contains functionality to render html from a markup file
+    class Renderer
+      # Initialize a new Markup object.
+      #
+      # @param [Gimli::File] file  The Gimli::File to process
+      # @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
+        @do_remove_yaml_front_matter = do_remove_yaml_front_matter
+      end
+
+      # Render the content with Gollum wiki syntax on top of the file's own
+      # markup language.
+      #
+      # @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)
+        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."
+          end
+        rescue Object => e
+          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')
+      end
+    end
+  end
+end
+
+

data/lib/gimli/markup/yaml_frontmatter_remover.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+module Gimli
+
+  module Markup
+
+    # Class that knows how to remove yaml front matter
+    class YamlFrontmatterRemover
+
+      # Removes YAML Front Matter
+      # Useful if you want to PDF your Jekyll site.
+      def process(data)
+        data.gsub /^(---\s*\n.*?\n?)^(---\s*$\n?)/m, ''
+      end
+    end
+  end
+end

data/lib/gimli/markupfile.rb

@@ -28,7 +28,7 @@ module Gimli
     # @param [String] format
     # @return [Symbol|nil]
     def load_format(format)
-      case format
+      case format.to_s
         when /(md|mkdn?|mdown|markdown)$/i
           :markdown
         when /(textile)$/i

data/lib/gimli/version.rb

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

data/lib/gimli/wkhtmltopdf.rb

@@ -16,7 +16,7 @@ module Gimli
       args = command(filename)
       invoke = args.join(' ')
 
-      result = IO.popen(invoke, "wb+") do |pdf|
+      IO.popen(invoke, "wb+") do |pdf|
         pdf.puts(html)
         pdf.close_write
         pdf.gets(nil)
@@ -35,7 +35,5 @@ module Gimli
     def bin
       @bin ||= "\"#{(`which wkhtmltopdf`).chomp}\""
     end
-
   end
-
 end

data/spec/fixtures/integration/markdown.md

@@ -0,0 +1,48 @@
+# Test file
+
+* A
+* Simple
+* List
+
+***
+
+1. A
+2. Numbered
+3. List
+
+## Tests
+
+### Link
+
+* http://google.com
+* <http://google.com>
+* [an example](http://example.com/ "Title")
+* [Google][]
+
+### Image
+
+![Alt text](https://www.google.se/images/srpr/logo3w.png)
+
+### Blockquote
+
+> This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
+> consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
+> Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
+>
+> Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
+> id sem consectetuer libero luctus adipiscing.
+
+### Code
+
+```ruby
+  puts 'Hello world!'
+  (1..10).each do |number|
+    p number
+  end
+```
+
+## Subheading
+
+**Lorem** ipsum __dolor__ sit *amet*, _consectetur_ adipiscing elit. Phasellus aliquet hendrerit velit eu bibendum. Phasellus et metus at velit vulputate posuere ac a turpis. Vivamus lobortis lectus at augue pretium vel dictum enim mollis. Fusce quis urna eget urna porta vulputate. Mauris eget sapien quis orci auctor adipiscing ac vitae magna. Nulla mauris quam, convallis porta tincidunt quis, imperdiet vitae magna. Maecenas orci odio, ullamcorper et ullamcorper nec, commodo ut lacus. Morbi tortor nulla, facilisis id laoreet non, imperdiet scelerisque sapien. Cras posuere arcu mauris. Nullam ac arcu tellus, a pharetra tellus. Nulla ac odio felis, nec porttitor nisi. Mauris fringilla adipiscing urna, vel ullamcorper felis congue et. Sed sollicitudin tempor odio, vel dignissim diam facilisis et. Nam rhoncus lacinia commodo.
+
+[Google]: http://google.com/

data/spec/fixtures/integration/style.css

@@ -0,0 +1,3 @@
+body {
+  background: #f00;
+}

data/spec/fixtures/integration/textile.textile

@@ -0,0 +1,47 @@
+h1. Test file
+
+* A
+* Simple
+* List
+
+***
+
+# A
+# Numbered
+# List
+
+h2. Tests
+
+h3. Link
+
+* http://google.com
+* "an example":http://example.com/
+* Google[1]
+
+h3. Image
+
+!https://www.google.se/images/srpr/logo3w.png!
+
+h3. Blockquote
+
+bq. This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
+    consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
+    Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
+
+bq. Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
+    id sem consectetuer libero luctus adipiscing.
+
+h3. Code
+
+```ruby
+  puts 'Hello world!'
+  (1..10).each do |number|
+    p number
+  end
+```
+
+## Subheading
+
+*Lorem* ipsum -dolor- sit ~amet~, _consectetur_ adipiscing elit. Phasellus aliquet hendrerit velit eu bibendum. Phasellus et metus at velit vulputate posuere ac a turpis. Vivamus lobortis lectus at augue pretium vel dictum enim mollis. Fusce quis urna eget urna porta vulputate. Mauris eget sapien quis orci auctor adipiscing ac vitae magna. Nulla mauris quam, convallis porta tincidunt quis, imperdiet vitae magna. Maecenas orci odio, ullamcorper et ullamcorper nec, commodo ut lacus. Morbi tortor nulla, facilisis id laoreet non, imperdiet scelerisque sapien. Cras posuere arcu mauris. Nullam ac arcu tellus, a pharetra tellus. Nulla ac odio felis, nec porttitor nisi. Mauris fringilla adipiscing urna, vel ullamcorper felis congue et. Sed sollicitudin tempor odio, vel dignissim diam facilisis et. Nam rhoncus lacinia commodo.
+
+http://google.com/[1]

data/spec/gimli/markup/code_block_spec.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+require './spec/spec_helper'
+
+require './lib/gimli'
+require './lib/gimli/markup'
+
+describe Gimli::Markup::CodeBlock do
+
+  it 'should highlight code if language is supplied' do
+    code_block = Gimli::Markup::CodeBlock.new('1', 'ruby', 'puts "hi"')
+    code_block.highlighted.should include('class="CodeRay"')
+    code_block.highlighted.should include('class="delimiter"')
+  end
+
+  it 'should highlight code if no language is supplied' do
+    code_block = Gimli::Markup::CodeBlock.new('1', nil, 'puts "hi"')
+    code_block.highlighted.should include('class="CodeRay"')
+  end
+end
+

data/spec/gimli/markup/code_spec.rb

@@ -0,0 +1,45 @@
+# encoding: utf-8
+
+require './spec/spec_helper'
+
+require './lib/gimli'
+require './lib/gimli/markup'
+
+describe Gimli::Markup::Code do
+
+  before do
+    @code = Gimli::Markup::Code.new
+  end
+
+  it 'should extract code block with language' do
+    language = 'ruby'
+    code = "\tputs 'hi'"
+    markup = "```#{language}\n#{code}\n```"
+    @code.extract(markup)
+    code_block = @code.instance_variable_get("@code_blocks").first
+    code_block.id.should eq Digest::SHA1.hexdigest(code)
+    code_block.language.should eq language
+    code_block.code.should eq code
+  end
+
+  it 'should extract code block without language' do
+    code = "\tputs 'hi'"
+    markup = "```\n#{code}\n```"
+    @code.extract(markup)
+    code_block = @code.instance_variable_get("@code_blocks").first
+    code_block.id.should eq Digest::SHA1.hexdigest(code)
+    code_block.language.should be nil
+    code_block.code.should eq code
+  end
+
+  it 'should process markup and give back code from id' do
+    language = 'ruby'
+    code = "\tputs 'hi'"
+    id = Digest::SHA1.hexdigest(code)
+    markup = "```#{language}\n#{code}\n```"
+    markup = @code.extract(markup)
+    code_block = @code.instance_variable_get("@code_blocks").first
+    @code.process(markup).should eq code_block.highlighted
+  end
+end
+

data/spec/gimli/{markup_spec.rb → markup/renderer_spec.rb}

@@ -4,16 +4,15 @@ require './spec/spec_helper'
 
 require './lib/gimli'
 
-describe Gimli::Markup do
+describe Gimli::Markup::Renderer do
 
   it "should remove yaml front matter if asked to" do
     output = "<p>This should be at the top of the file</p>"
 
-    file = Gimli::MarkupFile.new File.expand_path('../../fixtures/yaml_front_matter.textile', __FILE__)
-    markup = Gimli::Markup.new file, true
+    file = Gimli::MarkupFile.new File.expand_path('../../../fixtures/yaml_front_matter.textile', __FILE__)
+    markup = Gimli::Markup::Renderer.new file, true
 
     markup.render.should == output
   end
-
 end
 

data/spec/gimli/markup/yaml_frontmatter_remover_spec.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+require './spec/spec_helper'
+
+require './lib/gimli'
+require './lib/gimli/markup'
+
+describe Gimli::Markup::YamlFrontmatterRemover do
+
+  it 'should remove front matter' do
+    data = "---\nlayout: test\n---\n\n\nReal data"
+    expected = 'Real data'
+    Gimli::Markup::YamlFrontmatterRemover.new.process(data).should == expected
+  end
+
+  it 'should not modify string if no front matter exists' do
+    data = 'Should not be modified'
+    Gimli::Markup::YamlFrontmatterRemover.new.process(data).should == data
+  end
+end
+

data/spec/gimli/markup_file_spec.rb

@@ -0,0 +1,45 @@
+# encoding: utf-8
+
+require './spec/spec_helper'
+
+require './lib/gimli'
+
+describe Gimli::MarkupFile do
+
+  before do
+    @file = Gimli::MarkupFile.new 'fake'
+  end
+
+  it 'should recognize valid format' do
+    @file.valid_format?('textile').should be_true
+  end
+
+  it 'should recognize invalid format' do
+    @file.valid_format?('abc123').should be_false
+  end
+
+  it 'should recognize nil as invalid format' do
+    @file.valid_format?(nil).should be_false
+  end
+
+  it 'should give the name as the filename without the extension' do
+    file = Gimli::MarkupFile.new 'test.txt'
+    file.name.should == File.basename(file.filename, File.extname(file.filename))
+  end
+
+  it 'should know which formats that are valid' do
+    @file.load_format(:md).should eq :markdown
+    @file.load_format(:textile).should eq :textile
+    @file.load_format(:rdoc).should eq :rdoc
+    @file.load_format(:org).should eq :org
+    @file.load_format(:creole).should eq :creole
+    @file.load_format(:rst).should eq :rest
+    @file.load_format(:asciidoc).should eq :asciidoc
+    @file.load_format(:pod).should eq :pod
+    @file.load_format('1').should eq :roff
+    @file.load_format(:mediawiki).should eq :mediawiki
+    @file.load_format('fake').should be nil
+    @file.load_format(nil).should be nil
+  end
+end
+

data/spec/gimli/wkhtmltopdf_spec.rb

@@ -6,16 +6,30 @@ require './lib/gimli'
 
 describe Gimli::Wkhtmltopdf do
 
+  before do
+    @wkhtmltopdf = Gimli::Wkhtmltopdf.new
+  end
+
   it 'should assemble correct command' do
-    wkhtmltopdf = Gimli::Wkhtmltopdf.new
-    mock(wkhtmltopdf).bin { '"wkhtmltopdf"' }
-    args = wkhtmltopdf.command('test.pdf')
-    args.size.should == 4
+    mock(@wkhtmltopdf).bin { '"wkhtmltopdf"' }
+    args = @wkhtmltopdf.command('test.pdf')
+    args.size.should eq 4
     args.should include '"wkhtmltopdf"'
     args.should include '--quiet'
     args.should include '-'
     args.should include  '"test.pdf"'
   end
 
+  it 'should use which to find wkhtmltopdf first time' do
+    mock(@wkhtmltopdf).__double_definition_create__.call(:`, "which wkhtmltopdf") { '~/wkhtmltopdf' }
+    @wkhtmltopdf.bin.should eq '"~/wkhtmltopdf"'
+    @wkhtmltopdf.bin.should eq '"~/wkhtmltopdf"' # Should be cached
+  end
+
+  it 'should generate a pdf' do
+    mock(@wkhtmltopdf).__double_definition_create__.call(:`, "which wkhtmltopdf") { '~/wkhtmltopdf' }
+    mock(IO).popen("\"~/wkhtmltopdf\" --quiet - \"\"", "wb+") { true }
+    @wkhtmltopdf.output_pdf('', '')
+  end
 end
 

data/spec/integration_spec.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+
+require './spec/spec_helper'
+
+require './lib/gimli'
+
+require 'fileutils'
+
+describe 'Integration' do
+
+  it 'should generate files from fixtures' do
+    config = Gimli.configure do |c|
+      c.file = 'spec/fixtures/integration/'
+      c.output_dir = 'spec/tmp'
+    end
+
+    Gimli.process! config
+
+    ::File.exists?('spec/tmp/markdown.pdf').should be true
+    ::File.exists?('spec/tmp/textile.pdf').should be true
+  end
+
+  it 'should generate files from fixtures with aditional parameters' do
+    config = Gimli.configure do |c|
+      c.file = 'spec/fixtures/integration/'
+      c.output_dir = 'spec/tmp/merged'
+      c.merge = true
+      c.stylesheet = 'spec/fixtures/integration/style.css'
+      c.output_filename = 'merged'
+    end
+
+    Gimli.process! config
+
+    ::File.exists?('spec/tmp/merged/merged.pdf').should be true
+  end
+
+  after do
+    ::FileUtils.rm_rf 'spec/tmp'
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gimli
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markup
@@ -246,26 +246,37 @@ extra_rdoc_files:
 - LICENSE
 files:
 - bin/gimli
-- lib/gimli/path.rb
-- lib/gimli/markupfile.rb
+- lib/gimli/config.rb
 - lib/gimli/converter.rb
-- lib/gimli/wkhtmltopdf.rb
+- lib/gimli/markup/code.rb
+- lib/gimli/markup/code_block.rb
+- lib/gimli/markup/renderer.rb
+- lib/gimli/markup/yaml_frontmatter_remover.rb
+- lib/gimli/markup.rb
+- lib/gimli/markupfile.rb
+- lib/gimli/path.rb
 - lib/gimli/setup.rb
-- lib/gimli/config.rb
 - lib/gimli/version.rb
-- lib/gimli/markup.rb
+- lib/gimli/wkhtmltopdf.rb
 - lib/gimli.rb
-- spec/gimli/path_spec.rb
-- spec/gimli/converter_spec.rb
-- spec/gimli/markup_spec.rb
-- spec/gimli/file_spec.rb
-- spec/gimli/wkhtmltopdf_spec.rb
+- spec/fixtures/code_block.textile
+- spec/fixtures/code_block_with_utf8.textile
 - spec/fixtures/code_with_utf8.textile
-- spec/fixtures/recursion/level2/level2.markdown
+- spec/fixtures/integration/markdown.md
+- spec/fixtures/integration/style.css
+- spec/fixtures/integration/textile.textile
 - spec/fixtures/recursion/level1.textile
-- spec/fixtures/code_block.textile
+- spec/fixtures/recursion/level2/level2.markdown
 - spec/fixtures/yaml_front_matter.textile
-- spec/fixtures/code_block_with_utf8.textile
+- spec/gimli/converter_spec.rb
+- spec/gimli/markup/code_block_spec.rb
+- spec/gimli/markup/code_spec.rb
+- spec/gimli/markup/renderer_spec.rb
+- spec/gimli/markup/yaml_frontmatter_remover_spec.rb
+- spec/gimli/markup_file_spec.rb
+- spec/gimli/path_spec.rb
+- spec/gimli/wkhtmltopdf_spec.rb
+- spec/integration_spec.rb
 - spec/spec_helper.rb
 - config/style.css
 - LICENSE
@@ -285,7 +296,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2809593776543819551
+      hash: -3276508745148089455
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -294,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2809593776543819551
+      hash: -3276508745148089455
 requirements: []
 rubyforge_project: gimli
 rubygems_version: 1.8.24

data/spec/gimli/file_spec.rb

@@ -1,28 +0,0 @@
-# encoding: utf-8
-
-require './spec/spec_helper'
-
-require './lib/gimli'
-
-describe Gimli::MarkupFile do
-  it 'should recognize valid format' do
-    file = Gimli::MarkupFile.new 'fake'
-    file.valid_format?('textile').should be_true
-  end
-
-  it 'should recognize invalid format' do
-    file = Gimli::MarkupFile.new 'fake'
-    file.valid_format?('abc123').should be_false
-  end
-
-  it 'should recognize nil as invalid format' do
-    file = Gimli::MarkupFile.new 'fake'
-    file.valid_format?(nil).should be_false
-  end
-
-  it 'should give the name as the filename without the extension' do
-    file = Gimli::MarkupFile.new 'test.txt'
-    file.name.should == File.basename(file.filename, File.extname(file.filename))
-  end
-end
-