epub-parser 0.2.2 → 0.2.3

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

@@ -52,6 +52,10 @@ module EPUB
           languages.first
         end
 
+        def modified
+          metas.find {|meta| meta.property == 'dcterms:modified'}
+        end
+
         def to_h
           DC_ELEMS.inject({}) do |hsh, elem|
             hsh[elem] = __send__(elem)
@@ -94,20 +98,20 @@ module EPUB
         class Identifier < DCMES
           # @note This is ad-hoc
           # @todo Define and include OPF module for opf:scheme attribute
-          # @todo Define generale way to handle with identifier-type refiners
+          # @todo Define general way to handle with identifier-type refiners
           attr_accessor :scheme
 
           # @note This is ad-hoc
           # @todo Define and include OPF module for opf:scheme attribute
-          # @todo Define generale way to handle with identifier-type refiners
+          # @todo Define general way to handle with identifier-type refiners
           def isbn?
+            scheme == 'ISBN' or
+            content.to_s.downcase.start_with? 'urn:isbn' or
             refiners.any? {|refiner|
               refiner.property == 'identifier-type' and
               refiner.scheme == 'onix:codelist5' and
               %w[02 15].include? refiner.content
-            } or
-            scheme == 'ISBN' or
-            content.to_s.downcase.start_with? 'urn:isbn'
+            }
           end
         end
 

data/lib/epub/searcher/publication.rb

@@ -4,7 +4,6 @@ module EPUB
   module Searcher
     class Publication
       class << self
-        # @todo Use named argument in the future
         def search(package, word, **options)
           new(word).search(package, options)
         end
@@ -14,7 +13,6 @@ module EPUB
         @word = word
       end
 
-      # @todo Use named argument in the future
       def search(package, algorithm: :seamless)
         results = []
 

data/test/helper.rb

@@ -3,7 +3,9 @@ SimpleCov.start do
   add_filter '/test|deps/'
 end
 
+require 'pp'
 require 'test/unit'
 require 'test/unit/rr'
 require 'test/unit/notify'
+require 'pry'
 require 'epub/parser'

data/test/test_cfi.rb

