epubinfo 0.3.3 → 0.3.4

data/lib/epubinfo.rb

@@ -13,6 +13,6 @@ module EPUBInfo
   # @return [EPUBInfo::Models::Book] a model representation of the epub file
   def self.get(path)
     parser = EPUBInfo::Parser.parse(path)
-    EPUBInfo::Models::Book.new(parser.metadata_document, parser.drm_protected?)
+    EPUBInfo::Models::Book.new(parser)
   end
 end

data/lib/epubinfo/models/book.rb

@@ -4,6 +4,7 @@ module EPUBInfo
       # Titles, array of String instances ({http://idpf.org/epub/20/spec/OPF_2.0.1_draft.htm#Section2.2.1 EPUB2 reference})
       # @return [Array]
       attr_accessor :titles
+      def titles; @titles || []; end
 
       # Creators, array of Person instances ({http://idpf.org/epub/20/spec/OPF_2.0.1_draft.htm#Section2.2.2 EPUB2 reference})
       # @return [Array]
@@ -58,7 +59,8 @@ module EPUBInfo
       alias :drm_protected? :drm_protected
 
       # Should never be called directly, go through EPUBInfo.get
-      def initialize(document, drm_protected = false)
+      def initialize(parser)
+        document = parser.metadata_document
         return if document.nil?
         document.remove_namespaces!
         metadata = document.css('metadata')
@@ -73,7 +75,7 @@ module EPUBInfo
         self.source = metadata.xpath('.//source').first.content rescue nil
         self.languages = metadata.xpath('.//language').map(&:content)
         self.rights = metadata.xpath('.//rights').first.content rescue nil
-        self.drm_protected = drm_protected
+        self.drm_protected = parser.drm_protected?
       end
 
 

data/lib/epubinfo/parser.rb

@@ -19,11 +19,19 @@ module EPUBInfo
     private
 
     def zip_file
-      @zip_file ||= Zip::ZipFile.open(@path)
+      begin
+        @zip_file ||= Zip::ZipFile.open(@path)
+      rescue Zip::ZipError => e
+        raise NotAnEPUBFileError.new(e)
+      end
     end
 
     def root_document
-      @root_document ||= Nokogiri::XML(zip_file.read('META-INF/container.xml'))
+      begin
+        @root_document ||= Nokogiri::XML(zip_file.read('META-INF/container.xml'))
+      rescue => e
+        raise NotAnEPUBFileError.new(e)
+      end
     end
 
     def metadata_path

data/lib/epubinfo/utils.rb

@@ -11,5 +11,7 @@ module EPUBInfo
       end
     end
   end
+
+  class NotAnEPUBFileError < StandardError; end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epubinfo
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-21 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70289856730780 !ruby/object:Gem::Requirement
+  requirement: &70222491690700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.6
   type: :runtime
   prerelease: false
-  version_requirements: *70289856730780
+  version_requirements: *70222491690700
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70289856729900 !ruby/object:Gem::Requirement
+  requirement: &70222491689900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70289856729900
+  version_requirements: *70222491689900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70289856745540 !ruby/object:Gem::Requirement
+  requirement: &70222491689420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70289856745540
+  version_requirements: *70222491689420
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70289856744720 !ruby/object:Gem::Requirement
+  requirement: &70222491688700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.8.1
   type: :development
   prerelease: false
-  version_requirements: *70289856744720
+  version_requirements: *70222491688700
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70289856743920 !ruby/object:Gem::Requirement
+  requirement: &70222491688020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *70289856743920
+  version_requirements: *70222491688020
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70289856743140 !ruby/object:Gem::Requirement
+  requirement: &70222491687420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70289856743140
+  version_requirements: *70222491687420
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70289856742400 !ruby/object:Gem::Requirement
+  requirement: &70222491686800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70289856742400
+  version_requirements: *70222491686800
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70289856741600 !ruby/object:Gem::Requirement
+  requirement: &70222491686180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70289856741600
+  version_requirements: *70222491686180
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70289856740580 !ruby/object:Gem::Requirement
+  requirement: &70222491685520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70289856740580
+  version_requirements: *70222491685520
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70289856739760 !ruby/object:Gem::Requirement
+  requirement: &70222491684940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70289856739760
+  version_requirements: *70222491684940
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70289856746320 !ruby/object:Gem::Requirement
+  requirement: &70222491704780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70289856746320
+  version_requirements: *70222491704780
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70289856745760 !ruby/object:Gem::Requirement
+  requirement: &70222491704160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70289856745760
+  version_requirements: *70222491704160
 description: Supports EPUB2 and EPUB3 formats.
 email: christof@chdorner.com
 executables: []
@@ -175,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2476552663442480983
+      hash: -907416790490823548
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: