Merge pull request #10 from tmikoss/master

Update rubyzip to 1.0

Author: chrahunt

Gemfile.lock

@@ -1,18 +1,30 @@
 PATH
   remote: .
   specs:
-    docx (0.1.0)
+    docx (0.2.04)
       nokogiri (~> 1.5)
-      rubyzip (~> 0.9)
+      rubyzip (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    nokogiri (1.5.2)
-    rubyzip (0.9.7)
+    diff-lcs (1.2.5)
+    mini_portile (0.5.2)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.5)
+    rubyzip (1.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   docx!
+  rspec

docx.gemspec

@@ -10,9 +10,9 @@ Gem::Specification.new do |s|
   s.email       = ['chrahunt@gmail.com']
   s.homepage    = 'https://github.com/chrahunt/docx'
   s.files       = Dir["README.md", "LICENSE.md", "lib/**/*.rb"]
-  
+
   s.add_dependency 'nokogiri', '~> 1.5'
-  s.add_dependency 'rubyzip',  '~> 0.9'
+  s.add_dependency 'rubyzip',  '~> 1.0'
 
   s.add_development_dependency 'rspec'
 end

lib/docx/document.rb

@@ -1,5 +1,5 @@
 require 'docx/parser'
-require 'zip/zip'
+require 'zip'
 
 module Docx
   # The Document class wraps around a docx file and provides methods to
@@ -56,7 +56,7 @@ def to_s
     #   save(filepath) => void
     def save(path)
       update
-      Zip::ZipOutputStream.open(path) do |out|
+      Zip::OutputStream.open(path) do |out|
         zip.each do |entry|
           out.put_next_entry(entry.name)
 

lib/docx/parser.rb

@@ -1,14 +1,14 @@
 require 'docx/containers'
 require 'docx/elements'
 require 'nokogiri'
-require 'zip/zip'
+require 'zip'
 
 module Docx
   class Parser
     attr_reader :xml, :doc, :zip
 
     def initialize(path)
-      @zip = Zip::ZipFile.open(path)
+      @zip = Zip::File.open(path)
       @xml = @zip.read('word/document.xml')
       @doc = Nokogiri::XML(@xml)
       if block_given?