@@ -0,0 +1,227 @@
+# coding: utf-8
+require_relative 'helper'
+require 'epub/cfi'
+require 'epub/parser/cfi'
+require 'nokogiri/diff'
+
+class TestCFI < Test::Unit::TestCase
+  def test_escape
+    assert_equal '^^^[^]^(^)^,^;^=', EPUB::CFI.escape('^[](),;=')
+  end
+
+  def test_unescape
+    assert_equal '^[](),;=', EPUB::CFI.unescape('^^^[^]^(^)^,^;^=')
+  end
+
+  class TestPath < self
+    data([
+      '/6/14[chap05ref]!/4[body01]/10/2/1:3[2^[1^]]',
+      '/6/4!/4/10/2/1:3[Ф-"spa ce"-99%-aa^[bb^]^^]',
+      '/6/4!/4/10/2/1:3[Ф-"spa%20ce"-99%25-aa^[bb^]^^]',
+      '/6/4!/4/10/2/1:3[%d0%a4-"spa%20ce"-99%25-aa^[bb^]^^]',
+      '/6/4[chap01ref]!/4[body01]/10[para05]/2/1:3[yyy]',
+      '/6/4[chap01ref]!/4[body01]/10[para05]/1:3[xx,y]',
+      '/6/4[chap01ref]!/4[body01]/10[para05]/2/1:3[,y]',
+      '/6/4[chap01ref]!/4[body01]/10[para05]/2/1:3[;s=b]',
+      '/6/4[chap01ref]!/4[body01]/10[para05]/2/1:3[yyy;s=b]',
+      '/6/4[chap01ref]!/4[body01]/10[para05]/2[;s=b]',
+      '/6/4[chap01ref]!/4[body01]/10[para05]/3:10',
+      '/6/4[chap01ref]!/4[body01]/16[svgimg]',
+      '/6/4[chap01ref]!/4[body01]/10[para05]/1:0',
+      '/6/4[chap01ref]!/4[body01]/10[para05]/2/1:0',
+      '/6/4[chap01ref]!/4[body01]/10[para05]/2/1:3',
+    ].reduce({}) {|data, cfi|
+      data[cfi] = cfi
+      data
+    })
+    def test_to_s(cfi)
+      assert_equal cfi, epubcfi(cfi).to_s
+    end
+
+    data([
+      'epubcfi(/6/14[chap05ref]!/4[body01]/10/2/1:3[2^[1^]])',
+      'epubcfi(/6/4!/4/10/2/1:3[Ф-"spa ce"-99%-aa^[bb^]^^])',
+      'epubcfi(/6/4!/4/10/2/1:3[Ф-"spa%20ce"-99%25-aa^[bb^]^^])',
+      'epubcfi(/6/4!/4/10/2/1:3[%d0%a4-"spa%20ce"-99%25-aa^[bb^]^^])',
+      'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/2/1:3[yyy])',
+      'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/1:3[xx,y])',
+      'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/2/1:3[,y])',
+      'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/2/1:3[;s=b])',
+      'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/2/1:3[yyy;s=b])',
+      'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/2[;s=b])',
+      'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/3:10)',
+      'epubcfi(/6/4[chap01ref]!/4[body01]/16[svgimg])',
+      'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/1:0)',
+      'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/2/1:0)',
+      'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/2/1:3)',
+    ].reduce({}) {|data, cfi|
+      data[cfi] = cfi
+      data
+    })
+    def test_to_fragment(cfi)
+      assert_equal cfi, EPUB::Parser::CFI.parse(cfi).to_fragment
+    end
+
+    def test_compare
+      assert_equal -1, epubcfi('/6/4[id]') <=> epubcfi('/6/5')
+      assert_equal 0, epubcfi('/6/4') <=> epubcfi('/6/4')
+      assert_equal 1, epubcfi('/6/4') <=> epubcfi('/4/6')
+      assert_equal 1, epubcfi('/6/4!/4@3:7') <=> epubcfi('/6/4!/4')
+      assert_equal 1,
+        epubcfi('/6/4[chap01ref]!/4[body01]/10[para05]/2/1:3[yyy]') <=>
+        epubcfi('/6/4[chap01ref]!/4[body01]/10[para05]/1:3[xx,y]')
+      assert_nil epubcfi('/6/4[chap01ref]!/4[body01]/10[para05]/3:10') <=>
+        epubcfi('/6/4[chap01ref]!/4[body01]/10[para05]/3!:10')
+      assert_equal 1, epubcfi('/6/4') <=> epubcfi('/6')
+    end
+  end
+
+  class TestRange < self
+    def test_attributes
+      parent = epubcfi('/6/4[chap01ref]!/4[body01]/10[para05]')
+      first = epubcfi('/6/4[chap01ref]!/4[body01]/10[para05]/2/1:1')
+      last = epubcfi('/6/4[chap01ref]!/4[body01]/10[para05]/3:4')
+      range = epubcfi('/6/4[chap01ref]!/4[body01]/10[para05],/2/1:1,/3:4')
+      assert_equal 0, first <=> range.first
+      assert_equal 0, last <=> range.last
+
+      assert_equal 0, parent <=> range.parent
+    end
+
+    def test_to_s
+      assert_equal 'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/2/1:1)..epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/3:4)', epubcfi('/6/4[chap01ref]!/4[body01]/10[para05],/2/1:1,/3:4').to_s
+      assert_equal 'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]!/2/1:1)..epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]!/3:4)', epubcfi('/6/4[chap01ref]!/4[body01]/10[para05],!/2/1:1,!/3:4').to_s
+    end
+
+    def test_to_fragment
+      cfi = '/6/4[chap01ref]!/4[body01]/10[para05],/2/1:1,/3:4'
+      assert_equal 'epubcfi(' + cfi + ')', epubcfi('/6/4[chap01ref]!/4[body01]/10[para05],/2/1:1,/3:4').to_fragment
+    end
+
+    def test_cover
+      assert_true epubcfi('/6/4[chap01ref]!/4[body01]/10[para05],/2/1:1,/3:4').cover? epubcfi('/6/4[chap01ref]!/4[body01]/10[para05]/2/2/4')
+    end
+  end
+
+  class TestStep < self
+    def test_to_s
+      assert_equal '/6', EPUB::CFI::Step.new(6).to_s
+      assert_equal '/4[id]', EPUB::CFI::Step.new(4, EPUB::CFI::IDAssertion.new('id')).to_s
+    end
+
+    def test_compare
+      assert_equal 0, EPUB::CFI::Step.new(6) <=> EPUB::CFI::Step.new(6, 'assertion')
+      assert_equal -1, EPUB::CFI::Step.new(6) <=> EPUB::CFI::Step.new(7)
+    end
+  end
+
+  class TestIDAssertion < self
+    def test_to_s
+      assert_equal '[id]', EPUB::CFI::IDAssertion.new('id').to_s
+      assert_equal '[id;p=a]', EPUB::CFI::IDAssertion.new('id', {'p' => ['a']}).to_s
+    end
+  end
+
+  class TestTextLocationAssertion < self
+    def test_to_s
+      assert_equal '[yyy]', EPUB::CFI::TextLocationAssertion.new('yyy').to_s
+      assert_equal '[xx,y]', EPUB::CFI::TextLocationAssertion.new('xx', 'y').to_s
+      assert_equal '[,y]', EPUB::CFI::TextLocationAssertion.new(nil, 'y').to_s
+      assert_equal '[;s=b]', EPUB::CFI::TextLocationAssertion.new(nil, nil, {'s' => ['b']}).to_s
+      assert_equal '[yyy;s=b]', EPUB::CFI::TextLocationAssertion.new('yyy', nil, {'s' => ['b']}).to_s
+    end
+  end
+
+  class TestCharacterOffset < self
+    def test_to_s
+      assert_equal ':1', EPUB::CFI::CharacterOffset.new(1).to_s
+      assert_equal ':2[yyy]', EPUB::CFI::CharacterOffset.new(2, EPUB::CFI::TextLocationAssertion.new('yyy')).to_s
+    end
+
+    def test_compare
+      assert_equal 0,
+        EPUB::CFI::CharacterOffset.new(3) <=>
+        EPUB::CFI::CharacterOffset.new(3, EPUB::CFI::TextLocationAssertion.new('yyy'))
+      assert_equal -1,
+        EPUB::CFI::CharacterOffset.new(4) <=>
+        EPUB::CFI::CharacterOffset.new(5)
+      assert_equal 1,
+        EPUB::CFI::CharacterOffset.new(4, EPUB::CFI::TextLocationAssertion.new(nil, 'xx')) <=>
+        EPUB::CFI::CharacterOffset.new(2)
+    end
+  end
+
+  class TestSpatialOffset < self
+    def test_to_s
+      assert_equal '@0.5:30.2', EPUB::CFI::TemporalSpatialOffset.new(nil, 0.5, 30.2).to_s
+      assert_equal '@0:100', EPUB::CFI::TemporalSpatialOffset.new(nil, 0, 100).to_s
+      assert_equal '@50:50.0', EPUB::CFI::TemporalSpatialOffset.new(nil, 50, 50.0).to_s
+    end
+
+    def test_compare
+      assert_equal 0,
+        EPUB::CFI::TemporalSpatialOffset.new(nil, 30, 40) <=>
+        EPUB::CFI::TemporalSpatialOffset.new(nil, 30, 40)
+      assert_equal 1,
+        EPUB::CFI::TemporalSpatialOffset.new(nil, 30, 40) <=>
+        EPUB::CFI::TemporalSpatialOffset.new(nil, 40, 30)
+    end
+  end
+
+  class TestTemporalOffset < self
+    def test_to_s
+      assert_equal '~23.5', EPUB::CFI::TemporalSpatialOffset.new(23.5).to_s
+    end
+
+    def test_compare
+      assert_equal 0,
+        EPUB::CFI::TemporalSpatialOffset.new(23.5) <=>
+        EPUB::CFI::TemporalSpatialOffset.new(23.5)
+      assert_equal -1,
+        EPUB::CFI::TemporalSpatialOffset.new(23) <=>
+        EPUB::CFI::TemporalSpatialOffset.new(23.5)
+    end
+  end
+
+  class TestTemporalSpatialOffset < self
+    def test_to_s
+      assert_equal '~23.5@50:30.0', EPUB::CFI::TemporalSpatialOffset.new(23.5, 50, 30.0).to_s
+    end
+
+    def test_compare
+      assert_equal 0,
+        EPUB::CFI::TemporalSpatialOffset.new(23.5, 30, 40) <=>
+        EPUB::CFI::TemporalSpatialOffset.new(23.5, 30, 40.0)
+      assert_equal 1,
+        EPUB::CFI::TemporalSpatialOffset.new(23.5, 30, 40) <=>
+        EPUB::CFI::TemporalSpatialOffset.new(23.5)
+      assert_equal -1,
+        EPUB::CFI::TemporalSpatialOffset.new(nil, 30, 40) <=>
+        EPUB::CFI::TemporalSpatialOffset.new(23.5, 30, 40)
+      assert_equal -1,
+        EPUB::CFI::TemporalSpatialOffset.new(23.5, 30, 40) <=>
+        EPUB::CFI::TemporalSpatialOffset.new(23.5, 30, 50)
+      assert_equal 1,
+        EPUB::CFI::TemporalSpatialOffset.new(24, 30, 40) <=>
+        EPUB::CFI::TemporalSpatialOffset.new(23.5, 100, 100)
+    end
+  end
+
+  private
+
+  def epubcfi(string)
+    EPUB::Parser::CFI.new.parse(string)
+  end
+
+  def assert_equal_node(expected, actual, message='')
+    diff = AssertionMessage.delayed_diff(expected.to_s, actual.to_s)
+    message = build_message(message, <<EOT, expected, actual, diff)
+<?>
+expected but was
+<?>.?
+EOT
+    assert_block message do
+      expected.tdiff_equal actual
+    end
+  end
+end

