relaton-bib 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 6f04fbf9d97bcbdf157f86fcaa56df0898826220df4458dfe19021f45fbf2f49
-  data.tar.gz: 3f9430241262b2ce35db7bba082f3ff0657b4ac5144deb6a2885a507013176c0
+SHA1:
+  metadata.gz: 4e9e77fcafd4d9937bc4076463c4b96cf7fffada
+  data.tar.gz: 5eff627669c4a456d41b15f85f898bfc3563310f
 SHA512:
-  metadata.gz: b8b3cae293ee147603f2ac2886e29838697b96a95faa9c1ca2e1169d631e165727067f33deedf2dd457c7c01080fe86f373a0af211172ed137a81bcb49e4df03
-  data.tar.gz: 4f0acb9683c481e7196551edc1336e1fb1d0caf2e5638447fc460e31a1fde2232f06f4374b6a0dcaf0c5cacf5adf59d07d30299d3d7d0d40705807c36716a2f9
+  metadata.gz: 968fa8eae4a590a4fc392a9cde9c97059e5b07e692db31fbbc74d5c00f196b301d55df226261586587bad2d009a2cba55e1e170239508fbd2ce367f930c62f81
+  data.tar.gz: 96cfc0b51bb02bebcfcf5583ea2aa30ef02886bac7ae04a42b43e626c167a03518ba1289c0ecd5cd4c37d2cd1e359bdabf167d643299d101ca2eed774dcfe947

data/Gemfile.lock

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

data/README.adoc

@@ -308,6 +308,21 @@ item.to_xml date_format: :full
       </date>
       ...
 ----
