relaton-bib 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: c666eff3590a39978b0d0e4547096284b8eedb28c9bb87d819491adc19ad3181
-  data.tar.gz: 9fe53d79fbca6cb27d0febfbb79981b8cee85ee1f4954db53664bc5f5769394d
+SHA1:
+  metadata.gz: ee06437cee7f0efbacf8d04554136258ad4544f4
+  data.tar.gz: 3608ad874a15aa0a7c1d2d03270dc02a2a308dfd
 SHA512:
-  metadata.gz: e70371f853c3ab10c91cffea4a96453f9929b5979d5947541d8bea21116e236c7eb063968e72ead587af2f0fbd9e3c9a7489e4d83e5c729cbd6571b5ce1f4a2e
-  data.tar.gz: 96dc61bc07a449c64877fd94e86e9228259c084e5ddef22e4540133b4adc95321caeff297dff3aef3847df5213ffc17d9c874555d7ab13929c6a5e7c7c28abf2
+  metadata.gz: 45f05d3a1362dcb45a09c7a04696eb87a48094eaba7314271a519c13c85e83ddbeb85e2c6ccbad8e3f7a064a70c471dc6270684efabce3f2e09374c151fd38ad
+  data.tar.gz: 78315011778a04275ff534780f3138bb3f6e2c2476a6f7e7f1ea3287856664dffa80fe678ed0294494a5bed0d1d331c8c1f700d939ba4a7dad813fd435de3a53

data/Gemfile.lock

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

data/docs/hash.adoc

@@ -1,5 +1,7 @@
 = Relaton YAML
 
+== YAML
+
 The following structure is in place for encoding bibitem as YAML objects, and is also used 
 to represent bibliographic entries in Metanorma Asciidoctor. The structure has not yet been
 generalised to `bibdata/ext`, the flavour specific extensions of relaton.
@@ -252,11 +254,14 @@ validity:
   revision: 2011-03-04 09:00
 ....
 
+== Metanorma structure: nested definition list
+
 The Metanorma Asciidoctor representation of this hash structure
 in a bibliography
 is as a definition list, with nested definition lists for nested structures.
 Repeating elements in a hash can be realised as ordered or unordered lists.
-However, given how awkward lists of definition lists are in Asciidoctor,
+However, given how awkward lists of definition lists are in Asciidoctor
+(with a limitation of three nesting levels),
 Metanorma Asciidoctor also supports representing repeating elements 
 by repeating the key for that entry.
 
@@ -355,20 +360,20 @@ docid::
 docnumber:: 211
 edition:: 1
 language::
-  * en
-  * fr
+  . en
+  . fr
 script:: Latn
 version::
   revision_date::: 2019-04-01
   draft::: draft
 biblionote::
   type::: bibnote
-  content::: 
+  content:::
 +
----
+--
 Mark set a major league
 home run record in 1998.
----
+--
 docstatus::
   stage::: stage
   substage::: substage
@@ -384,11 +389,11 @@ date::
   type::: accessed
   value::: 2015-05-20
 abstract::
-  content::: 
+  content:::
 +
----
-      ISO 19115-1:2014 defines the schema required for ...
----
+--
+ISO 19115-1:2014 defines the schema required for ...
+--
 abstract::
   content::: L'ISO 19115-1:2014 définit le schéma requis pour ...
   language::: fr
@@ -419,8 +424,8 @@ extent::
   type::: section
   reference_from::: 7
 accesslocation::
-  * accesslocation1
-  * accesslocation2
+  . accesslocation1
+  . accesslocation2
 classification::
   type::: type
   value::: value
@@ -430,12 +435,12 @@ validity::
 
 
 ==== Contributor
-person::
+organization::
   name::: International Organization for Standardization
   url::: www.iso.org
   abbreviation::: ISO
   subdivision::: division
-role::
+role:: 
   type::: publisher
   description::: Publisher role
 
@@ -443,22 +448,25 @@ role::
 person::
   name:::
     completename::::
-      content::::: A. Bierman
-      language::::: en
++
+--
+content:: A. Bierman
+language:: en
+--
   affiliation:::
     organization::::
-      name::::: IETF
-      abbreviation::::: IETF
-      identifier:::::
 +
----
-type:: uri
-id:: www.ietf.org
----
+--
+name:: IETF
+abbreviation:: IETF
+identifier::
+type::: uri
+id::: www.ietf.org
+--
     description:::: Affiliation description
   contact:::
     street::::
-      * 8 Street St
+      . 8 Street St
     city:::: City
     postcode:::: 123456
     country:::: Country
@@ -469,7 +477,7 @@ id:: www.ietf.org
 role:: author
 
 ==== Contributor
-person::
+organization::
   name::: IETF
   abbreviation::: IETF
   identifier:::
@@ -484,13 +492,16 @@ person::
     initial:::: A.
     surname:::: Bierman
   affiliation:::
-    organization::::
-      name::::: IETF
-      abbreviation::::: IETF
-    description::::
-      content::::: Affiliation description
-      language::::: en
-      script::::: Latn
++
+--
+organization::
+  name::: IETF
+  abbreviation::: IETF
+description::
+  content::: Affiliation description
+  language::: en
+  script::: Latn
+--
   identifier:::
     type:::: uri
     id:::: www.person.com
@@ -506,8 +517,8 @@ bibitem::
     reference_to:::: 10
 
 ==== Relation
-type::: updates
-bibitem:::
+type:: updates
+bibitem::
   type::: standard
   formattedref::: ISO 19115:2003/Cor 1:2006
 
@@ -538,7 +549,260 @@ formattedref::
   script::: Latn
 ....
 
+== JSON Path style definition lists
+
+The foregoing structure requires frequent breakouts into open blocks, to deal
+with the limitation on Asciidoctor nested definition lists. An alternative is to
+represent the nested structure of Relaton records in a simple, one-level definition list, and to use the key for each key-value pair to represent the hierarchical nesting of entries, as a dot-delimited path of keys. For example,
+
+[source,asciidoctor]
+----
+[%bibitem]
+=== Rubber latex -- Sampling
+id:: iso123
+docid:: 
+  type::: ISO
+  id::: ISO 123
+----
+
+can instead be represented as:
+
+[source,asciidoctor]
+----
+[%bibitem]
+=== Rubber latex -- Sampling
+id:: iso123
+docid.type:: ISO
+docid.id::: ISO 123
+----
+
+Whenever part of the key is repeated between entries, the entries are assumed to attach to the same parent. If an array of hashes is needed, a blank entry is required for the key of each repeating element: For example,
+
+[source,asciidoctor]
+----
+[%bibitem]
+=== Rubber latex -- Sampling
+id:: iso123
+docid:: 
+  type::: ISO
+  id::: ISO 123
+docid::
+  type::: ABC
+  id::: 32784
+type:: standard
+----
+
+can instead be represented as:
+
+[source,asciidoctor]
+----
+[%bibitem]
+=== Rubber latex -- Sampling
+id:: iso123
+docid::
+docid.type:: ISO
+docid.id::: ISO 123
+docid::
+docid.type:: ABC
+docid.id:: 32784
+----
+
+Embedded elements can also repeat:
+
+[source,asciidoctor]
+----
+[%bibitem]
+...
+==== Contributor
+person::
+  contact:::
+    street::::
+      . 8 Street St
+    city:::: City
+    postcode:::: 123456
+    country:::: Country
+    state:::: State
+  contact:::
+    type:::: phone
+    value:::: 223322
+----
 
+can instead be represented as:
 
+[source,asciidoctor]
+----
+[%bibitem]
+...
+contributor.person.contact::
+contributor.person.contact.street:: 8 Street St
+contributor.person.contact.city:: City
+contributor.person.contact.postcode:: 123456
+contributor.person.contact.country:: Country
+contributor.person.contact.state:: State
+contributor.person.contact::
+contributor.person.contact.type:: phone
+contributor.person.contact.value:: 223322
+----
 
+The following is Metanorma Asciidoctor markup corresponding to the YAML
+given above, using JSON Path style definition lists instead of nested definition lists:
 
+[source,asciidoc]
+....
+[[ISO/TC211]]
+[%bibitem]
+=== {blank}
+fetched:: 2019-06-30
+title::
+title.type:: main
+title.content:: Geographic information
+title::
+title.type:: subtitle
+title.content:: Geographic information subtitle
+title.language:: en
+title.script:: Latn
+title.format:: text/plain
+type:: standard
+docid::
+docid.type:: ISO
+docid.id:: TC211
+docnumber:: 211
+edition:: 1
+language:: en
+language:: fr
+script:: Latn
+version.revision_date:: 2019-04-01
+version.draft:: draft
+biblionote.type:: bibnote
+biblionote.content::
++
+--
+Mark set a major league
+home run record in 1998.
+--
+docstatus.stage:: stage
+docstatus.substage:: substage
+docstatus.iteration:: iteration
+date::
+date.type:: issued
+date.value:: 2014
+date::
+date.type:: published
+date.from:: 2014-04
+date.to:: 2014-05
+date::
+date.type:: accessed
+date.value:: 2015-05-20
+abstract::
+abstract.content::
++
+--
+ISO 19115-1:2014 defines the schema required for ...
+--
+abstract::
+abstract.content:: L'ISO 19115-1:2014 définit le schéma requis pour ...
+abstract.language:: fr
+abstract.script:: Latn
+abstract.format:: text/plain
+copyright.owner.name:: International Organization for Standardization
+copyright.owner.abbreviation:: ISO
+copyright.owner.url:: www.iso.org
+copyright.from:: 2014
+copyright.to:: 2020
+link::
+link.type:: src
+link.content:: https://www.iso.org/standard/53798.html
+link::
+link.type:: obp
+link.content:: https://www.iso.org/obp/ui/#!iso:std:53798:en
+link::
+link.type:: rss
+link.content:: https://www.iso.org/contents/data/standard/05/37/53798.detail.rss
+medium::
+medium.form:: medium form
+medium.size:: medium size
+medium.scale:: medium scale
+place:: bib place
+extent.type:: section
+extent.reference_from:: 7
+accesslocation:: accesslocation1
+accesslocation:: accesslocation2
+classification.type:: type
+classification.value:: value
+validity.begins:: 2010-10-10 12:21
+validity.ends:: 2011-02-03 18:30
+contributor::
+contributor.organization.name:: International Organization for Standardization
+contributor.organization.url:: www.iso.org
+contributor.organization.abbreviation:: ISO
+contributor.organization.subdivision:: division
+contributor.role.type:: publisher
+contributor.role.description:: Publisher role
+contributor::
+contributor.person.name.completename.content:: A. Bierman
+contributor.person.name.completename.language:: en
+contributor.person.affiliation.organization.name:: IETF
+contributor.person.affiliation.organization.abbreviation:: IETF
+contributor.person.affiliation.organization.identifier.type:: uri
+contributor.person.affiliation.organization.identifier.id:: www.ietf.org
+contributor.person.affiliation.description:: Affiliation description
+contributor.person.contact::
+contributor.person.contact.street:: 8 Street St
+contributor.person.contact.city:: City
+contributor.person.contact.postcode:: 123456
+contributor.person.contact.country:: Country
+contributor.person.contact.state:: State
+contributor.person.contact::
+contributor.person.contact.type:: phone
+contributor.person.contact.value:: 223322
+contributor.role:: author
+contributor::
+contributor.organization.name:: IETF
+contributor.organization.abbreviation:: IETF
+contributor.organization.identifier.type:: uri
+contributor.organization.identifier.id:: www.ietf.org
+contributor.role:: publisher
+contributor::
+contributor.person.name.language:: en
+contributor.person.name.initial:: A.
+contributor.person.name.surname:: Bierman
+contributor.person.affiliation.organization.name:: IETF
+contributor.person.affiliation.organization.abbreviation:: IETF
+contributor.person.affiliation.description.content:: Affiliation description
+contributor.person.affiliation.description.language:: en
+contributor.person.affiliation.description.script:: Latn
+contributor.person.identifier.type:: uri
+contributor.person.identifier.id:: www.person.com
+contributor.role:: author
+relation::
+relation.type:: updates
+relation.bibitem.formattedref:: ISO 19115:2003
+relation.bibitem.bib_locality.type:: page
+relation.bibitem.bib_locality.reference_from:: 7
+relation.bibitem.bib_locality.reference_to:: 10
+relation::
+relation.type:: updates
+relation.bibitem.type:: standard
+relation.bibitem.formattedref:: ISO 19115:2003/Cor 1:2006
+series::
+series.type:: main
+series.title.type:: original
+series.title.content:: ISO/IEC FDIS 10118-3
+series.title.language:: en
+series.title.script:: Latn
+series.title.format:: text/plain
+series.place:: Serie's place
+series.organization:: Serie's organization
+series.abbreviation.content:: ABVR
+series.abbreviation.language:: en
+series.abbreviation.script:: Latn
+series.from:: 2009-02-01
+series.to:: 2010-12-20
+series.number:: serie1234
+series.partnumber:: part5678
+series::
+series.type:: alt
+series.formattedref.content:: serieref
+series.formattedref.language:: en
+series.formattedref.script:: Latn
+----

data/lib/relaton_bib/bib_item_locality.rb

@@ -17,18 +17,18 @@ module RelatonBib
 
   # Bibliographic item locality.
   class BibItemLocality
-    # @return [RelatonBib::SpecificLocalityType]
+    # @return [String]
     attr_reader :type
 
-    # @return [RelatonBib::LocalizedString]
+    # @return [String]
     attr_reader :reference_from
 
-    # @return [RelatonBib::LocalizedString]
+    # @return [String, NilClass]
     attr_reader :reference_to
 
     # @param type [String]
     # @param referenceFrom [String]
-    # @param referenceTo [String]
+    # @param referenceTo [String, NilClass]
     def initialize(type, reference_from, reference_to = nil)
       @type           = type
       @reference_from = reference_from
@@ -42,5 +42,12 @@ module RelatonBib
         builder.referenceTo reference_to if reference_to
       end
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = { type: type, reference_from: reference_from }
+      hash[:reference_to] = reference_to if reference_to
+      hash
+    end
   end
 end

data/lib/relaton_bib/biblio_note.rb

@@ -1,13 +1,13 @@
 module RelatonBib
   class BiblioNote < FormattedString
-    # @return [String]
+    # @return [String, NilClass]
     attr_reader :type
 
     # @param content [String]
-    # @param type [String]
-    # @param language [String] language code Iso639
-    # @param script [String] script code Iso15924
-    # @param format [String] the content type
+    # @param type [String, NilClass]
+    # @param language [String, NilClass] language code Iso639
+    # @param script [String, NilClass] script code Iso15924
+    # @param format [String, NilClass] the content format
     def initialize(content:, type: nil, language: nil, script: nil, format: nil)
       @type = type
       super content: content, language: language, script: script, format: format
@@ -19,5 +19,12 @@ module RelatonBib
       xml[:type] = type if type
       xml
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = super
+      hash[:type] = type if type
+      hash
+    end
   end
 end

data/lib/relaton_bib/biblio_version.rb

@@ -2,13 +2,13 @@ module RelatonBib
   # Version
   class BibliographicItem
     class Version
-      # @return [String]
+      # @return [String, NilClass]
       attr_reader :revision_date
 
       # @return [Array<String>]
       attr_reader :draft
 
-      # @param revision_date [String]
+      # @param revision_date [String, NilClass]
       # @param draft [Array<String>]
       def initialize(revision_date = nil, draft = [])
         @revision_date = revision_date
@@ -22,6 +22,14 @@ module RelatonBib
           draft.each { |d| builder.draft d }
         end
       end
+
+      # @return [Hash]
+      def to_hash
+        hash = {}
+        hash[:revision_date] = revision_date if revision_date
+        hash[:draft] = draft if draft&.any?
+        hash
+      end
     end
   end
 end

data/lib/relaton_bib/bibliographic_date.rb

@@ -12,13 +12,13 @@ module RelatonBib
     # @return [String]
     attr_reader :type
 
-    # @return [Time]
+    # @return [Date]
     attr_reader :from
 
-    # @return [Time]
+    # @return [Date]
     attr_reader :to
 
-    # @return [Time]
+    # @return [Date]
     attr_reader :on
 
     # @param type [String] "published", "accessed", "created", "activated"
@@ -52,6 +52,15 @@ module RelatonBib
     end
     # rubocop:enable Metrics/AbcSize
 
+    # @return [Hash]
+    def to_hash
+      hash = { type: type }
+      hash[:value] = on.to_s if on
+      hash[:from] = from.to_s if from
+      hash[:to] = to.to_s if to
+      hash
+    end
+
     private
 
     # Formats date
@@ -67,16 +76,16 @@ module RelatonBib
     end
 
     # @params date [String] 'yyyy', 'yyyy-mm', 'yyyy-mm-dd
-    # @return [Time]
+    # @return [Date]
     def parse_date(date)
       return unless date
 
       if date =~ /^\d{4}$/
-        Time.strptime date, "%Y"
+        Date.strptime date, "%Y"
       elsif date =~ /^\d{4}-\d{2}$/
-        Time.strptime date, "%Y-%m"
+        Date.strptime date, "%Y-%m"
       elsif date =~ /\d{4}-\d{2}-\d{2}$/
-        Time.strptime date, "%Y-%m-%d"
+        Date.strptime date, "%Y-%m-%d"
       end
     end
   end

data/lib/relaton_bib/bibliographic_item.rb

@@ -32,7 +32,7 @@ module RelatonBib
                inbook incollection inproceedings journal
     ].freeze
 
-    # @return [String]
+    # @return [String, NilClass]
     attr_reader :id
 
     # @return [Array<RelatonBib::TypedTitleString>]
@@ -41,13 +41,13 @@ module RelatonBib
     # @return [Array<RelatonBib::TypedUri>]
     attr_reader :link
 
-    # @return [String]
+    # @return [String, NilClass]
     attr_reader :type
 
     # @return [Array<RelatonBib::DocumentIdentifier>]
     attr_reader :docidentifier
 
-    # @return [String] docnumber
+    # @return [String, NilClass] docnumber
     attr_reader :docnumber
 
     # @return [Array<RelatonBib::BibliographicDate>]
@@ -59,10 +59,10 @@ module RelatonBib
     # @return [String, NillClass]
     attr_reader :edition
 
-    # @return [RelatonBib::BibliongraphicItem::Version]
+    # @return [RelatonBib::BibliongraphicItem::Version, NilClass]
     attr_reader :version
 
-    # @return [Array<RelatonBib::BiblioNote>, NilClass]
+    # @return [Array<RelatonBib::BiblioNote>]
     attr_reader :biblionote
 
     # @return [Array<String>] language Iso639 code
@@ -71,7 +71,7 @@ module RelatonBib
     # @return [Array<String>] script Iso15924 code
     attr_reader :script
 
-    # @return [RelatonBib::FormattedRef]
+    # @return [RelatonBib::FormattedRef, NilClass]
     attr_reader :formattedref
 
     # @!attribute [r] abstract
@@ -80,7 +80,7 @@ module RelatonBib
     # @return [RelatonBib::DocumentStatus, NilClass]
     attr_reader :status
 
-    # @return [RelatonBib::CopyrightAssociation]
+    # @return [RelatonBib::CopyrightAssociation, NilClass]
     attr_reader :copyright
 
     # @return [RelatonBib::DocRelationCollection]
@@ -134,6 +134,11 @@ module RelatonBib
     # @param validity [RelatonBib:Validity, NilClass]
     # @param fetched [Date, NilClass] default nil
     #
+    # @param copyright [Hash, RelatonBib::CopyrightAssociation, NilClass]
+    # @option copyright [Hash, RelatonBib::ContributionInfo] :owner
+    # @option copyright [String] :form
+    # @option copyright [String, NilClass] :to
+    #
     # @param date [Array<Hash>]
     # @option date [String] :type
     # @option date [String] :from
@@ -265,6 +270,38 @@ module RelatonBib
       end
     end
 
+    # @return [Hash]
+    def to_hash
+      hash = {}
+      hash[:id] = id if id
+      hash[:title] = title.map(&:to_hash) if title&.any?
+      hash[:link] = link.map(&:to_hash) if link&.any?
+      hash[:type] = type if type
+      hash[:docid] = docidentifier.map(&:to_hash) if docidentifier&.any?
+      hash[:docnumber] = docnumber if docnumber
+      hash[:date] = date.map(&:to_hash) if date&.any?
+      hash[:contributor] = contributor.map(&:to_hash) if contributor&.any?
+      hash[:edition] = edition if edition
+      hash[:version] = version.to_hash if version
+      hash[:biblionote] = biblionote.map(&:to_hash) if biblionote&.any?
+      hash[:language] = language if language&.any?
+      hash[:script] = script if script&.any?
+      hash[:formattedref] = formattedref.to_hash if formattedref
+      hash[:abstract] = abstract.map(&:to_hash) if abstract&.any?
+      hash[:docstatus] = status.to_hash if status
+      hash[:copyright] = copyright.to_hash if copyright
+      hash[:relation] = relation.map(&:to_hash) if relation&.any?
+      hash[:series] = series.map(&:to_hash) if series&.any?
+      hash[:medium] = medium.to_hash if medium
+      hash[:place] = place if place&.any?
+      hash[:extent] = extent.map(&:to_hash) if extent&.any?
+      hash[:accesslocation] = accesslocation if accesslocation&.any?
+      hash[:classification] = classification.to_hash if classification
+      hash[:validity] = validity.to_hash if validity
+      hash[:fetched] = fetched.to_s if fetched
+      hash
+    end
+
     private
 
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength

data/lib/relaton_bib/classification.rb

@@ -18,5 +18,12 @@ module RelatonBib
       xml = builder.classification value
       xml[:type] = type if type
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = { value: value }
+      hash[:type] = type if type
+      hash
+    end
   end
 end

data/lib/relaton_bib/contribution_info.rb

@@ -36,6 +36,15 @@ module RelatonBib
         end
       end
     end
+
+    # @return [Array]
+    def to_hash
+      if description&.any?
+        [type, description.map(&:content)] if type
+      else
+        type if type
+      end
+    end
   end
 
   # Contribution info.
@@ -54,8 +63,16 @@ module RelatonBib
       @role   = role.map { |r| ContributorRole.new(**r) }
     end
 
+    # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder)
       entity.to_xml builder
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = entity.to_hash
+      hash[:role] = role.map(&:to_hash) if role&.any?
+      hash
+    end
   end
 end

data/lib/relaton_bib/contributor.rb

@@ -43,6 +43,17 @@ module RelatonBib
         doc.postcode postcode if postcode
       end
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = {}
+      hash[:street] = street if street&.any?
+      hash[:city] = city
+      hash[:state] = state if state
+      hash[:country] = country
+      hash[:postcode] = postcode if postcode
+      hash
+    end
   end
 
   # Contact class.
@@ -63,11 +74,16 @@ module RelatonBib
     def to_xml(doc)
       doc.send type, value
     end
+
+    # @return [Hash]
+    def to_hash
+      { type: type, value: value }
+    end
   end
 
   # Affilation.
   class Affilation
-    # @return [RelatonBib::LocalizedString]
+    # @return [RelatonBib::LocalizedString, NilClass]
     attr_reader :name
 
     # @return [Array<RelatonBib::FormattedString>]
@@ -77,8 +93,10 @@ module RelatonBib
     attr_reader :organization
 
     # @param organization [RelatonBib::Organization]
+    # @param name [RelatonBib::LocalizedString, NilClass]
     # @param description [Array<RelatonBib::FormattedString>]
-    def initialize(organization, description = [])
+    def initialize(organization:, name: nil, description: [])
+      @name = name
       @organization = organization
       @description  = description
     end
@@ -91,6 +109,14 @@ module RelatonBib
         organization.to_xml builder
       end
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = organization.to_hash
+      hash[:name] = name.to_hash if name
+      hash[:description] = description.map(&:to_hash) if description&.any?
+      hash
+    end
   end
 
   # Contributor.
@@ -98,11 +124,11 @@ module RelatonBib
     # @return [URI]
     attr_reader :uri
 
-    # @return [Array<RelatonBib::Address, RelatonBib::Phone>]
+    # @return [Array<RelatonBib::Address, RelatonBib::Contact>]
     attr_reader :contact
 
     # @param url [String]
-    # @param contact [Array<RelatonBib::Address, RelatonBib::Phone>]
+    # @param contact [Array<RelatonBib::Address, RelatonBib::Contact>]
     def initialize(url: nil, contact: [])
       @uri = URI url if url
       @contact = contact
@@ -118,5 +144,13 @@ module RelatonBib
     def to_xml(builder)
       contact.each { |contact| contact.to_xml builder }
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = {}
+      hash[:url] = uri.to_s if uri
+      hash[:contact] = contact.map(&:to_hash) if contact&.any?
+      hash
+    end
   end
 end

data/lib/relaton_bib/copyright_association.rb

@@ -1,10 +1,10 @@
 module RelatonBib
   # Copyright association.
   class CopyrightAssociation
-    # @return [Time]
+    # @return [Date]
     attr_reader :from
 
-    # @return [Time]
+    # @return [Date, NilClass]
     attr_reader :to
 
     # @return [RelatonBib::ContributionInfo]
@@ -22,8 +22,8 @@ module RelatonBib
                else owner
                end
 
-      @from  = Time.strptime(from, "%Y") unless from.empty?
-      @to    = Time.strptime(to, "%Y") unless to.to_s.empty?
+      @from  = Date.strptime(from, "%Y") unless from.empty?
+      @to    = Date.strptime(to, "%Y") unless to.to_s.empty?
     end
 
     # @param builder [Nokogiri::XML::Builder]
@@ -34,5 +34,12 @@ module RelatonBib
         builder.owner { owner.to_xml builder }
       end
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = { owner: owner.to_hash[:organization], from: from.to_s }
+      hash[:to] = to.to_s if to
+      hash
+    end
   end
 end

data/lib/relaton_bib/document_identifier.rb

@@ -43,5 +43,12 @@ module RelatonBib
     def to_xml(builder)
       builder.docidentifier(id, type: type)
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = { id: id }
+      hash[:type] if type
+      hash
+    end
   end
 end

data/lib/relaton_bib/document_relation.rb

@@ -47,5 +47,12 @@ module RelatonBib
         end
       end
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = { type: type, bibitem: bibitem.to_hash }
+      hash[:bib_locality] = bib_locality.map(&:to_hash) if bib_locality&.any?
+      hash
+    end
   end
 end

data/lib/relaton_bib/document_status.rb

@@ -32,5 +32,13 @@ module RelatonBib
         builder.iteration iteration unless iteration.to_s.empty?
       end
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = { stage: stage }
+      hash[:substage] = substage if substage
+      hash[:iteration] = iteration if iteration
+      hash
+    end
   end
 end

data/lib/relaton_bib/formatted_string.rb

@@ -30,5 +30,12 @@ module RelatonBib
       builder.parent["format"] = format if format
       super
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = super
+      hash[:format] = format if format
+      hash
+    end
   end
 end

data/lib/relaton_bib/hash_converter.rb

@@ -198,7 +198,9 @@ module RelatonBib
             { content: d })
           end
           Affilation.new(
-            Organization.new(org_hash_to_bib(a[:organization])), a[:description])
+            organization: Organization.new(org_hash_to_bib(a[:organization])),
+            description: a[:description]
+          )
         end
       end
 
@@ -215,6 +217,7 @@ module RelatonBib
 
       def relations_hash_to_bib(ret)
         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)
@@ -222,15 +225,24 @@ module RelatonBib
         end
       end
 
+      # @param ret [Hash]
+      # @param r [Hash] relation
+      # @param i [Integr] index of relation
       def relation_bibitem_hash_to_bib(ret, r, i)
-        if r[:bibitem] then ret[:relation][i][:bibitem] =
-            BibliographicItem.new(hash_to_bib(r[:bibitem], true))
+        if r[:bibitem]
+          ret[:relation][i][:bibitem] = bib_item(hash_to_bib(r[:bibitem], true))
         else
           warn "bibitem missing: #{r}"
           ret[:relation][i][:bibitem] = nil
         end
       end
 
+      # @param item [Hash]
+      # @retirn [RelatonBib::BibliographicItem]
+      def bib_item(item)
+        BibliographicItem.new(item)
+      end
+
       def relation_biblocality_hash_to_bib(ret, r, i)
         ret[:relation][i][:bib_locality] =
           array(r[:bib_locality])&.map do |bl|
@@ -244,7 +256,7 @@ module RelatonBib
           s[:formattedref] and s[:formattedref] = formattedref(s[:formattedref])
           if s[:title]
             s[:title] = { content: s[:title] } unless s.is_a?(Hash)
-            s[:title] = TypedTitleString.new(s[:title])
+            s[:title] = typed_title_strig(s[:title])
           end
           s[:abbreviation] and
             s[:abbreviation] = localizedstring(s[:abbreviation])
@@ -252,15 +264,21 @@ module RelatonBib
         end
       end
 
+      # @param title [Hash]
+      # @return [RelatonBib::TypedTitleString]
+      def typed_title_strig(title)
+        TypedTitleString.new title
+      end
+
       def medium_hash_to_bib(ret)
         ret[:medium] and ret[:medium] = Medium.new(ret[:medium])
       end
 
       def classification_hash_to_bib(ret)
-        #ret[:classification] = [ret[:classification]] unless ret[:classification].is_a?(Array)
-        #ret[:classification]&.each_with_index do |c, i|
-        #ret[:classification][i] = RelatonBib::Classification.new(c)
-        #end
+        # ret[:classification] = [ret[:classification]] unless ret[:classification].is_a?(Array)
+        # ret[:classification]&.each_with_index do |c, i|
+        # ret[:classification][i] = RelatonBib::Classification.new(c)
+        # end
         ret[:classification] and
           ret[:classification] = Classification.new(ret[:classification])
       end

data/lib/relaton_bib/localized_string.rb

@@ -16,10 +16,8 @@ module RelatonBib
     # @param language [String] language code Iso639
     # @param script [String] script code Iso15924
     def initialize(content, language = nil, script = nil)
-      @language = []
-      @language << language if language
-      @script = []
-      @script << script if script
+      @language = language.is_a?(String) ? [language] : language
+      @script = script.is_a?(String) ? [script] : script
       @content = content
     end
 
@@ -37,9 +35,17 @@ module RelatonBib
     def to_xml(builder)
       return unless content
 
-      builder.parent["language"] = language.join(",") if language.any?
-      builder.parent["script"]   = script.join(",") if script.any?
+      builder.parent["language"] = language.join(",") if language&.any?
+      builder.parent["script"]   = script.join(",") if script&.any?
       builder.text content
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = { content: content }
+      hash[:language] = language if language&.any?
+      hash[:script] = script if script&.any?
+      hash
+    end
   end
 end

data/lib/relaton_bib/medium.rb

@@ -20,5 +20,14 @@ module RelatonBib
         builder.scale scale if scale
       end
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = {}
+      hash[:form] = form if form
+      hash[:size] = size if size
+      hash[:scale] = scale if scale
+      hash
+    end
   end
 end

data/lib/relaton_bib/organization.rb

@@ -34,6 +34,11 @@ module RelatonBib
     def to_xml(builder)
       builder.identifier(value, type: type)
     end
+
+    # @return [Hash]
+    def to_hash
+      { type: type, id: value }
+    end
   end
 
   # Organization.
@@ -41,10 +46,10 @@ module RelatonBib
     # @return [Array<RelatonBib::LocalizedString>]
     attr_reader :name
 
-    # @return [RelatonBib::LocalizedString]
+    # @return [RelatonBib::LocalizedString, NilClass]
     attr_reader :abbreviation
 
-    # @return [RelatonBib::LocalizedString]
+    # @return [RelatonBib::LocalizedString, NilClass]
     attr_reader :subdivision
 
     # @return [Array<RelatonBib::OrgIdentifier>]
@@ -61,7 +66,7 @@ module RelatonBib
     # @param subdivision [RelatoBib::LocalizedStrig, String]
     # @param url [String]
     # @param identifier [Array<RelatonBib::OrgIdentifier>]
-    # @param contact [Array<RelatonBib::Address, RelatonBib::Phone>]
+    # @param contact [Array<RelatonBib::Address, RelatonBib::Contact>]
     def initialize(**args)
       raise ArgumentError, "missing keyword: name" unless args[:name]
 
@@ -101,5 +106,14 @@ module RelatonBib
         super
       end
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = { name: name.map(&:to_hash) }
+      hash[:abbreviation] = abbreviation.to_hash if abbreviation
+      hash[:identifier] = identifier.map(&:to_hash) if identifier&.any?
+      hash[:subdivision] = subdivision.to_hash if subdivision
+      { organization: hash.merge(super) }
+    end
   end
 end

data/lib/relaton_bib/person.rb

@@ -56,6 +56,27 @@ module RelatonBib
         end
       end
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = {}
+      hash[:forename] = forename.map(&:to_hash) if forename&.any?
+      hash[:initial] = initial.map(&:to_hash) if initial&.any?
+      hash[:surname] = surname.to_hash if surname
+      hash[:addition] = addition.map(&:to_hash) if addition&.any?
+      hash[:prefix] = prefix.map(&:to_hash) if prefix&.any?
+      hash[:completename] = completename.to_hash if completename
+      hash
+      # instance_variables.reduce({}) do |hash, var|
+      #   val = instance_variable_get var
+      #   if val || val.is_a?(Array) && val.any?
+      #     key = var.to_s.sub("@", "").to_sym
+      #     hash.merge key => val
+      #   else
+      #     hash
+      #   end
+      # end
+    end
   end
 
   # Person identifier type.
@@ -94,6 +115,11 @@ module RelatonBib
     def to_xml(builder)
       builder.identifier value, type: type
     end
+
+    # @return [Hash]
+    def to_hash
+      { type: type, id: value }
+    end
   end
 
   # Person class.
@@ -109,7 +135,7 @@ module RelatonBib
 
     # @param name [RelatonBib::FullName]
     # @param affiliation [Array<RelatonBib::Affiliation>]
-    # @param contact [Array<RelatonBib::Address, RelatonBib::Phone>]
+    # @param contact [Array<RelatonBib::Address, RelatonBib::Contact>]
     # @param identifier [Array<RelatonBib::PersonIdentifier>]
     def initialize(name:, affiliation: [], contact: [], identifier: [])
       super(contact: contact)
@@ -127,5 +153,13 @@ module RelatonBib
         contact.each { |contact| contact.to_xml builder }
       end
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = { name: name.to_hash }
+      hash[:affiliation] = affiliation.map(&:to_hash) if affiliation&.any?
+      hash[:identifier] = identifier.map(&:to_hash) if identifier&.any?
+      { person: hash.merge(super) }
+    end
   end
 end

data/lib/relaton_bib/series.rb

@@ -93,5 +93,21 @@ module RelatonBib
     end
     # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
     # rubocop:enable Metrics/PerceivedComplexity
+
+    # @return [Hash]
+    def to_hash
+      hash = {}
+      hash[:type] = type if type
+      hash[:formattedref] = formattedref.to_hash if formattedref
+      hash[:title] = title.to_hash if title
+      hash[:place] = place if place
+      hash[:organization] = organization if organization
+      hash[:abbreviation] = abbreviation.to_hash if abbreviation
+      hash[:from] = from if from
+      hash[:to] = to if to
+      hash[:number] = number if number
+      hash[:partnumber] = partnumber if partnumber
+      hash
+    end
   end
 end

data/lib/relaton_bib/typed_title_string.rb

@@ -42,5 +42,12 @@ module RelatonBib
       builder.parent[:type] = type if type
       title.to_xml builder
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = {}
+      hash[:type] = type if type
+      hash.merge title.to_hash
+    end
   end
 end

data/lib/relaton_bib/typed_uri.rb

@@ -15,8 +15,14 @@ module RelatonBib
       @content = Addressable::URI.parse content if content
     end
 
+    # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder)
       builder.uri(content.to_s, type: type)
     end
+
+    # @return [Hash]
+    def to_hash
+      { type: type, content: content.to_s }
+    end
   end
 end

data/lib/relaton_bib/validity.rb

@@ -1,5 +1,7 @@
 module RelatonBib
   class Validity
+    FORMAT = "%Y-%m-%d %H:%M"
+
     # @return [Time, NilClass]
     attr_reader :begins
 
@@ -20,12 +22,20 @@ module RelatonBib
 
     # @param [Nokogiri::XML::Builder]
     def to_xml(builder)
-      format = "%Y-%m-%d %H:%M"
       builder.validity do
-        builder.validityBegins begins.strftime(format) if begins
-        builder.validityEnds ends.strftime(format) if ends
-        builder.validityRevision revision.strftime(format) if revision
+        builder.validityBegins begins.strftime(FORMAT) if begins
+        builder.validityEnds ends.strftime(FORMAT) if ends
+        builder.validityRevision revision.strftime(FORMAT) if revision
       end
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = {}
+      hash[:begins] = begins.strftime(FORMAT) if begins
+      hash[:ends] = ends.strftime(FORMAT) if ends
+      hash[:revision] = revision.strftime(FORMAT) if revision
+      hash
+    end
   end
 end

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "0.3.3".freeze
+  VERSION = "0.3.4".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -178,7 +178,11 @@ module RelatonBib
       def get_person(person)
         affilations = person.xpath("./affiliation").map do |a|
           org = a.at "./organization"
-          Affilation.new get_org(org)
+          desc = a.xpath("./description").map do |e|
+            FormattedString.new(content: e.text, language: e[:language],
+                                script: e[:script], format: e[:format])
+          end
+          Affilation.new organization: get_org(org), description: desc
         end
 
         contact = person.xpath("./address | ./phone | ./email | ./uri").map do |c|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-03 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: 'RelatonBib: Ruby XMLDOC impementation.'