gepub 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b78a10be8680f2fe6e66a12950adc4b3c326bc4f4232630db8da6a66281a4cbb
-  data.tar.gz: 7bd76c8e13b4540ac8d7fae3f7fd79a85c9eafbdd4c24386d1033deaf8bf365b
+  metadata.gz: 294cefe070bfd2c4a87e0fd46c45f10f08f75857045ad62ed02b83694ca9e9ae
+  data.tar.gz: 1df169f042577cd0ae74db3565e92f7f70b0b87fd9bafd7de5e3802574ab1578
 SHA512:
-  metadata.gz: 7981683e1eef0e903341b0af576bc47cfe415aaec26205aa90c98da86a763317cf2fa5602adda23065964ecd8c9f0287176bd3321763ca174dfbea663f53de25
-  data.tar.gz: 0bf3e8c606da8ec39e21eeb2f992a238084ef45b3ab3f722389a21d47bd37e47af4c89d6f818dbe73805a77813fe4c21df17acee8624c0946d2bc3dc6e9b1333
+  metadata.gz: 403d05c6d0a0d0121526d5ce92c8e95dfcb11aae052c84af6bec3303f8039b56852cc64fd4e1d171c715ad2b728a6eee2cee6043cedca2576999c7ccf1f35ae8
+  data.tar.gz: 89e1b455c6d1653fc4ec60ada97da3da50d508260ce5309ca3ec3aceabecd528b1941723ac5a4e594ec0bb34ea99d7ef64a5c4c573f22d5dc7627ea9e8d4b3f0

data/lib/gepub/book.rb

@@ -266,7 +266,7 @@ EOF
     
     def nav_doc(title = 'Table of Contents')
       # handle cascaded toc
-      start_level = @toc && @toc[0][:level] || 1
+      start_level = @toc && !@toc.empty? && @toc[0][:level] || 1
       stacked_toc = {level: start_level, tocs: [] }
       @toc.inject(stacked_toc) do |current_stack, toc_entry|
         toc_entry_level = toc_entry[:level] || 1
@@ -428,7 +428,7 @@ EOF
           |_x,item|
           item.media_type == 'application/x-dtbncx+xml'
         }.size == 0
-          if (@toc.size == 0)
+          if (@toc.size == 0 && !@package.spine.itemref_list.empty?)
             @toc << { :item => @package.manifest.item_list[@package.spine.itemref_list[0].idref] }
           end
           add_item('toc.ncx', id: 'ncx', content: StringIO.new(ncx_xml))
@@ -467,10 +467,12 @@ EOF
       item_attributes.each do |attr, val|
         next if val.nil?
         method_name = if attr == :toc_text
-                        attr.to_s
+                        ""
+                      elsif attr == :property
+                        "add_"
                       else
-                        "add_" + attr.to_s
-                      end
+                        "set_"
+                      end + attr.to_s
         item.send(method_name, val)
       end
       item

data/lib/gepub/book_add_item.rb

@@ -3,18 +3,18 @@ module GEPUB
     # add an item(i.e. html, images, audios, etc)  to Book.
     # the added item will be referenced by the first argument in the EPUB container.
     def add_item(href, deprecated_content = nil, deprecated_id = nil, deprecated_attributes = nil, content: nil, 
-                 id: nil,media_type: nil,fallback: nil,properties: nil,media_overlay: nil,toc_text: nil,
+                 id: nil,media_type: nil,fallback: nil,properties: nil,media_overlay: nil,toc_text: nil,property: nil,
                  attributes: {})
       content, id, attributes = handle_deprecated_add_item_arguments(deprecated_content, deprecated_id, deprecated_attributes, content, id, attributes)
-      add_item_internal(href, content: content, item_attributes: { id: id,media_type: media_type,fallback: fallback,properties: properties,media_overlay: media_overlay,toc_text: toc_text }, attributes: attributes, ordered: false)
+      add_item_internal(href, content: content, item_attributes: { id: id,media_type: media_type,fallback: fallback,properties: properties,media_overlay: media_overlay,toc_text: toc_text,property: property }, attributes: attributes, ordered: false)
     end
 
     # same as add_item, but the item will be added to spine of the EPUB.
     def add_ordered_item(href, deprecated_content = nil, deprecated_id = nil, deprecated_attributes = nil,  content:nil,
-                         id: nil,media_type: nil,fallback: nil,properties: nil,media_overlay: nil,toc_text: nil,
+                         id: nil,media_type: nil,fallback: nil,properties: nil,media_overlay: nil,toc_text: nil,property: nil,
                          attributes: {})
       content, id, attributes = handle_deprecated_add_item_arguments(deprecated_content, deprecated_id, deprecated_attributes, content, id, attributes)
-      add_item_internal(href, content: content, item_attributes: { id: id,media_type: media_type,fallback: fallback,properties: properties,media_overlay: media_overlay,toc_text: toc_text }, attributes: attributes, ordered: true)
+      add_item_internal(href, content: content, item_attributes: { id: id,media_type: media_type,fallback: fallback,properties: properties,media_overlay: media_overlay,toc_text: toc_text,property: property }, attributes: attributes, ordered: true)
     end
   end
 end

data/lib/gepub/item.rb

@@ -97,9 +97,7 @@ module GEPUB
     # guess and set content property from contents.
     def guess_content_property
       if File.extname(self.href) =~ /.x?html/ && @attributes['media-type'] === 'application/xhtml+xml'
-        @attributes['properties'] = (@attributes['properties'] || []).reject {
-          |x| x == 'svg' || x == 'mathml' || x == 'switch' || x == 'remote-resources'
-        }
+        @attributes['properties'] ||= []
         parsed = Nokogiri::XML::Document.parse(@content)
         return unless parsed.root.node_name === "html"
         ns_prefix =  parsed.namespaces.invert['http://www.w3.org/1999/xhtml']

data/lib/gepub/metadata.rb

@@ -171,7 +171,7 @@ module GEPUB
     end
 
     def identifier_by_id(id)
-      @content_nodes['identifier'].each {
+      (@content_nodes['identifier'] || []).each {
         |x|
         return x.content if x['id'] == id
       }

data/lib/gepub/version.rb

@@ -1,4 +1,4 @@
 module GEPUB
   # GEPUB gem version
-  VERSION = "1.0.10"
+  VERSION = "1.0.11"
 end

data/tools/generate_function.rb

@@ -4,7 +4,8 @@ attrs = GEPUB::Item::ATTRIBUTES.select do |attr|
 end.map do |attr|
   attr.sub('-', '_')
 end
-attrs << "toc_text" 
+attrs << "toc_text"
+attrs << "property"
 attrs_arguments_string = attrs.map { |attr| "#{attr}: nil" }.join(',')
 attrs_internal_string = "{ " + attrs.map { |attr| "#{attr}: #{attr}"}.join(',') + " }"
 File.write(File.join(File.dirname(__FILE__), "../lib/gepub/book_add_item.rb"), <<EOF)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gepub
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - KOJIMA Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri