html2odt 0.4.0 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17739952ee2010c4787bc33475552edf2f4a4053
-  data.tar.gz: 3e5140a764870fe43268d1089cb926315f8cfc85
+  metadata.gz: f516bc8a83378731a7fa9962c56543784bbaf8d9
+  data.tar.gz: 9851cb1589a9cb5b30aed2061b38c8686202b02e
 SHA512:
-  metadata.gz: 8b2d33e402c811c8b0705e90f914e40bb5cdcecb21dadc15af0b49fdccdeeb21a3a2afb4c35be7f66f91c09155d65e7c245e3729fa99d4d9cfcf766f115c17f3
-  data.tar.gz: 1f0bbca292059d5f856c5460ad4819f7dd4ee830f28fc8e1efd301fa65d5ba050d16d03a6c229564d1a2e5234c082a66c6ad222e2a5f12142708adccf6638578
+  metadata.gz: f28b6b63b34290a0eaff83ed813ca0b7add7f57911bf89e965073b1fec4ea745c575f0f49ab0cf67a596090b444411d3507e5699279d74241164b65db08e792e
+  data.tar.gz: 55f00819a1e29f07a3de4a239c579cd7c7e33703ae948f8aec9ee56ea96666941b818e7e44395207887af5caac20f3ca8a5e145c8c6ec6b6168bb03f9e173d2f

data/.travis.yml

@@ -1,12 +1,23 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.9
-  - 2.2.5
-  - 2.3.1
+  - 2.1.10
+  - 2.2.10
+  - 2.3.7
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
+  - 2.7.0
 
 before_install:
-  - gem install bundler
+  # Bundler 2.0 requires at least Ruby 2.3. We need to explicitly install an
+  # older version of bundler for older Ruby versions since they can't / won't
+  # check their required versions on their own.
+  - |
+    if [[ "$(rvm current)" =~ ^ruby-2\.[012] ]]; then
+      gem install bundler -v '< 2.0'
+    else
+      gem install bundler
+    fi
 
 cache: bundler
 sudo: false

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+# v0.4.6 - 2021-03-23
+
+Support resources behind redirects.
+Check for source being a file before trying to read it
+
+# v0.4.5 - 2021-01-06
+
+Force binmode when writing out the ODT
+
+# v0.4.4 - 2020-01-06
+
+Fix exception occurring with some document contents
+
+# v0.4.3 - 2017-12-15
+
+Handle files smaller than 6144 bytes. Relaxed version requirements.
+
+# v0.4.2 - 2017-12-15
+
+Try harder to determine image dimensions.
+
+# v0.4.1 - 2017-09-19
+
+Add support for nokogiri 1.8 in adition to the currently supported versions
+
 # v0.4.0 - 2017-03-30
 
 Bump required nokogiri version

data/README.md

