gepub 0.4.5 → 0.5.0

data/.gitignore

@@ -0,0 +1,27 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC
+testepub.epub
+
+## BUNDLER
+Gemfile.lock
+vendor/**
+.bundle/**

data/Gemfile

@@ -1,8 +1,4 @@
-source :rubygems
+source "http://rubygems.org"
 
-gem 'bundler', '>= 1.0.7', :require => 'bundle', :group => [:test, :development]
-gem 'rspec', '>= 2', :group => [:test, :development]
-gem 'epubcheck', '>= 0.1.0', :group => [:test, :development]
-gem 'jeweler', '>= 1.5.1', :group => :development
-gem 'libxml-ruby', '>= 1.1.4'
-gem 'rubyzip', '>= 0.9.4'
+# Specify your gem's dependencies in gepub.gemspec
+gemspec

data/README.rdoc

@@ -16,8 +16,7 @@ a good-enough EPUB generator library.
 * ncx: can't nest navPoint elements
 * ...and many other restrictions
 
-* note: GEPUB::Generator is now obsolete. use GEPUB::Book.
-* GEPUB::Book does not create directory. GEPUB::Book accepts IO object, not File.
+* GEPUB::Generator has been removed. Use GEPUB::Book instead.
 
 == SYNOPSIS:
 
@@ -66,11 +65,6 @@ a good-enough EPUB generator library.
 
   epub.generate_epub(epubname)
   
-== REQUIREMENTS: 
-
-* libxml-ruby
-* zipruby
-
 == INSTALL:
 
 * gem install gepub

data/Rakefile

@@ -1,42 +1 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "gepub"
-    gem.summary = %Q{a good-enough EPUB generator.}
-    gem.description = %Q{an easy-to-use (and easy-to-implement) EPUB generator.}
-    gem.email = "skoji@skoji.jp"
-    gem.homepage = "http://github.com/skoji/gepub"
-    gem.authors = ["KOJIMA Satoshi"]
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
-  spec.pattern = 'spec/**/*_spec.rb'
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "gepub #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require "bundler/gem_tasks"

data/gepub.gemspec

