gimli 0.1.6 → 0.1.7

data/config/style.css

@@ -4,6 +4,11 @@ body
   font-size: 12px;
 }
 
+.page-break
+{
+  page-break-before: always;
+}
+
 /* Code */
 code, tt
 {

data/lib/gimli.rb

@@ -16,10 +16,8 @@ module Gimli
       puts "Version: #{Gimli::Version}"
       return
     end
-    
-    Path.list_valid(ARGV.flags.file, ARGV.flags.recursive?).each do |file|
-      converter = Converter.new(MarkupFile.new(file))
-      converter.convert!
-    end
+
+    @files = Path.list_valid(ARGV.flags.file, ARGV.flags.recursive?).map { |file| MarkupFile.new(file) }
+    Converter.new(@files).convert!(ARGV.flags.merge?)
   end
-end
+end

data/lib/gimli/converter.rb

@@ -12,19 +12,35 @@ module Gimli
   class Converter
 
     # Initialize the converter with a File
-    # @param [Gimli::File] file The file to convert
-    def initialize(file)
-      @file = file
+    # @param [Array] files The list of Gimli::File to convert (passing a single file will still work)
+    def initialize(files)
+      @files = files
     end
 
     # Convert the file and save it as a PDF file
-    def convert!
-      markup = Markup.new @file
-      html = convert_image_urls markup.render
-
-      kit = pdf_kit(html)
+    # @param [Boolean] merge if true a single pdf with all input files are created
+    def convert!(merge = false)
+      merged_contents = []
+      @files.each do |file|
+        markup = Markup.new file
+        html = convert_image_urls markup.render
+        if merge
+          html = "<div class=\"page-break\"></div>#{html}" unless merged_contents.empty?
+          merged_contents << html
+        else
+          output_pdf(html, file)
+        end
+      end
 
-      kit.to_file(output_file)
+      unless merged_contents.empty?
+        if ARGV.flags.file?
+          path = ARGV.flags.file
+        else
+          path = Dir.getwd
+        end
+        html = merged_contents.join
+        output_pdf(html, nil)
+      end
     end
 
     # Rewrite relative image urls to absolute
@@ -49,6 +65,14 @@ module Gimli
       kit
     end
 
+    # Create the pdf
+    # @param [String] html the html input
+    # @param [String] filename the name of the output file
+    def output_pdf(html, filename)
+      kit = pdf_kit(html)
+      kit.to_file(output_file(filename))
+    end
+
     # Load the stylesheets to pdfkit loads the default and the user selected if any
     # @param [PDFKit] kit
     def load_stylesheets(kit)
@@ -80,8 +104,20 @@ module Gimli
 
     # Generate the name of the output file
     # @return [String]
-    def output_file
-      ::File.join(output_dir, "#{@file.name}.pdf")
+    # @param [Gimli::MarkupFile] file optionally, specify a file, otherwise use output filename
+    def output_file(file = nil)
+      if file
+        output_filename = file.name
+        if ARGV.flags.outputfilename? && @files.length == 1
+          output_filename = ARGV.flags.outputfilename
+        end
+      else
+        output_filename = Time.now.to_s.split(' ').join('_')
+        output_filename = @files.last.name if @files.length == 1 || ARGV.flags.merge?
+        output_filename = ARGV.flags.outputfilename if ARGV.flags.outputfilename?
+      end
+
+      ::File.join(output_dir, "#{output_filename}.pdf")
     end
   end
 end

data/lib/gimli/path.rb

@@ -8,6 +8,7 @@ module Gimli
     # Return an array of paths to valid markup file matching the passed pattern
     # @param [String] target
     # @param [Bool] recursive
+    # @return [Array] an array of valid files
     def self.list_valid(target, recursive = false)
       if recursive
         target ||= Dir.pwd
@@ -20,6 +21,7 @@ module Gimli
           target = File.join(target, '*')
         end
       end
+
       Dir.glob(target).keep_if { |file| MarkupFile.new(file).valid? }
     end
   end

data/lib/gimli/setup.rb

@@ -16,10 +16,18 @@ module Gimli extend OptiFlagSet
     description 'The stylesheet to use to override the standard'
     alternate_forms 's'
   end
+  optional_flag 'outputfilename' do
+    description 'Sets the name of the output file. Only used with single file and in merge mode'
+    alternate_forms 'n'
+  end
   optional_switch_flag 'recursive' do
     description 'Recurse current or target directory and convert all valid markup files'
     alternate_forms 'r'
   end
+  optional_switch_flag 'merge' do
+    description 'Merge markup files into single pdf file'
+    alternate_forms 'm'
+  end
   optional_switch_flag 'version' do
     description 'Show version information and quit'
     alternate_forms 'v'

data/lib/gimli/version.rb

@@ -2,7 +2,7 @@
 
 module Gimli
 
-  Version = "0.1.6"
+  Version = "0.1.7"
 
 end
 

data/spec/gimli/converter_spec.rb

@@ -10,7 +10,7 @@ describe Gimli::Converter do
     name = 'my_file'
     mock(file).name { name }
 
-    converter = Gimli::Converter.new file
+    converter = Gimli::Converter.new [file]
     mock(converter).output_dir { Dir.getwd }
 
     converter.output_file.should == File.join(Dir.getwd, "#{name}.pdf")
@@ -21,10 +21,22 @@ describe Gimli::Converter do
     name = 'my_file'
     mock(file).name { name }
 
-    converter = Gimli::Converter.new file
+    converter = Gimli::Converter.new [file]
     mock(converter).output_dir { '/tmp/out' }
 
-    converter.output_file.should == "/tmp/out/#{name}.pdf"
+    converter.output_file(file).should == "/tmp/out/#{name}.pdf"
+  end
+
+  it 'should give the correct output_file when one is set' do
+    file = Gimli::MarkupFile.new 'fake'
+    output_filename = 'my_file'
+
+    converter = Gimli::Converter.new [file]
+    mock(converter).output_dir { Dir.getwd }
+    mock(ARGV).flags.mock!.outputfilename? { true }
+    mock(ARGV).flags.mock!.outputfilename { output_filename }
+
+    converter.output_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.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-28 00:00:00.000000000 +02:00
+date: 2011-05-29 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &8153660 !ruby/object:Gem::Requirement
+  requirement: &7265960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8153660
+  version_requirements: *7265960
 - !ruby/object:Gem::Dependency
   name: github-markup
-  requirement: &8153220 !ruby/object:Gem::Requirement
+  requirement: &7265520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8153220
+  version_requirements: *7265520
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &8152800 !ruby/object:Gem::Requirement
+  requirement: &7265100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8152800
+  version_requirements: *7265100
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &8152380 !ruby/object:Gem::Requirement
+  requirement: &7264680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8152380
+  version_requirements: *7264680
 - !ruby/object:Gem::Dependency
   name: org-ruby
-  requirement: &8151960 !ruby/object:Gem::Requirement
+  requirement: &7264260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8151960
+  version_requirements: *7264260
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: &8151540 !ruby/object:Gem::Requirement
+  requirement: &7263840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8151540
+  version_requirements: *7263840
 - !ruby/object:Gem::Dependency
   name: wikicloth
-  requirement: &8151120 !ruby/object:Gem::Requirement
+  requirement: &7263420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8151120
+  version_requirements: *7263420
 - !ruby/object:Gem::Dependency
   name: albino
-  requirement: &8150700 !ruby/object:Gem::Requirement
+  requirement: &7263000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8150700
+  version_requirements: *7263000
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &8150280 !ruby/object:Gem::Requirement
+  requirement: &7262580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8150280
+  version_requirements: *7262580
 - !ruby/object:Gem::Dependency
   name: wkhtmltopdf-binary
-  requirement: &8149860 !ruby/object:Gem::Requirement
+  requirement: &7262160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8149860
+  version_requirements: *7262160
 - !ruby/object:Gem::Dependency
   name: pdfkit
-  requirement: &8144320 !ruby/object:Gem::Requirement
+  requirement: &7261740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8144320
+  version_requirements: *7261740
 - !ruby/object:Gem::Dependency
   name: optiflag
-  requirement: &8143860 !ruby/object:Gem::Requirement
+  requirement: &7256400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8143860
+  version_requirements: *7256400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &8143440 !ruby/object:Gem::Requirement
+  requirement: &7255960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8143440
+  version_requirements: *7255960
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &8142980 !ruby/object:Gem::Requirement
+  requirement: &7255480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8142980
+  version_requirements: *7255480
 description: Utility for converting markup files to pdf files. Useful for reports
   etc.
 email: fredrik.wallgren@gmail.com