+=== Create bibliographic item form YAML
+[source,ruby]
+----
+hash = YAML.load_file 'spec/examples/bib_item.yml'
+=> {"id"=>"ISO/TC211",
+...
+
+bib_hash = RelatonBib::HashConverter.hash_to_bib hash
+=> {:id=>"ISO/TC211",
+...
+
+RelatonBib::BibliographicItem.new bib_hash
+=> #<RelatonBib::BibliographicItem:0x007ff1524f8c88
+...
+----
 
 == Development
 

data/docs/hash.adoc

@@ -9,10 +9,10 @@ the following are equivalent:
 
 [source,yaml]
 ....
-titles:
+title:
   - type: main
     content: Geographic information
-titles:
+title:
   type: main
   content: Geographic information
 script:
@@ -32,7 +32,7 @@ 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:
+title:
   - type: main
     content: Geographic information
   - type: subtitle
@@ -73,7 +73,7 @@ docstatus:
   substage: substage
   iteration: iteration
 # date is an array, with mandatory type, and either an "on" value or a "from" and optional "to" value
-dates:
+date:
   - type: issued
     value: 2014
   - type: published
@@ -105,7 +105,7 @@ abstract:
 # 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:
+contributor:
   - organization:
       name: International Organization for Standardization
       url: www.iso.org
@@ -124,11 +124,11 @@ contributors:
         - organization:
             name: IETF
             abbreviation: IETF
-             identifiers:      
+             identifier:      
                - type: uri
                  id: www.ietf.org
           description: Affiliation description
-      contacts:
+      contact:
         - street:
           - 8 Street St
           city: City
@@ -141,7 +141,7 @@ contributors:
   - person:
       name: IETF
       abbreviation: IETF
-      identifiers:
+      identifier:
         - type: uri
           id: www.ietf.org
     role:
@@ -149,7 +149,7 @@ contributors:
   - person:
       name:
         language: en
-        initials:
+        initial:
           - A.
         surname: Bierman
       affiliation:
@@ -160,10 +160,10 @@ contributors:
              content: Affiliation description
              language: en
              script: Latn
-      identifiers:
+      identifier:
         - type: uri
           id: www.person.com
-    roles: 
+    role: 
       author
 # copyright consists of an owner (a hash containing the fields of an organisation),
 # a "from" date, and an optional "to" date
@@ -185,7 +185,7 @@ link:
 # 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:
+relation:
   - type: updates
     bibitem:
       formattedref: ISO 19115:2003
@@ -311,8 +311,8 @@ docid::
   type::: ISO
   id::: ISO 123
 type:: standard
-contributors::
-  roles::: author
+contributor::
+  role::: author
   person:::
     name::::
 +
@@ -374,14 +374,14 @@ docstatus::
   stage::: stage
   substage::: substage
   iteration::: iteration
-dates::
+date::
   type::: issued
   value::: 2014
-dates::
+date::
   type::: published
   from::: 2014-04
   to::: 2014-05
-dates::
+date::
   type::: accessed
   value::: 2015-05-20
 abstract::
@@ -451,21 +451,21 @@ person::
     organization::::
       name::::: IETF
       abbreviation::::: IETF
-      identifiers:::::
+      identifier:::::
 +
 ---
 type:: uri
 id:: www.ietf.org
 ---
     description:::: Affiliation description
-  contacts:::
+  contact:::
     street::::
       * 8 Street St
     city:::: City
     postcode:::: 123456
     country:::: Country
     state:::: State
-  contacts:::
+  contact:::
     type:::: phone
     value:::: 223322
 role:: author
@@ -474,7 +474,7 @@ role:: author
 person::
   name::: IETF
   abbreviation::: IETF
-  identifiers:::
+  identifier:::
     type:::: uri
     id:::: www.ietf.org
 role:: publisher
@@ -483,7 +483,7 @@ role:: publisher
 person::
   name:::
     language:::: en
-    initials:::: A.
+    initial:::: A.
     surname:::: Bierman
   affiliation:::
     organization::::
@@ -493,10 +493,10 @@ person::
       content::::: Affiliation description
       language::::: en
       script::::: Latn
-  identifiers:::
+  identifier:::
     type:::: uri
     id:::: www.person.com
-roles:: author
+role:: author
 
 ==== Relation
 type:: updates

data/lib/relaton_bib/biblio_note.rb

@@ -1,17 +1,4 @@
 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

@@ -1,14 +1,5 @@
 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]

data/lib/relaton_bib/bibliographic_date.rb

@@ -3,20 +3,6 @@
 require "time"
 
 module RelatonBib
-  class << self
-    def dates_hash_to_bib(ret)
-      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[:date][i][:on] ||= d[:value]
-          ret[:date][i].delete(:value)
-        end
-      end
-    end
-  end
-
   # Bibliographic date.
   class BibliographicDate
     TYPES = %w[published accessed created implemented obsoleted confirmed

data/lib/relaton_bib/bibliographic_item.rb

@@ -21,59 +21,9 @@ 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"
+require "relaton_bib/hash_converter"
 
 module RelatonBib
-  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
-
-    def title_hash_to_bib(ret)
-      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
-    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

data/lib/relaton_bib/classification.rb

@@ -1,15 +1,4 @@
 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

data/lib/relaton_bib/contribution_info.rb

@@ -4,19 +4,6 @@ require "relaton_bib/person"
 
 # RelatonBib module
 module RelatonBib
-  class << self
-    def contributors_hash_to_bib(ret)
-      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[:contributor][i].delete(:person)
-        ret[:contributor][i].delete(:organization)
-      end
-    end
-  end
 
   # Contributor's role.
   class ContributorRole
@@ -33,13 +20,13 @@ module RelatonBib
     # @param type [String] allowed types "author", "editor",
     #   "cartographer", "publisher"
     # @param description [Array<String>]
-    def initialize(*args)
-      @type = args.fetch 0
-      if type && !TYPES.include?(type)
+    def initialize(**args)
+      if args[:type] && !TYPES.include?(args[:type])
         raise ArgumentError, %{Type "#{type}" is invalid.}
       end
 
-      @description = args.fetch(1, []).map { |d| FormattedString.new content: d, format: nil }
+      @type = args[:type]
+      @description = args.fetch(:description, []).map { |d| FormattedString.new content: d, format: nil }
     end
 
     def to_xml(builder)
@@ -62,9 +49,9 @@ module RelatonBib
 
     # @param entity [RelatonBib::Person, RelatonBib::Organization]
     # @param role [Array<String>]
-    def initialize(entity:, role: ["publisher"])
+    def initialize(entity:, role: [{ type: "publisher" }])
       @entity = entity
-      @role   = role.map { |r| ContributorRole.new(*r) }
+      @role   = role.map { |r| ContributorRole.new(**r) }
     end
 
     def to_xml(builder)

data/lib/relaton_bib/contributor.rb

@@ -3,34 +3,6 @@
 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.is_a?(Hash) ?
-            { content: d[:content], language: d[:language],
-              script: d[:script], format: d[:format] } : 
-          { content: d })
-        end
-        Affilation.new(
-          Organization.new(org_hash_to_bib(a[:organization])), a[:description])
-      end
-    end
-
-    def contacts_hash_to_bib(c)
-      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],
-            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,16 +1,5 @@
 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,33 +11,6 @@ module RelatonBib
   #   IDENTICAL     = 'identical'
   #   NONEQUIVALENT = 'nonequivalent'
   # end
-  class << self
-    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)
-        relation_biblocality_hash_to_bib(ret, r, i)
-      end
-    end
-
-    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))
-      else
-        warn "bibitem missing: #{r}"
-        ret[:relation][i][:bibitem] = nil
-      end
-    end
-
-    def relation_biblocality_hash_to_bib(ret, r, i)
-      ret[:relation][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,15 +3,6 @@
 require "relaton_bib/localized_string"
 
 module RelatonBib
-  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]

data/lib/relaton_bib/formatted_ref.rb

@@ -1,13 +1,6 @@
 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_converter.rb

@@ -0,0 +1,311 @@
+module RelatonBib
+  class HashConverter
+    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 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
+
+      def title_hash_to_bib(ret)
+        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
+      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
+
+      def dates_hash_to_bib(ret)
+        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[:date][i][:on] ||= d[:value]
+            ret[:date][i].delete(:value)
+          end
+        end
+      end
+
+      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
+
+      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
+
+      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
+
+      def formattedref_hash_to_bib(ret)
+        ret[:formattedref] and ret[:formattedref] =
+          formattedref(ret[:formattedref])
+      end
+
+      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
+
+      def contributors_hash_to_bib(ret)
+        return unless ret[:contributor]
+        ret[:contributor] = array(ret[:contributor])
+        ret[:contributor]&.each_with_index do |c, i|
+          roles = array(ret[:contributor][i][:role]).map do |r|
+            if r.is_a? Array
+              { type: r[0], description: r.fetch(1) }
+            else
+              { type: r }
+            end
+          end
+          ret[:contributor][i][:role] = roles
+          ret[:contributor][i][:entity] = c[:person] ?
+            person_hash_to_bib(c[:person]) : org_hash_to_bib(c[:organization])
+          ret[:contributor][i].delete(:person)
+          ret[:contributor][i].delete(:organization)
+        end
+      end
+
+      def org_hash_to_bib(c)
+        return nil if c.nil?
+        c[:identifier] = array(c[:identifier])&.map do |a|
+          OrgIdentifier.new(a[:type], a[:id])
+        end
+        c
+      end
+
+      def person_hash_to_bib(c)
+        Person.new(
+          name: fullname_hash_to_bib(c),
+          affiliation: affiliation_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(
+          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),
+        )
+      end
+
+      def person_identifiers_hash_to_bib(c)
+        array(c[:identifier])&.map do |a|
+          PersonIdentifier.new(a[:type], a[:id])
+        end
+      end
+
+      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.is_a?(Hash) ?
+              { content: d[:content], language: d[:language],
+                script: d[:script], format: d[:format] } : 
+            { content: d })
+          end
+          Affilation.new(
+            Organization.new(org_hash_to_bib(a[:organization])), a[:description])
+        end
+      end
+
+      def contacts_hash_to_bib(c)
+        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],
+              country: a[:country], state: a[:state]) :
+          RelatonBib::Contact.new(type: a[:type], value: a[:value])
+        end
+      end
+
+      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)
+          relation_biblocality_hash_to_bib(ret, r, i)
+        end
+      end
+
+      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))
+        else
+          warn "bibitem missing: #{r}"
+          ret[:relation][i][:bibitem] = nil
+        end
+      end
+
+      def relation_biblocality_hash_to_bib(ret, r, i)
+        ret[:relation][i][:bib_locality] =
+          array(r[:bib_locality])&.map do |bl|
+            BibItemLocality.new(bl[:type], bl[:reference_from],
+                                bl[:reference_to])
+          end
+      end
+
+      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
+
+      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] and
+          ret[:classification] = Classification.new(ret[:classification])
+      end
+
+      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
+
+      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
+end

data/lib/relaton_bib/medium.rb

@@ -1,10 +1,4 @@
 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

data/lib/relaton_bib/organization.rb

@@ -3,16 +3,6 @@
 require "relaton_bib/contributor"
 
 module RelatonBib
-  class << self
-    def org_hash_to_bib(c)
-      return nil if c.nil?
-      c[:identifier] = array(c[:identifier])&.map do |a|
-        OrgIdentifier.new(a[:type], a[:id])
-      end
-      c
-    end
-  end
-
   # module OrgIdentifierType
   #   ORCID = 'orcid'
   #   URI   = 'uri'

data/lib/relaton_bib/person.rb

@@ -3,35 +3,6 @@
 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),
-        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(
-        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),
-      )
-    end
-
-    def person_identifiers_hash_to_bib(c)
-      array(c[:identifier])&.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,21 +1,6 @@
 # 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/validity.rb

@@ -1,14 +1,4 @@
 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

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "0.3.1".freeze
+  VERSION = "0.3.2".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -236,7 +236,7 @@ module RelatonBib
                    elsif (person = c.at "./person") then get_person(person)
                    end
           role_descr = c.xpath("./role/description").map &:text
-          ContributionInfo.new entity: entity, role: [[c.at("role")[:type], role_descr]]
+          ContributionInfo.new entity: entity, role: [{ type: c.at("role")[:type], description: role_descr }]
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2019-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -186,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_converter.rb
 - lib/relaton_bib/hash_to_bib.rb
 - lib/relaton_bib/localized_string.rb
 - lib/relaton_bib/medium.rb
@@ -219,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.'