gimli 0.1.8 → 0.1.9

data/README.textile

@@ -17,6 +17,16 @@ h3. Markup
 
 Markup files may be written in any format supported by GitHub-Markup (except roff).
 
+h3. Images
+
+Images can be included by absolute url on your hard drive or a absolute url on the Internet. You can also refer to an image relative from the markup file. Example in textile.
+
+<pre>
+!/tmp/test.jpg!
+!http://upload.wikimedia.org/wikipedia/en/b/bc/Wiki.png!
+!../images/test.jpg!
+</pre>
+
 h2. Installation
 
 The best way to install Gimli is with RubyGems:

data/bin/gimli

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'bundler/setup'
-
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)) + '/../lib/')
 
 require 'gimli'

data/lib/gimli/converter.rb

@@ -12,7 +12,7 @@ module Gimli
   class Converter
 
     # Initialize the converter with a File
-    # @param [Array] files The list of Gimli::File to convert (passing a single file will still work)
+    # @param [Array] files The list of Gimli::MarkupFile to convert (passing a single file will still work)
     def initialize(files)
       @files = files
     end
@@ -23,7 +23,7 @@ module Gimli
       merged_contents = []
       @files.each do |file|
         markup = Markup.new file
-        html = convert_image_urls markup.render
+        html = convert_image_urls markup.render, file.filename
         if merge
           html = "<div class=\"page-break\"></div>#{html}" unless merged_contents.empty?
           merged_contents << html
@@ -41,9 +41,10 @@ module Gimli
     # Rewrite relative image urls to absolute
     # @param [String] html some html to parse
     # @return [String] the html with all image urls replaced to absolute
-    def convert_image_urls(html)
+    def convert_image_urls(html, filename)
+      dir_string = ::File.dirname(::File.expand_path(filename))
       html.scan(/<img[^>]+src="([^"]+)"/).each do |url|
-        html.gsub!(url[0], ::File.expand_path(url[0])) unless url[0] =~ /^https?/
+        html.gsub!(url[0], ::File.expand_path(url[0], dir_string)) unless url[0] =~ /^https?/
       end
 
       html

data/lib/gimli/version.rb

@@ -2,7 +2,7 @@
 
 module Gimli
 
-  Version = "0.1.8"
+  Version = "0.1.9"
 
 end
 

data/spec/gimli/converter_spec.rb

@@ -84,31 +84,37 @@ describe Gimli::Converter do
 
   it 'should convert relative image urls to absolute' do
     file = Gimli::MarkupFile.new 'fake'
+    filename = 'fixtures/fake.textile'
+    dir_string = ::File.dirname(::File.expand_path(filename))
     converter = Gimli::Converter.new file
 
     html = '<p>foo</p><img src="test.jpg" alt="" /><p>bar</p><img src="test2.jpg" alt="" />'
-    valid_html = "<p>foo</p><img src=\"#{File.expand_path('test.jpg')}\" alt=\"\" /><p>bar</p><img src=\"#{File.expand_path('test2.jpg')}\" alt=\"\" />"
+    valid_html = "<p>foo</p><img src=\"#{File.expand_path('test.jpg', dir_string)}\" alt=\"\" /><p>bar</p><img src=\"#{File.expand_path('test2.jpg', dir_string)}\" alt=\"\" />"
 
-    converter.convert_image_urls(html).should == valid_html
+    converter.convert_image_urls(html, filename).should == valid_html
   end
 
   it 'should not rewrite non relative urls' do
     file = Gimli::MarkupFile.new 'fake'
+    filename = '../../fixtures/fake.textile'
+    dir_string = ::File.dirname(::File.expand_path(filename))
     converter = Gimli::Converter.new file
 
     html = '<p>foo</p><img src="https://d3nwyuy0nl342s.cloudfront.net/images/modules/header/logov3-hover.png" alt="" /><p>bar</p>'
 
-    converter.convert_image_urls(html).should == html
+    converter.convert_image_urls(html, filename).should == html
   end
 
   it 'should work on both absolute and relative images' do
     file = Gimli::MarkupFile.new 'fake'
+    filename = '../../fixtures/fake.textile'
+    dir_string = ::File.dirname(::File.expand_path(filename))
     converter = Gimli::Converter.new file
 
     html = '<p>foo</p><img src="test.jpg" alt="" /><p>bar</p><img src="/tmp/test2.jpg" alt="" /> <img src="https://d3nwyuy0nl342s.cloudfront.net/images/modules/header/logov3-hover.png" alt="" />'
-    valid_html = "<p>foo</p><img src=\"#{File.expand_path('test.jpg')}\" alt=\"\" /><p>bar</p><img src=\"/tmp/test2.jpg\" alt=\"\" /> <img src=\"https://d3nwyuy0nl342s.cloudfront.net/images/modules/header/logov3-hover.png\" alt=\"\" />"
+    valid_html = "<p>foo</p><img src=\"#{File.expand_path('test.jpg', dir_string)}\" alt=\"\" /><p>bar</p><img src=\"/tmp/test2.jpg\" alt=\"\" /> <img src=\"https://d3nwyuy0nl342s.cloudfront.net/images/modules/header/logov3-hover.png\" alt=\"\" />"
 
-    converter.convert_image_urls(html).should == valid_html
+    converter.convert_image_urls(html, filename).should == valid_html
   end
 end
 

metadata

@@ -1,229 +1,181 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gimli
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.1.9
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 8
-  version: 0.1.8
 platform: ruby
-authors: 
+authors:
 - Fredrik Wallgren
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-26 00:00:00 +02:00
+date: 2011-07-11 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: github-markup
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &10022600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: redcarpet
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *10022600
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: &10022120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.17.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: RedCloth
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *10022120
+- !ruby/object:Gem::Dependency
+  name: RedCloth
+  requirement: &10021660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.2.7
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: org-ruby
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *10021660
+- !ruby/object:Gem::Dependency
+  name: org-ruby
+  requirement: &10021200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.3
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: creole
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *10021200
+- !ruby/object:Gem::Dependency
+  name: creole
+  requirement: &10020740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: wikicloth
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *10020740
+- !ruby/object:Gem::Dependency
+  name: wikicloth
+  requirement: &10020280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.3
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: albino
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *10020280
+- !ruby/object:Gem::Dependency
+  name: albino
+  requirement: &10019820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *10019820
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &10019360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.4
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: wkhtmltopdf-binary
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *10019360
+- !ruby/object:Gem::Dependency
+  name: wkhtmltopdf-binary
+  requirement: &10018900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.5.3
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: pdfkit
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *10018900
+- !ruby/object:Gem::Dependency
+  name: pdfkit
+  requirement: &10018440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.2
   type: :runtime
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: optiflag
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *10018440
+- !ruby/object:Gem::Dependency
+  name: optiflag
+  requirement: &10017980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :runtime
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *10017980
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &10017600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *10017600
+- !ruby/object:Gem::Dependency
   name: rr
+  requirement: &10017140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *10017140
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &10016720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id014
-description: Utility for converting markup files to pdf files. Useful for reports etc.
+  prerelease: false
+  version_requirements: *10016720
+description: Utility for converting markup files to pdf files. Useful for reports
+  etc.
 email: fredrik.wallgren@gmail.com
-executables: 
+executables:
 - gimli
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.textile
 - LICENSE
-files: 
+files:
 - bin/gimli
 - lib/gimli/version.rb
 - lib/gimli/path.rb
@@ -249,36 +201,27 @@ files:
 has_rdoc: true
 homepage: https://github.com/walle/gimli
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: gimli
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Utility for converting markup files to pdf files.
 test_files: []
-