data/test/test_content_document.rb

@@ -65,7 +65,7 @@ class TestContentDocument < Test::Unit::TestCase
       item = EPUB::Publication::Package::Manifest::Item.new
       item.media_type = 'application/xhtml+xml'
       item.properties = %w[nav]
-      item.href = Addressable::URI.parse('nav.xhtml')
+      item.href = 'nav.xhtml'
       stub(item).read {File.read(File.expand_path('../fixtures/book/OPS/nav.xhtml', __FILE__))}
       manifest << item
       nav_doc = EPUB::Parser::ContentDocument.new(item).parse

data/test/test_ocf_physical_container.rb

@@ -53,13 +53,13 @@ class TestOCFPhysicalContainer < Test::Unit::TestCase
     end
   end
 
-  class TestFile < self
+  class TestUnpackedDirectory < self
     include ConcreteContainer
 
     def setup
       super
       @container_path = @container_path[0..-'.epub'.length-1]
-      @class = EPUB::OCF::PhysicalContainer::File
+      @class = EPUB::OCF::PhysicalContainer::UnpackedDirectory
       @container = @class.new(@container_path)
     end
 

data/test/test_parser.rb

@@ -29,7 +29,7 @@ class TestParser < Test::Unit::TestCase
   def test_parse_from_file_system
     adapter = EPUB::OCF::PhysicalContainer.adapter
     begin
-      EPUB::OCF::PhysicalContainer.adapter = :File
+      EPUB::OCF::PhysicalContainer.adapter = :UnpackedDirectory
       epub = EPUB::Parser.parse('test/fixtures/book')
       assert_instance_of EPUB::Book, epub
       assert_equal 'Mon premier guide de cuisson, un Mémoire', epub.main_title
@@ -39,11 +39,11 @@ class TestParser < Test::Unit::TestCase
   end
 
   def test_can_specify_container_adapter_when_parsing_individually
-    epub = EPUB::Parser.parse('test/fixtures/book', container_adapter: :File)
+    epub = EPUB::Parser.parse('test/fixtures/book', container_adapter: :UnpackedDirectory)
 
     assert_equal 'Mon premier guide de cuisson, un Mémoire', epub.main_title
     assert_equal File.read('test/fixtures/book/OPS/nav.xhtml'), epub.nav.read
-    assert_equal EPUB::OCF::PhysicalContainer::File, epub.container_adapter
+    assert_equal EPUB::OCF::PhysicalContainer::UnpackedDirectory, epub.container_adapter
     assert_equal EPUB::OCF::PhysicalContainer::Zipruby, EPUB::OCF::PhysicalContainer.adapter
   end
 

data/test/test_parser_cfi.rb

@@ -0,0 +1,38 @@
+# coding: utf-8
+require_relative 'helper'
+require 'epub/parser/cfi'
+
+class TestParserCFI < Test::Unit::TestCase
+  def setup
+    @parser = EPUB::Parser::CFI.new(debug: true)
+  end
+
+  # from http://www.idpf.org/epub/linking/cfi/epub-cfi.html
+  data([
+    'epubcfi(/6/14[chap05ref]!/4[body01]/10/2/1:3[2^[1^]])',
+    'epubcfi(/6/4!/4/10/2/1:3[Ф-"spa ce"-99%-aa^[bb^]^^])',
+    'epubcfi(/6/4!/4/10/2/1:3[Ф-"spa%20ce"-99%25-aa^[bb^]^^])',
+    'epubcfi(/6/4!/4/10/2/1:3[%d0%a4-"spa%20ce"-99%25-aa^[bb^]^^])',
+    'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/2/1:3[yyy])',
+    'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/1:3[xx,y])',
+    'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/2/1:3[,y])',
+    'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/2/1:3[;s=b])',
+    'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/2/1:3[yyy;s=b])',
+    'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/2[;s=b])',
+    'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/3:10)',
+    'epubcfi(/6/4[chap01ref]!/4[body01]/16[svgimg])',
+    'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/1:0)',
+    'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/2/1:0)',
+    'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/2/1:3)',
+    'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05],/2/1:1,/3:4)',
+    'epubcfi(/6,:1,:3)'
+  ].reduce({}) {|data, cfi|
+    data[cfi] = cfi
+    data
+  })
+  def test_raise_no_error_on_parsing_valid_cfi(cfi)
+    assert_nothing_raised do
+      @parser.parse(cfi)
+    end
+  end
+end

data/test/test_parser_content_document.rb

@@ -7,7 +7,7 @@ class TestParserContentDocument < Test::Unit::TestCase
     %w[item-1.xhtml item-2.xhtml nav.xhtml].each.with_index do |href, index|
       item = EPUB::Publication::Package::Manifest::Item.new
       item.id = index
-      item.href = Addressable::URI.parse(href)
+      item.href = href
       @manifest << item
     end
 

data/test/test_publication.rb

@@ -280,19 +280,27 @@ class TestPublication < Test::Unit::TestCase
 
       def test_find_item_by_relative_iri_returns_item_which_has_resolved_iri_as_href
         manifest = Package::Manifest.new
-        manifest << xhtml_item = Package::Manifest::Item.new.tap {|item| item.href = Addressable::URI.parse('text/01.xhtml')}
-        manifest << image_item = Package::Manifest::Item.new.tap {|item| item.href = Addressable::URI.parse('image/01.png')}
+        manifest << xhtml_item = Package::Manifest::Item.new.tap {|item| item.href = 'text/01.xhtml'}
+        manifest << image_item = Package::Manifest::Item.new.tap {|item| item.href = 'image/01.png'}
 
         assert_equal image_item, xhtml_item.find_item_by_relative_iri(Addressable::URI.parse('../image/01.png'))
       end
 
       def test_find_item_by_relative_iri_returns_nil_when_no_item_found
         manifest = Package::Manifest.new
