epubinfo 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/epubinfo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "epubinfo"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christof Dorner"]
-  s.date = "2012-04-01"
+  s.date = "2012-04-04"
   s.description = "Currently only supports EPUB 3 specification."
   s.email = "christof@chdorner.com"
   s.extra_rdoc_files = [
@@ -34,9 +34,9 @@ Gem::Specification.new do |s|
     "lib/epubinfo/models/person.rb",
     "lib/epubinfo/parser.rb",
     "lib/epubinfo/utils.rb",
-    "spec/lib/epubinfo/identifier_spec.rb",
     "spec/lib/epubinfo/models/book_spec.rb",
     "spec/lib/epubinfo/models/date_spec.rb",
+    "spec/lib/epubinfo/models/identifier_spec.rb",
     "spec/lib/epubinfo/models/person_spec.rb",
     "spec/lib/epubinfo/parser_spec.rb",
     "spec/lib/epubinfo_spec.rb",

data/lib/epubinfo.rb

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

data/lib/epubinfo/models/book.rb

@@ -6,6 +6,7 @@ module EPUBInfo
         :source, :languages, :rights
 
       def initialize(document)
+        return if document.nil?
         metadata = document.css('metadata')
         self.titles = metadata.xpath('.//dc:title', EPUBInfo::Utils::DC_NAMESPACE).map(&:content)
         self.creators = metadata.xpath('.//dc:creator', EPUBInfo::Utils::DC_NAMESPACE).map {|c| EPUBInfo::Models::Person.new(c) }
@@ -27,6 +28,22 @@ module EPUBInfo
       def dates; @dates || []; end
       def identifiers; @identifiers || []; end
       def languages; @languages || []; end
+
+      def to_hash
+        {
+          :titles => @titles,
+          :creators => @creators.map(&:to_hash),
+          :subjects => @subjects,
+          :description => @description,
+          :publisher => @publisher,
+          :contributors => @contributors.map(&:to_hash),
+          :dates => @dates.map(&:to_hash),
+          :identifiers => @identifiers.map(&:to_hash),
+          :source => @source,
+          :languages => @languages,
+          :rights => @rights
+        }
+      end
     end
   end
 end

data/lib/epubinfo/models/date.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module EPUBInfo
   module Models
     class Date
@@ -7,6 +9,13 @@ module EPUBInfo
         self.time = Time.parse(node.content)
         self.event = node.attribute('event').content rescue nil
       end
+
+      def to_hash
+        {
+          :time => @time,
+          :event => @event
+        }
+      end
     end
   end
 end

data/lib/epubinfo/models/identifier.rb

@@ -7,6 +7,13 @@ module EPUBInfo
         self.identifier = node.content
         self.scheme = node.attribute('scheme').content rescue nil
       end
+
+      def to_hash
+        {
+          :identifier => @identifier,
+          :scheme => @scheme
+        }
+      end
     end
   end
 end

data/lib/epubinfo/models/person.rb

@@ -8,6 +8,14 @@ module EPUBInfo
         self.file_as = node.attribute('file-as').content rescue nil
         self.role = node.attribute('role').content rescue nil
       end
+
+      def to_hash
+        {
+          :name => @name,
+          :file_as => @file_as,
+          :role => @role
+        }
+      end
     end
   end
 end

data/spec/lib/epubinfo/models/book_spec.rb

@@ -1,109 +1,111 @@
 require 'spec_helper'
 
 describe EPUBInfo::Models::Book do
-  context 'EPUB2' do
-    subject { EPUBInfo::Models::Book.new(Nokogiri::XML(File.new('spec/support/xml/metamorphosis_metadata_epub2.opf'))) }
-
-    its(:titles) { should == ['Metamorphosis'] }
-    its(:subjects) { should == ['Psychological fiction', 'Metamorphosis -- Fiction'] }
-    its(:description) { should == 'Classic story of self-discovery, told in a unique manner by Kafka.' }
-    its(:publisher) { should == 'Random House' }
-    its(:source) { should == 'http://www.gutenberg.org/files/5200/5200-h/5200-h.htm' }
-    its(:languages) { should == ['en'] }
-    its(:rights) { should == 'Copyrighted. Read the copyright notice inside this book for details.' }
-
-    context 'creators' do
-      it 'count should be 1' do
-        subject.creators.count.should == 1
-      end
+  describe '#initialize' do
+    context 'EPUB2' do
+      subject { EPUBInfo::Models::Book.new(Nokogiri::XML(File.new('spec/support/xml/metamorphosis_metadata_epub2.opf'))) }
+
+      its(:titles) { should == ['Metamorphosis'] }
+      its(:subjects) { should == ['Psychological fiction', 'Metamorphosis -- Fiction'] }
+      its(:description) { should == 'Classic story of self-discovery, told in a unique manner by Kafka.' }
+      its(:publisher) { should == 'Random House' }
+      its(:source) { should == 'http://www.gutenberg.org/files/5200/5200-h/5200-h.htm' }
+      its(:languages) { should == ['en'] }
+      its(:rights) { should == 'Copyrighted. Read the copyright notice inside this book for details.' }
+
+      context 'creators' do
+        it 'count should be 1' do
+          subject.creators.count.should == 1
+        end
 
-      it 'values should be of type Person' do
-        subject.creators.each do |creator|
-          creator.should be_kind_of EPUBInfo::Models::Person
+        it 'values should be of type Person' do
+          subject.creators.each do |creator|
+            creator.should be_kind_of EPUBInfo::Models::Person
+          end
         end
       end
-    end
 
-    context 'contributors' do
-      it 'count should be 1' do
-        subject.contributors.count.should == 1
-      end
+      context 'contributors' do
+        it 'count should be 1' do
+          subject.contributors.count.should == 1
+        end
 
-      it 'values should be of type Person' do
-        subject.contributors.each do |contributor|
-          contributor.should be_kind_of EPUBInfo::Models::Person
+        it 'values should be of type Person' do
+          subject.contributors.each do |contributor|
+            contributor.should be_kind_of EPUBInfo::Models::Person
+          end
         end
       end
-    end
 
-    context 'dates' do
-      it 'count should be 1' do
-        subject.dates.count.should == 2
-      end
+      context 'dates' do
+        it 'count should be 1' do
+          subject.dates.count.should == 2
+        end
 
-      it 'values should be of type Date' do
-        subject.dates.each do |date|
-          date.should be_kind_of EPUBInfo::Models::Date
+        it 'values should be of type Date' do
+          subject.dates.each do |date|
+            date.should be_kind_of EPUBInfo::Models::Date
+          end
         end
       end
-    end
 
-    context 'identifiers' do
-      it 'count should be 1' do
-        subject.identifiers.count.should == 1
-      end
+      context 'identifiers' do
+        it 'count should be 1' do
+          subject.identifiers.count.should == 1
+        end
 
-      it 'values should be of type Identifier' do
-        subject.identifiers.each do |identifier|
-          identifier.should be_kind_of EPUBInfo::Models::Identifier
+        it 'values should be of type Identifier' do
+          subject.identifiers.each do |identifier|
+            identifier.should be_kind_of EPUBInfo::Models::Identifier
+          end
         end
       end
     end
-  end
 
-  context 'EPUB3' do
-    subject { EPUBInfo::Models::Book.new(Nokogiri::XML(File.new('spec/support/xml/wasteland_metadata_epub3.opf'))) }
+    context 'EPUB3' do
+      subject { EPUBInfo::Models::Book.new(Nokogiri::XML(File.new('spec/support/xml/wasteland_metadata_epub3.opf'))) }
 
-    its(:titles) { should == ['The Waste Land'] }
-    its(:subjects) { should == ['Fiction'] }
-    its(:description) { should == 'Each facsimile page of the original manuscript is accompanied here by a typeset transcript on the facing page' }
-    its(:publisher) { should == 'Some Publisher' }
-    its(:source) { should == 'http://code.google.com/p/epub-samples/downloads/detail?name=wasteland-20120118.epub' }
-    its(:languages) { should == ['en-US'] }
-    its(:rights) { should == 'This work is shared with the public using the Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) license.' }
+      its(:titles) { should == ['The Waste Land'] }
+      its(:subjects) { should == ['Fiction'] }
+      its(:description) { should == 'Each facsimile page of the original manuscript is accompanied here by a typeset transcript on the facing page' }
+      its(:publisher) { should == 'Some Publisher' }
+      its(:source) { should == 'http://code.google.com/p/epub-samples/downloads/detail?name=wasteland-20120118.epub' }
+      its(:languages) { should == ['en-US'] }
+      its(:rights) { should == 'This work is shared with the public using the Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) license.' }
 
-    context 'creators' do
-      it 'count should be 1' do
-        subject.creators.count.should == 1
-      end
+      context 'creators' do
+        it 'count should be 1' do
+          subject.creators.count.should == 1
+        end
 
-      it 'values should be of type Person' do
-        subject.creators.each do |creator|
-          creator.should be_kind_of EPUBInfo::Models::Person
+        it 'values should be of type Person' do
+          subject.creators.each do |creator|
+            creator.should be_kind_of EPUBInfo::Models::Person
+          end
         end
       end
-    end
 
-    context 'contributors' do
-      it 'count should be 0' do
-        subject.contributors.count.should == 0
+      context 'contributors' do
+        it 'count should be 0' do
+          subject.contributors.count.should == 0
+        end
       end
-    end
 
-    context 'dates' do
-      it 'count should be 1' do
-        subject.dates.count.should == 1
+      context 'dates' do
+        it 'count should be 1' do
+          subject.dates.count.should == 1
+        end
       end
-    end
 
-    context 'identifiers' do
-      it 'count should be 1' do
-        subject.identifiers.count.should == 1
-      end
+      context 'identifiers' do
+        it 'count should be 1' do
+          subject.identifiers.count.should == 1
+        end
 
-      it 'values should be of type Identifier' do
-        subject.identifiers.each do |identifier|
-          identifier.should be_kind_of EPUBInfo::Models::Identifier
+        it 'values should be of type Identifier' do
+          subject.identifiers.each do |identifier|
+            identifier.should be_kind_of EPUBInfo::Models::Identifier
+          end
         end
       end
     end
@@ -120,5 +122,22 @@ describe EPUBInfo::Models::Book do
     its(:identifiers) { should == [] }
     its(:languages) { should == [] }
   end
+
+  describe '#to_hash' do
+    context 'keys' do
+      subject { EPUBInfo::Models::Book.new(Nokogiri::XML(File.new('spec/support/xml/metamorphosis_metadata_epub2.opf'))).to_hash.keys }
+      it { should include :titles }
+      it { should include :creators }
+      it { should include :subjects }
+      it { should include :description }
+      it { should include :publisher }
+      it { should include :contributors }
+      it { should include :dates }
+      it { should include :identifiers }
+      it { should include :source }
+      it { should include :languages }
+      it { should include :rights }
+    end
+  end
 end
 

data/spec/lib/epubinfo/models/date_spec.rb

@@ -1,8 +1,18 @@
 require 'spec_helper'
 
 describe EPUBInfo::Models::Date do
-  subject { EPUBInfo::Models::Date.new(Nokogiri::XML(File.new('spec/support/xml/metamorphosis_metadata_epub2.opf')).css('metadata').xpath('.//dc:date').first) }
+  describe '#initialize' do
+    subject { EPUBInfo::Models::Date.new(Nokogiri::XML(File.new('spec/support/xml/metamorphosis_metadata_epub2.opf')).css('metadata').xpath('.//dc:date').first) }
 
-  its(:time) { should == Time.parse('2005-08-17') }
-  its(:event) { should == 'publication' }
+    its(:time) { should == Time.parse('2005-08-17') }
+    its(:event) { should == 'publication' }
+  end
+
+  describe '#to_hash' do
+    context 'keys' do
+      subject { EPUBInfo::Models::Date.new(Nokogiri::XML(File.new('spec/support/xml/metamorphosis_metadata_epub2.opf')).css('metadata').xpath('.//dc:date').first).to_hash.keys }
+      it { should include :time }
+      it { should include :event }
+    end
+  end
 end

data/spec/lib/epubinfo/models/identifier_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe EPUBInfo::Models::Identifier do
+  describe '#initialize' do
+    context 'EPUB2' do
+      subject { EPUBInfo::Models::Identifier.new(Nokogiri::XML(File.new('spec/support/xml/metamorphosis_metadata_epub2.opf')).css('metadata').xpath('.//dc:identifier', EPUBInfo::Utils::DC_NAMESPACE).first) }
+
+      its(:identifier) { should == 'http://www.gutenberg.org/ebooks/5200' }
+      its(:scheme) { should == 'URI' }
+    end
+
+    context 'EPUB3' do
+      subject { EPUBInfo::Models::Identifier.new(Nokogiri::XML(File.new('spec/support/xml/wasteland_metadata_epub3.opf')).css('metadata').xpath('.//dc:identifier', EPUBInfo::Utils::DC_NAMESPACE).first) }
+
+      its(:identifier) { should == 'code.google.com.epub-samples.wasteland-basic' }
+    end
+  end
+
+  describe '#to_hash' do
+    context 'keys' do
+      subject { EPUBInfo::Models::Identifier.new(Nokogiri::XML(File.new('spec/support/xml/metamorphosis_metadata_epub2.opf')).css('metadata').xpath('.//dc:identifier', EPUBInfo::Utils::DC_NAMESPACE).first).to_hash.keys }
+      it { should include :identifier }
+      it { should include :scheme }
+    end
+  end
+end
+

data/spec/lib/epubinfo/models/person_spec.rb

@@ -1,20 +1,31 @@
 require 'spec_helper'
 
 describe EPUBInfo::Models::Person do
-  context 'creator' do
-    subject { EPUBInfo::Models::Person.new(Nokogiri::XML(File.new('spec/support/xml/metamorphosis_metadata_epub2.opf')).css('metadata').xpath('.//dc:creator').first) }
+  describe '#initialize' do
+    context 'creator' do
+      subject { EPUBInfo::Models::Person.new(Nokogiri::XML(File.new('spec/support/xml/metamorphosis_metadata_epub2.opf')).css('metadata').xpath('.//dc:creator').first) }
 
-    its(:name) { should == 'Franz Kafka' }
-    its(:file_as) { should == 'Kafka, Franz' }
-    its(:role) { should be_nil }
-  end
+      its(:name) { should == 'Franz Kafka' }
+      its(:file_as) { should == 'Kafka, Franz' }
+      its(:role) { should be_nil }
+    end
+
+    context 'contributor' do
+      subject { EPUBInfo::Models::Person.new(Nokogiri::XML(File.new('spec/support/xml/metamorphosis_metadata_epub2.opf')).css('metadata').xpath('.//dc:contributor').first) }
 
-  context 'contributor' do
-    subject { EPUBInfo::Models::Person.new(Nokogiri::XML(File.new('spec/support/xml/metamorphosis_metadata_epub2.opf')).css('metadata').xpath('.//dc:contributor').first) }
+      its(:name) { should == 'David Wyllie' }
+      its(:file_as) { should == 'Wyllie, David' }
+      its(:role) { should == 'trl' }
+    end
+  end
 
-    its(:name) { should == 'David Wyllie' }
-    its(:file_as) { should == 'Wyllie, David' }
-    its(:role) { should == 'trl' }
+  describe '#initialize' do
+    context 'keys' do
+      subject { EPUBInfo::Models::Person.new(Nokogiri::XML(File.new('spec/support/xml/metamorphosis_metadata_epub2.opf')).css('metadata').xpath('.//dc:creator').first).to_hash.keys }
+      it { should include :name }
+      it { should include :file_as }
+      it { should include :role }
+    end
   end
 end
 

data/spec/lib/epubinfo_spec.rb

@@ -6,7 +6,9 @@ describe EPUBInfo do
   describe '#get' do
     it 'calls parser' do
       document = EPUBInfo::Parser.parse(epub_path).metadata_document
-      EPUBInfo::Parser.should_receive(:parse) { document }
+      parser = mock
+      parser.stub(:metadata_document)
+      EPUBInfo::Parser.should_receive(:parse) { parser }
       EPUBInfo.get(epub_path)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epubinfo
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-01 00:00:00.000000000 Z
+date: 2012-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70277487870140 !ruby/object:Gem::Requirement
+  requirement: &70144976238900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.6
   type: :runtime
   prerelease: false
-  version_requirements: *70277487870140
+  version_requirements: *70144976238900
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70277487869060 !ruby/object:Gem::Requirement
+  requirement: &70144976237580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70277487869060
+  version_requirements: *70144976237580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70277487868220 !ruby/object:Gem::Requirement
+  requirement: &70144976236920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70277487868220
+  version_requirements: *70144976236920
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70277487867080 !ruby/object:Gem::Requirement
+  requirement: &70144976236060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *70277487867080
+  version_requirements: *70144976236060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70277487864120 !ruby/object:Gem::Requirement
+  requirement: &70144976235400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *70277487864120
+  version_requirements: *70144976235400
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70277487862520 !ruby/object:Gem::Requirement
+  requirement: &70144976234360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70277487862520
+  version_requirements: *70144976234360
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70277487877760 !ruby/object:Gem::Requirement
+  requirement: &70144976233760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277487877760
+  version_requirements: *70144976233760
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70277487876700 !ruby/object:Gem::Requirement
+  requirement: &70144976233080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277487876700
+  version_requirements: *70144976233080
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70277487875840 !ruby/object:Gem::Requirement
+  requirement: &70144976231960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277487875840
+  version_requirements: *70144976231960
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70277487874480 !ruby/object:Gem::Requirement
+  requirement: &70144976229800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277487874480
+  version_requirements: *70144976229800
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70277487872840 !ruby/object:Gem::Requirement
+  requirement: &70144976228360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277487872840
+  version_requirements: *70144976228360
 description: Currently only supports EPUB 3 specification.
 email: christof@chdorner.com
 executables: []
@@ -157,9 +157,9 @@ files:
 - lib/epubinfo/models/person.rb
 - lib/epubinfo/parser.rb
 - lib/epubinfo/utils.rb
-- spec/lib/epubinfo/identifier_spec.rb
 - spec/lib/epubinfo/models/book_spec.rb
 - spec/lib/epubinfo/models/date_spec.rb
+- spec/lib/epubinfo/models/identifier_spec.rb
 - spec/lib/epubinfo/models/person_spec.rb
 - spec/lib/epubinfo/parser_spec.rb
 - spec/lib/epubinfo_spec.rb
@@ -183,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 995591802829821889
+      hash: 1349912243114699965
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/spec/lib/epubinfo/identifier_spec.rb

@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-describe EPUBInfo::Models::Identifier do
-  context 'EPUB2' do
-    subject { EPUBInfo::Models::Identifier.new(Nokogiri::XML(File.new('spec/support/xml/metamorphosis_metadata_epub2.opf')).css('metadata').xpath('.//dc:identifier', EPUBInfo::Utils::DC_NAMESPACE).first) }
-
-    its(:identifier) { should == 'http://www.gutenberg.org/ebooks/5200' }
-    its(:scheme) { should == 'URI' }
-  end
-
-  context 'EPUB3' do
-    subject { EPUBInfo::Models::Identifier.new(Nokogiri::XML(File.new('spec/support/xml/wasteland_metadata_epub3.opf')).css('metadata').xpath('.//dc:identifier', EPUBInfo::Utils::DC_NAMESPACE).first) }
-
-    its(:identifier) { should == 'code.google.com.epub-samples.wasteland-basic' }
-  end
-end
-