Guide, manifest and spine no longer get passed a reference to opf_xml

valobox · Jan 18, 2012 · f80611a · f80611a
1 parent 8cc5b52
commit f80611a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 17 deletions.
diff --git a/lib/epub/file.rb b/lib/epub/file.rb
@@ -107,19 +107,19 @@ def compress!(*filter)
     # Part of the OPF
     ###
     def manifest
-      Manifest.new opf_xml, self
+      Manifest.new self
     end
 
     def metadata
-      Metadata.new opf_xml, self
+      Metadata.new self
     end
 
     def guide
-      Guide.new opf_xml, self
+      Guide.new self
     end
 
     def spine
-      Spine.new opf_xml, self
+      Spine.new self
     end
 
     def toc

diff --git a/lib/epub/guide.rb b/lib/epub/guide.rb
@@ -3,15 +3,20 @@ class Guide
     OPF_XPATH      = '//xmlns:guide'
     OPF_ITEM_XPATH = '//xmlns:reference'
 
-    def initialize(rootdoc, epub)
+    def initialize(epub)
       @epub   = epub
-      @xmldoc = rootdoc.xpath(OPF_XPATH)
+    end
+
+
+    def xmldoc
+      @epub.opf_xml.xpath(OPF_XPATH)
     end
 
 
     def normalize!
+      doc = xmldoc
       # TODO: Handle this better
-      return if @xmldoc.size < 1
+      return if doc.size < 1
 
       items do |node|
         href = CGI::unescape(node.attributes['href'].to_s)
@@ -20,18 +25,18 @@ def normalize!
         node['href'] = item.normalized_hashed_path(:relative_to => @epub.opf_path)
       end
 
-      @epub.save_opf!(@xmldoc, OPF_XPATH)
+      @epub.save_opf!(doc, OPF_XPATH)
     end
 
     def to_s
-      @xmldoc.to_s
+      xmldoc.to_s
     end
 
     private
 
       # Iterate over each item in the guide
       def items
-        @xmldoc.xpath(OPF_ITEM_XPATH).each do |item|
+        xmldoc.xpath(OPF_ITEM_XPATH).each do |item|
           yield(item)
         end
       end

diff --git a/lib/epub/manifest.rb b/lib/epub/manifest.rb
@@ -12,7 +12,7 @@ class Manifest
       'xmlns' => 'http://www.idpf.org/2007/opf'
     }
 
-    def initialize(rootdoc, epub)
+    def initialize(epub)
       @epub = epub
       reload_xmldoc
     end

diff --git a/lib/epub/spine.rb b/lib/epub/spine.rb
@@ -3,9 +3,13 @@ class Spine
     OPF_XPATH      = '//xmlns:spine'
     OPF_ITEM_XPATH = '//xmlns:itemref'
 
-    def initialize(rootdoc, epub)
-      @epub   = epub
-      @xmldoc = rootdoc.xpath(OPF_XPATH).first
+    def initialize(epub)
+      @epub = epub
+    end
+
+
+    def xmldoc
+      @epub.opf_xml.xpath(OPF_XPATH).first
     end
 
 
@@ -28,18 +32,18 @@ def toc
 
 
     def to_s
-      @xmldoc.to_s
+      xmldoc.to_s
     end
 
     def toc_manifest_id
-      toc_manifest_id = @xmldoc.attributes['toc']
+      toc_manifest_id = xmldoc.attributes['toc']
       toc_manifest_id.to_s.strip
     end
 
     private
 
       def nodes
-        @xmldoc.xpath(OPF_ITEM_XPATH).each do |node|
+        xmldoc.xpath(OPF_ITEM_XPATH).each do |node|
           yield(node)
         end
       end