epubinfo_with_toc 0.5.0 → 0.5.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzRhZWZjNDMwYzM0ZGI0MTY3YTk2ZjFlZjNjYjIzMmZhNGVlZGVmNA==
+    NDRiZDZjZTgyNTJiM2MwMTVkMzQ4Njg1ODQyNzc0YzVjYWEwNzhkOA==
   data.tar.gz: !binary |-
-    ODllZDgzNGVhNDVlNTAxNjhjNWQyMjllNzViMmQ4ODBlODVkYmRlNw==
+    M2Y5Mzg4NWY3NTVlYzg4YjNjNzJjZmIyMzk2NDA4YmEyYjIwMjY2MA==
 SHA512:
   metadata.gz: !binary |-
-    YTdmODFlMmUwODJkNDJkYjg0MWJhNmYwODA1ZjFiOTMzYWE5MDYzZTVlNjMx
-    ZjFlYzM2YjkzZTc0OGE1ODU0MTgxZjU5YWQ0YWE2OGZmMDdlZDIwMTlkNjJm
-    Y2I0MzVhMzk5NGE5OWJmYmQ0OWZlOTI4MGMzNTkzZGZmYjFlYzY=
+    N2Y1YzI2Zjc2N2JmMzE1ZjZmZDUyMDA0ZjJkMTY2ODVmMjUxYzQzMTBkYzY3
+    MzEyYzc4Y2Y2MTkyYThkY2ZkOTNkN2E1ODAwZTM2OTMyMmYyMjVhMGM3ZGEw
+    YmRhNjAyOGY3ZjQwMDE4N2VhYjQ4Njk5YTM5NGY4NzEwMWY1ZWY=
   data.tar.gz: !binary |-
-    NTU4MzMyNDY2NmYyZWFhYzY3Y2NiYzBhYWI2MGIzZGExNjZkYjVmMjc0OWFl
-    MTVlM2FiNmI3NjBkNTE4YWI2ODI1OTYzODQyODNhYzZmMmFjMDdkODZlZDNj
-    NmZmMGRhZTNkOTYyOWI2Yzk3ZWVkNmQzOTFmNTE4NzZkZTE4ZGY=
+    Mjc2ZTE2MGU5YzNhNWNkMDlhNDVmNjc5Mjg2MjU1YzlhZDNlMDVkZDlhZWM2
+    MGMwYTE2YTY0ZmY1MTI1MGJmMjdkOTc1MDk3YTgyOTcwYWI4YmEwMTVjMjI0
+    ZmE2NzBiOGNiYTYzY2NkNTljOGFmMjlkZjFkODRiOGQ1NmZjYmQ=

data/README.md

@@ -71,6 +71,10 @@ end
 ```
 
 ## Changelog
+**0.5.1** *Januari 13,2014*
+
+* navPoint can be nested.
+
 **0.5.0** *Januari 11,2014*
 
 * A lot of bugfixing

data/lib/epubinfo/models/table_of_contents/navigation.rb

@@ -12,7 +12,8 @@ class Navigation
     ncx_doc.remove_namespaces!
 
     if ncx_doc
-      map = ncx_doc.xpath('//navMap/navPoint').map do |navpoint|
+      #map = ncx_doc.xpath('//navMap/navPoint').map do |navpoint|
+      map = ncx_doc.xpath('//navPoint').map do |navpoint|
         {'label' =>(navpoint % 'navLabel/text').content , 'path' => (navpoint % 'content').attr('src')}
       end
     end

data/lib/epubinfo/models/table_of_contents/resource.rb

@@ -97,6 +97,10 @@ class Resource
     @css ||= self.to_a.select {|r| r[:type] =~ /text\/css/}
   end
 
+  def html
+    @html ||= self.to_a.select {|r| r[:type] =~ /application\/xhtml\+xml/}
+  end
+
   def to_a
     @resources ||=
         begin
@@ -110,8 +114,11 @@ class Resource
               uri_ref = ''
               order = ''
 
-              nav_point = @table_of_contents.document.xpath("//navPoint[starts-with(content/@src,'#{uri}')]").first
-              if nav_point
+              #nav_point = @table_of_contents.document.xpath("//navPoint[starts-with(content/@src,'#{uri}')]").first
+              content = @table_of_contents.document.xpath("//content[starts-with(@src,'#{uri}')]")
+              nav_point = content.search('../../navPoint').first
+
+              if nav_point #unless nav_point.nil? || nav_point.empty?
                 label = nav_point.at('navLabel text').content || ''
                 uri_ref = nav_point.at('content').attr('src') || ''
                 order = nav_point.attr('playOrder') || ''

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epubinfo_with_toc
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Christof Dorner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip