epubinfo 0.4.0 → 0.4.1

data/README.md

@@ -1,5 +1,4 @@
-# epubinfo [![Continuous Integration](https://secure.travis-ci.org/chdorner/epubinfo.png?branch=master)](http://travis-ci.org/chdorner/epubinfo) [![Dependencies](https://gemnasium.com/chdorner/epubinfo.png)](http://gemnasium.com/chdorner/epubinfo)
-
+# epubinfo [![Continuous Integration](https://secure.travis-ci.org/chdorner/epubinfo.png?branch=master)](http://travis-ci.org/chdorner/epubinfo)
 Extracts metadata information from EPUB files. Supports EPUB2 and EPUB3 formats.
 
 ## Usage
@@ -13,6 +12,11 @@ Which returns a `EPUBInfo::Models::Book` instance, please refer to the [API docu
 
 ## Changelog
 
+**0.4.1** *February 15, 2013*
+
+* Added Book#version to get EPUB version of the file
+* Added support for modified_date in Book#dates
+
 **0.4.0** *July 31, 2012*
 
 * Added Book#cover method for extracting covers from epubs

data/lib/epubinfo/models/book.rb

@@ -62,12 +62,17 @@ module EPUBInfo
       # @return [Cover]
       attr_accessor :cover
 
+      # EPUB Version ({http://idpf.org/epub/20/spec/OPF_2.0.1_draft.htm#Section1.4.1.2})
+      # @return [String]
+      attr_accessor :version
+
       # Should never be called directly, go through EPUBInfo.get
       def initialize(parser)
         document = parser.metadata_document
         return if document.nil?
         document.remove_namespaces!
         metadata = document.css('metadata')
+        self.version = document.css('package')[0]['version']
         self.titles = metadata.xpath('.//title').map(&:content)
         self.creators = metadata.xpath('.//creator').map {|c| EPUBInfo::Models::Person.new(c) }
         self.subjects = metadata.xpath('.//subject').map(&:content)
@@ -75,6 +80,12 @@ module EPUBInfo
         self.publisher = metadata.xpath('.//publisher').first.content rescue nil
         self.contributors = metadata.xpath('.//contributor').map {|c| EPUBInfo::Models::Person.new(c) }
         self.dates = metadata.xpath('.//date').map { |d| EPUBInfo::Models::Date.new(d) }
+        modified_date = metadata.xpath(".//meta[@property='dcterms:modified']").map do |d|
+          date = EPUBInfo::Models::Date.new(d)
+          date.event = 'modification'
+          date
+        end
+        self.dates += modified_date;
         self.identifiers = metadata.xpath('.//identifier').map { |i| EPUBInfo::Models::Identifier.new(i) }
         self.source = metadata.xpath('.//source').first.content rescue nil
         self.languages = metadata.xpath('.//language').map(&:content)

data/lib/epubinfo/models/cover.rb

@@ -28,7 +28,6 @@ module EPUBInfo
       # Content type of cover file
       # @return [String]
       attr_accessor :content_type
-      def content_type; @content_type; end
 
       # Cover exists?
       # @return [Boolean]
@@ -41,6 +40,7 @@ module EPUBInfo
       # @return [File]
       # Tempfile is used to enable access to cover file
       # If block is passed, the tempfile is passed to it
+      # and closed after the block is executed
       #   cover.file do { |f| puts f.size }
       # Otherwise user is responsible to unlink and close tempfile
       #   file = book.cover.file
@@ -75,7 +75,7 @@ module EPUBInfo
       def epub_cover_item
         @epub_cover_item ||= begin
           metadata = @parser.metadata_document.css('metadata')
-          cover_id = metadata.css('meta [name=cover]').attr('content').value rescue nil || 'cover-image'
+          cover_id = (metadata.css('meta [name=cover]').attr('content').value rescue nil) || 'cover-image'
 
           manifest = @parser.metadata_document.css('manifest')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epubinfo
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.2.4
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +203,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Supports EPUB2 and EPUB3 formats.
 email: christof@chdorner.com
 executables: []
@@ -236,7 +252,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 425566557774208517
+      hash: -351582616179957298
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -245,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Extracts metadata information from EPUB files