@@ -1,77 +1,25 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "gepub/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{gepub}
-  s.version = "0.4.5"
+  s.name        = "gepub"
+  s.version     = GEPUB::VERSION
+  s.authors     = ["KOJIMA Satoshi"]
+  s.email       = ["skoji@mac.com"]
+  s.homepage    = %q{http://github.com/skoji/gepub}
+  s.summary     = %q{a good-enough EPUB generator.}
+  s.description = %q{an easy-to-use EPUB generator.}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["KOJIMA Satoshi"]
-  s.date = %q{2011-06-13}
-  s.description = %q{an easy-to-use (and easy-to-implement) EPUB generator.}
-  s.email = %q{skoji@skoji.jp}
-  s.executables = ["gepuber"]
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "bin/gepuber",
-    "examples/example.rb",
-    "gepub.gemspec",
-    "lib/gepub.rb",
-    "lib/gepub/book.rb",
-    "lib/gepub/generator.rb",
-    "lib/gepub/gepuber.rb",
-    "lib/gepub/item.rb",
-    "spec/fixtures/testdata/0.html",
-    "spec/fixtures/testdata/1.html",
-    "spec/gepub_spec.rb",
-    "spec/gepuber_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/skoji/gepub}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
-  s.summary = %q{a good-enough EPUB generator.}
-  s.test_files = [
-    "examples/example.rb",
-    "spec/gepub_spec.rb",
-    "spec/gepuber_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.rubyforge_project = "gepub"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<libxml-ruby>, [">= 1.1.4"])
-      s.add_runtime_dependency(%q<rubyzip>, [">= 0.9.4"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.7"])
-      s.add_development_dependency(%q<rspec>, [">= 2"])
-      s.add_development_dependency(%q<epubcheck>, [">= 0.1.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.5.1"])
-    else
-      s.add_dependency(%q<libxml-ruby>, [">= 1.1.4"])
-      s.add_dependency(%q<rubyzip>, [">= 0.9.4"])
-      s.add_dependency(%q<bundler>, [">= 1.0.7"])
-      s.add_dependency(%q<rspec>, [">= 2"])
-      s.add_dependency(%q<epubcheck>, [">= 0.1.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.5.1"])
-    end
-  else
-    s.add_dependency(%q<libxml-ruby>, [">= 1.1.4"])
-    s.add_dependency(%q<rubyzip>, [">= 0.9.4"])
-    s.add_dependency(%q<bundler>, [">= 1.0.7"])
-    s.add_dependency(%q<rspec>, [">= 2"])
-    s.add_dependency(%q<epubcheck>, [">= 0.1.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.5.1"])
-  end
+  s.add_development_dependency "rspec", ">= 2"
+  s.add_development_dependency "epubcheck", ">= 0.1.0"
+  s.add_runtime_dependency "nokogiri", ">= 1.5.0"
+  s.add_runtime_dependency "rubyzip", ">= 0.9.4"
 end
-

data/lib/gepub/book.rb

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 require 'rubygems'
-require 'xml/libxml'
+require 'nokogiri'
 require 'zip/zip'
 require 'fileutils'
 
 
 module GEPUB
   class Book
-    attr_accessor :spine, :locale
+    attr_accessor :spine, :locale, :epub_version, :epub_backword_compat
 
     def self.def_meta(name, key = nil)
       key ||= name
@@ -32,6 +32,8 @@ module GEPUB
       @contents_prefix = @contents_prefix + "/" if contents_prefix != ""
       @itemcount = 0
       @locale = 'en'
+      @epub_version = 2.1
+      @epub_backword_compat = false
     end
 
     def_meta :title
@@ -125,104 +127,101 @@ EOF
     end
 
     def opf_xml
-      result = XML::Document.new
-      result.root = XML::Node.new('package')
-      package = result.root
-      XML::Namespace.new(package, nil, 'http://www.idpf.org/2007/opf')
+      opf = Nokogiri::XML::Document.new
+      opf.root = package = Nokogiri::XML::Node.new('package', opf)
+      package.add_namespace(nil, 'http://www.idpf.org/2007/opf')
       package['version'] = '2.0'
       package['unique-identifier'] = 'BookID'
-
-
-      package << metadataelem = XML::Node.new('metadata')
-      XML::Namespace.new(metadataelem, 'opf', 'http://www.idpf.org/2007/opf')
-      XML::Namespace.new(metadataelem, 'dc', "http://purl.org/dc/elements/1.1/")
-
-      metadataelem << XML::Node.new('dc:language', @locale)
-
-      @metadata.each { | k, v |
+      package << metadataelem = Nokogiri::XML::Node.new('metadata', opf)
+      metadataelem.add_namespace('opf', 'http://www.idpf.org/2007/opf')
+      metadataelem.add_namespace('dc', "http://purl.org/dc/elements/1.1/")
+      metadataelem << lang = Nokogiri::XML::Node.new('dc:language', opf)
+      lang.content = @locale
+      @metadata.each { |k,v|
         if (k == :cover)
-          metadataelem << node = XML::Node.new("meta")
+          metadataelem << node = Nokogiri::XML::Node.new("meta", opf)
           node['name'] = 'cover'
           node['content'] = v
         elsif (k == :identifier)
           v.each {
             |id|
-            metadataelem << node = XML::Node.new("dc:#{k}",id[:identifier])
+            metadataelem << node = Nokogiri::XML::Node.new("dc:#{k}", opf)
+            node.content = id[:identifier]
             if (id[:main_id])
               node['id'] = 'BookID'
             end
             node['opf:scheme'] = id[:scheme]
           }
         elsif (k == :gepub_version)
-          metadataelem << node = XML::Node.new("meta")
+          metadataelem << node = Nokogiri::XML::Node.new("meta", opf)
           node['name'] = 'gepub version'
           node['content'] = v
         else
-          metadataelem << node = XML::Node.new("dc:#{k}",v)
+          metadataelem << node = Nokogiri::XML::Node.new("dc:#{k}",opf)
+          node.content = v
         end
       }
 
-      package << manifestelem = XML::Node.new('manifest')
+      package << manifestelem = Nokogiri::XML::Node.new('manifest', opf)
       @manifest.each {
         |item|
-        manifestelem << node = XML::Node.new("item")
+        manifestelem << node = Nokogiri::XML::Node.new("item", opf)
         node['id'] = "#{item.itemid}"
         node['href'] = "#{item.href}"
         node['media-type'] = "#{item.mediatype}" 
       }
-      
-      package << spineelem = XML::Node.new('spine')
+
+      package << spineelem = Nokogiri::XML::Node.new('spine', opf)
       spineelem['toc'] = 'ncx'
 
       @spine.each {
         |v|
-        spineelem << node = XML::Node.new('itemref')
+        spineelem << node = Nokogiri::XML::Node.new('itemref', opf)
         node['idref'] = "#{v.itemid}"
       }
-
-      result.to_s
-
+      opf.to_s
     end
+    
 
     def ncx_xml
-      result = XML::Document.new
-      result.root = XML::Node.new('ncx')
-      root = result.root
-      XML::Namespace.new(root, nil, "http://www.daisy.org/z3986/2005/ncx/")
+      ncx = Nokogiri::XML::Document.new
+      ncx.root = root = Nokogiri::XML::Node.new('ncx', ncx)
+      root.add_namespace(nil, "http://www.daisy.org/z3986/2005/ncx/")
       root['version'] = "2005-1"
-      root << head = XML::Node.new('head')
-      head << uid = XML::Node.new('meta')
+      root << head = Nokogiri::XML::Node.new('head', ncx)
+      head << uid = Nokogiri::XML::Node.new('meta', ncx)
       uid['name'] = 'dtb:uid'
       uid['content'] = "#{@main_identifier}"
 
-      head << depth = XML::Node.new('meta')
+      head << depth = Nokogiri::XML::Node.new('meta', ncx)
       depth['name'] = 'dtb:depth'
       depth['content'] = '1'
 
-      head << totalPageCount = XML::Node.new('meta')
+      head << totalPageCount = Nokogiri::XML::Node.new('meta', ncx)
       totalPageCount['name'] = 'dtb:totalPageCount'
       totalPageCount['content'] = '0'
 
-      head << maxPageNumber = XML::Node.new('meta')
+      head << maxPageNumber = Nokogiri::XML::Node.new('meta', ncx)
       maxPageNumber['name'] = 'dtb:maxPageNumber'
       maxPageNumber['content'] = '0'
 
+      root << docTitle = Nokogiri::XML::Node.new('docTitle', ncx)
+      docTitle << docTitleText = Nokogiri::XML::Node.new('text', ncx)
+      docTitleText.content = "#{@metadata[:title]}"
 
-      root << docTitle = XML::Node.new('docTitle')
-      docTitle << XML::Node.new('text', "#{@metadata[:title]}")
-      
-      root << nav_map = XML::Node.new('navMap')
+      root << nav_map = Nokogiri::XML::Node.new('navMap', ncx)
       count = 1
       @toc.each {
         |x|
-        nav_point = XML::Node.new('navPoint')
+        nav_point = Nokogiri::XML::Node.new('navPoint', ncx)
         nav_point['id'] = "#{x[:item].itemid}"
         nav_point['playOrder'] = "#{count}"
         
-        nav_label = XML::Node.new('navLabel')
-        nav_label << XML::Node.new('text', "#{x[:text]}")
+        nav_label = Nokogiri::XML::Node.new('navLabel', ncx)
+        nav_label << navtxt = Nokogiri::XML::Node.new('text', ncx)
+        navtxt.content = "#{x[:text]}"
         
-        nav_content = XML::Node.new('content')
+        nav_content = Nokogiri::XML::Node.new('content', ncx)
         if x[:id].nil?
           nav_content['src'] = "#{x[:item].href}"
         else
@@ -230,12 +229,11 @@ EOF
         end
         
         count = count + 1
-
         nav_map << nav_point
         nav_point << nav_label
         nav_point << nav_content
       }
-      result.to_s
+      ncx.to_s
     end
   end
 end

data/lib/gepub/gepuber.rb

@@ -27,7 +27,7 @@ module GEPUB
         |k,v|
         self.send "#{k}=", v
       }
-      @texts ||= ['[0-9]*.html'] 
+      @texts ||= ['[0-9]*.{xhtml,html}'] 
       @resources ||= ['*.css',  'img/*']
       @coverimg ||= 'cover.jpg'
       @table_of_contents ||= {}

data/lib/gepub/item.rb

@@ -20,6 +20,8 @@ module GEPUB
         'application/xhtml+xml'
       when /.css/i
         'text/css'
+      when /.js/i
+        'text/javascript'
       when /.(jpg|jpeg)/i
         'image/jpeg'
       when /.png/i

data/lib/gepub/version.rb

@@ -0,0 +1,3 @@
+module GEPUB
+  VERSION = "0.5.0"
+end

data/lib/gepub.rb

@@ -1,5 +1,6 @@
+require 'gepub/version'
 require 'gepub/item'
 require 'gepub/book'
 require 'gepub/gepuber'
-require 'gepub/generator'
+
 

data/spec/gepub_spec.rb

@@ -1,9 +1,6 @@
-# need to install 'epubcheck'.
-
 require File.dirname(__FILE__) + '/spec_helper.rb'
 require 'rubygems'
-require 'xml/libxml'
-
+require 'nokogiri'
 
 describe GEPUB::Item do
   it "should return atttributes" do
@@ -28,133 +25,119 @@ describe GEPUB::Item do
     item.mediatype.should == 'image/jpeg'
   end
 
+  it "should handle css" do
+    item = GEPUB::Item.new('id', 'img/foo.css')
+    item.mediatype.should == 'text/css'
+  end
+
+  it "should handle javascript" do
+    item = GEPUB::Item.new('id', 'js/jQuery.js')
+    item.mediatype.should == 'text/javascript'
+  end
+
 end
 
 describe GEPUB::Book do
   before do
-    @generator = GEPUB::Book.new('thetitle')
-    @generator.author = "theauthor"
-    @generator.contributor = "contributors contributors!"
-    @generator.publisher = "thepublisher"
-    @generator.date = "2010-05-05"
-    @generator.identifier = "http://example.jp/foobar/"
-    @generator.locale = 'ja'
-    item1 = @generator.add_ref_to_item('text/foobar.html','c1')
+    @book = GEPUB::Book.new('thetitle')
+    @book.author = "theauthor"
+    @book.contributor = "contributors contributors!"
+    @book.publisher = "thepublisher"
+    @book.date = "2010-05-05"
+    @book.identifier = "http://example.jp/foobar/"
+    @book.locale = 'ja'
+    item1 = @book.add_ref_to_item('text/foobar.html','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>'))
-    @generator.spine.push(item1)
+    @book.spine.push(item1)
 
-    item2 = @generator.add_ordered_item('text/barbar.html',
+    item2 = @book.add_ordered_item('text/barbar.html',
                                         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')
-    @generator.add_nav(item2, 'test chapter')
+    @book.add_nav(item2, 'test chapter')
   end
 
   it "should have titile"  do
-    @generator.title.should == 'thetitle' 
+    @book.title.should == 'thetitle' 
   end
 
   it "should generate correct ncx"  do
-    ncx = LibXML::XML::Parser.string(@generator.ncx_xml).parse
-    ncx.root.name.should == 'ncx'
-    ncx.root.attributes['version'].should == '2005-1'
-    ncx.root.namespaces.namespace.href.should == 'http://www.daisy.org/z3986/2005/ncx/'
+    ncx = Nokogiri::XML.parse(@book.ncx_xml).root
+    ncx.name.should == 'ncx'
+    ncx.attributes['version'].value.should == '2005-1'
+    ncx.namespaces['xmlns'] == 'http://www.daisy.org/z3986/2005/ncx/'
   end
 
   it "should have correct head in ncx" do
-    ncx = LibXML::XML::Parser.string(@generator.ncx_xml).parse
-    ncx.root.namespaces.default_prefix='a'
-
-    ncx.find_first('a:head').should_not be_nil
-
-    ncx.find_first("a:head/a:meta[@name='dtb:uid']")['content'].should == "http://example.jp/foobar/"
-    ncx.find_first("a:head/a:meta[@name='dtb:depth']").should_not be_nil
-    ncx.find_first("a:head/a:meta[@name='dtb:totalPageCount']").should_not be_nil
-    ncx.find_first("a:head/a:meta[@name='dtb:maxPageNumber']").should_not be_nil
+    head = Nokogiri::XML.parse(@book.ncx_xml).at_xpath('/xmlns:ncx/xmlns:head')
+    head.should_not be_nil
+    head.at_xpath("xmlns:meta[@name='dtb:uid']")['content'].should == "http://example.jp/foobar/"
+    head.xpath("xmlns:meta[@name='dtb:depth']").size.should > 0
+    head.xpath("xmlns:meta[@name='dtb:totalPageCount']").size.should > 0
+    head.xpath("xmlns:meta[@name='dtb:maxPageNumber']").size.should > 0
   end
 
   it "should have correct ncx doctitle" do
-    ncx = LibXML::XML::Parser.string(@generator.ncx_xml).parse
-    ncx.root.namespaces.default_prefix='a'
+    doctitle = Nokogiri::XML.parse(@book.ncx_xml).root
 
-    ncx.root.find_first('a:docTitle').should_not be_nil
-    ncx.root.find_first('a:docTitle/a:text').content.should == 'thetitle'
+    doctitle.xpath('xmlns:docTitle').size.should > 0 
+    doctitle.at_xpath('xmlns:docTitle/xmlns:text').text.should == 'thetitle'
   end
 
   it "should correct ncx navmap" do
-    ncx = LibXML::XML::Parser.string(@generator.ncx_xml).parse
-    ncx.root.namespaces.default_prefix='a'
+    ncx = Nokogiri::XML::parse(@book.ncx_xml).root
 
-    ncx.root.find_first('a:navMap').should_not be_nil
-    nav_point = ncx.root.find_first('a:navMap/a:navPoint')
+    ncx.xpath('xmlns:navMap').size.should > 0
+    nav_point = ncx.at_xpath('xmlns:navMap/xmlns:navPoint')
     nav_point['id'].should == 'c2'
     nav_point['playOrder'].should == '1'
     
-    nav_point.find_first('a:navLabel/a:text').content.should == 'test chapter'
-    nav_point.find_first('a:content')['src'] == 'foobar2.html'
+    nav_point.at_xpath('xmlns:navLabel/xmlns:text').content.should == 'test chapter'
+    nav_point.at_xpath('xmlns:content')['src'] == 'foobar2.html'
 
   end
 
   it "should create correct opf" do
-    opf = LibXML::XML::Parser.string(@generator.opf_xml).parse
-    opf.root.namespaces.default_prefix='a'
-
-    opf.root.name.should == 'package'
-    opf.root.namespaces.namespace.href.should == 'http://www.idpf.org/2007/opf'
-    opf.root['version'] == '2.0'
-    opf.root['unique-identifier'] == 'http://example.jp/foobar/'
+    opf = Nokogiri::XML.parse(@book.opf_xml).root
+    opf.name.should == 'package'
+    opf.namespaces['xmlns'] == 'http://www.idpf.org/2007/opf'
+    opf['version'] == '2.0'
+    opf['unique-identifier'] == 'http://example.jp/foobar/'
   end
-  
 
   it "should have correct metadata in opf" do
-    opf = LibXML::XML::Parser.string(@generator.opf_xml).parse
-    opf.root.namespaces.default_prefix='a'
-
-    metadata = opf.find_first('a:metadata')
-    metadata.find_first('dc:language').content.should == 'ja'
-    # TODO checking metadatas...
+    opf = Nokogiri::XML.parse(@book.opf_xml).root
+    metadata = opf.xpath('xmlns:metadata').first
+    metadata.at_xpath('dc:language', metadata.namespaces).content.should == 'ja'
+    #TODO: check metadata
   end
 
   it "should have correct manifest and spine in opf" do
-    opf = LibXML::XML::Parser.string(@generator.opf_xml).parse
-    opf.root.namespaces.default_prefix='a'
+    opf = Nokogiri::XML.parse(@book.opf_xml).root
 
-    manifest = opf.find_first('a:manifest')
-    manifest.find_first('a:item')['id'].should == 'c1'
-    manifest.find_first('a:item')['href'].should == 'text/foobar.html'    
-    manifest.find_first('a:item')['media-type'].should == 'application/xhtml+xml'
+    manifest = opf.at_xpath('xmlns:manifest')
+    manifest.at_xpath('xmlns:item')['id'].should == 'c1'
+    manifest.at_xpath('xmlns:item')['href'].should == 'text/foobar.html'    
+    manifest.at_xpath('xmlns:item')['media-type'].should == 'application/xhtml+xml'
 
-    spine = opf.find_first('a:spine')
+    spine = opf.at_xpath('xmlns:spine')
     spine['toc'].should == 'ncx'
-    spine.find_first('a:itemref')['idref'].should == 'c1'
-  end
-
-  it "should have correct metadata in opf" do
-    opf = LibXML::XML::Parser.string(@generator.opf_xml).parse
-    opf.root.namespaces.default_prefix='a'
-
-    metadata = opf.find_first('a:metadata')
-    metadata.find_first('dc:language').content.should == 'ja'
-    # TODO checking metadatas...
+    spine.at_xpath('xmlns:itemref')['idref'].should == 'c1'
   end
 
   it "should have correct cover image id" do
-    item = @generator.add_ref_to_item("img/img.jpg")
-    @generator.specify_cover_image(item)
+    item = @book.add_ref_to_item("img/img.jpg")
+    @book.specify_cover_image(item)
 
-    opf = LibXML::XML::Parser.string(@generator.opf_xml).parse
-    opf.root.namespaces.default_prefix='a'
+    opf = Nokogiri::XML.parse(@book.opf_xml).root
 
-    metadata = opf.find_first('a:metadata')
-    metas = metadata.find('a:meta').select {
-      |m| m['name'] == 'cover'
-    }
-    metas.length.should == 1
-    metas[0]['content'].should == item.itemid    
+    metadata = opf.at_xpath('xmlns:metadata')
+    meta = metadata.at_xpath("xmlns:meta[@name='cover']")
+    meta['content'].should == item.itemid        
   end
 
   it "should generate correct epub" do
     epubname = File.join(File.dirname(__FILE__), 'testepub.epub')
-    @generator.generate_epub(epubname)
+    @book.generate_epub(epubname)
     %x( epubcheck #{epubname} )
   end
 

data/spec/gepuber_spec.rb

@@ -1,15 +1,12 @@
 # -*- coding: utf-8 -*-
-# need to install 'epubcheck'.
 
 require File.dirname(__FILE__) + '/spec_helper.rb'
 require 'rubygems'
-require 'xml/libxml'
-
 
 describe GEPUB::Gepuber do
   it "should be initialized with empty conf" do
     gepuber = GEPUB::Gepuber.new({})
-    gepuber.texts.should == ['[0-9]*.html']
+    gepuber.texts.should == ['[0-9]*.{xhtml,html}']
     gepuber.resources.should == ['*.css',  'img/*']
     gepuber.title.should == ""
     gepuber.table_of_contents.should == {}
@@ -18,22 +15,22 @@ describe GEPUB::Gepuber do
   it "should read config hash" do
     conf = 
       {
-      locale: 'ja',
-      title: 'theTitle',
-      author: 'theAuthor',
-      publisher: 'thePublisher',
-      date: '2011-03-11',
-      identifier: 'http://skoji.jp/gepuber/2011-03-11.0.0',
-      epubname: 'gepub_00',
-      table_of_contents: {
+      :locale => 'ja',
+      :title => 'theTitle',
+      :author => 'theAuthor',
+      :publisher => 'thePublisher',
+      :date => '2011-03-11',
+      :identifier => 'http://skoji.jp/gepuber/2011-03-11.0.0',
+      :epubname => 'gepub_00',
+      :table_of_contents => {
         '1_.html' => '1st toc',
         '3_.html' => '3rd toc',
         '3_.html#a1' => '3rd toc 2',
         '9_.html' => 'last toc'
       },
-      coverimg: 'cover.gif',
-      texts: [ '*.html' ],
-      resources: ['*.css','*.gif']
+      :coverimg => 'cover.gif',
+      :texts => [ '*.html' ],
+      :resources => ['*.css','*.gif']
     }
 
     gepuber = GEPUB::Gepuber.new(conf )

metadata

@@ -1,105 +1,81 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gepub
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.0
   prerelease: 
-  version: 0.4.5
 platform: ruby
-authors: 
+authors:
 - KOJIMA Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: libxml-ruby
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.4
-  type: :runtime
-  prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rubyzip
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.4
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.7
-  type: :development
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+date: 2012-01-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70335555213040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70335555213040
+- !ruby/object:Gem::Dependency
   name: epubcheck
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70335555212540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70335555212540
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &70335555212080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.1
-  type: :development
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
   prerelease: false
-  version_requirements: *id006
-description: an easy-to-use (and easy-to-implement) EPUB generator.
-email: skoji@skoji.jp
-executables: 
+  version_requirements: *70335555212080
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: &70335555211620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *70335555211620
+description: an easy-to-use EPUB generator.
+email:
+- skoji@mac.com
+executables:
 - gepuber
 extensions: []
-
-extra_rdoc_files: 
-- README.rdoc
-files: 
+extra_rdoc_files: []
+files:
 - .document
+- .gitignore
 - Gemfile
 - README.rdoc
 - Rakefile
-- VERSION
 - bin/gepuber
 - examples/example.rb
 - gepub.gemspec
 - lib/gepub.rb
 - lib/gepub/book.rb
-- lib/gepub/generator.rb
 - lib/gepub/gepuber.rb
 - lib/gepub/item.rb
+- lib/gepub/version.rb
 - spec/fixtures/testdata/0.html
 - spec/fixtures/testdata/1.html
 - spec/gepub_spec.rb
@@ -107,33 +83,31 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/skoji/gepub
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.7.2
+rubyforge_project: gepub
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: a good-enough EPUB generator.
-test_files: 
-- examples/example.rb
+test_files:
+- spec/fixtures/testdata/0.html
+- spec/fixtures/testdata/1.html
 - spec/gepub_spec.rb
 - spec/gepuber_spec.rb
 - spec/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-0.4.5

data/lib/gepub/generator.rb

@@ -1,275 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'rubygems'
-require 'xml/libxml'
-require 'zip/zip'
-require 'fileutils'
-
-
-module GEPUB
-  class Generator
-
-    attr_accessor :spine
-
-    def initialize(title)
-      warn('GEPUB::Generator is obsolete. use GEPUB::Book instead.')
-      @metadata = Hash.new
-      @manifest = Hash.new
-      @spine = Array.new
-      @toc = Array.new
-      @metadata[:title] = title
-      @manifest['ncx'] = { :href => 'toc.ncx', :mediatype => 'application/x-dtbncx+xml' }
-      @contents_prefix = "" # may insert "OEBPS/"
-      @locale = 'en'
-    end
-
-    def contents_prefix=(prefix)
-      @contents_prefix =  prefix + "/"
-    end
-
-    def title
-      @metadata[:title]
-    end
-
-    def title=(title)
-      @metadata[:title] = title
-    end
-
-    def author
-      @metadata[:creator]
-    end
-
-    def author=(author)
-      @metadata[:creator] = author
-    end
-
-    def contributor
-      @metadata[:contributor]
-    end
-    
-    def contributor=(contributor)
-      @metadata[:contributor] = contributor
-    end
-
-    def publisher
-      @metadata[:publisher]
-    end
-
-    def publisher=(publisher)
-      @metadata[:publisher] = publisher
-    end
-    
-    def date
-      @metadata[:date]
-    end
-
-    def date=(date)
-      @metadata[:date] = date
-    end
-    
-    def identifier
-      @metadata[:itentifier]
-    end
-
-    def identifier=(id)
-      @metadata[:identifier] = id
-    end
-    
-    def locale
-      @locale
-    end
-    
-    def locale=(locale)
-      @locale = locale
-    end
-
-    def addManifest(id, href, mediatype)
-      @manifest[id] = { :href => href, :mediatype => mediatype }
-    end
-
-    def addNav(id, text, ref)
-      @toc.push({ :id => id, :text => text, :ref => ref})
-    end
-
-    def specifyCoverImage(id)
-      @metadata[:cover] = id
-    end
-
-    def create(destdir)
-      create_mimetype(destdir)
-      create_container(destdir)
-      create_toc(destdir)
-      create_opf(destdir)
-    end
-    
-    def create_epub(destdir, targetdir, epubname = @metadata[:title])
-      realtarget = File::expand_path(targetdir)
-
-      FileUtils.cd("#{destdir}") do
-        |dir|
-        epubname = "#{realtarget}/#{epubname}.epub"
-        File.delete(epubname) if File.exist?(epubname)
-        
-        Zip::ZipOutputStream::open(epubname) {
-          |epub|
-          epub.put_next_entry('mimetype', '', '', Zip::ZipEntry::STORED)
-          epub << 'application/epub+zip'
-
-          Dir["**/*"].each do
-            |f|
-            if File.basename(f) != 'mimetype' && !File.directory?(f)
-              File.open(f,'rb') do
-                |file|
-                epub.put_next_entry(f)
-                epub << file.read
-              end
-            end
-          end
-        }
-      end
-    end
-
-    def mimetype_contents
-      <<EOF
-application/epub+zip
-EOF
-    end
-    def create_mimetype(destdir)
-      File.open(destdir + '/mimetype', 'w') {
-        | file |
-        file << mimetype_contents
-      }
-    end
-
-    def container_xml
-      <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
-  <rootfiles>
-    <rootfile full-path="#{@contents_prefix}content.opf" media-type="application/oebps-package+xml"/>
-  </rootfiles>
-</container>
-EOF
-    end
-
-    def create_container(destdir)
-      infdir = destdir + "/META-INF"
-      Dir.mkdir(infdir) if !File.exist?(infdir)
-
-      File.open(infdir + "/container.xml", 'w') {
-        |file|
-        file << container_xml
-      }
-    end
-
-    def opf_xml
-      result = XML::Document.new
-      result.root = XML::Node.new('package')
-      package = result.root
-      XML::Namespace.new(package, nil, 'http://www.idpf.org/2007/opf')
-      package['version'] = '2.0'
-      package['unique-identifier'] = 'BookID'
-
-
-      package << metadataelem = XML::Node.new('metadata')
-      XML::Namespace.new(metadataelem, 'opf', 'http://www.idpf.org/2007/opf')
-      XML::Namespace.new(metadataelem, 'dc', "http://purl.org/dc/elements/1.1/")
-
-      metadataelem << XML::Node.new('dc:language', @locale)
-
-      @metadata.each { | k, v |
-        if (k == :cover)
-          metadataelem << node = XML::Node.new("meta")
-          node['name'] = 'cover'
-          node['content'] = v
-        else
-          metadataelem << node = XML::Node.new("dc:#{k}",v)
-          if (k == :identifier)
-            node['id'] = 'BookID'
-            node['opf:scheme'] = 'URL'
-          end
-        end
-      }
-
-      package << manifestelem = XML::Node.new('manifest')
-      @manifest.each {|k,v|
-        manifestelem << node = XML::Node.new("item")
-        node['id'] = "#{k}"
-        node['href'] = "#{v[:href]}"
-        node['media-type'] = "#{v[:mediatype]}" 
-      }
-      
-      package << spineelem = XML::Node.new('spine')
-      spineelem['toc'] = 'ncx'
-
-      @spine.each {
-        |v|
-        spineelem << node = XML::Node.new('itemref')
-        node['idref'] = "#{v}"
-      }
-
-      result.to_s
-
-    end
-
-    def create_opf(destdir)
-      File.open(destdir + "/" + @contents_prefix + "content.opf", 'w') { | file | file << opf_xml }
-    end
-
-    def ncx_xml
-      result = XML::Document.new
-      result.root = XML::Node.new('ncx')
-      root = result.root
-      XML::Namespace.new(root, nil, "http://www.daisy.org/z3986/2005/ncx/")
-      root['version'] = "2005-1"
-      root << head = XML::Node.new('head')
-      head << uid = XML::Node.new('meta')
-      uid['name'] = 'dtb:uid'
-      uid['content'] = "#{@metadata[:identifier]}"
-
-      head << depth = XML::Node.new('meta')
-      depth['name'] = 'dtb:depth'
-      depth['content'] = '1'
-
-      head << totalPageCount = XML::Node.new('meta')
-      totalPageCount['name'] = 'dtb:totalPageCount'
-      totalPageCount['content'] = '0'
-
-      head << maxPageNumber = XML::Node.new('meta')
-      maxPageNumber['name'] = 'dtb:maxPageNumber'
-      maxPageNumber['content'] = '0'
-
-
-      root << docTitle = XML::Node.new('docTitle')
-      docTitle << XML::Node.new('text', "#{@metadata[:title]}")
-      
-      root << nav_map = XML::Node.new('navMap')
-      count = 1
-      @toc.each {
-        |x|
-        nav_point = XML::Node.new('navPoint')
-        nav_point['id'] = "#{x[:id]}"
-        nav_point['playOrder'] = "#{count}"
-        
-        nav_label = XML::Node.new('navLabel')
-        nav_label << XML::Node.new('text', "#{x[:text]}")
-        
-        nav_content = XML::Node.new('content')
-        nav_content['src'] = "#{x[:ref]}"
-        count = count + 1
-
-        nav_map << nav_point
-        nav_point << nav_label
-        nav_point << nav_content
-      }
-      result.to_s
-    end
-    
-    def create_toc(destdir)
-      File.open(destdir + "/" + @contents_prefix + "toc.ncx", 'w') {
-        |file|
-        file << ncx_xml
-      }
-    end
-
-  end
-end