relaton-bib 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2abaf5913dd0232af19e1c20dc414e03600ad0aa
-  data.tar.gz: 894d6a6c92caade62b6eb08f36330285ba29db49
+  metadata.gz: ae823658c869e7c4d00aef9221fdf350c392983d
+  data.tar.gz: 825dc45f0be774a8ab5223cee4228756f0980d43
 SHA512:
-  metadata.gz: e7352c621df13c1b88f884b57aff48fa0747616f0f5742983da8f054b81199732b058d09d53e0f52692010cbeda9094fdcf31980e5467bd339cd93205fc65388
-  data.tar.gz: 9fdd392bd65b2c89063eae8c4367aaf62f48abe3ca3295cec9b1efbd72f337c5b0b89d8b73ec05d598e702cbd10d7e3a9323ed8c76a14459daa9e9a528a8ebe5
+  metadata.gz: 24d8041638369f3e86da7e3dbb28f6aae1f399377f301a69d26bfadf0d3099c428517f6910e8563efa470aa5756a29ca4952fe613a4956d5097531930890c9c9
+  data.tar.gz: 2ca098df8c11661cc0c7a34830528b667e47da674c9afa0a14e0f1e55737adace2533a5a99be67630be7e3269c28bc5c35a789a71c0d3bd9ba9722a7047ec32d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton-bib (0.2.5)
+    relaton-bib (0.3.0)
       addressable
       nokogiri (~> 1.10)
 

data/README.adoc

