Changed functionality of determining file path or stream

Author: visoft

lib/docx/document.rb

@@ -23,7 +23,12 @@ class Document
     def initialize(path_or_io, options = {})
       @replace = {}
 
-      @zip = options[:use_buffer] ? Zip::File.open_buffer(path_or_io) : Zip::File.open(path_or_io)
+      # if path-or_io is string && does not contain a null byte
+      if (path_or_io.instance_of?(String) && !/\u0000/.match?(path_or_io))
+        @zip = Zip::File.open(path_or_io)
+      else
+        @zip = Zip::File.open_buffer(path_or_io)
+      end
 
       @document_xml = @zip.read('word/document.xml')
       @doc = Nokogiri::XML(@document_xml)
@@ -49,10 +54,6 @@ def self.open(path, &block)
       new(path, &block)
     end
 
-    def self.open_buffer(buffer, &block)
-      new(buffer, use_buffer: true, &block)
-    end
-
     def paragraphs
       @doc.xpath('//w:document//w:body/w:p').map { |p_node| parse_paragraph_from p_node }
     end

spec/docx/document_spec.rb

@@ -86,7 +86,7 @@
     context 'using stream' do
       before do
         stream = File.binread(@fixtures_path + '/basic.docx')
-        @doc = Docx::Document.open_buffer(stream)
+        @doc = Docx::Document.open(stream)
       end
 
       it_behaves_like 'reading'
@@ -365,7 +365,7 @@
     context 'from a stream' do
       before do
         stream = File.binread(@fixtures_path + '/saving.docx')
-        @doc = Docx::Document.open_buffer(stream)
+        @doc = Docx::Document.open(stream)
       end
 
       it_behaves_like 'saving to file'
@@ -393,7 +393,7 @@
         doc = Docx::Document.open(@fixtures_path + '/basic.docx')
         result = doc.stream
 
-        @doc = Docx::Document.open_buffer(result)
+        @doc = Docx::Document.open(result)
       end
 
       it_behaves_like 'reading'