epub-parser 0.0.4 → 0.0.5

data/Rakefile

@@ -10,3 +10,13 @@ Rake::TestTask.new do |task|
 end
 
 YARD::Rake::YardocTask.new
+
+namespace :sample do
+  desc 'Build the test fixture EPUB'
+  task :build do
+    input_dir  = 'test/fixtures/book'
+    output_dir = 'test/fixtures/'
+    FileList["#{input_dir}/**/*"]
+    sh "epzip #{input_dir}"
+  end
+end

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 'epubcheck'
   s.add_development_dependency 'epub_validator'
 
   s.add_runtime_dependency 'enumerabler'

data/lib/epub/parser/ocf.rb

@@ -34,8 +34,8 @@ module EPUB
           rootfile = EPUB::OCF::Container::Rootfile.new
           %w[full-path media-type].each do |attr|
             rootfile.send(attr.gsub(/-/, '_') + '=', elem[attr])
-            container.rootfiles << rootfile
           end
+          container.rootfiles << rootfile
         end
 
         container

data/lib/epub/parser/publication.rb

@@ -68,7 +68,7 @@ module EPUB
           %w[ idref id ].each do |attr|
             itemref.send "#{attr}=", elm[attr]
           end
-          itemref.linear = !(elm['linear'] == 'no')
+          itemref.linear = (elm['linear'] != 'no')
           itemref.properties = elm['properties'] ? elm['properties'].split(' ') : []
           spine << itemref
         end

data/lib/epub/parser/version.rb

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

data/lib/epub/publication/package/manifest.rb

@@ -7,13 +7,12 @@ module EPUB
       class Manifest
         attr_accessor :package,
                       :id
-        attr_reader :items
 
         # syntax sugar for #items.<<
         def <<(item)
-          @items ||= []
+          @items ||= {}
           item.manifest = self
-          @items << item
+          @items[item.id] = item
         end
 
         # syntax sugar
@@ -29,8 +28,12 @@ module EPUB
           items.selector {|i| i.properties.include? 'cover-image'}.first
         end
 
+        def items
+          @items.collect {|id, item| item}
+        end
+
         def [](item_id)
-          items.selector {|item| item.id == item_id}.first
+          @items[item_id]
         end
 
         class Item

data/lib/epub/publication/package/spine.rb

@@ -34,6 +34,7 @@ module EPUB
         class Itemref
           attr_accessor :spine,
                         :idref, :linear, :id, :properties
+          alias linear? linear
 
           # @return [Package::Manifest::Item] item referred by this object
           def item

data/test/fixtures/book/OPS//343/203/253/343/203/274/343/203/210/343/203/225/343/202/241/343/202/244/343/203/253.opf

@@ -26,6 +26,12 @@
     <item id="cover"
 	  href="cover.xhtml"
 	  media-type="application/xhtml+xml"/>
+    <item id="internal-css"
+	  href="special.css"
+	  media-type="text/css"/>
+    <item id="external-css"
+	  href="http://example.net/stylesheets/common.css"
+	  media-type="text/css"/>
   </manifest>
   <spine>
     <itemref idref="nav"/>

data/test/test_parser.rb

@@ -50,6 +50,8 @@ class TestParser < Test::Unit::TestCase
     end
 
     def test_h
+      Modify method name
+
       @book.resources.each do |item|
         assert_instance_of EPUB::Publication::Package::Manifest::Item, item
       end

data/test/test_parser_ocf.rb

@@ -7,6 +7,10 @@ class TestParserOCF < Test::Unit::TestCase
     @parser = EPUB::Parser::OCF.new 'test/fixtures/book'
   end
 
+  def test_parsed_container_has_one_rootfile
+    assert_equal 1, @parser.parse_container.rootfiles.length
+  end
+
   def test_parse_container_can_find_primary_rootfile
     container = @parser.parse_container
 

data/test/test_parser_publication.rb

@@ -13,8 +13,8 @@ class TestParserPublication < Test::Unit::TestCase
       @manifest = @parser.parse_manifest
     end
 
-    def test_manifest_has_6_items
-      assert_equal 6, @manifest.items.length
+    def test_manifest_has_8_items
+      assert_equal 8, @manifest.items.length
     end
 
     def test_item_has_full_path_as_iri_attribute
@@ -76,6 +76,11 @@ class TestParserPublication < Test::Unit::TestCase
 
       assert_equal fallback, result
     end
+
+    def test_item_with_absolute_iri_as_href_must_keep_it
+      item = @manifest['external-css']
+      assert_equal 'http://example.net/stylesheets/common.css', item.iri.to_s
+    end
   end
 
   class TestParseGuide < TestParserPublication

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epub-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000Z
+date: 2012-01-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubygems-test
-  requirement: &23104020 !ruby/object:Gem::Requirement
+  requirement: &11713580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23104020
+  version_requirements: *11713580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &23103420 !ruby/object:Gem::Requirement
+  requirement: &11712960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23103420
+  version_requirements: *11712960
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &23102800 !ruby/object:Gem::Requirement
+  requirement: &11712220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23102800
+  version_requirements: *11712220
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &23101980 !ruby/object:Gem::Requirement
+  requirement: &11730760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *23101980
+  version_requirements: *11730760
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &23101360 !ruby/object:Gem::Requirement
+  requirement: &11730060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23101360
+  version_requirements: *11730060
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &23100660 !ruby/object:Gem::Requirement
+  requirement: &11729480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23100660
+  version_requirements: *11729480
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &23099840 !ruby/object:Gem::Requirement
+  requirement: &11728780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23099840
+  version_requirements: *11728780
 - !ruby/object:Gem::Dependency
   name: epzip
-  requirement: &23099100 !ruby/object:Gem::Requirement
+  requirement: &11728300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23099100
+  version_requirements: *11728300
+- !ruby/object:Gem::Dependency
+  name: epubcheck
+  requirement: &11727620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *11727620
 - !ruby/object:Gem::Dependency
   name: epub_validator
-  requirement: &23098420 !ruby/object:Gem::Requirement
+  requirement: &11727080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23098420
+  version_requirements: *11727080
 - !ruby/object:Gem::Dependency
   name: enumerabler
-  requirement: &23114140 !ruby/object:Gem::Requirement
+  requirement: &11726420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23114140
+  version_requirements: *11726420
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &23113600 !ruby/object:Gem::Requirement
+  requirement: &11725700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23113600
+  version_requirements: *11725700
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &23113100 !ruby/object:Gem::Requirement
+  requirement: &11725080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +153,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23113100
+  version_requirements: *11725080
 description: Parse EPUB 3 book loosely
 email:
 - KitaitiMakoto@gmail.com
@@ -210,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1759315474015504497
+      hash: -4205757875746414572
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -219,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1759315474015504497
+      hash: -4205757875746414572
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.8