gepub 0.7.0beta2 → 0.7.0beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2afcf92b07b1b44821ac597b73dcc8294fb185c
-  data.tar.gz: f6019eace6b777af7b2339df1921aaaa3b29cdde
+  metadata.gz: 833f05ede33a71bba649b8ccde78e0a8caf475c3
+  data.tar.gz: 26d1584dcdf16d87c42090f1803993802739cb23
 SHA512:
-  metadata.gz: b0737564831bfb33d14959ead4304e2c1b43bbe5aabca34700da7d47357c1c0f606d81fc6added90846c16b203833570e7de00f791f92e6fde0b00017fbdedcf
-  data.tar.gz: f213252ad81213d2680d653a4254951a979ea91893e1bfc625490398525401a3bf9d6240e7fa25ccaa11a8f90e88ebcec33f62d92641cf11c655b7abcf8b29d1
+  metadata.gz: df4d06a93c4caf45e41ac8929b45b68649afd49bf20d70dd93b264d42526f35f54e4d8f856fa43b247f5fd721fbc2177355c6f170d94ef892c5b07e8b707db64
+  data.tar.gz: 943567fcabc8ef69866f39219fd1149eb4c790aaa00bd3313762bf76f01431dc8382caaa2c483d46b18cfa17ea94c59aab8dbc513e464dfc69f2b3f097aa96c8

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.2.2
 script: bundle exec rake spec

data/lib/gepub/book.rb

@@ -279,7 +279,7 @@ EOF
     end
       
     def generate_nav_doc(title = 'Table of Contents')
-      add_item('nav.html', StringIO.new(nav_doc(title)), 'nav').add_property('nav')
+      add_item('nav.xhtml', StringIO.new(nav_doc(title)), 'nav').add_property('nav')
     end
     
     def nav_doc(title = 'Table of Contents')
