epub-parser 0.0.3 → 0.0.4

data/epub-parser.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'thin'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'epzip'
+  s.add_development_dependency 'epub_validator'
 
   s.add_runtime_dependency 'enumerabler'
   s.add_runtime_dependency 'nokogiri'

data/lib/epub.rb

@@ -0,0 +1,52 @@
+require 'epub/ocf'
+require 'epub/publication'
+require 'epub/content_document'
+
+module EPUB
+  modules = [ :ocf, :package, :content_document ]
+  attr_reader *modules
+  modules.each do |mod|
+    define_method "#{mod}=" do |obj|
+      instance_variable_set "@#{mod}", obj
+      obj.book = self
+    end
+  end
+
+  def each_page_by_spine(&blk)
+    enum = @package.spine.items
+    if block_given?
+      enum.each &blk
+    else
+      enum
+    end
+  end
+
+  def each_page_by_toc(&blk)
+  end
+
+  def each_content(&blk)
+    enum = @package.manifest.items
+    if block_given?
+      enum.each &blk
+    else
+      enum.to_enum
+    end
+  end
+
+  def other_navigation
+  end
+
+  def resources
+    @package.manifest.items
+  end
+
+  # Syntax sugar
+  def rootfile_path
+    ocf.container.rootfile.full_path
+  end
+
+  # Syntax sugar
+  def cover_image
+    package.manifest.cover_image
+  end
+end

data/lib/epub/book.rb

@@ -1,43 +1,7 @@
-require 'epub/ocf'
-require 'epub/publication'
-require 'epub/content_document'
+require 'epub'
 
 module EPUB
   class Book
-    attr_accessor :ocf, :package, :content_document
-
-    def each_page_by_spine(&blk)
-      enum = @package.spine.items
-      if block_given?
-        enum.each &blk
-      else
-        enum
-      end
-    end
-
-    def each_page_by_toc(&blk)
-    end
-
-    def each_content(&blk)
-      enum = @package.manifest.items
-      if block_given?
-        enum.each &blk
-      else
-        enum.to_enum
-      end
-    end
-
-    def other_navigation
-    end
-
-    # Syntax sugar
-    def rootfile_path
-      ocf.container.rootfile.full_path
-    end
-
-    # Syntax sugar
-    def cover_image
-      package.manifest.cover_image
-    end
+    include EPUB
   end
 end

data/lib/epub/ocf.rb

@@ -3,6 +3,6 @@ module EPUB
     MODULES = %w[container encryption manifest metadata rights signatures]
     MODULES.each {|m| require "epub/ocf/#{m}"}
 
-    attr_accessor *MODULES
+    attr_accessor :book, *MODULES
   end
 end

data/lib/epub/parser.rb

@@ -1,4 +1,3 @@
-require 'epub/book'
 require 'epub/constants'
 require 'epub/parser/version'
 require 'epub/parser/ocf'
@@ -23,7 +22,7 @@ module EPUB
       Dir.mkdir(root_directory) unless File.directory? root_directory
       @dir = File.realpath root_directory
 
-      @book = Book.new
+      @book = create_book options
 
       unzip_cmd = options['unzip-command'] || 'unzip'
       unzip_cmd << " #{@filepath.to_s.shellescape} -d #{@dir.to_s.shellescape}"
@@ -34,7 +33,7 @@ puts unzip_cmd
     def parse
       @book.ocf = parse_ocf
       @book.package = parse_publication
-      @book.content_document = parse_content_document
+      # @book.content_document =??? parse_content_document
       # ...
 
       @book
@@ -51,5 +50,19 @@ puts unzip_cmd
     def parse_content_document
       # ContentDocument.parse @dir
     end
+
+    private
+
+    def create_book(params)
+      case
+      when params[:book]
+        options[:book]
+      when params[:class]
+        options[:class].new
+      else
+        require 'epub/book'
+        Book.new
+      end
+    end
   end
 end

data/lib/epub/parser/version.rb

@@ -1,5 +1,5 @@
 module EPUB
   class Parser
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/epub/publication/package.rb

@@ -3,7 +3,8 @@
 module EPUB
   module Publication
     class Package
-      attr_accessor :version, :unique_identifier, :prefix, :xml_lang, :dir, :id
+      attr_accessor :book,
+                    :version, :unique_identifier, :prefix, :xml_lang, :dir, :id
       attr_reader :metadata, :manifest, :spine, :guide
       alias lang  xml_lang
       alias lang= xml_lang=

data/test/helper.rb

@@ -5,5 +5,3 @@ end
 
 gem 'test-unit'
 require 'test/unit'
-
-include EPUB

data/test/test_parser.rb

@@ -25,13 +25,13 @@ class TestParser < Test::Unit::TestCase
 
     def test_each_page_by_spine_iterates_items_in_spines_order
       @book.each_page_by_spine do |page|
-        assert_instance_of Publication::Package::Manifest::Item, page
+        assert_instance_of EPUB::Publication::Package::Manifest::Item, page
       end
     end
 
     def test_each_content_iterates_items_in_manifest
       @book.each_content do |page|
-        assert_instance_of Publication::Package::Manifest::Item, page
+        assert_instance_of EPUB::Publication::Package::Manifest::Item, page
       end
     end
 
@@ -45,7 +45,13 @@ class TestParser < Test::Unit::TestCase
       contents = @book.each_content
 
       contents.each do |page|
-        assert_instance_of Publication::Package::Manifest::Item, page
+        assert_instance_of EPUB::Publication::Package::Manifest::Item, page
+      end
+    end
+
+    def test_h
+      @book.resources.each do |item|
+        assert_instance_of EPUB::Publication::Package::Manifest::Item, item
       end
     end
   end

data/test/test_parser_content_document.rb

@@ -4,7 +4,7 @@ require 'epub/parser/content_document'
 class TestParserContentDocument < Test::Unit::TestCase
   def setup
     @dir = 'test/fixtures/book'
-    @parser = Parser::ContentDocument.new @dir
+    @parser = EPUB::Parser::ContentDocument.new @dir
   end
 
   def test_parse_navigations

data/test/test_parser_ocf.rb

@@ -4,7 +4,7 @@ require 'epub/parser/ocf'
 
 class TestParserOCF < Test::Unit::TestCase
   def setup
-    @parser = Parser::OCF.new 'test/fixtures/book'
+    @parser = EPUB::Parser::OCF.new 'test/fixtures/book'
   end
 
   def test_parse_container_can_find_primary_rootfile

data/test/test_parser_publication.rb

@@ -4,7 +4,7 @@ require 'epub/parser/publication'
 
 class TestParserPublication < Test::Unit::TestCase
   def setup
-    @parser = Parser::Publication.new 'test/fixtures/book/OPS/ルートファイル.opf'
+    @parser = EPUB::Parser::Publication.new 'test/fixtures/book/OPS/ルートファイル.opf'
   end
 
   class TestParseManifest < TestParserPublication
@@ -26,7 +26,7 @@ class TestParserPublication < Test::Unit::TestCase
     def test_fallback_attribute_of_item_should_be_item_object
       fallback = @manifest['manifest-item-2'].fallback
 
-      assert_instance_of Publication::Package::Manifest::Item, fallback
+      assert_instance_of EPUB::Publication::Package::Manifest::Item, fallback
       assert_equal 'manifest-item-fallback', fallback.id
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epub-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-03 00:00:00.000000000Z
+date: 2012-01-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubygems-test
-  requirement: &9485980 !ruby/object:Gem::Requirement
+  requirement: &23104020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9485980
+  version_requirements: *23104020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9485300 !ruby/object:Gem::Requirement
+  requirement: &23103420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9485300
+  version_requirements: *23103420
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &9483760 !ruby/object:Gem::Requirement
+  requirement: &23102800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9483760
+  version_requirements: *23102800
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &9481540 !ruby/object:Gem::Requirement
+  requirement: &23101980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *9481540
+  version_requirements: *23101980
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &9480560 !ruby/object:Gem::Requirement
+  requirement: &23101360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9480560
+  version_requirements: *23101360
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &9479860 !ruby/object:Gem::Requirement
+  requirement: &23100660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9479860
+  version_requirements: *23100660
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &9479400 !ruby/object:Gem::Requirement
+  requirement: &23099840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9479400
+  version_requirements: *23099840
 - !ruby/object:Gem::Dependency
   name: epzip
-  requirement: &9065560 !ruby/object:Gem::Requirement
+  requirement: &23099100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9065560
+  version_requirements: *23099100
+- !ruby/object:Gem::Dependency
+  name: epub_validator
+  requirement: &23098420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *23098420
 - !ruby/object:Gem::Dependency
   name: enumerabler
-  requirement: &9064540 !ruby/object:Gem::Requirement
+  requirement: &23114140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9064540
+  version_requirements: *23114140
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &9063520 !ruby/object:Gem::Requirement
+  requirement: &23113600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9063520
+  version_requirements: *23113600
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &9062780 !ruby/object:Gem::Requirement
+  requirement: &23113100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +142,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9062780
+  version_requirements: *23113100
 description: Parse EPUB 3 book loosely
 email:
 - KitaitiMakoto@gmail.com
@@ -146,6 +157,7 @@ files:
 - README
 - Rakefile
 - epub-parser.gemspec
+- lib/epub.rb
 - lib/epub/book.rb
 - lib/epub/constants.rb
 - lib/epub/content_document.rb
@@ -198,7 +210,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1208319521840117348
+      hash: 1759315474015504497
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -207,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1208319521840117348
+      hash: 1759315474015504497
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.8