gepub 0.7.0beta1 → 0.7.0beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da95a78f54f7a71d249dd06e76e9b18adacc7239
-  data.tar.gz: 7f50cc69320fbdb6664821690836dbdd3b2fddf5
+  metadata.gz: b2afcf92b07b1b44821ac597b73dcc8294fb185c
+  data.tar.gz: f6019eace6b777af7b2339df1921aaaa3b29cdde
 SHA512:
-  metadata.gz: 2de76d9b67b24bcd553a58a09efdbf9a1692831ccf44925ce06e863d0f1e1b826b5aeae5fb71545861a1bd2d6f5eab79af6a25358aee8bdac83a71de4e8bc3b7
-  data.tar.gz: 87688508687b17fadf099f34b8d6a83ce4d3f8c22d7bcc47052e40a1de12399e91c1ecd011091f010a922b89a6910438b73360625e3257b05481028ea8e0e574
+  metadata.gz: b0737564831bfb33d14959ead4304e2c1b43bbe5aabca34700da7d47357c1c0f606d81fc6added90846c16b203833570e7de00f791f92e6fde0b00017fbdedcf
+  data.tar.gz: f213252ad81213d2680d653a4254951a979ea91893e1bfc625490398525401a3bf9d6240e7fa25ccaa11a8f90e88ebcec33f62d92641cf11c655b7abcf8b29d1

data/README.md

@@ -1,4 +1,6 @@
 # gepub  
