Merge branch 'dev'

Conflicts:
	lib/docx/document.rb
	lib/docx/parser.rb

Author: higginsdragon

lib/docx/document.rb

@@ -1,4 +1,6 @@
-require 'docx/parser'
+require 'docx/containers'
+require 'docx/elements'
+require 'nokogiri'
 require 'zip/zip'
 
 module Docx
@@ -16,14 +18,16 @@ module Docx
   #     puts d.text
   #   end
   class Document
-    delegate :paragraphs, :bookmarks, :tables, :to => :@parser
-    delegate :doc, :xml, :zip, :to => :@parser
+    attr_reader :xml, :doc, :zip
+    
     def initialize(path, &block)
       @replace = {}
+      @zip = Zip::ZipFile.open(path)
+      @xml = @zip.read('word/document.xml')
+      @doc = Nokogiri::XML(@xml)
       if block_given?
-        @parser = Parser.new(File.expand_path(path), &block)
-      else
-        @parser = Parser.new(File.expand_path(path))
+        yield self
+        @zip.close
       end
     end
 
@@ -35,6 +39,23 @@ def self.open(path, &block)
       self.new(path, &block)
     end
 
+    def paragraphs
+      @doc.xpath('//w:document//w:body//w:p').map { |p_node| parse_paragraph_from p_node }
+    end
+
+    def bookmarks
+      bkmrks_hsh = Hash.new
+      bkmrks_ary = @doc.xpath('//w:bookmarkStart').map { |b_node| parse_bookmark_from b_node }
+      # auto-generated by office 2010
+      bkmrks_ary.reject! {|b| b.name == "_GoBack" }
+      bkmrks_ary.each {|b| bkmrks_hsh[b.name] = b }
+      bkmrks_hsh
+    end
+
+    def tables
+      @doc.xpath('//w:document//w:body//w:tbl').map { |t_node| parse_table_from t_node }
+    end
+
     ##
     # *Deprecated*
     # 
@@ -83,5 +104,18 @@ def update
       @replace["word/document.xml"] = doc.serialize :save_with => 0
     end
 
+    # generate Elements::Containers::Paragraph from paragraph XML node
+    def parse_paragraph_from(p_node)
+      Elements::Containers::Paragraph.new(p_node)
+    end
+
+    # generate Elements::Bookmark from bookmark XML node
+    def parse_bookmark_from(b_node)
+      Elements::Bookmark.new(b_node)
+    end
+
+    def parse_table_from(t_node)
+      Elements::Containers::Table.new(t_node)
+    end
   end
 end