relaton-bib 0.3.3 → 0.3.8

data/lib/relaton_bib/hit.rb

@@ -0,0 +1,32 @@
+module RelatonBib
+  class Hit
+    # @return [Array<Hash>]
+    attr_reader :hit
+
+    # @param hit [Hash]
+    # @param hit_collection [RelatonIso::HitCollection, RelatonNist:HitCollection]
+    def initialize(hit, hit_collection = nil)
+      @hit            = hit
+      @hit_collection = hit_collection
+    end
+
+    # @return [String]
+    def to_s
+      inspect
+    end
+
+    # @return [String]
+    def inspect
+      "<#{self.class}:#{format('%#.14x', object_id << 1)} "\
+      "@text=\"#{@hit_collection&.text}\" "\
+      "@fetched=\"#{!@fetch.nil?}\" "\
+      "@fullIdentifier=\"#{@fetch&.shortref(nil)}\" "\
+      "@title=\"#{@hit[:code]}\">"
+    end
+
+    # @return [String]
+    def to_xml(**opts)
+      fetch.to_xml **opts
+    end
+  end
+end

data/lib/relaton_bib/hit_collection.rb

@@ -0,0 +1,34 @@
+module RelatonBib
+  class HitCollection < Array
+    # @return [TrueClass, FalseClass]
+    attr_reader :fetched
+
+    # @return [String]
+    attr_reader :text
+
+    # @return [String]
+    attr_reader :year
+
+    # @return [RelatonIso::HitCollection]
+    def fetch
+      workers = WorkersPool.new 4
+      workers.worker(&:fetch)
+      each do |hit|
+        workers << hit
+      end
+      workers.end
+      workers.result
+      @fetched = true
+      self
+    end
+
+    def to_s
+      inspect
+    end
+
+    # @return [String]
+    def inspect
+      "<#{self.class}:#{format('%#.14x', object_id << 1)} @fetched=#{@fetched}>"
+    end
+  end
+end

data/lib/relaton_bib/localized_string.rb

@@ -3,6 +3,8 @@
 module RelatonBib
   # Localized string.
   class LocalizedString
+    include RelatonBib
+
     # @return [Array<String>] language Iso639 code
     attr_reader :language
 
@@ -16,10 +18,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 +37,19 @@ 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
+      return content unless language || script
+
+      hash = { "content" => content }
+      hash["language"] = single_element_array(language) if language&.any?
+      hash["script"] = single_element_array(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,51 +46,35 @@ 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>]
     attr_reader :identifier
 
-    def hash2locstr(name)
-      name.is_a?(Hash) ?
-        LocalizedString.new(name[:content], name[:language], name[:script]) : 
-        LocalizedString.new(name)
-    end
-
     # @param name [String, Hash, Array<String, Hash>]
-    # @param abbreviation [RelatoBib::LocalizedStrig, String]
-    # @param subdivision [RelatoBib::LocalizedStrig, String]
+    # @param abbreviation [RelatoBib::LocalizedString, String]
+    # @param subdivision [RelatoBib::LocalizedString, 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]
 
       super(url: args[:url], contact: args.fetch(:contact, []))
 
       @name = if args[:name].is_a?(Array)
-                args[:name].map { |n| hash2locstr(n) }
+                args[:name].map { |n| localized_string(n) }
               else
-                [hash2locstr(args[:name])]
+                [localized_string(args[:name])]
               end
 
-      @abbreviation = if args[:abbreviation].is_a?(String)
-                        LocalizedString.new(args[:abbreviation])
-                      else
-                        args[:abbreviation]
-                      end
-
-      @subdivision  = if args[:subdivision].is_a?(String)
-                        LocalizedString.new(args[:subdivision])
-                      else
-                        args[:subdivision]
-                      end
-
-      @identifier  = args.fetch(:identifier, [])
+      @abbreviation = localized_string args[:abbreviation]
+      @subdivision  = localized_string args[:subdivision]
+      @identifier   = args.fetch(:identifier, [])
     end
 
     # @param builder [Nokogiri::XML::Builder]
@@ -101,5 +90,26 @@ module RelatonBib
         super
       end
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = { "name" => single_element_array(name) }
+      hash["abbreviation"] = abbreviation.to_hash if abbreviation
+      hash["identifier"] = single_element_array(identifier) if identifier&.any?
+      hash["subdivision"] = subdivision.to_hash if subdivision
+      { "organization" => hash.merge(super) }
+    end
+
+    private
+
+    # @param arg [String, Hash, RelatoBib::LocalizedString]
+    # @return [RelatoBib::LocalizedString]
+    def localized_string(arg)
+      if arg.is_a?(String) then LocalizedString.new(arg)
+      elsif arg.is_a?(Hash)
+        LocalizedString.new(arg[:content], arg[:language], arg[:script])
+      elsif arg.is_a? LocalizedString then arg
+      end
+    end
   end
 end

data/lib/relaton_bib/person.rb

@@ -5,6 +5,8 @@ require "relaton_bib/contributor"
 module RelatonBib
   # Person's full name
   class FullName
+    include RelatonBib
+
     # @return [Array<RelatonBib::LocalizedString>]
     attr_accessor :forename
 
@@ -56,6 +58,18 @@ module RelatonBib
         end
       end
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = {}
+      hash["forename"] = single_element_array(forename) if forename&.any?
+      hash["initial"] = single_element_array(initial) if initial&.any?
+      hash["surname"] = surname.to_hash if surname
+      hash["addition"] = single_element_array(addition) if addition&.any?
+      hash["prefix"] = single_element_array(prefix) if prefix&.any?
+      hash["completename"] = completename.to_hash if completename
+      hash
+    end
   end
 
   # Person identifier type.
@@ -94,6 +108,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 +128,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 +146,13 @@ module RelatonBib
         contact.each { |contact| contact.to_xml builder }
       end
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = { "name" => name.to_hash }
+      hash["affiliation"] = single_element_array(affiliation) if affiliation&.any?
+      hash["identifier"] = single_element_array(identifier) 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,19 @@ module RelatonBib
       builder.parent[:type] = type if type
       title.to_xml builder
     end
+
+    # @return [Hash]
+    def to_hash
+      th = title.to_hash
+      return th unless type
+
+      hash = { "type" => type }
+      if th.is_a? String
+        hash["content"] = th
+      else
+        hash.merge! th
+      end
+      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.8".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -5,7 +5,7 @@ module RelatonBib
     class << self
       def from_xml(xml)
         doc = Nokogiri::XML(xml)
-        bibitem = doc.at "/bibitem"
+        bibitem = doc.at "/bibitem|/bibdata"
         BibliographicItem.new(item_data(bibitem))
       end
 
@@ -29,8 +29,8 @@ module RelatonBib
           edition: bibitem.at("./edition")&.text,
           version: fetch_version(bibitem),
           biblionote: fetch_note(bibitem),
-          language: bibitem.xpath("./language").map(&:text),
-          script: bibitem.xpath("./script").map(&:text),
+          language: fetch_language(bibitem),
+          script: fetch_script(bibitem),
           abstract: fetch_abstract(bibitem),
           docstatus: fetch_status(bibitem),
           copyright: fetch_copyright(bibitem),
@@ -67,6 +67,14 @@ module RelatonBib
         end
       end
 
+      def fetch_language(item)
+        item.xpath("./language").reduce([]) { |a, l| l.text.empty? ? a : a << l.text }
+      end
+
+      def fetch_script(item)
+        item.xpath("./script").reduce([]) { |a, s| s.text.empty? ? a : a << s.text }
+      end
+
       # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
 
       def fetch_series(item)
@@ -145,8 +153,9 @@ module RelatonBib
         status = item.at("./status")
         return unless status
 
+        stage = status.at "stage"
         DocumentStatus.new(
-          stage: status.at("stage").text,
+          stage: stage ? stage.text : status.text,
           substage: status.at("substage")&.text,
           iteration: status.at("iteration")&.text,
         )
@@ -154,8 +163,9 @@ module RelatonBib
 
       def fetch_dates(item)
         item.xpath("./date").map do |d|
+          type = d[:type].to_s.empty? ? "published" : d[:type]
           RelatonBib::BibliographicDate.new(
-            type: d[:type], on: d.at("on")&.text, from: d.at("from")&.text,
+            type: type, on: d.at("on")&.text, from: d.at("from")&.text,
             to: d.at("to")&.text
           )
         end
@@ -178,7 +188,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|