docxedit 0.0.2 → 0.0.5

data/lib/docxedit/content_block.rb

@@ -1,6 +1,5 @@
 module DocxEdit
   class ContentBlock
-    
     attr_accessor :content
     
     def initialize(xml, content)
@@ -9,6 +8,10 @@ module DocxEdit
       @content = content
     end
     
+    def clone
+      result = ContentBlock.new(rclone_xml(@xml), @content_key)
+    end
+    
     def xml
       unless(@content_key == @content)
         @node = REXML::XPath.first(@xml, "//*[text()='#{@content_key}']]")
@@ -17,5 +20,17 @@ module DocxEdit
       end
       return @xml
     end
+    
+  private
+  
+    def rclone_xml(node)
+      new_node = node.clone
+      unless node.node_type == :text
+        node.children.each do |c|
+          new_node << rclone_xml(c)
+        end
+      end
+      return new_node
+    end
   end
 end

data/lib/docxedit/docx.rb

@@ -1,19 +1,26 @@
 require 'zip/zip'
 require "rexml/document"
+require 'tempfile'
 require_relative 'content_block'
 
 module DocxEdit
   class Docx    
-    attr_reader :zip_file, :xml_document
+    attr_reader :zip_file, :xml_document, :xml_headers, :xml_footers
     
     def initialize(path)
       @zip_file = Zip::ZipFile.new(path)
-      @xml_document = REXML::Document.new(read_content)
+      bind_contents
+    end
+    
+    def files
+      return @xml_headers + @xml_footers + [@xml_document]
     end
     
     def contains?(text)
-      REXML::XPath.each @xml_document, XPATH_ALL_TEXT_NODE do |n|
-        return true if n.text =~ text
+      files.each do |f|
+        REXML::XPath.each f, XPATH_ALL_TEXT_NODE do |n|
+          return true if n.text =~ text
+        end
       end
       return false
     end
@@ -24,14 +31,18 @@ module DocxEdit
     end
     
     def replace(reg_to_match, replacement)
-      REXML::XPath.each @xml_document, XPATH_ALL_TEXT_NODE do |n|
-        n.text = n.text.gsub(reg_to_match, replacement)
+      files.each do |f|
+        REXML::XPath.each f, XPATH_ALL_TEXT_NODE do |n|
+          n.text = n.text.gsub(reg_to_match, replacement)
+        end
       end
     end
     
     def find_block_with_content(exact_content_string)
-      node = REXML::XPath.first(@xml_document, "//w:p[descendant-or-self::*[text()='#{exact_content_string}']]")
-      return ContentBlock.new(node, exact_content_string)
+      files.each do
+        node = REXML::XPath.first(@xml_document, "//w:p[descendant-or-self::*[text()='#{exact_content_string}']]")
+        return ContentBlock.new(node, exact_content_string) unless node.nil?
+      end
     end
     
     # insert the xml of a content block :before or :after the anchor_block
@@ -54,17 +65,64 @@ module DocxEdit
     DOCUMENT_FILE_PATH = 'word/document.xml'
     XPATH_ALL_TEXT_NODE = "//*[text()]"
   
-    def read_content()
-      return text = @zip_file.read(DOCUMENT_FILE_PATH)
+    def bind_contents
+      @xml_document = REXML::Document.new(@zip_file.read(DOCUMENT_FILE_PATH))
+      @xml_headers = []
+      @xml_footers = []
+      REXML::Document.new(@zip_file.read(DOCUMENT_FILE_PATH))
+      
+      idx = 1
+      src = read_or_nil("word/header#{idx}.xml")
+      while(!src.nil?) do
+        @xml_headers << REXML::Document.new(src)
+        idx = idx + 1
+        src = read_or_nil("word/header#{idx}.xml")
+      end
+      
+      idx = 1
+      src = read_or_nil("word/footer#{idx}.xml")
+      while(!src.nil?) do
+        @xml_headers << REXML::Document.new(src)
+        idx = idx + 1
+        src = read_or_nil("word/footer#{idx}.xml")
+      end
+    end
+    
+    
+    def read_or_nil(name)
+      return @zip_file.read(name) rescue return nil
+    end
+    
+    def write_entry(zip_output_stream, entry_name, xml_doc)
+      zip_output_stream.put_next_entry(entry_name)
+      output = ""
+      xml_doc.write(output, 0)
+      zip_output_stream.print output
     end
     
     def write_content()
-      @zip_file.get_output_stream(DOCUMENT_FILE_PATH) do |input|
-        output = ""
-        @xml_document.write(output, 0)
-        input.write output
+      temp_file = Tempfile.new('docxedit-')
+      Zip::ZipOutputStream.open(temp_file.path) do |zos|
+        @zip_file.entries.each do |e|
+          unless e.name == DOCUMENT_FILE_PATH || e.name =~ /word\/(header|footer)[0-9]+\.xml/
+            zos.put_next_entry(e.name)
+            zos.print e.get_input_stream.read
+          end
+        end
+        
+        write_entry(zos, DOCUMENT_FILE_PATH, @xml_document)
+        (0 .. @xml_headers.size - 1).each do |idx|
+          write_entry zos, "word/header#{idx + 1}.xml", @xml_headers[idx]
+        end
+        (0 .. @xml_footers.size - 1).each do |idx|
+          write_entry zos, "word/footer#{idx + 1}.xml", @xml_footers[idx]
+        end
       end
-      @zip_file.commit
+      
+      path = @zip_file.name
+      FileUtils.rm(path)
+      FileUtils.mv(temp_file.path, path)
+      @zip_file = Zip::ZipFile.new(path)
     end
   end
 end

data/lib/docxedit/version.rb

@@ -1,3 +1,3 @@
 module DocxEdit
-  VERSION = "0.0.2"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: docxedit
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Olivier Amblet
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 +01:00
+date: 2011-02-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rubyzip
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -30,8 +30,22 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: minimal .docx file editor.
 email: olivier@amblet.net
 executables: []