Merge pull request #112 from ruby-docx/fix-document-to_s-raises-error

Fix Docx::Document#to_s fails when given file has document22.xml.rels

Author: satoryu

lib/docx/document.rb

@@ -87,12 +87,12 @@ def font_size
     def hyperlinks
       hyperlink_relationships.each_with_object({}) do |rel, hash|
         hash[rel.attributes['Id'].value] = rel.attributes['Target'].value
-      end 
+      end
     end
 
     def hyperlink_relationships
       @rels.xpath("//xmlns:Relationship[contains(@Type,'hyperlink')]")
-    end    
+    end
 
     ##
     # *Deprecated*
@@ -168,13 +168,20 @@ def replace_entry(entry_path, file_contents)
     def load_styles
       @styles_xml = @zip.read('word/styles.xml')
       @styles = Nokogiri::XML(@styles_xml)
-      @rels_xml = @zip.read('word/_rels/document.xml.rels')
-      @rels = Nokogiri::XML(@rels_xml)
+      load_rels
     rescue Errno::ENOENT => e
       warn e.message
       nil
     end
 
+    def load_rels
+      rels_entry = @zip.glob('word/_rels/document*.xml.rels').first
+      raise Errno::ENOENT unless rels_entry
+
+      @rels_xml = rels_entry.get_input_stream.read
+      @rels = Nokogiri::XML(@rels_xml)
+    end
+
     #--
     # TODO: Flesh this out to be compatible with other files
     # TODO: Method to set flag on files that have been edited, probably by inserting something at the

spec/docx/document_spec.rb

@@ -467,4 +467,15 @@
       File.delete(temp_file_path) if File.exist?(temp_file_path)
     end
   end
+
+  describe '#to_s' do
+    let(:doc) { Docx::Document.open(@fixtures_path + '/weird_docx.docx') }
+
+    it 'does not raise error' do
+      expect { doc.to_s }.to_not raise_error
+    end
+    it 'returns a String' do
+      expect(doc.to_s).to be_a(String)
+    end
+  end
 end