-        manifest << xhtml_item = Package::Manifest::Item.new.tap {|item| item.href = Addressable::URI.parse('text/01.xhtml')}
+        manifest << xhtml_item = Package::Manifest::Item.new.tap {|item| item.href = 'text/01.xhtml'}
 
         assert_nil xhtml_item.find_item_by_relative_iri(Addressable::URI.parse('../image/01.png'))
       end
 
+      def test_find_item_by_relative_iri_raises_error_when_iri_starts_with_slash
+        item = Package::Manifest::Item.new
+
+        assert_raise ArgumentError do
+          item.find_item_by_relative_iri Addressable::URI.parse('/starting/with/slash')
+        end
+      end
+
       data('UTF-8'     => [Encoding::UTF_8,     'utf-8-encoded'],
            'EUC-JP'    => [Encoding::EUC_JP,    'euc-jp-encoded'],
            'Shift-JIS' => [Encoding::Shift_JIS, 'shift_jis-encoded'])
@@ -305,7 +313,7 @@ class TestPublication < Test::Unit::TestCase
 
       def test_entry_name_returns_normalized_iri
         item = Package::Manifest::Item.new
-        item.href = Addressable::URI.parse('../style.css')
+        item.href = '../style.css'
         obj = Object.new
         stub(item).manifest {obj}
         stub(obj).package {obj}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epub-parser
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - KITAITI Makoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-04 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -179,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: racc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,13 +193,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: zipruby
+  name: nokogiri-diff
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -207,33 +207,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: zipruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogumbo
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -295,12 +295,10 @@ files:
 - docs/UnpackedArchive.markdown
 - epub-parser.gemspec
 - examples/aggregate-contents-from-web.rb
-- features/epubinfo.feature
-- features/step_definitions/epubinfo_steps.rb
-- features/support/env.rb
 - lib/epub.rb
 - lib/epub/book.rb
 - lib/epub/book/features.rb
+- lib/epub/cfi.rb
 - lib/epub/constants.rb
 - lib/epub/content_document.rb
 - lib/epub/content_document/navigation.rb
@@ -313,12 +311,15 @@ files:
 - lib/epub/ocf/metadata.rb
 - lib/epub/ocf/physical_container.rb
 - lib/epub/ocf/physical_container/archive_zip.rb
-- lib/epub/ocf/physical_container/file.rb
+- lib/epub/ocf/physical_container/unpacked_directory.rb
 - lib/epub/ocf/physical_container/unpacked_uri.rb
 - lib/epub/ocf/physical_container/zipruby.rb
 - lib/epub/ocf/rights.rb
 - lib/epub/ocf/signatures.rb
 - lib/epub/parser.rb
+- lib/epub/parser/cfi.rb
+- lib/epub/parser/cfi.tab.rb
+- lib/epub/parser/cfi.y
 - lib/epub/parser/content_document.rb
 - lib/epub/parser/ocf.rb
 - lib/epub/parser/publication.rb
@@ -354,12 +355,14 @@ files:
 - test/fixtures/book/OPS/日本語.xhtml
 - test/fixtures/book/mimetype
 - test/helper.rb
+- test/test_cfi.rb
 - test/test_content_document.rb
 - test/test_epub.rb
 - test/test_fixed_layout.rb
 - test/test_inspect.rb
 - test/test_ocf_physical_container.rb
 - test/test_parser.rb
+- test/test_parser_cfi.rb
 - test/test_parser_content_document.rb
 - test/test_parser_fixed_layout.rb
 - test/test_parser_ocf.rb
@@ -386,21 +389,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: EPUB 3 Parser
 test_files:
-- features/epubinfo.feature
-- features/step_definitions/epubinfo_steps.rb
-- features/support/env.rb
 - test/helper.rb
+- test/test_cfi.rb
 - test/test_content_document.rb
 - test/test_epub.rb
 - test/test_fixed_layout.rb
 - test/test_inspect.rb
 - test/test_ocf_physical_container.rb
 - test/test_parser.rb
+- test/test_parser_cfi.rb
 - test/test_parser_content_document.rb
 - test/test_parser_fixed_layout.rb
 - test/test_parser_ocf.rb