@@ -33,7 +33,7 @@ item = RelatonBib::BibliographicItem.new(
   id: "ISO/TC211",
   fetched: Date.today.to_s,
   type: "standard",
-  titles: [
+  title: [
     { type: "main", content: "Geographic information", language: "en", script: "Latn" },
     {
       content: "Information géographique", language: "fr", script: "Latn"
@@ -50,16 +50,16 @@ item = RelatonBib::BibliographicItem.new(
     RelatonBib::DocumentIdentifier.new(id: "TC211", type: "ISO")
   ],
   docnumber: "123456",
-  dates: [
+  date: [
     { type: "issued", on: "2014" },
     { type: "published", on: "2014-04" },
     { type: "accessed", on: "2015-05-20" }
   ],
-  contributors: [
+  contributor: [
     { entity: {
         name: "International Organization for Standardization",
         url: "www.iso.org", abbreviation: "ISO", subdivision: "division" },
-      roles: [["publisher", ["Publisher role"]]], }
+      role: [["publisher", ["Publisher role"]]], }
   ],
   edition: "1",
   version: RelatonBib::BibliographicItem::Version.new("2019-04-01", ["draft"]),
@@ -79,7 +79,7 @@ item = RelatonBib::BibliographicItem.new(
       abbreviation: "ISO", url: "www.iso.org"
     },
     from: "2014", to: "2020" },
-  relations: [
+  relation: [
     { type: "updates",
       bibitem: RelatonBib::BibliographicItem.new(
         formattedref: RelatonBib::FormattedRef.new(content: "ISO 19115:2003"),

data/lib/relaton_bib/bibliographic_date.rb

@@ -5,13 +5,13 @@ require "time"
 module RelatonBib
   class << self
     def dates_hash_to_bib(ret)
-      return unless ret[:dates]
-      ret[:dates] = array(ret[:dates])
-      ret[:dates].each_with_index do |d, i|
+      return unless ret[:date]
+      ret[:date] = array(ret[:date])
+      ret[:date].each_with_index do |d, i|
         # value is synonym of on: it is reserved word in YAML
         if d[:value]
-          ret[:dates][i][:on] ||= d[:value]
-          ret[:dates][i].delete(:value)
+          ret[:date][i][:on] ||= d[:value]
+          ret[:date][i].delete(:value)
         end
       end
     end

data/lib/relaton_bib/bibliographic_item.rb

@@ -35,9 +35,9 @@ module RelatonBib
     end
 
     def title_hash_to_bib(ret)
-      return unless ret[:titles]
-      ret[:titles] = array(ret[:titles])
-      ret[:titles] = ret[:titles].map do |t|
+      return unless ret[:title]
+      ret[:title] = array(ret[:title])
+      ret[:title] = ret[:title].map do |t|
         t.is_a?(Hash) ? t : { content: t, language: "en", script: "Latn", 
                               format: "text/plain", type: "main" }
       end
@@ -101,10 +101,10 @@ module RelatonBib
     attr_reader :docnumber
 
     # @return [Array<RelatonBib::BibliographicDate>]
-    attr_reader :dates
+    attr_reader :date
 
     # @return [Array<RelatonBib::ContributionInfo>]
-    attr_reader :contributors
+    attr_reader :contributor
 
     # @return [String, NillClass]
     attr_reader :edition
@@ -134,7 +134,7 @@ module RelatonBib
     attr_reader :copyright
 
     # @return [RelatonBib::DocRelationCollection]
-    attr_reader :relations
+    attr_reader :relation
 
     # @return [Array<RelatonBib::Series>]
     attr_reader :series
@@ -184,18 +184,18 @@ module RelatonBib
     # @param validity [RelatonBib:Validity, NilClass]
     # @param fetched [Date, NilClass] default nil
     #
-    # @param dates [Array<Hash>]
-    # @option dates [String] :type
-    # @option dates [String] :from
-    # @option dates [String] :to
+    # @param date [Array<Hash>]
+    # @option date [String] :type
+    # @option date [String] :from
+    # @option date [String] :to
     #
-    # @param contributors [Array<Hash>]
-    # @option contributors [RealtonBib::Organization, RelatonBib::Person]
-    # @option contributors [String] :type
-    # @option contributors [String] :from
-    # @option contributirs [String] :to
-    # @option contributors [String] :abbreviation
-    # @option contributors [Array<Array<String,Array<String>>>] :roles
+    # @param contributor [Array<Hash>]
+    # @option contributor [RealtonBib::Organization, RelatonBib::Person]
+    # @option contributor [String] :type
+    # @option contributor [String] :from
+    # @option contributor [String] :to
+    # @option contributor [String] :abbreviation
+    # @option contributor [Array<Array<String,Array<String>>>] :role
     #
     # @param abstract [Array<Hash, RelatonBib::FormattedString>]
     # @option abstract [String] :content
@@ -203,27 +203,31 @@ module RelatonBib
     # @option abstract [String] :script
     # @option abstract [String] :type
     #
-    # @param relations [Array<Hash>]
-    # @option relations [String] :type
-    # @option relations [RelatonBib::BibliographicItem, RelatonIso::IsoBibliographicItem] :bibitem
-    # @option relations [Array<RelatonBib::BibItemLocality>] :bib_locality
+    # @param relation [Array<Hash>]
+    # @option relation [String] :type
+    # @option relation [RelatonBib::BibliographicItem, RelatonIso::IsoBibliographicItem] :bibitem
+    # @option relation [Array<RelatonBib::BibItemLocality>] :bib_locality
+    #
+    # @param link [Array<Hash, RelatonBib::TypedUri>]
+    # @option link [String] :type
+    # @option link [String] :content
     def initialize(**args)
       if args[:type] && !TYPES.include?(args[:type])
         raise ArgumentError, %{Type "#{args[:type]}" is invalid.}
       end
 
-      @title = (args[:titles] || []).map do |t|
+      @title = (args[:title] || []).map do |t|
         t.is_a?(Hash) ? TypedTitleString.new(t) : t
       end
 
-      @dates = (args[:dates] || []).map do |d|
+      @date = (args[:date] || []).map do |d|
         d.is_a?(Hash) ? BibliographicDate.new(d) : d
       end
 
-      @contributors = (args[:contributors] || []).map do |c|
+      @contributor = (args[:contributor] || []).map do |c|
         if c.is_a? Hash
           e = c[:entity].is_a?(Hash) ? Organization.new(c[:entity]) : c[:entity]
-          ContributionInfo.new(entity: e, role: c[:roles])
+          ContributionInfo.new(entity: e, role: c[:role])
         else c
         end
       end
@@ -250,7 +254,7 @@ module RelatonBib
       @language       = args.fetch :language, []
       @script         = args.fetch :script, []
       @status         = args[:docstatus]
-      @relations      = DocRelationCollection.new(args[:relations] || [])
+      @relation      = DocRelationCollection.new(args[:relation] || [])
       @link           = args.fetch(:link, []).map { |s| s.is_a?(Hash) ? TypedUri.new(s) : s }
       @series         = args.fetch :series, []
       @medium         = args[:medium]
@@ -290,7 +294,7 @@ module RelatonBib
 
     # @return [String]
     def shortref(identifier, **opts)
-      pubdate = dates.select { |d| d.type == "published" }
+      pubdate = date.select { |d| d.type == "published" }
       year = if opts[:no_year] || pubdate.empty? then ""
              else ":" + pubdate&.first&.on&.year.to_s
              end
@@ -328,8 +332,8 @@ module RelatonBib
         link.each { |s| s.to_xml builder }
         docidentifier.each { |di| di.to_xml builder }
         builder.docnumber docnumber if docnumber
-        dates.each { |d| d.to_xml builder, **opts }
-        contributors.each do |c|
+        date.each { |d| d.to_xml builder, **opts }
+        contributor.each do |c|
           builder.contributor do
             c.role.each { |r| r.to_xml builder }
             c.to_xml builder
@@ -343,7 +347,7 @@ module RelatonBib
         abstract.each { |a| builder.abstract { a.to_xml(builder) } }
         status&.to_xml builder
         copyright&.to_xml builder
-        relations.each { |r| r.to_xml builder, **opts }
+        relation.each { |r| r.to_xml builder, **opts }
         series.each { |s| s.to_xml builder }
         medium&.to_xml builder
         place.each { |pl| builder.place pl }

data/lib/relaton_bib/contribution_info.rb

@@ -6,14 +6,14 @@ require "relaton_bib/person"
 module RelatonBib
   class << self
     def contributors_hash_to_bib(ret)
-      return unless ret[:contributors]
-      ret[:contributors] = array(ret[:contributors])
-      ret[:contributors]&.each_with_index do |c, i|
-        ret[:contributors][i][:roles] = array(ret[:contributors][i][:roles])
-        ret[:contributors][i][:entity] = c[:person] ?
+      return unless ret[:contributor]
+      ret[:contributor] = array(ret[:contributor])
+      ret[:contributor]&.each_with_index do |c, i|
+        ret[:contributor][i][:role] = array(ret[:contributor][i][:role])
+        ret[:contributor][i][:entity] = c[:person] ?
           person_hash_to_bib(c[:person]) : org_hash_to_bib(c[:organization])
-        ret[:contributors][i].delete(:person)
-        ret[:contributors][i].delete(:organization)
+        ret[:contributor][i].delete(:person)
+        ret[:contributor][i].delete(:organization)
       end
     end
   end

data/lib/relaton_bib/contributor.rb

@@ -18,8 +18,8 @@ module RelatonBib
     end
 
     def contacts_hash_to_bib(c)
-      return [] unless c[:contacts]
-      array(c[:contacts]).map do |a|
+      return [] unless c[:contact]
+      array(c[:contact]).map do |a|
         (a[:city] || a[:country]) ?
           RelatonBib::Address.new(
             street: Array(a[:street]), city: a[:city], postcode: a[:postcode],
@@ -125,13 +125,13 @@ module RelatonBib
     attr_reader :uri
 
     # @return [Array<RelatonBib::Address, RelatonBib::Phone>]
-    attr_reader :contacts
+    attr_reader :contact
 
     # @param url [String]
-    # @param contacts [Array<RelatonBib::Address, RelatonBib::Phone>]
-    def initialize(url: nil, contacts: [])
+    # @param contact [Array<RelatonBib::Address, RelatonBib::Phone>]
+    def initialize(url: nil, contact: [])
       @uri = URI url if url
-      @contacts = contacts
+      @contact = contact
     end
 
     # Returns url.
@@ -142,7 +142,7 @@ module RelatonBib
 
     # @params builder [Nokogiri::XML::Builder]
     def to_xml(builder)
-      contacts.each { |contact| contact.to_xml builder }
+      contact.each { |contact| contact.to_xml builder }
     end
   end
 end

data/lib/relaton_bib/document_relation.rb

@@ -13,25 +13,25 @@ module RelatonBib
   # end
   class << self
     def relations_hash_to_bib(ret)
-      return unless ret[:relations]
-      ret[:relations] = array(ret[:relations])
-      ret[:relations]&.each_with_index do |r, i|
+      return unless ret[:relation]
+      ret[:relation] = array(ret[:relation])
+      ret[:relation]&.each_with_index do |r, i|
         relation_bibitem_hash_to_bib(ret, r, i)
         relation_biblocality_hash_to_bib(ret, r, i)
       end
     end
 
     def relation_bibitem_hash_to_bib(ret, r, i)
-      if r[:bibitem] then ret[:relations][i][:bibitem] =
+      if r[:bibitem] then ret[:relation][i][:bibitem] =
           BibliographicItem.new(hash_to_bib(r[:bibitem], true))
       else
         warn "bibitem missing: #{r}"
-        ret[:relations][i][:bibitem] = nil
+        ret[:relation][i][:bibitem] = nil
       end
     end
 
     def relation_biblocality_hash_to_bib(ret, r, i)
-      ret[:relations][i][:bib_locality] =
+      ret[:relation][i][:bib_locality] =
         array(r[:bib_locality])&.map do |bl|
           BibItemLocality.new(bl[:type], bl[:reference_from],
                               bl[:reference_to])

data/lib/relaton_bib/document_relation_collection.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
 module RelatonBib
-  # Document relations collection
+  # Document relation collection
   class DocRelationCollection < Array
-    # @param relations [Array<RelatonBib::DocumentRelation, Hash>]
-    # @option relations [String] :type
-    # @option relations [String] :identifier
-    # @option relations [String, NIllClass] :url (nil)
-    # @option relations [Array<RelatonBib::BibItemLocality>] :bib_locality
-    # @option relations [RelatonBib::BibliographicItem, NillClass] :bibitem (nil)
-    def initialize(relations)
-      super relations.map { |r| r.is_a?(Hash) ? DocumentRelation.new(r) : r }
+    # @param relation [Array<RelatonBib::DocumentRelation, Hash>]
+    # @option relation [String] :type
+    # @option relation [String] :identifier
+    # @option relation [String, NIllClass] :url (nil)
+    # @option relation [Array<RelatonBib::BibItemLocality>] :bib_locality
+    # @option relation [RelatonBib::BibliographicItem, NillClass] :bibitem (nil)
+    def initialize(relation)
+      super relation.map { |r| r.is_a?(Hash) ? DocumentRelation.new(r) : r }
     end
 
     # @return [Array<RelatonBib::DocumentRelation>]

data/lib/relaton_bib/organization.rb

@@ -6,7 +6,7 @@ module RelatonBib
   class << self
     def org_hash_to_bib(c)
       return nil if c.nil?
-      c[:identifiers] = array(c[:identifiers])&.map do |a|
+      c[:identifier] = array(c[:identifier])&.map do |a|
         OrgIdentifier.new(a[:type], a[:id])
       end
       c
@@ -58,7 +58,7 @@ module RelatonBib
     attr_reader :subdivision
 
     # @return [Array<RelatonBib::OrgIdentifier>]
-    attr_reader :identifiers
+    attr_reader :identifier
 
     def hash2locstr(name)
       name.is_a?(Hash) ?
@@ -70,12 +70,12 @@ module RelatonBib
     # @param abbreviation [RelatoBib::LocalizedStrig, String]
     # @param subdivision [RelatoBib::LocalizedStrig, String]
     # @param url [String]
-    # @param identifiers [Array<RelatonBib::OrgIdentifier>]
-    # @param contacts [Array<RelatonBib::Address, RelatonBib::Phone>]
+    # @param identifier [Array<RelatonBib::OrgIdentifier>]
+    # @param contact [Array<RelatonBib::Address, RelatonBib::Phone>]
     def initialize(**args)
       raise ArgumentError, "missing keyword: name" unless args[:name]
 
-      super(url: args[:url], contacts: args.fetch(:contacts, []))
+      super(url: args[:url], contact: args.fetch(:contact, []))
 
       @name = if args[:name].is_a?(Array)
                 args[:name].map { |n| hash2locstr(n) }
@@ -95,7 +95,7 @@ module RelatonBib
                         args[:subdivision]
                       end
 
-      @identifiers  = args.fetch(:identifiers, [])
+      @identifier  = args.fetch(:identifier, [])
     end
 
     # @param builder [Nokogiri::XML::Builder]
@@ -107,7 +107,7 @@ module RelatonBib
         builder.subdivision { |s| subdivision.to_xml s } if subdivision
         builder.abbreviation { |a| abbreviation.to_xml a } if abbreviation
         builder.uri url if uri
-        identifiers.each { |identifier| identifier.to_xml builder }
+        identifier.each { |identifier| identifier.to_xml builder }
         super
       end
     end

data/lib/relaton_bib/person.rb

@@ -8,17 +8,17 @@ module RelatonBib
       Person.new(
         name: fullname_hash_to_bib(c),
         affiliation: affiliation_hash_to_bib(c),
-        contacts: contacts_hash_to_bib(c),
-        identifiers: person_identifiers_hash_to_bib(c),
+        contact: contacts_hash_to_bib(c),
+        identifier: person_identifiers_hash_to_bib(c),
       )
     end
 
     def fullname_hash_to_bib(c)
       n = c[:name]
       FullName.new(
-        forenames: array(n[:forenames])&.map { |f| localname(f, c) },
-        initials: array(n[:initials])&.map { |f| localname(f, c) },
-        additions: array(n[:additions])&.map { |f| localname(f, c) },
+        forename: array(n[:forename])&.map { |f| localname(f, c) },
+        initial: array(n[:initial])&.map { |f| localname(f, c) },
+        addition: array(n[:addition])&.map { |f| localname(f, c) },
         prefix: array(n[:prefix])&.map { |f| localname(f, c) },
         surname: localname(n[:surname], c),
         completename: localname(n[:completename], c),
@@ -26,7 +26,7 @@ module RelatonBib
     end
 
     def person_identifiers_hash_to_bib(c)
-      array(c[:identifiers])&.map do |a|
+      array(c[:identifier])&.map do |a|
         PersonIdentifier.new(a[:type], a[:id])
       end
     end
@@ -35,16 +35,16 @@ module RelatonBib
   # Person's full name
   class FullName
     # @return [Array<RelatonBib::LocalizedString>]
-    attr_accessor :forenames
+    attr_accessor :forename
 
     # @return [Array<RelatonBib::LocalizedString>]
-    attr_accessor :initials
+    attr_accessor :initial
 
     # @return [RelatonBib::LocalizedString]
     attr_accessor :surname
 
     # @return [Array<RelatonBib::LocalizedString>]
-    attr_accessor :additions
+    attr_accessor :addition
 
     # @return [Array<RelatonBib::LocalizedString>]
     attr_accessor :prefix
@@ -53,9 +53,9 @@ module RelatonBib
     attr_reader :completename
 
     # @param surname [RelatonBib::LocalizedString]
-    # @param forenames [Array<RelatonBib::LocalizedString>]
-    # @param initials [Array<RelatonBib::LocalizedString>]
-    # @param additions [Array<RelatonBib::LocalizedString>]
+    # @param forename [Array<RelatonBib::LocalizedString>]
+    # @param initial [Array<RelatonBib::LocalizedString>]
+    # @param addition [Array<RelatonBib::LocalizedString>]
     # @param prefix [Array<RelatonBib::LocalizedString>]
     # @param completename [RelatonBib::LocalizedString]
     def initialize(**args)
@@ -64,9 +64,9 @@ module RelatonBib
       end
 
       @surname      = args[:surname]
-      @forenames    = args.fetch :forenames, []
-      @initials     = args.fetch :initials, []
-      @additions    = args.fetch :additions, []
+      @forename     = args.fetch :forename, []
+      @initial      = args.fetch :initial, []
+      @addition     = args.fetch :addition, []
       @prefix       = args.fetch :prefix, []
       @completename = args[:completename]
     end
@@ -78,10 +78,10 @@ module RelatonBib
           builder.completename { completename.to_xml builder }
         else
           prefix.each { |p| builder.prefix { p.to_xml builder } } 
-          initials.each { |i| builder.initial { i.to_xml builder } }
-          additions.each { |a| builder.addition { a.to_xml builder } }
+          initial.each { |i| builder.initial { i.to_xml builder } }
+          addition.each { |a| builder.addition { a.to_xml builder } }
           builder.surname { surname.to_xml builder }
-          forenames.each { |f| builder.forename { f.to_xml builder } }
+          forename.each { |f| builder.forename { f.to_xml builder } }
         end
       end
     end
@@ -134,17 +134,17 @@ module RelatonBib
     attr_accessor :affiliation
 
     # @return [Array<RelatonBib::PersonIdentifier>]
-    attr_accessor :identifiers
+    attr_accessor :identifier
 
     # @param name [RelatonBib::FullName]
     # @param affiliation [Array<RelatonBib::Affiliation>]
-    # @param contacts [Array<RelatonBib::Address, RelatonBib::Phone>]
-    # @param identifiers [Array<RelatonBib::PersonIdentifier>]
-    def initialize(name:, affiliation: [], contacts: [], identifiers: [])
-      super(contacts: contacts)
+    # @param contact [Array<RelatonBib::Address, RelatonBib::Phone>]
+    # @param identifier [Array<RelatonBib::PersonIdentifier>]
+    def initialize(name:, affiliation: [], contact: [], identifier: [])
+      super(contact: contact)
       @name        = name
       @affiliation = affiliation
-      @identifiers = identifiers
+      @identifier = identifier
     end
 
     # @param builder [Nokogiri::XML::Builder]
@@ -152,8 +152,8 @@ module RelatonBib
       builder.person do
         name.to_xml builder
         affiliation.each { |a| a.to_xml builder }
-        identifiers.each { |id| id.to_xml builder }
-        contacts.each { |contact| contact.to_xml builder }
+        identifier.each { |id| id.to_xml builder }
+        contact.each { |contact| contact.to_xml builder }
       end
     end
   end

data/lib/relaton_bib/typed_uri.rb

@@ -19,4 +19,4 @@ module RelatonBib
       builder.uri(content.to_s, type: type)
     end
   end
-end
+end

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "0.2.5".freeze
+  VERSION = "0.3.0".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -19,13 +19,13 @@ module RelatonBib
           id: bibitem[:id]&.empty? ? nil : bibitem[:id],
           type: bibitem[:type]&.empty? ? nil : bibitem[:type],
           fetched: bibitem.at("./fetched")&.text,
-          titles: fetch_titles(bibitem),
+          title: fetch_titles(bibitem),
           formattedref: fref(bibitem),
           link: fetch_link(bibitem),
           docid: fetch_docid(bibitem),
           docnumber: bibitem.at("./docnumber")&.text,
-          dates: fetch_dates(bibitem),
-          contributors: fetch_contributors(bibitem),
+          date: fetch_dates(bibitem),
+          contributor: fetch_contributors(bibitem),
           edition: bibitem.at("./edition")&.text,
           version: fetch_version(bibitem),
           biblionote: fetch_note(bibitem),
@@ -34,7 +34,7 @@ module RelatonBib
           abstract: fetch_abstract(bibitem),
           docstatus: fetch_status(bibitem),
           copyright: fetch_copyright(bibitem),
-          relations: fetch_relations(bibitem),
+          relation: fetch_relations(bibitem),
           series: fetch_series(bibitem),
           medium: fetch_medium(bibitem),
           place: bibitem.xpath("./place").map(&:text),
@@ -165,14 +165,14 @@ module RelatonBib
         names = org.xpath("name").map do |n|
           { content: n.text, language: n[:language], script: n[:script] }
         end
-        identifiers = org.xpath("./identifier").map do |i|
+        identifier = org.xpath("./identifier").map do |i|
           OrgIdentifier.new(i[:type], i.text)
         end
         Organization.new(name: names,
                          abbreviation: org.at("abbreviation")&.text,
                          subdivision: org.at("subdivision")&.text,
                          url: org.at("uri")&.text,
-                         identifiers: identifiers)
+                         identifier: identifier)
       end
 
       def get_person(person)
@@ -181,22 +181,22 @@ module RelatonBib
           Affilation.new get_org(org)
         end
 
-        contacts = person.xpath("./address | ./phone | ./email | ./uri").map do |contact|
-          if contact.name == "address"
-            streets = contact.xpath("./street").map(&:text)
+        contact = person.xpath("./address | ./phone | ./email | ./uri").map do |c|
+          if c.name == "address"
+            streets = c.xpath("./street").map(&:text)
             Address.new(
               street: streets,
-              city: contact.at("./city").text,
-              state: contact.at("./state").text,
-              country: contact.at("./country").text,
-              postcode: contact.at("./postcode").text,
+              city: c.at("./city").text,
+              state: c.at("./state").text,
+              country: c.at("./country").text,
+              postcode: c.at("./postcode").text,
             )
           else
-            Contact.new(type: contact.name, value: contact.text)
+            Contact.new(type: c.name, value: c.text)
           end
         end
 
-        identifiers = person.xpath("./identifier").map do |pi|
+        identifier = person.xpath("./identifier").map do |pi|
           PersonIdentifier.new pi[:type], pi.text
         end
 
@@ -212,15 +212,15 @@ module RelatonBib
 
         name = FullName.new(
           completename: cname, surname: sname,
-          initials: name_part(person, "initial"), forenames: name_part(person, "forename"),
-          additions: name_part(person, "addition"), prefix: name_part(person, "prefix")
+          initial: name_part(person, "initial"), forename: name_part(person, "forename"),
+          addition: name_part(person, "addition"), prefix: name_part(person, "prefix")
         )
 
         Person.new(
           name: name,
           affiliation: affilations,
-          contacts: contacts,
-          identifiers: identifiers,
+          contact: contact,
+          identifier: identifier,
         )
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2019-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler