epub-parser 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cad6963a6325a736ef8f5006e9b0a037e0718070
-  data.tar.gz: d1ef1c2fbb7dd77791524c39cab200eecee063ad
+  metadata.gz: 5064ac374ce37d6547455f140004939cc0fb6beb
+  data.tar.gz: 210f062f461f4ae37f84709953e1f1f029ddba44
 SHA512:
-  metadata.gz: 05c2b6004493b0f41d6b3ba7e9f32f6aed5c171f34f9477d39d7a10493d2dce2e711c49816fc26784ff25deb7a966c9b297cc1e1a0d12398920bccf17aacc2cc
-  data.tar.gz: b4d737ae179399f3f159561d103a5b52bd2dc9c7c17e5fed8115cb1b1a0dca296ba5d60c8840f72b425d3d222503de6dd07fc3aceac1adde72ca744a7d3af3d4
+  metadata.gz: 726184ddb137eaceed9774eb81bcf3ea36b9896495b247a115dbc89d12f628af2ccc7d0f8abb87baec30e8fa44c0bcd4f40b0175297f5e21922d7f3696c58628
+  data.tar.gz: 0d5c3e0d8a4afc8410088ef77daeb59d28f37caf1a349ddfd4eeeb693d0364dce61a19e3cc69c6d79032f51fc3b24c8b20fb5303f389aa6e6f975111edf983d9

data/.yardopts

@@ -10,4 +10,4 @@ docs/EpubOpen.markdown
 docs/Navigation.markdown
 docs/Searcher.markdown
 docs/UnpackedArchive.markdown
-docs/ExtractContentsFromWeb.markdown
+docs/AggregateContentsFromWeb.markdown

data/CHANGELOG.markdown

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+0.2.2
+-----
+
+* [BUGFIX]Item#entry_name returns normalized IRI
+
 0.2.1
 -----
 

data/README.markdown

@@ -150,6 +150,10 @@ If you find other gems, please tell me or request a pull request.
 RECENT CHANGES
 --------------
 
+### 0.2.2
+
+* [BUGFIX]Item#entry_name returns normalized IRI
+
 ### 0.2.1
 
 * Remove deprecated `EPUB::Constants::MediaType::UnsupportedError`. Use `UnsupportedMediatType` instead.

data/docs/{ExtractContentsFromWeb.markdown → AggregateContentsFromWeb.markdown}

@@ -1,9 +1,9 @@
-{file:docs/Home.markdown} > **{file:docs/ExtractContentsFromWeb.markdown}**
+{file:docs/Home.markdown} > **{file:docs/AggregateContentsFromWeb.markdown}**
 
-Extract Contents From the Web
+Aggregate Contents From the Web
 =============================
 
-From version 0.2.1, EPUB Parser can parse unpacked(unzipped) EPUB files on the web and extract contents in the books.
+From version 0.2.1, EPUB Parser can parse unpacked(unzipped) EPUB files on the web and aggregate contents in the books.
 
 Let's get contents of pretty cmmic Page Blanche from IDPF's GitHub repository: https://github.com/IDPF/epub3-samples/tree/master/30/page-blanche
 
@@ -21,13 +21,13 @@ EPUB Parser can treat the URI as EPUB book file path and parse contents from it
 The trick is to set {EPUB::OCF::PhysicalContainer.adapter container adapter} to {EPUB::OCF::PhysicalContainer::UnpackedURI :UnpackedURI}. It makes it possible to parse EPUB book from the web.
 Now we can play with EPUB books as always!
 
-As an example, I will show you a script to download all the files of specified EPUB book to local directory(source code is available in repository's examples/extract-contents-from-web.rb).
+As an example, I will show you a script to download all the files of specified EPUB book to local directory(source code is available in repository's examples/aggregate-contents-from-web.rb).
 
-{include:file:examples/extract-contents-from-web.rb}
+{include:file:examples/aggregate-contents-from-web.rb}
 
 Execution:
 
-    $ ruby examples/extract-contents-from-web.rb https://raw.githubusercontent.com/IDPF/epub3-samples/master/30/page-blanche/
+    $ ruby examples/aggregate-contents-from-web.rb https://raw.githubusercontent.com/IDPF/epub3-samples/master/30/page-blanche/
     Started downloading EPUB contents...
       from: https://raw.githubusercontent.com/IDPF/epub3-samples/master/30/page-blanche/
       to: /tmp/epub-parser20150703-13148-ghdtfq

data/docs/Home.markdown

@@ -101,7 +101,7 @@ More documentations are avaiable in:
 * {file:docs/Navigation.markdown}
 * {file:docs/Searcher.markdown}
 * {file:docs/UnpackedArchive.markdown}
-* {file:docs/ExtractContentsFromWeb.markdown}
+* {file:docs/AggregateContentsFromWeb.markdown}
 
 If you installed EPUB Parser via gem command, you can also generate documentaiton by your own([rubygems-yardoc][] gem is needed):
 

data/lib/epub/parser/version.rb

@@ -1,5 +1,5 @@
 module EPUB
   class Parser
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

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

@@ -100,8 +100,11 @@ module EPUB
 
           # full path in archive
           def entry_name
+            dummy_root_iri = Addressable::URI.parse('http://example.net/') # FIXME: Use constant
             rootfile = manifest.package.book.ocf.container.rootfile.full_path
-            Addressable::URI.unescape(rootfile + href.normalize.request_uri)
+            en = Addressable::URI.unencode((dummy_root_iri + rootfile + href).normalize.request_uri)
+            en.slice!(0) if en.start_with? '/'
+            en
           end
 
           def read

data/test/test_publication.rb

@@ -302,6 +302,21 @@ class TestPublication < Test::Unit::TestCase
         item = epub.package.manifest[id]
         assert_equal encoding, item.read.encoding
       end
+
+      def test_entry_name_returns_normalized_iri
+        item = Package::Manifest::Item.new
+        item.href = Addressable::URI.parse('../style.css')
+        obj = Object.new
+        stub(item).manifest {obj}
+        stub(obj).package {obj}
+        stub(obj).book {obj}
+        stub(obj).ocf {obj}
+        stub(obj).container {obj}
+        stub(obj).rootfile {obj}
+        stub(obj).full_path {Addressable::URI.parse('OPS/contents.opf')}
+
+        assert_equal 'style.css', item.entry_name
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epub-parser
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - KITAITI Makoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-03 00:00:00.000000000 Z
+date: 2015-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -283,9 +283,9 @@ files:
 - Rakefile
 - bin/epub-open
 - bin/epubinfo
+- docs/AggregateContentsFromWeb.markdown
 - docs/EpubOpen.markdown
 - docs/Epubinfo.markdown
-- docs/ExtractContentsFromWeb.markdown
 - docs/FixedLayout.markdown
 - docs/Home.markdown
 - docs/Item.markdown
@@ -294,7 +294,7 @@ files:
 - docs/Searcher.markdown
 - docs/UnpackedArchive.markdown
 - epub-parser.gemspec
-- examples/extract-contents-from-web.rb
+- examples/aggregate-contents-from-web.rb
 - features/epubinfo.feature
 - features/step_definitions/epubinfo_steps.rb
 - features/support/env.rb