@@ -307,8 +307,10 @@ EOF
           tocs.each {
             |x|
             id = x[:id].nil? ? "" : "##{x[:id]}"
+            toc_text = x[:text]
+            toc_text = x[:item].href if toc_text.nil? or toc_text == ''
             xml_doc.li {
-              xml_doc.a({'href' => x[:item].href + id} ,x[:text])
+              xml_doc.a({'href' => x[:item].href + id} ,toc_text)
               if x[:child_stack] && x[:child_stack][:tocs].size > 0
                 write_toc(xml_doc, x[:child_stack][:tocs])
               end
@@ -349,7 +351,7 @@ EOF
           xml.navMap {
             @toc.each {
               |x|
-              xml.navPoint('id' => "#{x[:item].itemid}##{x[:id]}", 'playOrder' => "#{count}") {
+              xml.navPoint('id' => "#{x[:item].itemid}_#{x[:id]}", 'playOrder' => "#{count}") {
                 xml.navLabel {
                   xml.text_  "#{x[:text]}"
                 }

data/lib/gepub/item.rb

@@ -73,19 +73,20 @@ module GEPUB
 
     # guess and set content property from contents.
     def guess_content_property
-      if File.extname(self.href) =~ /.x?html/
+      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'
         }
         parsed = Nokogiri::XML::Document.parse(@content)
+        return unless parsed.root.node_name === "html"
         ns_prefix =  parsed.namespaces.invert['http://www.w3.org/1999/xhtml']
         if ns_prefix.nil?
           prefix = ''
         else
           prefix = "#{ns_prefix}:"
         end
-        videos = parsed.xpath("//#{prefix}video[starts-with(@src,'http')]")
-        audios = parsed.xpath("//#{prefix}audio[starts-with(@src,'http')]")
+        videos = parsed.xpath("//#{prefix}video[starts-with(@src,'http')]") + parsed.xpath("//#{prefix}video/#{prefix}source[starts-with(@src,'http')]")
+        audios = parsed.xpath("//#{prefix}audio[starts-with(@src,'http')]") + parsed.xpath("//#{prefix}audio/#{prefix}source[starts-with(@src,'http')]")
         if videos.size > 0 || audios.size > 0
           self.add_property('remote-resources')
         end
@@ -98,7 +99,8 @@ module GEPUB
         if parsed.xpath("//epub:switch", { 'epub' => 'http://www.idpf.org/2007/ops' }).size > 0
           self.add_property('switch')
         end
-        if parsed.xpath("//#{prefix}script").size > 0
+        scripts = parsed.xpath("//#{prefix}script") + parsed.xpath("//#{prefix}form")
+        if scripts.size > 0
           self.add_property('scripted')
         end
       end

data/lib/gepub/version.rb

@@ -1,4 +1,4 @@
 module GEPUB
   # GEPUB gem version 
-  VERSION = "0.7.0beta2"
+  VERSION = "0.7.0beta3"
 end

data/spec/book_spec.rb

@@ -291,6 +291,15 @@ describe GEPUB::Book do
        filehandle = File.new(File.dirname(__FILE__) + '/fixtures/testdata/wasteland-20120118.epub')
        book = GEPUB::Book.parse(filehandle)
        expect(book).to be_instance_of GEPUB::Book
+       expect(book.items.size).to eq 6
+       expect(book.items['t1'].href).to eq 'wasteland-content.xhtml'
+       expect(book.items['nav'].href).to eq 'wasteland-nav.xhtml'
+       expect(book.items['cover'].href).to eq 'wasteland-cover.jpg'
+       expect(book.items['css'].href).to eq 'wasteland.css'
+       expect(book.items['css-night'].href).to eq 'wasteland-night.css'
+       expect(book.items['ncx'].href).to eq 'wasteland.ncx'              
+       expect(book.spine_items.size).to eq 1
+       expect(book.spine_items[0].href).to eq 'wasteland-content.xhtml'
       end
      end
     end

data/spec/example_spec.rb

@@ -28,7 +28,7 @@ describe 'GEPUB usage' do
             file 'text/chap1.xhtml' => StringIO.new('<html xmlns="http://www.w3.org/1999/xhtml"><head><title>c1</title></head><body><p>the first page</p></body></html>')
             heading 'Chapter 1'
             file 'text/chap1-1.xhtml' => StringIO.new('<html xmlns="http://www.w3.org/1999/xhtml"><head><title>c2</title></head><body><p>the second page</p></body></html>')
-            file 'text/chap2.html' => StringIO.new('<html xmlns="http://www.w3.org/1999/xhtml"><head><title>c3</title></head><body><p>the third page</p></body></html>')
+            file 'text/chap2.xhtml' => StringIO.new('<html xmlns="http://www.w3.org/1999/xhtml"><head><title>c3</title></head><body><p>the third page</p></body></html>')
             heading 'Chapter 2'
           }
         }
@@ -59,7 +59,7 @@ describe 'GEPUB usage' do
             file 'text/chap1.xhtml' => StringIO.new('<html xmlns="http://www.w3.org/1999/xhtml"><head><title>c1</title></head><body><p>the first page</p></body></html>')
             heading 'Chapter 1'
             file 'text/chap1-1.xhtml' => StringIO.new('<html xmlns="http://www.w3.org/1999/xhtml"><head><title>c2</title></head><body><p>the second page</p></body></html>')
-            file 'text/chap2.html' => StringIO.new('<html xmlns="http://www.w3.org/1999/xhtml"><head><title>c3</title></head><body><p>the third page</p></body></html>')
+            file 'text/chap2.xhtml' => StringIO.new('<html xmlns="http://www.w3.org/1999/xhtml"><head><title>c3</title></head><body><p>the third page</p></body></html>')
             heading 'Chapter 2'
           }
         }

data/spec/fixtures/{epubcheck-3.0.1 → epubcheck-4.0.0}/README.txt

@@ -6,17 +6,19 @@ and internal reference consistency are checked. EpubCheck can be run
 as a standalone command-line tool, installed as a web application or
 used as a library.
 
-Epubcheck project home: http://code.google.com/p/epubcheck/
+EpubCheck project home: https://github.com/idpf/epubcheck
+
 
 RUNNING
 
-To run the tool you need Java Runtime (1.5 or above). Any OS should do. Run
+To run the tool you need Java Runtime (1.6 or above). Any OS should do. Run
 it from the command line: 
 
-java -jar epubcheck-x.x.x.jar file.epub
+java -jar epubcheck.jar file.epub
 
 All detected errors are simply printed to stderr.
 
+
 USING AS A LIBRARY
 
 You can also use EpubCheck as a library in your Java application. EpubCheck
@@ -26,10 +28,12 @@ constructors and then call validate() method. Report is an interface that
 you can implement to get a list of the errors and warnings reported by the
 validation engine (instead of the error list being printed out).
 
+
 LICENSING
 
 See COPYING.txt and THIRD-PARTY.txt
 
+
 AUTHORS / CONTRIBUTORS
 
 Peter Sorotokin 
@@ -37,13 +41,19 @@ Garth Conboy
 Markus Gylling 
 Piotr Kula
 Paul Norton
-Liza Daly
 Jessica Hekman
+Liza Daly
 George Bina
 Bogdan Iordache
 Ionut-Maxim Margelatu
-Thomas Ledoux
 Romain Deltour
+Thomas Ledoux
+Tobias Fischer
+Steve Antoch
+Arwen Pond
+Masayoshi Takahashi
+Satoshi KOJIMA
+
 
 Most of the EpubCheck functionality comes from the schema validation tool Jing
 and schemas that were developed by IDPF and DAISY. EpubCheck development was

data/spec/fixtures/epubcheck-4.0.0/THIRD-PARTY.txt

@@ -0,0 +1,44 @@
+Licenses of third-party dependencies
+------------------------------------
+
+  Guava: Google Core Libraries for Java, 14.0.1
+    The Apache Software License, Version 2.0
+
+  TwelveMonkeys :: Common :: Image, 3.1.2
+    New BSD License
+
+  TwelveMonkeys :: Common :: IO, 3.1.2
+    New BSD License
+
+  TwelveMonkeys :: Common :: Language support, 3.1.2
+    New BSD License
+
+  TwelveMonkeys :: ImageIO :: Core, 3.1.2
+    New BSD License
+
+  TwelveMonkeys :: ImageIO :: JPEG plugin, 3.1.2
+    New BSD License
+
+  TwelveMonkeys :: ImageIO :: Metadata, 3.1.2
+    New BSD License
+
+  Saxon-HE, 9.5.1-5
+    Mozilla Public License Version 2.0
+
+  Commons Compress, 1.5
+    The Apache Software License, Version 2.0
+
+  Jackson, 1.9.12
+    The Apache Software License, Version 2.0
+
+  Data Mapper for Jackson, 1.9.12
+    The Apache Software License, Version 2.0
+
+  Jing, 20120724.0.0
+    New BSD License
+
+  Simple API for CSS, 1.3
+    The W3C Software License
+
+
+Copies of the licenses are provided in the 'licenses' directory.

data/spec/gepub_spec.rb

@@ -78,7 +78,7 @@ describe GEPUB::Book do
 </body>
 </html>
 EOF
-    item3 = @book.add_ordered_item('text/nav.html', StringIO.new(nav_string), 'nav').add_property('nav')
+    item3 = @book.add_ordered_item('text/nav.xhtml', StringIO.new(nav_string), 'nav').add_property('nav')
   end
 
   it "should have titile"  do
@@ -113,7 +113,7 @@ EOF
 
     expect(ncx.xpath('xmlns:navMap').size).to be > 0
     nav_point = ncx.at_xpath('xmlns:navMap/xmlns:navPoint')
-    expect(nav_point['id']).to eq('c2#')
+    expect(nav_point['id']).to eq('c2_')
     expect(nav_point['playOrder']).to eq('1')
     
     expect(nav_point.at_xpath('xmlns:navLabel/xmlns:text').content).to eq('test chapter')
@@ -205,4 +205,25 @@ EOF
     @book.generate_epub(epubname)
     epubcheck(epubname)
   end
+
+  it 'should generate valid EPUB when @toc is empty' do
+    epubname = File.join(File.dirname(__FILE__), 'testepub4.epub')
+    @book = GEPUB::Book.new('OEPBS/package.opf', { 'version' => '3.0'} ) 
+    @book.title = 'thetitle'
+    @book.creator = "theauthor"
+    @book.contributor = "contributors contributors!"
+    @book.publisher = "thepublisher"
+    @book.date = "2015-05-05"
+    @book.identifier = "http://example.jp/foobar/"
+    @book.language = 'ja'
+    item1 = @book.add_item('text/foobar.xhtml',nil, 'c1')
+    item1.add_content(StringIO.new('<html xmlns="http://www.w3.org/1999/xhtml"><head><title>c1</title></head><body><p>the first page</p></body></html>'))
+    @book.spine.push(item1)
+    item2 = @book.add_ordered_item('text/barbar.xhtml',
+                                   StringIO.new('<html xmlns="http://www.w3.org/1999/xhtml"><head><title>c2</title></head><body><p>second page, whith is test chapter.</p></body></html>'),
+                                   'c2')
+    @book.generate_epub(epubname)
+    epubcheck(epubname)
+
+  end
 end

data/spec/spec_helper.rb

@@ -32,9 +32,9 @@ RSpec.configure do |config|
   end
 
   def epubcheck(epubname)
-    jar = File.join(File.dirname(__FILE__), 'fixtures/epubcheck-3.0.1/epubcheck-3.0.1.jar')    
+    jar = File.join(File.dirname(__FILE__), 'fixtures/epubcheck-4.0.0/epubcheck.jar')    
     stdout = capture(:stdout) do 
-      puts %x(java -jar #{jar} #{epubname})
+      puts %x(java -Duser.language=en -jar #{jar} #{epubname})
     end
     expect(stdout).to include("No errors or warnings detected.")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gepub
 version: !ruby/object:Gem::Version
-  version: 0.7.0beta2
+  version: 0.7.0beta3
 platform: ruby
 authors:
 - KOJIMA Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -121,19 +121,27 @@ files:
 - spec/fixtures/builder/text/localresource.conf
 - spec/fixtures/builder/text/memo.txt
 - spec/fixtures/builder/text/nav.xhtml
-- spec/fixtures/epubcheck-3.0.1/COPYING.txt
-- spec/fixtures/epubcheck-3.0.1/README.txt
-- spec/fixtures/epubcheck-3.0.1/THIRD-PARTY.txt
-- spec/fixtures/epubcheck-3.0.1/epubcheck-3.0.1.jar
-- spec/fixtures/epubcheck-3.0.1/lib/Saxon-HE-9.4.0.6.jar
-- spec/fixtures/epubcheck-3.0.1/lib/commons-compress-1.4.1.jar
-- spec/fixtures/epubcheck-3.0.1/lib/guava-13.0.1.jar
-- spec/fixtures/epubcheck-3.0.1/lib/jing-20120724.0.0.jar
-- spec/fixtures/epubcheck-3.0.1/lib/sac-1.3.jar
-- spec/fixtures/epubcheck-3.0.1/licenses/Apache-2.0.txt
-- spec/fixtures/epubcheck-3.0.1/licenses/BSD-3-Clause.txt
-- spec/fixtures/epubcheck-3.0.1/licenses/MPL-1.0.txt
-- spec/fixtures/epubcheck-3.0.1/licenses/W3C.txt
+- spec/fixtures/epubcheck-4.0.0/COPYING.txt
+- spec/fixtures/epubcheck-4.0.0/README.txt
+- spec/fixtures/epubcheck-4.0.0/THIRD-PARTY.txt
+- spec/fixtures/epubcheck-4.0.0/epubcheck.jar
+- spec/fixtures/epubcheck-4.0.0/lib/Saxon-HE-9.5.1-5.jar
+- spec/fixtures/epubcheck-4.0.0/lib/common-image-3.1.2.jar
+- spec/fixtures/epubcheck-4.0.0/lib/common-io-3.1.2.jar
+- spec/fixtures/epubcheck-4.0.0/lib/common-lang-3.1.2.jar
+- spec/fixtures/epubcheck-4.0.0/lib/commons-compress-1.5.jar
+- spec/fixtures/epubcheck-4.0.0/lib/guava-14.0.1.jar
+- spec/fixtures/epubcheck-4.0.0/lib/imageio-core-3.1.2.jar
+- spec/fixtures/epubcheck-4.0.0/lib/imageio-jpeg-3.1.2.jar
+- spec/fixtures/epubcheck-4.0.0/lib/imageio-metadata-3.1.2.jar
+- spec/fixtures/epubcheck-4.0.0/lib/jackson-core-asl-1.9.12.jar
+- spec/fixtures/epubcheck-4.0.0/lib/jackson-mapper-asl-1.9.12.jar
+- spec/fixtures/epubcheck-4.0.0/lib/jing-20120724.0.0.jar
+- spec/fixtures/epubcheck-4.0.0/lib/sac-1.3.jar
+- spec/fixtures/epubcheck-4.0.0/licenses/Apache-2.0.txt
+- spec/fixtures/epubcheck-4.0.0/licenses/BSD-3-Clause.txt
+- spec/fixtures/epubcheck-4.0.0/licenses/MPL-1.0.txt
+- spec/fixtures/epubcheck-4.0.0/licenses/W3C.txt
 - spec/fixtures/testdata/0.html
 - spec/fixtures/testdata/1.html
 - spec/fixtures/testdata/image1.jpg
@@ -183,19 +191,27 @@ test_files:
 - spec/fixtures/builder/text/localresource.conf
 - spec/fixtures/builder/text/memo.txt
 - spec/fixtures/builder/text/nav.xhtml
-- spec/fixtures/epubcheck-3.0.1/COPYING.txt
-- spec/fixtures/epubcheck-3.0.1/README.txt
-- spec/fixtures/epubcheck-3.0.1/THIRD-PARTY.txt
-- spec/fixtures/epubcheck-3.0.1/epubcheck-3.0.1.jar
-- spec/fixtures/epubcheck-3.0.1/lib/Saxon-HE-9.4.0.6.jar
-- spec/fixtures/epubcheck-3.0.1/lib/commons-compress-1.4.1.jar
-- spec/fixtures/epubcheck-3.0.1/lib/guava-13.0.1.jar
-- spec/fixtures/epubcheck-3.0.1/lib/jing-20120724.0.0.jar
-- spec/fixtures/epubcheck-3.0.1/lib/sac-1.3.jar
-- spec/fixtures/epubcheck-3.0.1/licenses/Apache-2.0.txt
-- spec/fixtures/epubcheck-3.0.1/licenses/BSD-3-Clause.txt
-- spec/fixtures/epubcheck-3.0.1/licenses/MPL-1.0.txt
-- spec/fixtures/epubcheck-3.0.1/licenses/W3C.txt
+- spec/fixtures/epubcheck-4.0.0/COPYING.txt
+- spec/fixtures/epubcheck-4.0.0/README.txt
+- spec/fixtures/epubcheck-4.0.0/THIRD-PARTY.txt
+- spec/fixtures/epubcheck-4.0.0/epubcheck.jar
+- spec/fixtures/epubcheck-4.0.0/lib/Saxon-HE-9.5.1-5.jar
+- spec/fixtures/epubcheck-4.0.0/lib/common-image-3.1.2.jar
+- spec/fixtures/epubcheck-4.0.0/lib/common-io-3.1.2.jar
+- spec/fixtures/epubcheck-4.0.0/lib/common-lang-3.1.2.jar
+- spec/fixtures/epubcheck-4.0.0/lib/commons-compress-1.5.jar
+- spec/fixtures/epubcheck-4.0.0/lib/guava-14.0.1.jar
+- spec/fixtures/epubcheck-4.0.0/lib/imageio-core-3.1.2.jar
+- spec/fixtures/epubcheck-4.0.0/lib/imageio-jpeg-3.1.2.jar
+- spec/fixtures/epubcheck-4.0.0/lib/imageio-metadata-3.1.2.jar
+- spec/fixtures/epubcheck-4.0.0/lib/jackson-core-asl-1.9.12.jar
+- spec/fixtures/epubcheck-4.0.0/lib/jackson-mapper-asl-1.9.12.jar
+- spec/fixtures/epubcheck-4.0.0/lib/jing-20120724.0.0.jar
+- spec/fixtures/epubcheck-4.0.0/lib/sac-1.3.jar
+- spec/fixtures/epubcheck-4.0.0/licenses/Apache-2.0.txt
+- spec/fixtures/epubcheck-4.0.0/licenses/BSD-3-Clause.txt
+- spec/fixtures/epubcheck-4.0.0/licenses/MPL-1.0.txt
+- spec/fixtures/epubcheck-4.0.0/licenses/W3C.txt
 - spec/fixtures/testdata/0.html
 - spec/fixtures/testdata/1.html
 - spec/fixtures/testdata/image1.jpg

data/spec/fixtures/epubcheck-3.0.1/THIRD-PARTY.txt

@@ -1,20 +0,0 @@
-Licenses of third-party dependencies
-------------------------------------
-
-  Guava: Google Core Libraries for Java, 13.0.1
-    The Apache Software License, Version 2.0
-
-  Saxon-HE, 9.4.0.6
-    Mozilla Public License Version 1.0
-
-  Commons Compress, 1.4.1
-    The Apache Software License, Version 2.0
-
-  Jing, 20120724.0.0
-    New BSD License
-
-  Simple API for CSS, 1.3
-    The W3C Software License
-
-
-Copies of the licenses are provided in the 'licenses' directory.