@@ -12,7 +12,7 @@ line tools by Aurélien Bompard are called **`x`**`html2odt`?
 
 This project uses [nokogiri](http://www.nokogiri.org) to parse the HTML and
 apply the XSLT transformations. Nokogiri implements a forgiving HTML parser and
-tries be as forgiving as possible. Furthermore, the basic API expects HTML
+tries to be as forgiving as possible. Furthermore, the basic API expects HTML
 fragments, not full documents. We are not expecting the users of this library to
 pass in a complete, valid XHTML document. A reasonably good piece of HTML should
 be good enough. Therefore we skipped the `X` in the name as well.

data/html2odt.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.executables   << "html2odt.rb"
 
-  spec.add_dependency "dimensions", "~> 1.3.0"
-  spec.add_dependency "nokogiri", "~> 1.7.1"
-  spec.add_dependency "rubyzip", "~> 1.0"
+  spec.add_dependency "dimensions"
+  spec.add_dependency "nokogiri"
+  spec.add_dependency "rubyzip"
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "fakeweb", "~> 1.3"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "webmock"
 end

data/lib/html2odt.rb

@@ -13,6 +13,7 @@ module Html2Odt
   ODT_TEMPLATE  = File.join(File.dirname(__FILE__), "..", "odt", "template.odt")
 end
 
+require "html2odt/dimensions_patches"
 require "html2odt/document"
 require "html2odt/image"
 require "html2odt/version"

data/lib/html2odt/dimensions_patches.rb

@@ -0,0 +1,28 @@
+module Html2Odt::DimensionsPatches
+  # Default implemenation of IO#peek from GEM_PATH/dimensions-1.3.0/lib/dimensions/io.rb:
+  #
+  #   def peek
+  #     unless no_peeking?
+  #       read(pos + 1024) while @reader.width.nil? && pos < 6144
+  #       rewind
+  #     end
+  #   end
+  #
+  # It had two problems:
+  #
+  # a) if the file is shorter than 6144 bytes, it would keep reading infinitely
+  # b) if the width can only be detected after the 6144 limit, it would not work
+  #    as expected
+  #
+  # Now we keep reading the file, until we can determine a width or until
+  # there's nothing left to read.
+  #
+  def peek
+    return if no_peeking?
+
+    while read(pos + 1024) && @reader.width.nil?
+    end
+
+    rewind
+  end
+end

data/lib/html2odt/document.rb

@@ -58,7 +58,7 @@ class Html2Odt::Document
       xml = xslt_tranform(html, Html2Odt::XHTML2ODT_XSL)
 
       xml = xml.sub('<?xml version="1.0" encoding="utf-8"?>', '')
-      xml = @tpl_content_xml.sub(CONTENT_REGEX, xml)
+      xml = @tpl_content_xml.sub(CONTENT_REGEX) { xml }
 
       xml = xslt_tranform(xml, Html2Odt::XHTML2ODT_STYLES_XSL)
 
@@ -174,7 +174,7 @@ class Html2Odt::Document
   end
 
   def write_to(path)
-    File.write(path, data)
+    File.write(path, data, mode: 'wb')
   end
 
   protected
@@ -363,8 +363,8 @@ class Html2Odt::Document
       height = img["height"].to_i
       width = height * image.height / image.width
     else
-      width  = image.width
-      height = image.height
+      width  = image.width.to_i
+      height = image.height.to_i
     end
 
     img["width"]  = "#{(width  / DPI * INCH_TO_CM).round(2)}cm"
@@ -399,6 +399,9 @@ class Html2Odt::Document
   def uri_to_file(uri)
     Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
       resp = http.get(uri.path)
+      if resp.is_a?(Net::HTTPRedirection) and redirect_uri = URI.parse(resp['location'])
+        resp = http.get(redirect_uri)
+      end
 
       return nil unless resp.is_a?(Net::HTTPSuccess)
 

data/lib/html2odt/image.rb

@@ -18,11 +18,12 @@ class Html2Odt::Image
   end
 
   def valid?
-    return false if source.nil? or !File.readable?(source)
+    return false if source.nil? or !File.readable?(source) or !File.file?(source)
 
     if @valid.nil?
       File.open(source, "rb") do |io|
         Dimensions(io)
+        io.extend Html2Odt::DimensionsPatches
 
         # Interacting with Dimensions::Reader directly to
         #
@@ -32,11 +33,12 @@ class Html2Odt::Image
         io.send :peek
         reader = io.instance_variable_get :@reader
 
-        if reader.type
+        if reader.type && reader.width && reader.height
           @type = reader.type
-          @width = reader.width
+
+          @width  = reader.width
           @height = reader.height
-          @angle = reader.angle
+          @angle  = reader.angle
 
           @valid = true
         else

data/lib/html2odt/version.rb

@@ -1,3 +1,3 @@
 module Html2Odt
-  VERSION = "0.4.0"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: html2odt
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.6
 platform: ruby
 authors:
 - Gregor Schmidt (Planio)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2021-03-23 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
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 description: html2odt generates ODT documents based on HTML fragments using xhtml2odt
 email:
 - gregor@plan.io
@@ -129,6 +129,7 @@ files:
 - bin/html2odt.rb
 - html2odt.gemspec
 - lib/html2odt.rb
+- lib/html2odt/dimensions_patches.rb
 - lib/html2odt/document.rb
 - lib/html2odt/image.rb
 - lib/html2odt/version.rb
@@ -180,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: html2odt generates ODT documents based on HTML fragments