docstache 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebc3b1a35a807456664b2f75b8f636fc7417075f
-  data.tar.gz: 92fb9f96b317ed48ccdd9b10b889116bef154abf
+  metadata.gz: 64b050be7b5b3314f3970e3cf195dd436c18bbb8
+  data.tar.gz: ca44b9c1d7f1e2881edb09cac633a759b538412d
 SHA512:
-  metadata.gz: 8a4830e510ea526919d69734b496767c596869e014cf775563c86dd7d84a52687ebfb6fd98eb0d56f927412dfb28aff5a314ae19cf7ac7b919d2144a2ab0dc4a
-  data.tar.gz: 3a09c43efa037551271a60c8c7c704e7d954288c7ffbc176740bae2cde8238d3c96b5c43bfad86fad50bbb8c2706120f32a86e25a31c2181b741694ed5f5cd81
+  metadata.gz: c363eed61fd680c394a7fd47db76f2f1a134d1606bddc2645be3ca36ec09211689b6baf6318b7dcd6a0f676817d0d8e2cbee5b209560e1dc8f363f0dd495fda1
+  data.tar.gz: 2369c45c26d8e3613277e164d76c9ff17554aaa1f37c8b9251364db393565c69897e2889c29d0332d47a886482901edc41723657d33159c74b2a543a20de3aa0

data/changelog.md

@@ -1,7 +1,10 @@
 # Changelog
 
+## 0.3.0
+* [???] Added ability to do tag interpolation in headers and footers.  The header/footer used is the header or footer from the first document passed into `Document.new()`
+
 ## 0.2.1
-* [25b4c2e9e3dcb19b6fe9a255fec2c2bfd92029a6] Fixed a bug where a tag with regular expression characters could not be fixed with the `fix_errors` method 
+* [25b4c2e9e3dcb19b6fe9a255fec2c2bfd92029a6] Fixed a bug where a tag with regular expression characters could not be fixed with the `fix_errors` method
 
 ## 0.2.0
 

data/lib/docstache/document.rb

@@ -4,6 +4,7 @@ module Docstache
       raise ArgumentError if paths.empty?
       @path = paths.shift
       @zip_file = Zip::File.open(@path)
+      load_references
       @document = Nokogiri::XML(unzip_read(@zip_file, "word/document.xml"))
       zip_files = paths.map{|p| Zip::File.open(p)}
       documents = zip_files.map{|f| Nokogiri::XML(unzip_read(f, "word/document.xml"))}
@@ -11,16 +12,21 @@ module Docstache
         @document.css('w|p').last.add_next_sibling(page_break)
         @document.css('w|p').last.add_next_sibling(doc.css('w|body > *:not(w|sectPr)'))
       end
+      find_documents_to_interpolate
     end
 
     def tags
-      @document.text.gsub(/\s+/, '').scan(/\{\{.+?\}\}/)
+      @documents.values.flat_map { |document|
+        document.text.gsub(/\s+/, '').scan(/\{\{.+?\}\}/)
+      }
     end
 
     def usable_tags
-      @document.css('w|t').select { |tag| tag.text =~ /\{\{.+?\}\}/ }.map { |tag|
-        tag.text.scan(/\{\{.+?\}\}/)
-      }.flatten
+      @documents.values.flat_map { |document|
+        document.css('w|t').select { |tag| tag.text =~ /\{\{.+?\}\}/ }.flat_map { |tag|
+          tag.text.scan(/\{\{.+?\}\}/)
+        }
+      }
     end
 
     def fix_errors
@@ -34,19 +40,27 @@ module Docstache
     end
 
     def save
-      buffer = zip_buffer(@document)
+      buffer = zip_buffer(@documents)
       File.open(@path, "w") {|f| f.write buffer.string}
     end
 
     def render_file(output, data={})
-      rendered = Docstache::Renderer.new(@document, data).render
-      buffer = zip_buffer(rendered)
+      rendered_documents = Hash[
+        @documents.map { |(path, document)|
+          [path, Docstache::Renderer.new(document.dup, data).render]
+        }
+      ]
+      buffer = zip_buffer(rendered_documents)
       File.open(output, "w") {|f| f.write buffer.string}
     end
 
     def render_stream(data={})
-      rendered = Docstache::Renderer.new(@document, data).render
-      buffer = zip_buffer(rendered)
+      rendered_documents = Hash[
+        @documents.map { |(path, document)|
+          [path, Docstache::Renderer.new(document.dup, data).render]
+        }
+      ]
+      buffer = zip_buffer(rendered_documents)
       buffer.rewind
       return buffer.sysread
     end
@@ -54,10 +68,16 @@ module Docstache
     private
 
     def problem_paragraphs
-      missing_tags = tags - usable_tags
-      missing_tags.flat_map do |tag|
-        @document.css('w|p').select {|t| t.text =~ /#{Regexp.escape(tag)}/}
+      missing_tags = tags
+      usable_tags.each do |usable_tag|
+        index = missing_tags.index(usable_tag)
+        missing_tags.delete_at(index) if index
       end
+      missing_tags.flat_map { |tag|
+        @documents.values.inject([]) { |tags, document|
+          tags + document.css('w|p').select {|t| t.text =~ /#{Regexp.escape(tag)}/}
+        }
+      }
     end
 
     def flatten_paragraph(p)
@@ -78,16 +98,18 @@ module Docstache
       return contents
     end
 
-    def zip_buffer(document)
+    def zip_buffer(documents)
       buffer = Zip::OutputStream.write_buffer do |out|
         @zip_file.entries.each do |e|
-          unless ["word/document.xml"].include?(e.name)
+          unless documents.keys.include?(e.name)
             out.put_next_entry(e.name)
             out.write(e.get_input_stream.read)
           end
         end
-        out.put_next_entry("word/document.xml")
-        out.write(@document.to_xml(indent: 0).gsub("\n", ""))
+        documents.each do |path, document|
+          out.put_next_entry(path)
+          out.write(document.to_xml(indent: 0).gsub("\n", ""))
+        end
       end
       return buffer
     end
@@ -102,5 +124,28 @@ module Docstache
       br['w:type'] = "page"
       return p
     end
+
+    def load_references
+      @references = {}
+      ref_xml = Nokogiri::XML(unzip_read(@zip_file, "word/_rels/document.xml.rels"))
+      ref_xml.css("Relationship").each do |ref|
+        id = ref.attributes["Id"].value
+        @references[id] = {
+          id: id,
+          type: ref.attributes["Type"].value.split("/")[-1].to_sym,
+          target: ref.attributes["Target"].value
+        }
+      end
+    end
+
+    def find_documents_to_interpolate
+      @documents = {"word/document.xml" => @document}
+      @document.css("w|headerReference, w|footerReference").each do |header_ref|
+        if @references.has_key?(header_ref.attributes["id"].value)
+          ref = @references[header_ref.attributes["id"].value]
+          @documents["word/#{ref[:target]}"] = Nokogiri::XML(unzip_read(@zip_file, "word/#{ref[:target]}"))
+        end
+      end
+    end
   end
 end

data/lib/docstache/version.rb

@@ -1,3 +1,3 @@
 module Docstache
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docstache
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Will Cosgrove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-09 00:00:00.000000000 Z
+date: 2016-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri