Merge pull request #112 from skoji/fix-properties-overwrite

Do not remove properties in GEPUB::Item#guess_content_property
skoji · Feb 22, 2020 · cca2898 · cca2898
2 parents 22a373c + 629742d
commit cca2898
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/lib/gepub/item.rb b/lib/gepub/item.rb
@@ -97,9 +97,7 @@ def landmark(type:, title:, id: nil)
     # 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']

diff --git a/spec/gepub_spec.rb b/spec/gepub_spec.rb
@@ -293,4 +293,18 @@
     expect(FileUtils.compare_file(epubname1, epubname2)).to be true
   end
 
+  it 'should not forget svg attribute when parsing book' do
+    @book = GEPUB::Book.new
+    @book.identifier = 'test'
+    @book.add_ordered_item('foobar.xhtml', content: StringIO.new('<html><img src="image.svg" /></html>')).add_property 'svg'
+    epubname = File.join(__dir__, 'testepub.epub')
+    @book.generate_epub(epubname)
+    File.open(epubname) do |f|
+      parsed_book = GEPUB::Book.parse(f)
+      item = parsed_book.item_by_href 'foobar.xhtml'
+      expect(item).not_to be_nil
+      expect(item['properties']).to include 'svg'
+    end
+  end
+
 end