isodoc 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b691b554f0a49dc8569ee3e146ebfd0f3c89ea90137fceecb13c4074b81a394
-  data.tar.gz: e8763e26527bbefb11b9f4faa53803b34a0c2b3d4aeaac37aa44d644623ba213
+  metadata.gz: 93ba96559e2759a596b63d1a785bfb669b3e0b1b400a091af8a6c54c4c6f1470
+  data.tar.gz: 0c48f7c99b83091ab02ad792a6d5dd555fcc0777da4d3931dac7ed824884e0c3
 SHA512:
-  metadata.gz: f6dfd36655433ae916f325b73a4578db4526223872afbc6efb01b73eea33a15f248051b58fa56cca7f96addc1044fde56f5105d9bb82e0038e1475046684847a
-  data.tar.gz: 29750797a89547268c68c62ca9617a5e4705053f03941c173b83233a064e426fa92996be584a2b11da68ec5e42015667ff4e8673f49f6a5e44026f584938584e
+  metadata.gz: b89709b81819fe0b5ed8b48fcb33f7f25f998659f74d97fa65d4642acf762d8c96aca75f525d8941596cea8ba60ad1fd6c3687ae1a178e95d49ce48a7d93e2cc
+  data.tar.gz: c0c0b053b432bafed3e2c926f33cf39b926bfc4e4b0467f4e5c66223d5d9df7e8d4a77fe0b188de319af2f5113a75f5b2c38a111f51e6b690e2b85dacd6819ba

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    isodoc (0.9.6)
+    isodoc (0.9.7)
       asciimath
-      html2doc (~> 0.8.1)
+      html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
       liquid
       metanorma (~> 0.3.0)
@@ -42,7 +42,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    html2doc (0.8.5)
+    html2doc (0.8.6)
       asciimath
       htmlentities (~> 4.3.4)
       image_size
@@ -74,7 +74,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.12.1)
-    parser (2.5.1.2)
+    parser (2.5.3.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     pry (0.11.3)
@@ -146,4 +146,4 @@ DEPENDENCIES
   timecop (~> 0.9)
 
 BUNDLED WITH
-   1.16.6
+   1.17.1

data/isodoc.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ruby-xslt"
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"
-  spec.add_dependency "html2doc", "~> 0.8.1"
+  spec.add_dependency "html2doc", "~> 0.8.6"
   spec.add_dependency "liquid"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "sassc", "~> 1.12.1"

data/lib/isodoc/function/to_word_html.rb

@@ -23,11 +23,13 @@ module IsoDoc::Function
         FileUtils.rm_rf "#{dir}/*"
       end
       @filename = filename
+      @localdir = %r{/}.match(filename) ? filename.sub(%r{/[^/]+$}, "/") : "./"
       [filename, dir]
     end
 
+    # tmp image dir is same directory as @filename
     def tmpimagedir
-      @filename + @tmpimagedir
+      @filename.sub(%r{^.*/([^/]+)$}, "\\1") + @tmpimagedir
     end
 
 
@@ -39,7 +41,7 @@ module IsoDoc::Function
         if @standardstylesheet
           head.style do |style|
             stylesheet = File.read(@standardstylesheet, encoding: "utf-8").
-              gsub("FILENAME", filename)
+              gsub("FILENAME", File.basename(filename))
             style.comment "\n#{stylesheet}\n"
           end
         end

data/lib/isodoc/html_function/html.rb

@@ -205,8 +205,7 @@ module IsoDoc::HtmlFunction
 
     def datauri(i)
       type = i["src"].split(".")[-1]
-      #bin = open(i["src"]).read(encoding: "utf-8")
-      bin = File.read(i["src"], encoding: "utf-8")
+      bin = File.read(@localdir + i["src"], encoding: "utf-8")
       data = Base64.strict_encode64(bin)
       i["src"] = "data:image/#{type};base64,#{data}"
     end
@@ -215,9 +214,10 @@ module IsoDoc::HtmlFunction
       matched = /\.(?<suffix>\S+)$/.match i["src"]
       uuid = UUIDTools::UUID.random_create.to_s
       new_full_filename = File.join(tmpimagedir, "#{uuid}.#{matched[:suffix]}")
-      FileUtils.cp i["src"], new_full_filename
+      local_filename = File.join(@localdir, i["src"])
+      FileUtils.cp local_filename, new_full_filename
       i["src"] = new_full_filename
-      i["width"], i["height"] = Html2Doc.image_resize(i, @maxheight, @maxwidth)
+      i["width"], i["height"] = Html2Doc.image_resize(i, local_filename, @maxheight, @maxwidth)
     end
 
     def html_toc(docxml)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.9.6".freeze
+  VERSION = "0.9.7".freeze
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -29,7 +29,8 @@ module IsoDoc::WordFunction
 
     def word_admonition_images(docxml)
       docxml.xpath("//div[@class = 'Admonition']//img").each do |i|
-         i["width"], i["height"] = Html2Doc.image_resize(i, @maxheight, 300)
+        i["width"], i["height"] =
+          Html2Doc.image_resize(i, File.join(@localdir, i["src"]), @maxheight, 300)
       end
     end
 
@@ -85,16 +86,14 @@ module IsoDoc::WordFunction
 
     def generate_header(filename, _dir)
       return nil unless @header
-      #template = Liquid::Template.parse(File.read(@header, encoding: "UTF-8"))
       template = IsoDoc::Common.liquid(File.read(@header, encoding: "UTF-8"))
       meta = @meta.get
       meta[:filename] = filename
       params = meta.map { |k, v| [k.to_s, v] }.to_h
-      File.open("header.html", "w:UTF-8") do |f|
-        f.write(template.render(params))
-      end
-      @files_to_delete << "header.html"
-      "header.html"
+      headerfile = File.join(@localdir, "header.html")
+      File.open(headerfile, "w:UTF-8") { |f| f.write(template.render(params)) }
+      @files_to_delete << headerfile
+      headerfile
     end
 
     def word_toc_entry(toclevel, heading)

data/spec/isodoc/postproc_spec.rb

@@ -544,6 +544,41 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
 
   end
 
+  it "moves images in HTML, using relative file location" do
+    FileUtils.rm_f "spec/test.html"
+    FileUtils.rm_rf "spec/test_images"
+    IsoDoc::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("spec/test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <preface><foreword>
+         <figure id="_">
+         <name>Split-it-right sample divider</name>
+                  <image src="assets/rice_image1.png" id="_" imagetype="PNG"/>
+                  <image src="assets/rice_image1.png" id="_" width="20000" height="300000" imagetype="PNG"/>
+                  <image src="assets/rice_image1.png" id="_" width="99" height="auto" imagetype="PNG"/>
+       </figure>
+       </foreword></preface>
+        </iso-standard>
+    INPUT
+    html = File.read("spec/test.html").sub(/^.*<main class="main-section">/m, '<main class="main-section">').
+      sub(%r{</main>.*$}m, "</main>")
+    expect(`ls test_images`).to match(/\.png$/)
+    expect(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png")).to be_equivalent_to <<~"OUTPUT"
+           <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
+             <br />
+             <div>
+               <h1 class="ForewordTitle">Foreword</h1>
+               <div id="_" class="figure">
+               <img src="test_images/_.png" height="776" width="922" />
+<img src="test_images/_.png" height="800" width="53" />
+<img src="test_images/_.png" height="83" width="99" />
+       <p class="FigureTitle" align="center">Figure 1&#xA0;&#x2014; Split-it-right sample divider</p></div>
+             </div>
+             <p class="zzSTDTitle1"></p>
+           </main>
+    OUTPUT
+  end
+
+
   it "encodes images in HTML as data URIs" do
     FileUtils.rm_f "test.html"
     FileUtils.rm_rf "test_images"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.6
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement