eac 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08cca7087c83821e3aa1829c37ef5d9e7ff953e9
-  data.tar.gz: da306856cff5df5582f2a4a0f1296cf68662fbd3
+  metadata.gz: 743055a92de815917a402696dada62e5b3f662c4
+  data.tar.gz: 7a616c2a07a992bc42ba01b90b12eb91af07cd89
 SHA512:
-  metadata.gz: 05512e97247a5a8083002f5d052846375f7ab6cf56de92721c9f38cc1ab16519aa433714524745bf37631b5a0ea6025c64782a6a960eaa079a3b6f86de7b4e1f
-  data.tar.gz: 61aac72e65748a9287f85d9b10e8a202317cbbeefb481229eb0f48d37097fd67eb9e93dd94573d8f0c483915303aab032c65d07f893ee465510cedc3d6e9c4cc
+  metadata.gz: 3eb03d9407a0f1bd613ae20a89d269d64573f11f26fc208af5015cb02541945942b6a77b8df05be02b53b1677cf128444e8f1f838e6b14b2289ae4a714d35982
+  data.tar.gz: 69e2f069345f61e508b5e9af301aa94faca0f4fbe388d00b3a00c06a56b00dca6faf9c837b8a94ff47f7bdaa6921575895ca9e2a27baa0bcff960ab53f2e6487

data/lib/eac.rb

@@ -2,13 +2,13 @@
 require 'nokogiri'
 
 module EAC
-  
+
   class << self
     def parse(content)
       xml_doc = Nokogiri::XML(content)
-      entity_types = xml_doc.xpath("//ns:cpfDescription/ns:identity/ns:entityType", 
+      entity_types = xml_doc.xpath("//ns:cpfDescription/ns:identity/ns:entityType",
                                    ns:'urn:isbn:1-931666-33-4')
-      if entity_types.nil? || entity_types.length < 1                             
+      if entity_types.nil? || entity_types.length < 1
         raise ArgumentError.new("entityType not found")
       end
       if entity_types.length > 1
@@ -26,7 +26,7 @@ module EAC
 
   class Doc
     def initialize(xml_doc)
-      @xml = xml_doc  
+      @xml = xml_doc
     end
   end
 
@@ -41,19 +41,48 @@ module EAC
 
     def names
       if @names.nil?
-         @names = names_from_entries
+        @names = []
+        name_entries = @xml.xpath("//ns:cpfDescription/ns:identity/ns:nameEntry",
+                                  ns:'urn:isbn:1-931666-33-4')
+        name_entries.each do |entry|
+          @names << Name.new(entry)
+        end
       end
       @names
     end
 
-    def names_from_entries
-      name_elements = []
-      name_entries = @xml.xpath("//ns:cpfDescription/ns:identity/ns:nameEntry",
-                                    ns:'urn:isbn:1-931666-33-4')
-      name_entries.each do |entry|
-        name_elements << Name.new(entry)
+    def occupations
+      if @occupations.nil?
+        @occupations = @xml.xpath("//ns:occupations/ns:occupation/ns:term",
+                                  ns:'urn:isbn:1-931666-33-4').map(&:text)
+      end
+      @occupations
+    end
+
+    def biography
+      if @biography.nil?
+        @biography = Biography.new(@xml)
+      end
+    @biography
+    end
+
+    class Biography
+      attr_reader :notes, :abstract
+      def initialize(xml)
+        @notes = xml.xpath('//ns:biogHist/ns:p', ns:'urn:isbn:1-931666-33-4').map(&:text)
+
+        xml_result = xml.xpath('//ns:biogHist/ns:abstract', ns:'urn:isbn:1-931666-33-4')
+        if xml_result.empty?
+          @abstract = ""
+        else
+          @abstract = xml_result.map(&:text).join('\n')
+        end
+
       end
-      name_elements
+    end
+
+    class Event
+      #item.xpath('ns:date', ns:'urn:isbn:1-931666-33-4')
     end
 
     class Name
@@ -83,6 +112,7 @@ module EAC
     end
   end
 
+
 end
 
 def EAC(*args, &block)

data/lib/eac/version.rb

@@ -1,3 +1,3 @@
 module Eac
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/eac_spec.rb

@@ -31,10 +31,35 @@ describe EAC do
       person
     end
 
+    let (:cadell) { EAC(File.read("./data/yale_cadell.xml"))}
+
     describe "attributes" do
       it "should have 'record_id'" do
         expect(person.record_id).to eq("RU007004")
       end
+
+      it "should have occupations" do
+        expect(person.occupations).to eq(["Paleontologist", "Geologist", "Acting Secretary in Charge of the United States National Museum", "Secretary, Smithsonian Institution"])
+      end
+      it "should have biography data" do
+      end
+    end
+
+    context "biography" do
+       context "abstract" do
+         it "should be nil if no abstract present" do
+           expect(person.biography.abstract).to eq('')
+         end
+         it "should have text if abstract present" do
+           expect(cadell.biography.abstract).to include("Thomas Cadell was born in Bristol")
+         end
+       end
+      context "notes" do
+        it "should have an array of strings with content from file" do
+          expect(person.biography.notes.length).to eq(7)
+          expect(person.biography.notes[1]).to include("Walcott was appointed Secretary of the Smithsonian")
+        end
+      end
     end
 
     describe "with name" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eac
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Sarah Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-24 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler