gutenberg_rdf 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 541a22ec14bf66080b5795db4d5d86ee62db04a2
-  data.tar.gz: 7c115cfce05f53427bba5363087b435a0bf1ddfc
+  metadata.gz: 085a4adadf222928edc61b7660ae01c77f519682
+  data.tar.gz: 374a75dfb36da499bf3657775630ebda8ace5e64
 SHA512:
-  metadata.gz: a68d926ca0bc5dd8904e29dd191ecd5b78b96f9d34bd101ca3ff1f5d84ac0f423a7d6b14bb3565237013da27cc2e7d0f255206113b4fdd399bea2e49fdfa40e6
-  data.tar.gz: 7b338342891dfe1b89ffc1f23ee5e7739e6dc1a7a07d982217208eb4cc6ff4e64a5a3619fff27fce11d7bd6008621f1a92644d6e8b427abe8b2a8d4683834536
+  metadata.gz: 3b19af4c7c7f1b58b10adff65dd47d43900248966fd155cd1e76bd4e4879660148ea4d1dfba136ab0403ae049311241ade185056a8fa91b7ea5ebb737900c82d
+  data.tar.gz: 2485ba29c8f3e31f17004366e9fe3cc0f3c76453d793ec55db7c5cbbbc7dafdd804e01b2196fc31479004fd9e5726a6c83809ea034d5875cd52bc754d7d63ca7

data/lib/gutenberg_rdf/rdf.rb

@@ -87,7 +87,7 @@ module GutenbergRdf
     def extract_authors
       entries = Array.new
       xml.elements.each('pgterms:agent') do |agent|
-        entries << Agent.new(agent.root)
+        entries << Agent.new(agent)
       end
       entries
     end

data/lib/gutenberg_rdf/rdf/agent.rb

@@ -7,12 +7,16 @@ module GutenbergRdf
         @xml = xml
       end
 
+      def to_s
+        fullname
+      end
+
       def id
-        xml.elements['pgterms:agent'].attributes['about'].match(/\A\d\d\d\d\/agents\/(\d+)\z/)[1]
+        xml.attributes['about'].match(/\A\d\d\d\d\/agents\/(\d+)\z/)[1]
       end
 
       def fullname
-        [firstname, lastname].join(' ')
+        [firstname, lastname].reject(&:empty?).join(' ')
       end
 
       def lastname
@@ -24,20 +28,20 @@ module GutenbergRdf
       end
 
       def birthdate
-        xml.elements['pgterms:agent/pgterms:birthdate'].text
+        xml.elements['pgterms:birthdate'].text
       end
 
       def deathdate
-        xml.elements['pgterms:agent/pgterms:deathdate'].text
+        xml.elements['pgterms:deathdate'].text
       end
 
       def webpage
-        xml.elements['pgterms:agent/pgterms:webpage'].attributes['resource']
+        xml.elements['pgterms:webpage'].attributes['resource']
       end
 
       def aliases
         entries = Array.new
-        xml.elements.each('pgterms:agent/pgterms:alias') do |name|
+        xml.elements.each('pgterms:alias') do |name|
           entries << name.text
         end
         entries
@@ -46,7 +50,7 @@ module GutenbergRdf
     private
 
       def name_parts
-        parts = xml.elements['pgterms:agent/pgterms:name'].text.split(/, */)
+        parts = xml.elements['pgterms:name'].text.split(/, */)
         last  = parts.shift
         first = parts.reverse.join(' ')
 

data/lib/gutenberg_rdf/version.rb

@@ -1,3 +1,3 @@
 module GutenbergRdf
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

data/spec/gutenberg_rdf/rdf/agent_spec.rb

@@ -14,8 +14,7 @@ module GutenbergRdf
                   <pgterms:webpage rdf:resource="http://en.wikipedia.org/wiki/Jon_James_Doe"/>
                 </pgterms:agent>
               </rdf:RDF>'
-        rdf = REXML::Document.new(xml)
-        Agent.new(rdf.root)
+        Agent.new(REXML::Document.new(xml).root.elements['pgterms:agent'])
       end
 
       it "expects an agent ID" do
@@ -34,6 +33,10 @@ module GutenbergRdf
         expect(agent.fullname).to eql 'Jon James Doe'
       end
 
+      it "returns the #fullname when to_s is called" do
+        expect(agent.to_s).to eql 'Jon James Doe'
+      end
+
       it "expects a birth date" do
         expect(agent.birthdate).to eql '1830'
       end
@@ -58,8 +61,7 @@ module GutenbergRdf
                      <pgterms:name>Dato</pgterms:name>
                    </pgterms:agent>
                  </rdf:RDF>'
-          rdf = REXML::Document.new(xml)
-          Agent.new(rdf.root)
+          Agent.new(REXML::Document.new(xml).root.elements['pgterms:agent'])
         end
 
         it "expects it to be assigned to the last name" do
@@ -77,8 +79,7 @@ module GutenbergRdf
                      <pgterms:name>Doe, Jon, Sir</pgterms:name>
                    </pgterms:agent>
                  </rdf:RDF>'
-          rdf = REXML::Document.new(xml)
-          Agent.new(rdf.root)
+          Agent.new(REXML::Document.new(xml).root.elements['pgterms:agent'])
         end
 
         it "expects the correct name order" do
@@ -94,8 +95,7 @@ module GutenbergRdf
                      <pgterms:name>Doe, J. J. (Jon James)</pgterms:name>
                    </pgterms:agent>
                  </rdf:RDF>'
-          rdf = REXML::Document.new(xml)
-          Agent.new(rdf.root)
+          Agent.new(REXML::Document.new(xml).root.elements['pgterms:agent'])
         end
 
         it "expects initials to replaced by name in brackets" do

data/spec/gutenberg_rdf/rdf_spec.rb

@@ -158,15 +158,16 @@ module GutenbergRdf
       end
       let(:rdf) { Rdf.new(REXML::Document.new(xml)) }
 
-      it "expects a Array" do
-        expect(rdf.authors.class).to be Array
-      end
-      it "expects correct number to be returned" do
+      it "returns the correct number of authors" do
         expect(rdf.authors.count).to be 2
       end
       it "expects an author object" do
         expect(rdf.authors.first.class).to be Rdf::Agent
       end
+      it "has the correct author names" do
+        expect(rdf.authors.first.fullname).to eq 'Mary Mapes Dodge'
+        expect(rdf.authors.last.fullname).to eq 'Various'
+      end
     end
 
     describe "#subjects" do

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: gutenberg_rdf
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Mike Cook
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-19 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
 description: A Ruby wrapper for the Project Gutenberg RDF catalog files (requires
@@ -32,8 +32,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -59,17 +59,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: A Ruby wrapper for the Project Gutenberg RDF catalog files.