html2odt 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df8d84152bdb9bd084049457e5d4b7873947ea7d
-  data.tar.gz: 61d994a96bc8b0a0d6f98ffb10802c2b80422447
+  metadata.gz: 67d0f7c76e86cb16aa718ed1b4868ff957878227
+  data.tar.gz: efde21663754a80ab324d80bfb04935fbd712bb2
 SHA512:
-  metadata.gz: b3096708a2dd8854a36be52da95ae61848c51ddde69e3fbee23b326790aa93ec2e97f37f93dda0108b26480cba0a8cb3d979d0acc9d5d36a7bf8420bcce62a6f
-  data.tar.gz: 112d12a289eb3cab46a4404c2b51799cd99a42d90a406b109acf23bedfa1a7f203d838b9e19f11c74ecb1bf7dd8ab860dc96175b1b88d85e4213ff1a01af2ad9
+  metadata.gz: 4f47e1fddc20d3967cefbb9ee8397e49ef52e2a94479fecc9393f55ff49e7ed5ad4def7cc47ebfb6814b5f321484e5cf008230ba55226d3240a0c8206e7e2145
+  data.tar.gz: 5edbcb7ce66dafa336a02baee0dbe41fda7faf332db8579e6c7bf591fe1617c28f4e8378c9a6f059a6e7b610665aca57387165395f5db5072d4a317c4f90abda

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 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.

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", "< 1.9"
-  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 "fakeweb"
 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

@@ -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"

data/lib/html2odt/image.rb

@@ -23,6 +23,7 @@ class Html2Odt::Image
     if @valid.nil?
       File.open(source, "rb") do |io|
         Dimensions(io)
+        io.extend Html2Odt::DimensionsPatches
 
         # Interacting with Dimensions::Reader directly to
         #
@@ -32,24 +33,14 @@ 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
 
-          # for some files, peek doesn't seem to do the trick and width/height
-          # stay nil. According to
-          # https://github.com/sstephenson/dimensions#reading-dimensions-from-a-stream
-          # the dimensions get initialized 'once enough of the file' has been
-          # read, so we do that.
-          #
-          while reader.width.nil?
-            break unless io.read(8192)
-          end
-
-          @width = reader.width
+          @width  = reader.width
           @height = reader.height
-          @angle = reader.angle
+          @angle  = reader.angle
 
-          @valid = not(@width.nil? or @height.nil?)
+          @valid = true
         else
           @valid = false
         end

data/lib/html2odt/version.rb

@@ -1,3 +1,3 @@
 module Html2Odt
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html2odt
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Gregor Schmidt (Planio)
@@ -14,106 +14,100 @@ dependencies:
   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
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.9'
+        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
   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
@@ -135,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