Merge branch 'master' into patch-1

Author: satoryu

README.md

@@ -8,7 +8,7 @@ A ruby library/gem for interacting with `.docx` files. currently capabilities in
 
 Requires ruby (tested with 2.1.1)
 
-    gem 'docx', '~> 0.2.07', :require => ["docx"]
+    gem 'docx', '~> 0.3.0'
 
 ### Reading
 

docx.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://github.com/chrahunt/docx'
   s.files       = Dir["README.md", "LICENSE.md", "lib/**/*.rb"]
 
-  s.add_dependency 'nokogiri', '>= 1.10.4'
-  s.add_dependency 'rubyzip',  '~> 1.2', '>= 1.2.1'
+  s.add_dependency 'nokogiri', '~> 1.10', '>= 1.10.4'
+  s.add_dependency 'rubyzip',  '~> 2.0'
 
   s.add_development_dependency 'rspec', '~> 3.7'
-  s.add_development_dependency 'rake', '~> 12.3'
+  s.add_development_dependency 'rake', '~> 13.0'
 end

lib/docx/document.rb

@@ -51,7 +51,7 @@ def self.open(path, &block)
     end
 
     def paragraphs
-      @doc.xpath('//w:document//w:body//w:p').map { |p_node| parse_paragraph_from p_node }
+      @doc.xpath('//w:document//w:body/w:p').map { |p_node| parse_paragraph_from p_node }
     end
 
     def bookmarks

spec/docx/document_spec.rb

@@ -89,6 +89,12 @@
     it "should read embedded links" do
       expect(@doc.tables[0].columns[1].cells[1].text).to match(/^Directive/)
     end
+
+    describe '#paragraphs' do
+      it 'should not grabs paragraphs in the tables' do
+        expect(@doc.paragraphs.map(&:text)).to_not include("Second table")
+      end
+    end
   end
 
   describe 'editing'  do