relaton-bib 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9d747bf888e86ace731f3530973d303018fc8a40
-  data.tar.gz: e34fd357eb8de68e45b79347b3dca102c14a914a
+SHA256:
+  metadata.gz: 79c5d34910126e13bbdea1f3a91e3071a269e6c369b5fca092568fe575fdddd6
+  data.tar.gz: f6320115abaa8b7e4e15aab3dfb846c5806e4811e5b412f0c12adb1113c909ba
 SHA512:
-  metadata.gz: c0f9a37d0effe46c0df56db9c38ba8c5b5d5ae67f6d6de511cd85e47ca078ac8e9dc7c53e509421c7e501a343cc6fa13b11464e90b4b3e024e0ba29280053d7d
-  data.tar.gz: 9a2d1682c08910a7c7abc6ee560f988004c38c42816677db7af1505f8ccc748353863861cb640ddb0836b655d6e2d5317dfc4266a9d831b480a72f35d1c27323
+  metadata.gz: 3f6d1623ece6d63cd329cdb12f7fd05d64b90bee9e6cced305d3bd767a6570e28e95b350cfec538dd1ac43ed82f2ba4ae9f93b92a5bbe5605b6efccb6333b1ff
+  data.tar.gz: b720da5c197a74cacf54e6f4b645223a186105a85a7b1fab5dd8c701007034c08081cd0f01b17723d3d968fd9592b34fcc80b37ef25c10d7cae872bd54e46b87

data/.travis.yml

@@ -10,7 +10,7 @@ rvm:
 - 2.4
 - ruby-head
 before_install: 
-- gem install bundler -v 2.0.1
+- gem install bundler -v "~> 2"
 - bundle update
 matrix:
   allow_failures:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton-bib (0.2.3)
+    relaton-bib (0.2.4)
       addressable
       nokogiri (~> 1.8.4)
 
@@ -10,6 +10,7 @@ GEM
   specs:
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
+    byebug (11.0.1)
     debase (0.2.2)
       debase-ruby_core_source (>= 0.10.2)
     debase-ruby_core_source (0.10.5)
@@ -21,7 +22,7 @@ GEM
     mini_portile2 (2.3.0)
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
-    public_suffix (3.1.0)
+    public_suffix (3.1.1)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -49,6 +50,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.0)
+  byebug
   debase
   equivalent-xml (~> 0.6)
   rake (~> 10.0)

data/appveyor.yml

@@ -0,0 +1,36 @@
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
+version: '{build}'
+
+cache:
+  - vendor/bundle
+
+environment:
+  matrix:
+    - RUBY_VERSION: 25
+    - RUBY_VERSION: 24
+    - RUBY_VERSION: _trunk
+
+matrix:
+  allow_failures:
+    - RUBY_VERSION: _trunk
+
+install:
+  - ps: . { iwr -useb https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/appveyor.ps1 } | iex
+  - refreshenv
+
+build_script:
+  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - set GIT_TERMINAL_PROMPT=0
+  - gem install bundler -v "~> 2"
+  - bundle config --local path vendor/bundle
+  - bundle update
+  - bundle install
+
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
+test_script:
+  - bundle exec rake

data/docs/hash.adoc