+
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/skoji/gepub?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [<img src="https://secure.travis-ci.org/skoji/gepub.png" />](http://travis-ci.org/skoji/gepub) 
 [![Coverage Status](https://coveralls.io/repos/skoji/gepub/badge.png?branch=master)](https://coveralls.io/r/skoji/gepub?branch=master)
 [![Dependency Status](https://gemnasium.com/skoji/gepub.png)](https://gemnasium.com/skoji/gepub)
@@ -18,7 +20,10 @@ a generic EPUB parser/generator library.
 
 * See [issues](https://github.com/skoji/gepub/issues/) for known problems.
 
-**GEPUB::Builder will be obsolete in gepub 0.7. GEPUB::Book#new will be enhanced instead of Builder DSL. **
+If you are using GEPUB::Builder from your code and do not like its behaviour(e.g. the block inside is evaluated as inside the Builder instance), please consider using GEPUB::Book directly.
+
+** GEPUB::Builder will be obsolete in gepub 0.7. GEPUB::Book#new will be enhanced instead of Builder DSL. **
+
 
 ## SYNOPSIS:
 

data/lib/gepub/book.rb

@@ -264,11 +264,59 @@ module GEPUB
 EOF
     end
 
+
+    # add tocdata like this : [ {link: chapter1.xhtml, text: 'Capter 1', level: 1} ] .
+    # if item corresponding to the link does not exists, error will be thrown.
+    def add_tocdata(toc_yaml)
+      newtoc = []
+      toc_yaml.each do |toc_entry|
+        href, id = toc_entry[:link].split('#')
+        item = @package.manifest.item_by_href(href)
+        throw "#{href} does not exist." if item.nil?
+        newtoc.push({item: item, id: id, text: toc_entry[:text], level: toc_entry[:level] })
+      end
+      @toc = @toc + newtoc
+    end
+      
     def generate_nav_doc(title = 'Table of Contents')
       add_item('nav.html', StringIO.new(nav_doc(title)), 'nav').add_property('nav')
     end
-
+    
     def nav_doc(title = 'Table of Contents')
+      # handle cascaded toc
+      start_level = @toc && @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
+        if current_stack[:level] < toc_entry_level
+          new_stack = { level: toc_entry_level, tocs: [], parent: current_stack}
+          current_stack[:tocs].last[:child_stack] = new_stack
+          current_stack = new_stack
+        else
+          while current_stack[:level] > toc_entry_level and
+               !current_stack[:parent].nil?
+            current_stack = current_stack[:parent]
+          end
+        end
+        current_stack[:tocs].push toc_entry
+        current_stack
+      end
+      # write toc 
+      def write_toc xml_doc, tocs
+        xml_doc.ol {
+          tocs.each {
+            |x|
+            id = x[:id].nil? ? "" : "##{x[:id]}"
+            xml_doc.li {
+              xml_doc.a({'href' => x[:item].href + id} ,x[:text])
+              if x[:child_stack] && x[:child_stack][:tocs].size > 0
+                write_toc(xml_doc, x[:child_stack][:tocs])
+              end
+            }
+          }
+        }
+      end
+      # build nav
       builder = Nokogiri::XML::Builder.new {
         |doc|
         doc.html('xmlns' => "http://www.w3.org/1999/xhtml",'xmlns:epub' => "http://www.idpf.org/2007/ops") {
@@ -276,15 +324,7 @@ EOF
           doc.body {
             doc.nav('epub:type' => 'toc', 'id' => 'toc') {
               doc.h1 "#{title}"
-              doc.ol {
-                @toc.each {
-                  |x|
-                  id = x[:id].nil? ? "" : "##{x[:id]}"
-                  doc.li {
-                    doc.a({'href' => x[:item].href + id} ,x[:text])
-                  }
-                }
-              }
+              write_toc(doc, stacked_toc[:tocs])
             }
           }
         }
@@ -309,7 +349,7 @@ EOF
           xml.navMap {
             @toc.each {
               |x|
-              xml.navPoint('id' => "#{x[:item].itemid}", 'playOrder' => "#{count}") {
+              xml.navPoint('id' => "#{x[:item].itemid}##{x[:id]}", 'playOrder' => "#{count}") {
                 xml.navLabel {
                   xml.text_  "#{x[:text]}"
                 }

data/lib/gepub/builder.rb

@@ -296,7 +296,9 @@ module GEPUB
     def resources(attributes = {}, &block)
       ResourceBuilder.new(@book, attributes, &block)
     end
-    
+    def book
+      @book
+    end
     def generate_epub_stream
       @book.generate_epub_stream
     end

data/lib/gepub/metadata.rb

@@ -158,6 +158,10 @@ module GEPUB
       end
     end
 
+    def title=(content)
+      title(content)
+    end
+
     def title(content=UNASSIGNED, id = nil, title_type = nil)
       if unassigned?(content)
         if !@content_nodes['title'].nil?
@@ -216,7 +220,7 @@ module GEPUB
     end
 
     def set_title(content, id = nil, title_type = nil)
-      warn "obsolete : set_title. use title instead."
+      warn "obsolete : set_title. use title or title= instead."
       title_clear
       meta = add_title(content, id, title_type)
       yield meta if block_given?
@@ -264,6 +268,10 @@ module GEPUB
       lastmodified Time.now
     end
 
+    def lastmodified=(date)
+      lastmodified(date)
+    end
+    
     def set_lastmodified(date=nil)
       warn "obsolete : set_lastmodified. use lastmodified instead."
       date ||= Time.now

data/lib/gepub/package.rb

@@ -15,6 +15,7 @@ module GEPUB
     }.flatten
     def_delegators :@metadata, :set_lastmodified
     def_delegators :@metadata, :lastmodified
+    def_delegators :@metadata, :lastmodified=
     def_delegators :@metadata, :modified_now
     def_delegators :@metadata, :rendition_layout
     def_delegators :@metadata, :rendition_layout=

data/lib/gepub/version.rb

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

data/spec/book_spec.rb

@@ -239,6 +239,11 @@ describe GEPUB::Book do
         book.lastmodified(Time.parse('2012-9-12 00:00:00Z'))
         expect(book.lastmodified.content).to eq(Time.parse('2012-9-12 00:00:00 UTC'))
       end
+      it 'set time in string : using assign method' do
+        book = GEPUB::Book.new
+        book.lastmodified = Time.parse('2012-9-12 00:00:00Z')
+        expect(book.lastmodified.content).to eq(Time.parse('2012-9-12 00:00:00 UTC'))
+      end
     end
     describe 'page_progression_direction=' do
       it 'set page_progression_direction' do 

data/spec/builder_spec.rb

@@ -385,10 +385,10 @@ describe GEPUB::Builder do
       expect(builder.instance_eval{ @book.spine.itemref_list[1].properties[0] }).to eq('rendition:layout-pre-paginated')
       expect(builder.instance_eval{ @book.spine.itemref_list[1].properties[1] }).to eq('rendition:orientation-landscape')
       expect(builder.instance_eval{ @book.spine.itemref_list[1].properties[2] }).to eq('rendition:spread-both')
-      builder.instance_eval{
-        xml = Nokogiri::XML::Document.parse @book.opf_xml
-        xml.root['prefix'].should == 'rendition: http://www.idpf.org/vocab/rendition/#'
+      xml = builder.instance_eval{
+        Nokogiri::XML::Document.parse @book.opf_xml
       }
+      expect(xml.root['prefix']).to eq 'rendition: http://www.idpf.org/vocab/rendition/#'
     end
 
     it 'whould handle ibooks version' do
@@ -519,9 +519,10 @@ describe GEPUB::Builder do
           file 'with_remote.xhtml' => StringIO.new('<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops"><head></head><body><div><p><video src="http://foo.bar">no video</video></p></div></body></html>')
         }
       }
-      builder.instance_eval {
-        @book.item_by_href('with_remote.xhtml').properties[0].should == 'remote-resources'
+      prop = builder.instance_eval {
+        @book.item_by_href('with_remote.xhtml').properties[0]
       }
+      expect(prop).to eq 'remote-resources'
     end
 
     it 'should handle remote resource URL' do
@@ -541,9 +542,10 @@ describe GEPUB::Builder do
           file 'mathml.xhtml' => StringIO.new('<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops"><head></head><body><div><p><math xmlns="http://www.w3.org/1998/Math/MathML"></math></p></div></body></html>')
         }
       }
-      builder.instance_eval {
-        @book.item_by_href('mathml.xhtml').properties[0].should == 'mathml'
+      prop = builder.instance_eval {
+        @book.item_by_href('mathml.xhtml').properties[0]
       }
+      expect(prop).to eq 'mathml'
     end
 
     it 'should handle svg' do
@@ -553,9 +555,10 @@ describe GEPUB::Builder do
           file 'svg.xhtml' => StringIO.new('<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops"><head></head><body><div><p><svg xmlns="http://www.w3.org/2000/svg"></svg></p></div></body></html>')
         }
       }
-      builder.instance_eval {
-        @book.item_by_href('svg.xhtml').properties[0].should == 'svg'
+      prop = builder.instance_eval {
+        @book.item_by_href('svg.xhtml').properties[0]
       }
+      expect(prop).to eq 'svg'
     end
 
     it 'should handle epub:switch' do
@@ -577,9 +580,10 @@ describe GEPUB::Builder do
 </epub:switch></p></div></body></html>')
         }
       }
-      builder.instance_eval {
-        @book.item_by_href('switch.xhtml').properties[0].should == 'switch'
+      prop = builder.instance_eval {
+        @book.item_by_href('switch.xhtml').properties[0]
       }
+      expect(prop).to eq 'switch'
     end
 
     it 'should handle scripted property' do
@@ -589,18 +593,19 @@ describe GEPUB::Builder do
           file 'scripted.xhtml' => StringIO.new('<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops"><head><script>alert("scripted");</script></head><body><div><p>text comes here</p></div></body></html>')
         }
       }
-      builder.instance_eval {
-        @book.item_by_href('scripted.xhtml').properties[0].should == 'scripted'
-      }
+      expect(builder.instance_eval {
+        @book.item_by_href('scripted.xhtml').properties[0]
+      }).to eq 'scripted'
     end
 
     it 'should handle optional file' do
       builder = GEPUB::Builder.new {
         optional_file 'META-INF/test.xml' => StringIO.new('<test></test>')
       }
-      builder.instance_eval {
-        @book.optional_files.size.should == 1
-      }
+      expect(builder.instance_eval {
+        @book.optional_files.size
+      }).to eq 1
+      
       expect(builder.instance_eval {      
         @book.optional_files['META-INF/test.xml']
       }).not_to be_nil

data/spec/gepub_spec.rb

@@ -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')

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ end
 
 RSpec.configure do |config|
   # Use color in STDOUT
-  config.color_enabled = true
+  config.color = true
   # Use color not only in STDOUT but also in pagers and files
   config.tty = true
   # Use the specified formatter

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gepub
 version: !ruby/object:Gem::Version
-  version: 0.7.0beta1
+  version: 0.7.0beta2
 platform: ruby
 authors:
 - KOJIMA Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-30 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: gepub
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: a generic EPUB library for Ruby.