gepub 0.6.1 → 0.6.2

data/{README.rdoc → README.md}

@@ -1,29 +1,29 @@
-= gepub
-{<img src="https://secure.travis-ci.org/skoji/gepub.png" />}[http://travis-ci.org/skoji/gepub]
+# gepub [<img src="https://secure.travis-ci.org/skoji/gepub.png" />](http://travis-ci.org/skoji/gepub)
 
 * http://github.com/skoji/gepub
 
-== DESCRIPTION:
+## DESCRIPTION:
 
 a generic EPUB parser/generator library.
 
-== FEATURES/PROBLEMS:
+## FEATURES/PROBLEMS:
 
 * GEPUB::Book provides functionality to create EPUB file, and parsing EPUB file
 * from version 0.6, GEPUB::Book will be able handle almost every metadata in EPUB2/EPUB3.
   .. but is still beta version. Please inform me when you find bugs.
-
 * Will provide easy to generate EPUB class, like Nokogiri::XML::Generator.
 
-== SYNOPSIS:
+* See [issues](https://github.com/skoji/gepub/issues/) for known problems.
+
+## SYNOPSIS:
 
 see examples directory.
 
-== INSTALL:
+## INSTALL:
 
 * gem install gepub
 
-== LICENSE:
+## LICENSE:
 
 (The New BSD License)
 

data/lib/gepub/book.rb

@@ -31,23 +31,33 @@ module GEPUB
             files[entry.name] = zis.read
             case entry.name
             when MIMETYPE then
-              files[MIMETYPE] = nil 
+              if files[MIMETYPE] != MIMETYPE_CONTENTS
+                warn "#{MIMETYPE} is not valid: should be #{MIMETYPE_CONTENTS} but was #{files[MIMETYPE]}"
+              end
+              files.delete(MIMETYPE)
             when CONTAINER then
-              package_path = rootfile_from_container(files[entry.name])
-              files[CONTAINER] = nil
+              package_path = rootfile_from_container(files[CONTAINER])
+              files.delete(CONTAINER)
             when ROOTFILE_PATTERN then
               package = Package.parse_opf(files[entry.name], entry.name)
+              files.delete(entry.name)
             end
           end
         end
+
+        if package.nil?
+          raise 'this container do not cotains publication information file'
+        end
+        
         if package_path != package.path
           warn 'inconsistend EPUB file: container says opf is #{package_path}, but actually #{package.path}'
         end
+        
         files.each {
           |k, content|
           item = package.manifest.item_by_href(k.sub(/^#{package.contents_prefix}/,''))
           if !item.nil?
-            files[k] = nil
+            files.delete(k)
             item.add_raw_content(content)
           end
         }
@@ -102,13 +112,19 @@ module GEPUB
     def ordered(&block)
       @package.ordered(&block)
     end
+
     def generate_epub(path_to_epub)
-      if (@toc.size == 0)
-        @toc << { :item => @package.spine.itemref_list[0] }
-      end
 
       if version.to_f < 3.0 || @package.epub_backward_compat
-        add_item('toc.ncx', StringIO.new(ncx_xml), 'ncx')
+        if @package.manifest.item_list.select {
+          |x,item|
+          item.media_type == 'application/x-dtbncx+xml'
+        }.size == 0
+          if (@toc.size == 0)
+            @toc << { :item => @package.manifest.item_list[@package.spine.itemref_list[0].idref] }
+          end
+          add_item('toc.ncx', StringIO.new(ncx_xml), 'ncx')
+        end
       end
 
       if version.to_f >=3.0

data/lib/gepub/gepuber.rb

@@ -22,11 +22,11 @@ module GEPUB
     attr_accessor :texts, :resources, :epubname, :coverimg, :table_of_contents, :provider
     
     def method_missing(name, *args)
-      @package.send(name, *args)
+      @book.send(name, *args)
     end
     
     def initialize(param)
-      @package = GEPUB::Package.new()
+      @book = GEPUB::Book.new()
       param.each {
         |k,v|
         self.send "#{k}=", v
@@ -42,22 +42,23 @@ module GEPUB
     def create(destbasedir = ".")
       @provider.new(@texts).each {
         |f, fio|
-        item = add_item(f, fio)
-        @spine << item
-        if !@table_of_contents[f].nil?
-          add_nav(item, @table_of_contents[f]) 
-          @table_of_contents.each {
-            |k,v|
-            k =~ /^#{f}#(.*)$/
-            add_nav(item, v, $1) unless $1.nil?
-          }
-        end
+        @book.ordered {
+          item = add_item(f, fio)
+          if !@table_of_contents[f].nil?
+            item.toc_text table_of_contents[f] 
+            @table_of_contents.each {
+              |k,v|
+              k =~ /^#{f}#(.*)$/
+              add_nav(item, v, $1) unless $1.nil?
+            }
+          end
+        }
       }
 
       @provider.new(@resources).each {
         |f, fio|
         item = add_item(f, fio)
-        specify_cover_image(item) if File.basename(f) == @coverimg
+        item.cover_image if File.basename(f) == @coverimg
       }
       generate_epub(File.join(destbasedir, @epubname + '.epub'))      
     end

data/lib/gepub/version.rb

@@ -1,3 +1,3 @@
 module GEPUB
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/lib/gepub/xml_util.rb

@@ -17,8 +17,10 @@ module GEPUB
         |k,v|
         attributes[k] = v.to_s
       }
-      attributes['xml:lang'] = attributes['lang'];
-      attributes.delete('lang')
+      if attributes['lang']
+        attributes['xml:lang'] = attributes['lang'];
+        attributes.delete('lang')
+      end
       attributes
     end
   end

data/spec/example_spec.rb

@@ -21,7 +21,7 @@ describe 'GEPUB usage' do
                              'th' => 'GEPUB ตัวอย่าง (ญี่ปุ่น)')
       }
       # you can do the same thing using method chain
-      book.add_title('これはあくまでサンプルです',nil, GEPUB::TITLE_TYPE::SUBTITLE).set_display_seq(1).add_alternates('en' => 'this book is just a sample.')
+      book.add_title('これはあくまでサンプルです',nil, GEPUB::TITLE_TYPE::SUBTITLE).set_display_seq(2).add_alternates('en' => 'this book is just a sample.')
       book.add_creator('小嶋智') {
         |creator|
         creator.display_seq = 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gepub
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70155015272060 !ruby/object:Gem::Requirement
+  requirement: &70172284071640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70155015272060
+  version_requirements: *70172284071640
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70155015271560 !ruby/object:Gem::Requirement
+  requirement: &70172284071140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70155015271560
+  version_requirements: *70172284071140
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70155015271100 !ruby/object:Gem::Requirement
+  requirement: &70172284070680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 0.9.6
   type: :runtime
   prerelease: false
-  version_requirements: *70155015271100
+  version_requirements: *70172284070680
 description: gepub is a EPUB parser/generator. Generates EPUB2 opf. will support EPUB3
   parse/generation
 email:
@@ -57,7 +57,7 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
-- README.rdoc
+- README.md
 - Rakefile
 - bin/gepuber
 - examples/generate_example.rb