html2odt 0.4.4 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 464efb77c678a0b0e3e0027fcb31008ab6df1a2e78b9d9ae0ecfc39f173863ba
-  data.tar.gz: f2d86c56e5e8671cdfeec2df5d48b6011b35580245201f62a78328fadbcaa2f1
+  metadata.gz: 9e7333fa453361625a05b47649a10be5b4a8d6a2a073289b52da7024f6af8e2a
+  data.tar.gz: 7275188a428445ed045e7d927938341b4391e27b3d39d689d8535214e5e33545
 SHA512:
-  metadata.gz: '0289085cedecd1c97daf05fbdbe507d88324bc301435abbc30dde0c873f991ab284840ec65fa31c778de87dfd8f3d12cfc9a75dd59e0bc246b69a74ebcd46011'
-  data.tar.gz: 745d2fc688b79c66ca747b75022af33e78f93f6d4e2be223d06e8137355c2bcb50046265cacdafaf6c4cb6886538ec50e78d155bfedd7419b76ee40b76063fce
+  metadata.gz: 1130c4878fdf23ff88bffe63909982ca9b0e4ac0e39413c76c868576ee926247f62e86f3f9280d0f1cd31e0d2b8bf2da2c67c0043367187ab12a16f5ab5ef745
+  data.tar.gz: d7bda0c68280863114c7b2bce0f3e62b4950be17037f45f8d7a97de786f26c2696a4ca12363410bdb306b027bd1fa5a77296e6c0092efcd78e35be161d9584a8

data/.github/workflows/ci.yml

@@ -0,0 +1,31 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+
+jobs:
+  test:
+    name: Ruby ${{ matrix.ruby }}
+    # ubuntu-22.04 provides ruby/setup-ruby prebuilt binaries across the whole
+    # 2.7 - 4.0 range; ubuntu-latest (24.04) no longer ships 2.7 / 3.0 builds.
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - '3.2'
+          - '3.3'
+          - '3.4'
+          - '4.0'
+    steps:
+      - uses: actions/checkout@v5
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake test

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+# v0.4.7 - 2026-06-12
+
+Strip the Zip64 extra field from the mimetype entry so files generated with
+rubyzip >= 3.2 pass ODF validation and are accepted by strict consumers such as
+older LibreOffice (#5).
+
+# 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

data/README.md

@@ -3,7 +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)
+[![CI](https://github.com/planio-gmbh/html2odt/actions/workflows/ci.yml/badge.svg)](https://github.com/planio-gmbh/html2odt/actions/workflows/ci.yml)
 
 ## html2odt vs. xhtml2odt
 

data/lib/html2odt/document.rb

@@ -129,56 +129,76 @@ class Html2Odt::Document
   end
 
   def data
-    @data ||= begin
-      buffer = Zip::OutputStream.write_buffer do |output_stream|
-        # Copy contents from template, while replacing content.xml and
-        # styles.xml
-        Zip::File.open(@template) do |file|
-          file.each do |entry|
-            next if entry.directory?
-
-            entry.get_input_stream do |input_stream|
-              data = case entry.name
-              when "content.xml"
-                content_xml
-              when "meta.xml"
-                meta_xml
-              when "styles.xml"
-                styles_xml
-              when "META-INF/manifest.xml"
-                manifest_xml
-              else
-                input_stream.sysread
-              end
-
-              if entry.name == "mimetype"
-                # mimetype may not be compressed
-                output_stream.put_next_entry(entry.name, nil, nil, Zlib::NO_COMPRESSION)
-              else
-                output_stream.put_next_entry(entry.name)
-              end
-              output_stream.write data
-            end
-          end
-        end
+    @data ||= zip_buffer.string
+  end
 
-        # Adding images found in the HTML sources
-        (@images || []).each do |image|
-          output_stream.put_next_entry(image.target)
-          output_stream.write File.read(image.source)
-        end
-      end
+  def write_to(path)
+    File.write(path, data, mode: 'wb')
+  end
+
+  protected
 
-      buffer.string
+  # ODF forbids an "extra field" on the mimetype zip entry. rubyzip >= 3.0
+  # writes a Zip64 extra field into every local header, producing files the ODF
+  # validator and strict consumers (e.g. older LibreOffice) reject. rubyzip
+  # >= 3.2 can suppress it per stream, which is thread-safe (unlike the global
+  # Zip.write_zip64_support). rubyzip 2.x never wrote the extra field, so the
+  # option is neither needed nor available there.
+  def zip_buffer
+    if write_buffer_supports_suppressing_extra_fields?
+      Zip::OutputStream.write_buffer(suppress_extra_fields: true) do |output_stream|
+        add_entries(output_stream)
+      end
+    else
+      Zip::OutputStream.write_buffer do |output_stream|
+        add_entries(output_stream)
+      end
     end
   end
 
-  def write_to(path)
-    File.write(path, data)
+  def write_buffer_supports_suppressing_extra_fields?
+    Zip::OutputStream.method(:write_buffer).parameters.any? do |_, name|
+      name == :suppress_extra_fields
+    end
   end
 
-  protected
+  def add_entries(output_stream)
+    # Copy contents from template, while replacing content.xml and styles.xml
+    Zip::File.open(@template) do |file|
+      file.each do |entry|
+        next if entry.directory?
+
+        entry.get_input_stream do |input_stream|
+          data = case entry.name
+          when "content.xml"
+            content_xml
+          when "meta.xml"
+            meta_xml
+          when "styles.xml"
+            styles_xml
+          when "META-INF/manifest.xml"
+            manifest_xml
+          else
+            input_stream.sysread
+          end
+
+          if entry.name == "mimetype"
+            # mimetype may not be compressed
+            output_stream.put_next_entry(entry.name, nil, nil, Zlib::NO_COMPRESSION)
+          else
+            output_stream.put_next_entry(entry.name)
+          end
+          output_stream.write data
+        end
+      end
+    end
 
+    # Adding images found in the HTML sources
+    (@images || []).each do |image|
+      output_stream.put_next_entry(image.target)
+      output_stream.write File.read(image.source)
+    end
+  end
 
   def read_xmls
     unless File.readable?(@template)
@@ -399,6 +419,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,7 +18,7 @@ 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|

data/lib/html2odt/version.rb

@@ -1,3 +1,3 @@
 module Html2Odt
-  VERSION = "0.4.4"
+  VERSION = "0.4.7"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: html2odt
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.7
 platform: ruby
 authors:
 - Gregor Schmidt (Planio)
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dimensions
@@ -117,8 +116,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -165,7 +164,6 @@ homepage: https://github.com/planio-gmbh/html2odt
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -180,8 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 4.0.1
 specification_version: 4
 summary: html2odt generates ODT documents based on HTML fragments
 test_files: []

data/.travis.yml

@@ -1,23 +0,0 @@
-language: ruby
-rvm:
-  - 2.1.10
-  - 2.2.10
-  - 2.3.7
-  - 2.4.9
-  - 2.5.7
-  - 2.6.5
-  - 2.7.0
-
-before_install:
-  # 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