peregrin 1.2.1 → 1.2.2

data/lib/formats/epub.rb

@@ -144,7 +144,7 @@ class Peregrin::Epub
           nav_src = from_opf_root(nav_href)
           nav_content = zipfile.content(nav_src)
           nav = @book.add_blueprint(:nav, nav_src, nav_content)
-        rescue => e
+        rescue
           raise FailureLoadingNAV
         end
       end
@@ -154,7 +154,7 @@ class Peregrin::Epub
       inf_rels.each { |rel|
         src = "META-INF/#{rel}.xml"
         next  unless zipfile.find(src)
-        bp = @book.add_blueprint(rel.to_sym, src, zipfile.content(src))
+        @book.add_blueprint(rel.to_sym, src, zipfile.content(src))
       }
     end
 
@@ -616,8 +616,7 @@ class Peregrin::Epub
 
 
     def uri_unescape(str)
-      @uri_parser ||= URI.const_defined?(:Parser) ? URI::Parser.new : URI
-      @uri_parser.unescape(str)
+      CGI.unescape(str)
     end
 
 

data/lib/peregrin.rb

@@ -2,7 +2,7 @@ module Peregrin
 
   # Required libraries
   require 'fileutils'
-  require 'uri'
+  require 'cgi'
   require 'zipruby'
   require 'nokogiri'
   require 'mime/types'

data/lib/peregrin/version.rb

@@ -1,5 +1,5 @@
 module Peregrin
 
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 
 end

metadata

@@ -1,80 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: peregrin
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 1
-  version: 1.2.1
+version: !ruby/object:Gem::Version
+  version: 1.2.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Joseph Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-29 00:00:00 +10:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: &17250820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: zipruby
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *17250820
+- !ruby/object:Gem::Dependency
+  name: zipruby
+  requirement: &17250340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mime-types
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *17250340
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: &17249900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *17249900
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &17249480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *17249480
 description: Peregrin converts EPUBs, Zhooks and Ochooks.
 email: joseph@inventivelabs.com.au
-executables: 
+executables:
 - peregrin
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - MIT-LICENSE
-files: 
+files:
 - bin/peregrin
 - lib/formats/epub.rb
 - lib/formats/ochook.rb
@@ -99,38 +88,32 @@ files:
 - test/utils/outliner_test.rb
 - README.md
 - MIT-LICENSE
-has_rdoc: true
 homepage: http://ochook.org/peregrin
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - Peregrin
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: nowarning
-rubygems_version: 1.3.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Peregrin - ebook conversion
 test_files: []
-