@@ -0,0 +1,546 @@
+= Relaton 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.
+
+Any elements which are arrays can also be populated by a hash or single element. For example,
+the following are equivalent:
+
+[source,yaml]
+....
+titles:
+  - type: main
+    content: Geographic information
+titles:
+  type: main
+  content: Geographic information
+script:
+  - Latn
+script: Latn
+....
+
+In YAML, "on" is a reserved word, and thus cannot be used as a key. "value" is used as a synonym for
+"on" in dates.
+
+The structure below is given in YAML format:
+
+[source,yaml]
+....
+# bibliographic item anchor, used to crossreference within document
+id: ISO/TC211
+# date record was created
+fetched: 2019-06-30
+# titles are an array, with a mandatory type and content, and optional format, language and script
+titles:
+  - type: main
+    content: Geographic information
+  - type: subtitle
+    content: Geographic information subtitle
+    language: en
+    script: Latn
+    format: text/plain
+# type of document
+type: standard
+# document identifiers are an array, with a mandatory type and id component
+docid:
+  type: ISO
+  id: TC211
+# document number
+docnumber: 211
+# edition
+edition: 1
+# language is an array
+language:
+  - en
+  - fr
+# script is an array
+script:
+  Latn
+# version contains revision date and draft (as array)
+version:
+  revision_date: 2019-04-01
+  draft: draft
+# note is an array of type and content
+biblionote:
+  type: bibnote
+  content: >
+      Mark set a major league
+      home run record in 1998.
+# document status has stage, and optional substage and iteration
+docstatus:
+  stage: stage
+  substage: substage
+  iteration: iteration
+# date is an array, with mandatory type, and either an "on" value or a "from" and optional "to" value
+dates:
+  - type: issued
+    value: 2014
+  - type: published
+    from: 2014-04
+    to: 2014-05
+  - type: accessed
+    value: 2015-05-20
+# abstract is an array, with content, and optional language, script, format
+abstract:
+  - content: >
+      ISO 19115-1:2014 defines the schema required for ...
+  - content: >
+      L'ISO 19115-1:2014 définit le schéma requis pour ...
+    language: fr
+    script: Latn
+    format: text/plain
+# contributors are an array of entity/role pairs, where entity is either person or organization.
+# The role is an array; if there is a more complete description, that is given as the second element 
+# of an array, and is itself an array.
+# Organisations have attributes name, url, abbreviation, subdivision, contacts, identifiers
+# Persons have attributes name, affiliation, contacts
+# Person names have attributes surname, completename, initials, forename, additions, prefixes.
+# Initials, forename, additions, prefixes are arrays.
+# Name field values are either strings, or hashes, with content and language and script attributes.
+# The language and script attribute can also be given on the name.
+# Contacts are an array, containing either addresses, or other fields. 
+# Addresses are identified as hashes containing a city attribute; they can also contain a street 
+# (which is an array), a postcode, a state, and a country. The other contact fields
+# are phones, emails, uris; they contain a type giving the field name, and a value.
+# Affiliations are an array, and they contains an organization, and an optional description. 
+# The affiliation description can be a single string, or a hash of content, language, script, and format.
+contributors:
+  - organization:
+      name: International Organization for Standardization
+      url: www.iso.org
+      abbreviation: ISO
+      subdivision: division
+    role: 
+      - publisher
+      - 
+        - Publisher role
+  - person:
+      name:
+        completename:
+          content: A. Bierman
+          language: en
+      affiliation:
+        - organization:
+            name: IETF
+            abbreviation: IETF
+             identifiers:      
+               - type: uri
+                 id: www.ietf.org
+          description: Affiliation description
+      contacts:
+        - street:
+          - 8 Street St
+          city: City
+          postcode: 123456
+          country: Country
+          state: State
+        - type: phone
+          value: 223322
+    role: author
+  - person:
+      name: IETF
+      abbreviation: IETF
+      identifiers:
+        - type: uri
+          id: www.ietf.org
+    role:
+      publisher
+  - person:
+      name:
+        language: en
+        initials:
+          - A.
+        surname: Bierman
+      affiliation:
+        -  organization:
+             name: IETF
+             abbreviation: IETF
+           description:
+             content: Affiliation description
+             language: en
+             script: Latn
+      identifiers:
+        - type: uri
+          id: www.person.com
+    roles: 
+      author
+# copyright consists of an owner (a hash containing the fields of an organisation),
+# a "from" date, and an optional "to" date
+copyright:
+   owner:
+     name: International Organization for Standardization
+     abbreviation: ISO
+     url: www.iso.org
+   from: 2014
+   to: 2020
+# link is an array of URIs, with a type and content
+link:
+  - type: src
+    content: https://www.iso.org/standard/53798.html
+  - type: obp
+    content: https://www.iso.org/obp/ui/#!iso:std:53798:en
+  - type: rss
+    content: https://www.iso.org/contents/data/standard/05/37/53798.detail.rss
+# relations are an array of type, bibitem, and bib_locality.
+# bibitem contains any of the attributes of a bibliographic item.
+# bib_locality is an array that contains a type, a reference_from, and optionally a reference_to
+relations:
+  - type: updates
+    bibitem:
+      formattedref: ISO 19115:2003
+    bib_locality:
+      type: page
+      reference_from: 7
+      reference_to: 10
+  - type: updates
+    bibitem:
+      type: standard
+      formattedref: ISO 19115:2003/Cor 1:2006
+# series are an array, containing a type, and either a formattedref, or:
+# a title, a place, an organization (string),
+# an abbreviation, a from, a to, a number, and a partnumber.
+# The series title, like the titles of bibliographic items, contains a type,
+# content, and optional language, script, and format attributes.
+# The abbreviation and formattedref are either a string, 
+# or a hash containing content, language, and script.
+series:
+  - type: main
+    title:
+      type: original
+      content: ISO/IEC FDIS 10118-3
+      language: en
+      script: Latn
+      format: text/plain
+    place: Serie's place
+    organization: Serie's organization
+    abbreviation:
+      content: ABVR
+      language: en
+      script: Latn
+    from: 2009-02-01
+    to: 2010-12-20
+    number: serie1234
+    partnumber: part5678
+  - type: alt
+    formattedref: 
+      content: serieref
+      language: en
+      script: Latn
+# medium contains a form, a size, and a scale
+medium:
+  form: medium form
+  size: medium size
+  scale: medium scale
+# place is an array of strings
+place: bib place
+# extent is an array, containing type, a reference_from, and an optional reference_to
+extent:
+  type: section
+  reference_from: 7
+# accesslocation is an array of strings
+accesslocation:
+  - accesslocation1
+  - accesslocation2
+# classification is an array of type and value
+classification:
+  type: type
+  value: value
+# validity contains a begins date, an ends date, and a revision date
+validity:
+  begins: 2010-10-10 12:21
+  ends: 2011-02-03 18:30
+  revision: 2011-03-04 09:00
+....
+
+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,
+Metanorma Asciidoctor also supports representing repeating elements 
+by repeating the key for that entry.
+
+Each Relaton entry in a bibliography is represented in Metanorma Asciidoctor
+through a subclause with option attribute `[%bibitem]`. Any title given to the
+subclause is treated as the title for the bibliographic entry, with language `en`,
+script `Latn`, format `text/plain`, and type `main`. If there is no such title
+for the entry, the subclause title should be left as `{blank}`.
+
+So the following is a very simple reference in Metanorma Asciidoctor:
+
+[source,asciidoctor]
+----
+[%bibitem]
+=== Rubber latex -- Sampling
+id:: iso123
+docid:: 
+  type::: ISO
+  id::: ISO 123
+docid::
+  type::: ABC
+  id::: 32784
+type:: standard
+----
+
+The anchor crossreference for the bibliographic entry may be encoded as the
+`id` entry in the definition list, or as the normal Asciidoctor anchor on the
+subclause, which takes priority over it:
+
+[source,asciidoctor]
+----
+[[iso123]]
+[%bibitem]
+=== Rubber latex -- Sampling
+docid:: 
+  type::: ISO
+  id::: ISO 123
+type:: standard
+----
+
+Asciidoctor does not currently cope with definition lists more than four levels
+deep. If deeper nesting is needed, you will need to attach a new definition
+list with a list continuation:
+
+[source,asciidoctor]
+----
+[[iso123]]
+[%bibitem]
+=== Rubber latex -- Sampling
+docid:: 
+  type::: ISO
+  id::: ISO 123
+type:: standard
+contributors::
+  roles::: author
+  person:::
+    name::::
++
+--
+completename::
+  language::: en
+  content::: Fred
+--
+----
+
+The most heavily nested parts of a Relaton entry are the contributors,
+series, and relations. To prevent excessive depth of nesting for such
+entries, they can be marked up as subclauses within the entry, with the clause
+titles "contributor", "series", and "relation". Each subclause contains
+a new definition list, with its definition list reset to zero depth;
+the subclauses can be repeated for multiple instances of the same subentity.
+
+The following is Metanorma Asciidoctor markup corresponding to the YAML
+given above:
+
+
+[source,asciidoc]
+....
+[[ISO/TC211]]
+[%bibitem]
+=== {blank}
+fetched:: 2019-06-30
+title::
+  type::: main
+  content::: Geographic information
+title::
+  type::: subtitle
+  content::: Geographic information subtitle
+  language::: en
+  script::: Latn
+  format::: text/plain
+type:: standard
+docid::
+  type::: ISO
+  id::: TC211
+docnumber:: 211
+edition:: 1
+language::
+  * en
+  * fr
+script:: Latn
+version::
+  revision_date::: 2019-04-01
+  draft::: draft
+biblionote::
+  type::: bibnote
+  content::: 
++
+---
+Mark set a major league
+home run record in 1998.
+---
+docstatus::
+  stage::: stage
+  substage::: substage
+  iteration::: iteration
+dates::
+  type::: issued
+  value::: 2014
+dates::
+  type::: published
+  from::: 2014-04
+  to::: 2014-05
+dates::
+  type::: accessed
+  value::: 2015-05-20
+abstract::
+  content::: 
++
+---
+      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
+  script::: Latn
+  format::: text/plain
+copyright::
+   owner:::
+     name:::: International Organization for Standardization
+     abbreviation:::: ISO
+     url:::: www.iso.org
+   from::: 2014
+   to::: 2020
+link::
+  type::: src
+  content::: https://www.iso.org/standard/53798.html
+link::
+  type::: obp
+  content::: https://www.iso.org/obp/ui/#!iso:std:53798:en
+link::
+  type::: rss
+  content::: https://www.iso.org/contents/data/standard/05/37/53798.detail.rss
+medium::
+  form::: medium form
+  size::: medium size
+  scale::: medium scale
+place:: bib place
+extent::
+  type::: section
+  reference_from::: 7
+accesslocation::
+  * accesslocation1
+  * accesslocation2
+classification::
+  type::: type
+  value::: value
+validity::
+  begins::: 2010-10-10 12:21
+  ends::: 2011-02-03 18:30
+
+
+==== Contributor
+person::
+  name::: International Organization for Standardization
+  url::: www.iso.org
+  abbreviation::: ISO
+  subdivision::: division
+role::
+  * publisher
+  * 
+  ** Publisher role
+
+==== Contributor
+person::
+  name:::
+    completename::::
+      content::::: A. Bierman
+      language::::: en
+  affiliation:::
+    organization::::
+      name::::: IETF
+      abbreviation::::: IETF
+      identifiers:::::
++
+---
+type:: uri
+id:: www.ietf.org
+---
+    description:::: Affiliation description
+  contacts:::
+    street::::
+      * 8 Street St
+    city:::: City
+    postcode:::: 123456
+    country:::: Country
+    state:::: State
+  contacts:::
+    type:::: phone
+    value:::: 223322
+role:: author
+
+==== Contributor
+person::
+  name::: IETF
+  abbreviation::: IETF
+  identifiers:::
+    type:::: uri
+    id:::: www.ietf.org
+role:: publisher
+
+==== Contributor
+person::
+  name:::
+    language:::: en
+    initials:::: A.
+    surname:::: Bierman
+  affiliation:::
+    organization::::
+      name::::: IETF
+      abbreviation::::: IETF
+    description::::
+      content::::: Affiliation description
+      language::::: en
+      script::::: Latn
+  identifiers:::
+    type:::: uri
+    id:::: www.person.com
+roles:: author
+
+==== Relation
+type:: updates
+bibitem::
+  formattedref::: ISO 19115:2003
+  bib_locality:::
+    type:::: page
+    reference_from:::: 7
+    reference_to:::: 10
+
+==== Relation
+type::: updates
+bibitem:::
+  type::: standard
+  formattedref::: ISO 19115:2003/Cor 1:2006
+
+==== Series
+type:: main
+title::
+  type::: original
+  content::: ISO/IEC FDIS 10118-3
+  language::: en
+  script::: Latn
+  format::: text/plain
+place:: Serie's place
+organization:: Serie's organization
+abbreviation::
+  content::: ABVR
+  language::: en
+  script::: Latn
+from:: 2009-02-01
+to:: 2010-12-20
+number:: serie1234
+partnumber:: part5678
+
+==== Series
+type:: alt
+formattedref::
+  content::: serieref
+  language::: en
+  script::: Latn
+....
+
+
+
+
+

data/lib/relaton_bib/biblio_note.rb

@@ -1,4 +1,17 @@
 module RelatonBib
+  class << self
+    def biblionote_hash_to_bib(ret)
+      return unless ret[:biblionote]
+      ret[:biblionote] = array(ret[:biblionote])
+      (ret[:biblionote])&.each_with_index do |n, i|
+        ret[:biblionote][i] =
+          BiblioNote.new(content: n[:content], type: n[:type], 
+                         language: n[:language], 
+                         script: n[:script], format: n[:format])
+      end
+    end
+  end
+
   class BiblioNote < FormattedString
     # @return [String]
     attr_reader :type

data/lib/relaton_bib/biblio_version.rb

@@ -0,0 +1,36 @@
+module RelatonBib
+  # Version
+  class << self
+    def version_hash_to_bib(ret)
+      return unless ret[:version]
+      ret[:version][:draft] = array(ret[:version][:draft])
+      ret[:version] and ret[:version] = BibliographicItem::Version.new(
+          ret[:version][:revision_date], ret[:version][:draft])
+    end
+  end
+
+  class BibliographicItem
+    class Version
+      # @return [String]
+      attr_reader :revision_date
+
+      # @return [Array<String>]
+      attr_reader :draft
+
+      # @param revision_date [String]
+      # @param draft [Array<String>]
+      def initialize(revision_date = nil, draft = [])
+        @revision_date = revision_date
+        @draft         = draft
+      end
+
+      # @param builder [Nokogiri::XML::Builder]
+      def to_xml(builder)
+        builder.version do
+          builder.revision_date revision_date if revision_date
+          draft.each { |d| builder.draft d }
+        end
+      end
+    end
+  end
+end

data/lib/relaton_bib/bibliographic_date.rb

@@ -3,10 +3,25 @@
 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|
+        # 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)
+        end
+      end
+    end
+  end
+
   # Bibliographic date.
   class BibliographicDate
     TYPES = %w[published accessed created implemented obsoleted confirmed
-               updated issued transmitted copied unchanged circulated].freeze
+               updated issued transmitted copied unchanged circulated
+    ].freeze
 
     # @return [String]
     attr_reader :type
@@ -26,7 +41,8 @@ module RelatonBib
     def initialize(type:, on: nil, from: nil, to: nil)
       raise ArgumentError, "expected :on or :from argument" unless on || from
 
-      raise ArgumentError, %{Type "#{type}" is ivalid.} unless TYPES.include?(type)
+      TYPES.include?(type) or
+        raise ArgumentError, %{Type "#{type}" is invalid.} unless
 
       @type = type
       @on   = parse_date on

data/lib/relaton_bib/bibliographic_item.rb

@@ -19,39 +19,68 @@ require "relaton_bib/document_relation"
 require "relaton_bib/bib_item_locality"
 require "relaton_bib/xml_parser"
 require "relaton_bib/biblio_note"
+require "relaton_bib/biblio_version"
 require "relaton_bib/workers_pool"
-
+require "relaton_bib/hash_to_bib.rb"
 
 module RelatonBib
-  # Bibliographic item
-  class BibliographicItem
-    class Version
-      # @return [String]
-      attr_reader :revision_date
-
-      # @return [Array<String>]
-      attr_reader :draft
-
-      # @oaram revision_date [String]
-      # @param draft [Array<String>]
-      def initialize(revision_date = nil, draft = [])
-        @revision_date = revision_date
-        @draft         = draft
+  class << self
+    def extent_hash_to_bib(ret)
+      return unless ret[:extent]
+      ret[:extent] = array(ret[:extent])
+      ret[:extent]&.each_with_index do |e, i|
+        ret[:extent][i] = BibItemLocality.new(e[:type], e[:reference_from],
+                                              e[:reference_to])
       end
+    end
 
-      # @param builder [Nokogiri::XML::Builder]
-      def to_xml(builder)
-        builder.version do
-          builder.revision_date revision_date if revision_date
-          draft.each { |d| builder.draft d }
-        end
+    def title_hash_to_bib(ret)
+      return unless ret[:titles]
+      ret[:titles] = array(ret[:titles])
+      ret[:titles] = ret[:titles].map do |t|
+        t.is_a?(Hash) ? t : { content: t, language: "en", script: "Latn", 
+                              format: "text/plain", type: "main" }
       end
     end
 
+    def language_hash_to_bib(ret)
+      return unless ret[:language]
+      ret[:language] = array(ret[:language])
+    end
+
+    def script_hash_to_bib(ret)
+      return unless ret[:script]
+      ret[:script] = array(ret[:script])
+    end
+
+    def abstract_hash_to_bib(ret)
+      return unless ret[:abstract]
+      ret[:abstract] = array(ret[:abstract])
+    end
+
+    def link_hash_to_bib(ret)
+      return unless ret[:link]
+      ret[:link] = array(ret[:link])
+    end
+
+    def place_hash_to_bib(ret)
+      return unless ret[:place]
+      ret[:place] = array(ret[:place])
+    end
+
+    def accesslocation_hash_to_bib(ret)
+      return unless ret[:accesslocation]
+      ret[:accesslocation] = array(ret[:accesslocation])
+    end
+  end
+
+  # Bibliographic item
+  class BibliographicItem
     TYPES = %W[article book booklet conference manual proceedings presentation
                thesis techreport standard unpublished map electronic\sresource
                audiovisual film video broadcast graphic_work music patent
-               inbook incollection inproceedings journal].freeze
+               inbook incollection inproceedings journal
+    ].freeze
 
     # @return [String]
     attr_reader :id

data/lib/relaton_bib/classification.rb

@@ -1,4 +1,15 @@
 module RelatonBib
+  class << self
+    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] and
+        ret[:classification] = Classification.new(ret[:classification])
+    end
+  end
+
   class Classification
     # @return [String, NilClass]
     attr_reader :type
@@ -19,4 +30,4 @@ module RelatonBib
       xml[:type] = type if type
     end
   end
-end
+end

data/lib/relaton_bib/contribution_info.rb

@@ -4,10 +4,25 @@ require "relaton_bib/person"
 
 # RelatonBib module
 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] ?
+          person_hash_to_bib(c[:person]) : org_hash_to_bib(c[:organization])
+        ret[:contributors][i].delete(:person)
+        ret[:contributors][i].delete(:organization)
+      end
+    end
+  end
+
   # Contributor's role.
   class ContributorRole
     TYPES = %w[author performer publisher editor adapter translator
-               distributor].freeze
+               distributor
+    ].freeze
 
     # @return [Array<RelatonBib::FormattedString>]
     attr_reader :description

data/lib/relaton_bib/contributor.rb

@@ -3,6 +3,32 @@
 require "uri"
 
 module RelatonBib
+  class << self
+    def affiliation_hash_to_bib(c)
+      return [] unless c[:affiliation]
+      array(c[:affiliation]).map do |a|
+        a[:description] = array(a[:description])&.map do |d|
+          FormattedString.new(d.nil? ? { content: nil } :
+            { content: d[:content], language: d[:language],
+             script: d[:language], format: d[:format] })
+        end
+        Affilation.new(
+          Organization.new(org_hash_to_bib(a[:organization])), a[:description])
+      end
+    end
+
+    def contacts_hash_to_bib(c)
+      return [] unless c[:contacts]
+      array(c[:contacts]).map do |a|
+        (a[:city] || a[:country]) ?
+          RelatonBib::Address.new(
+            street: Array(a[:street]), city: a[:city], postcode: a[:postcode],
+            country: a[:country], state: a[:state]) :
+        RelatonBib::Contact.new(type: a[:type], value: a[:value])
+      end
+    end
+  end
+
   # Address class.
   class Address
     # @return [Array<String>]

data/lib/relaton_bib/document_identifier.rb

@@ -1,5 +1,16 @@
 module RelatonBib
   # Document identifier.
+  
+  class << self
+    def docid_hash_to_bib(ret)
+      return unless ret[:docid]
+      ret[:docid] = array(ret[:docid])
+      ret[:docid]&.each_with_index do |id, i|
+        ret[:docid][i] = DocumentIdentifier.new(id: id[:id], type: id[:type])
+      end
+    end
+  end
+
   class DocumentIdentifier
     # @return [String]
     attr_reader :id

data/lib/relaton_bib/document_relation.rb

@@ -11,6 +11,33 @@ module RelatonBib
   #   IDENTICAL     = 'identical'
   #   NONEQUIVALENT = 'nonequivalent'
   # 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|
+        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] =
+          BibliographicItem.new(hash_to_bib(r[:bibitem], true))
+      else
+        warn "bibitem missing: #{r}"
+        ret[:relations][i][:bibitem] = nil
+      end
+    end
+
+    def relation_biblocality_hash_to_bib(ret, r, i)
+      ret[:relations][i][:bib_locality] =
+        array(r[:bib_locality])&.map do |bl|
+          BibItemLocality.new(bl[:type], bl[:reference_from],
+                              bl[:reference_to])
+        end
+    end
+  end
 
   # Documett relation
   class DocumentRelation

data/lib/relaton_bib/document_status.rb

@@ -3,7 +3,16 @@
 require "relaton_bib/localized_string"
 
 module RelatonBib
-  # Dovument status.
+  class << self
+    def docstatus_hash_to_bib(ret)
+      ret[:docstatus] and ret[:docstatus] =
+        DocumentStatus.new(stage: ret[:docstatus][:stage],
+                           substage: ret[:docstatus][:substage],
+                           iteration: ret[:docstatus][:iteration])
+    end
+  end
+
+  # Document status.
   class DocumentStatus
     # @return [String]
     attr_reader :stage

data/lib/relaton_bib/formatted_ref.rb

@@ -1,6 +1,13 @@
 require "relaton_bib/formatted_string"
 
 module RelatonBib
+  class << self
+    def formattedref_hash_to_bib(ret)
+      ret[:formattedref] and ret[:formattedref] =
+        formattedref(ret[:formattedref])
+    end
+  end
+
   class FormattedRef < FormattedString
     # @param [Nokogiri::XML::Builder]
     def to_xml(builder)

data/lib/relaton_bib/hash_to_bib.rb

@@ -0,0 +1,70 @@
+module RelatonBib
+  class << self
+    def hash_to_bib(args, nested = false)
+      return nil unless args.is_a?(Hash)
+      ret = Marshal.load(Marshal.dump(symbolize(args))) # deep copy
+      timestamp_hash(ret) unless nested
+      title_hash_to_bib(ret)
+      link_hash_to_bib(ret)
+      language_hash_to_bib(ret)
+      script_hash_to_bib(ret)
+      dates_hash_to_bib(ret)
+      docid_hash_to_bib(ret)
+      version_hash_to_bib(ret)
+      biblionote_hash_to_bib(ret)
+      abstract_hash_to_bib(ret)
+      formattedref_hash_to_bib(ret)
+      docstatus_hash_to_bib(ret)
+      contributors_hash_to_bib(ret)
+      relations_hash_to_bib(ret)
+      series_hash_to_bib(ret)
+      medium_hash_to_bib(ret)
+      place_hash_to_bib(ret)
+      extent_hash_to_bib(ret)
+      accesslocation_hash_to_bib(ret)
+      classification_hash_to_bib(ret)
+      validity_hash_to_bib(ret)
+      ret
+    end
+
+    def timestamp_hash(ret)
+      ret[:fetched] ||= Date.today.to_s
+    end
+
+    def symbolize(obj)
+      obj.is_a? Hash and
+        return obj.inject({}){|memo,(k,v)| memo[k.to_sym] =  symbolize(v); memo}
+      obj.is_a? Array and
+        return obj.inject([]){|memo,v    | memo           << symbolize(v); memo}
+      return obj
+    end
+
+    def array(a)
+      return [] unless a
+      return [a] unless a.is_a?(Array)
+      a
+    end
+
+    def localname(f, c)
+      return nil if f.nil?
+      f.is_a?(Hash) and lang = f[:language] 
+      lang ||= c[:name][:language] 
+      f.is_a?(Hash) and script = f[:script] 
+      script ||= c[:name][:script]
+      f.is_a?(Hash) ?
+        RelatonBib::LocalizedString.new(f[:content], lang, script) :
+        RelatonBib::LocalizedString.new(f, lang, script)
+    end
+
+    def localizedstring(f)
+      f.is_a?(Hash) ?
+        RelatonBib::LocalizedString.new(f[:content], f[:language], f[:script]) :
+        RelatonBib::LocalizedString.new(f)
+    end
+
+    def formattedref(f)
+      f.is_a?(Hash) ? RelatonBib::FormattedRef.new(f) :
+        RelatonBib::FormattedRef.new(content: f)
+    end
+  end
+end

data/lib/relaton_bib/medium.rb

@@ -1,4 +1,10 @@
 module RelatonBib
+  class << self
+    def medium_hash_to_bib(ret)
+      ret[:medium] and ret[:medium] = Medium.new(ret[:medium])
+    end
+  end
+
   class Medium
     # @return [String, NilClass]
     attr_reader :form, :size, :scale
@@ -21,4 +27,4 @@ module RelatonBib
       end
     end
   end
-end
+end

data/lib/relaton_bib/organization.rb

@@ -3,6 +3,16 @@
 require "relaton_bib/contributor"
 
 module RelatonBib
+  class << self
+    def org_hash_to_bib(c)
+      return nil if c.nil?
+      c[:identifiers] = array(c[:identifiers])&.map do |a|
+        OrgIdentifier.new(a[:type], a[:id])
+      end
+      c
+    end
+  end
+
   # module OrgIdentifierType
   #   ORCID = 'orcid'
   #   URI   = 'uri'
@@ -51,7 +61,9 @@ module RelatonBib
     attr_reader :identifiers
 
     def hash2locstr(name)
-      name.is_a?(Hash) ? LocalizedString.new(name[:content], name[:language], name[:script]) : LocalizedString.new(name)
+      name.is_a?(Hash) ?
+        LocalizedString.new(name[:content], name[:language], name[:script]) : 
+        LocalizedString.new(name)
     end
 
     # @param name [String, Hash, Array<String, Hash>]

data/lib/relaton_bib/person.rb

@@ -3,6 +3,35 @@
 require "relaton_bib/contributor"
 
 module RelatonBib
+  class << self
+    def person_hash_to_bib(c)
+      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),
+      )
+    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) },
+        prefix: array(n[:prefix])&.map { |f| localname(f, c) },
+        surname: localname(n[:surname], c),
+        completename: localname(n[:completename], c),
+      )
+    end
+
+    def person_identifiers_hash_to_bib(c)
+      array(c[:identifiers])&.map do |a|
+        PersonIdentifier.new(a[:type], a[:id])
+      end
+    end
+  end
+
   # Person's full name
   class FullName
     # @return [Array<RelatonBib::LocalizedString>]

data/lib/relaton_bib/series.rb

@@ -1,6 +1,21 @@
 # frozen_string_literal: true
 
 module RelatonBib
+  class << self
+    def series_hash_to_bib(ret)
+      array(ret[:series])&.each_with_index do |s, i|
+        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])
+        end
+        s[:abbreviation] and
+          s[:abbreviation] = localizedstring(s[:abbreviation])
+        ret[:series][i] = Series.new(s)
+      end
+    end
+  end
+
   #
   # Series class.
   #

data/lib/relaton_bib/typed_title_string.rb

@@ -29,7 +29,9 @@ module RelatonBib
       if args[:title]
         @title = args[:title]
       else
-        fsargs = args.select { |k, _v| %i[content language script format].include? k }
+        fsargs = args.select do |k, _v|
+          %i[content language script format].include? k 
+        end
         @title = FormattedString.new(fsargs)
       end
     end

data/lib/relaton_bib/validity.rb

@@ -1,4 +1,14 @@
 module RelatonBib
+  class << self
+    def validity_hash_to_bib(ret)
+      return unless ret[:validity]
+      ret[:validity][:begins] and b = Time.parse(ret[:validity][:begins])
+      ret[:validity][:ends] and e = Time.parse(ret[:validity][:ends])
+      ret[:validity][:revision] and r = Time.parse(ret[:validity][:revision])
+      ret[:validity] = Validity.new(begins: b, ends: e, revision: r)
+    end
+  end
+
   class Validity
     # @return [Time, NilClass]
     attr_reader :begins
@@ -28,4 +38,4 @@ module RelatonBib
       end
     end
   end
-end
+end

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "0.2.3".freeze
+  VERSION = "0.2.4".freeze
 end

data/relaton-bib.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "ruby-debug-ide"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "byebug"
 
   spec.add_dependency "addressable"
   spec.add_dependency "nokogiri", "~> 1.8.4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-26 00:00:00.000000000 Z
+date: 2019-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -152,11 +166,14 @@ files:
 - LICENSE.txt
 - README.adoc
 - Rakefile
+- appveyor.yml
 - bin/console
 - bin/setup
+- docs/hash.adoc
 - lib/relaton_bib.rb
 - lib/relaton_bib/bib_item_locality.rb
 - lib/relaton_bib/biblio_note.rb
+- lib/relaton_bib/biblio_version.rb
 - lib/relaton_bib/bibliographic_date.rb
 - lib/relaton_bib/bibliographic_item.rb
 - lib/relaton_bib/classification.rb
@@ -169,6 +186,7 @@ files:
 - lib/relaton_bib/document_status.rb
 - lib/relaton_bib/formatted_ref.rb
 - lib/relaton_bib/formatted_string.rb
+- lib/relaton_bib/hash_to_bib.rb
 - lib/relaton_bib/localized_string.rb
 - lib/relaton_bib/medium.rb
 - lib/relaton_bib/organization.rb
@@ -201,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: 'RelatonBib: Ruby XMLDOC impementation.'