Merge pull request #135 from manovasanth1227/file_not_supported_fix

File Not Supported Error fix

lib/docx/document.rb

@@ -25,6 +25,7 @@ def initialize(path_or_io, options = {})
 
       # if path-or_io is string && does not contain a null byte
       if (path_or_io.instance_of?(String) && !/\u0000/.match?(path_or_io))
+        raise Errno::EIO.new('Invalid file format') if !File.extname(path_or_io).eql?('.docx')
         @zip = Zip::File.open(path_or_io)
       else
         @zip = Zip::File.open_buffer(path_or_io)
@@ -38,7 +39,7 @@ def initialize(path_or_io, options = {})
       load_styles
       yield(self) if block_given?
     ensure
-      @zip.close
+      @zip.close unless @zip.nil?
     end
 
     # This stores the current global document properties, for now

spec/docx/document_spec.rb

@@ -18,6 +18,21 @@
         end.to_not raise_error
       end
     end
+
+    context 'When reading a un-supported file' do
+      it 'should throw file not supported error' do
+        expect do
+          Docx::Document.open(@fixtures_path + '/invalid_format.pdf')
+        end.to raise_error(Errno::EIO, 'Input/output error - Invalid file format')
+      end
+
+      it 'should throw file not found error' do
+        invalid_path = @fixtures_path + '/invalid_file_path.docx'
+        expect do
+          Docx::Document.open(invalid_path)
+        end.to raise_error(Zip::Error, "File #{invalid_path} not found")
+      end
+    end
   end
 
   describe 'reading' do