html2odt 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2e147b6eecf0af3652facf38559813053546c6a
-  data.tar.gz: 303a83ca4cd9e86ecfe5091d911847358a79f77c
+  metadata.gz: b7e81713f41dce40fa45764753a39d223a553fd9
+  data.tar.gz: e87f898ad29e339a024ea0820d794ac0ee5b98b0
 SHA512:
-  metadata.gz: 9d3086df185e177ea423c7a886503463918933a032741d25c96a0fe847ac089043e32275d0b533f3295124021c696d9f0af9fd83d0b6ab4f10065e417b9c24b8
-  data.tar.gz: 5114655368d6cbcd5df9b0f404f9bdc5b7d8203e3308d33eb9c86f60641cbaca2c153ccc034f890d3394559aa55b698125ce7c42ded667d9e63bc45268a36c6b
+  metadata.gz: 5fd546c9b347ec908fe1412ca3239065a0c1e988b8f07ce4ef1f1985e38e1e08f230f90b7c67afb08af303e426c81babd94d5800c5ca5b3865814e9144c83651
+  data.tar.gz: b1f8f277a58aae0b132fac04a43a6189db977440b5200f6e49a4ba63f87a1c400ef6e26c46a7d9e34733c45a469f0c5427683b252e710f8eac1a0d24ce2abdd7

data/.gitignore

@@ -1 +1,2 @@
 /pkg/
+/Gemfile.lock

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.1.9
+  - 2.2.5
+  - 2.3.1
+
+before_install:
+  - gem install bundler
+
+cache: bundler
+sudo: false

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.3.1 - 2016-06-06
+
+Improved support for Ruby 2.0.0, improved handling of invalid URIs
+
 # v0.3.0 - 2016-05-25
 
 Adding support for `base_uri` configuration to expand links and download images

data/README.md

@@ -3,6 +3,7 @@
 This gem provides a Ruby wrapper around the set of XLST stylesheets published as
 [xhtml2odt](https://github.com/abompard/xhtml2odt).
 
+[![Build Status](https://travis-ci.org/planio-gmbh/html2odt.svg?branch=master)](https://travis-ci.org/planio-gmbh/html2odt)
 
 ## html2odt vs. xhtml2odt
 

data/lib/html2odt/document.rb

@@ -267,7 +267,11 @@ class Html2Odt::Document
     doc = Nokogiri::HTML::DocumentFragment.parse(html)
 
     doc.css("a").each do |a|
-      a["href"] = (base_uri + a["href"]).to_s
+      begin
+        a["href"] = (base_uri + a["href"]).to_s
+      rescue URI::InvalidURIError
+        # Ignore invalid uris, they just stay as is
+      end
     end
 
     doc.to_xml(:save_with => Nokogiri::XML::Node::SaveOptions::AS_XML)
@@ -314,7 +318,7 @@ class Html2Odt::Document
         file
       end
 
-      return file.path
+      return file
     end
 
     # cannot handle image properly, return nil

data/lib/html2odt/image.rb

@@ -5,6 +5,17 @@ class Html2Odt::Image
     @target_base = target_base
   end
 
+  # Assign file instead of source, if you were creating tempfiles and need them
+  # to stay around until the ODT is generated.
+  def source=(file_or_path)
+    if file_or_path.respond_to? :path
+      @source = file_or_path.path
+      @file = file_or_path
+    else
+      @source = file_or_path.to_s
+    end
+  end
+
   def valid?
     return false if source.nil? or !File.readable?(source)
 

data/lib/html2odt/version.rb

@@ -1,3 +1,3 @@
 module Html2Odt
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: html2odt
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Gregor Schmidt (Planio)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dimensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.7.2
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: html2odt generates ODT documents based on HTML fragments using xhtml2odt
@@ -117,11 +117,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -170,12 +170,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/Gemfile.lock

@@ -1,32 +0,0 @@
-PATH
-  remote: .
-  specs:
-    html2odt (0.3.0)
-      dimensions (~> 1.3.0)
-      nokogiri (~> 1.6.7.2)
-      rubyzip (~> 1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    byebug (9.0.3)
-    dimensions (1.3.0)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    rake (10.5.0)
-    rubyzip (1.2.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.12)
-  byebug
-  html2odt!
-  minitest (~> 5.0)
-  rake (~> 10.0)
-
-BUNDLED WITH
-   1.12.3