relaton-bib 1.16.1 → 1.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6165095300e083fe287e6c6cd187f26f0449d0de89a32aade55d3dc5481c939f
-  data.tar.gz: fca1f9e076e2d6ed8267c86be8bc0b3fa2bae34a19feddfac306958a2d400016
+  metadata.gz: 8098843fe273de5162b5c7f640ed970e78829a22a71aef66675a65bd9eaa60aa
+  data.tar.gz: 89e952252458837ebbec87cec74801414f676e0aafea76bf69a7c98157e96c32
 SHA512:
-  metadata.gz: 1bf3f71377b6ee41cc12ee9bf80be44c0ab81d10f237535c17372f1ebdd5a17f7f6685ceda9dc684764c85663015be88ecb7a5060680b3a4a7e8af1c8c65ddaf
-  data.tar.gz: e2fbf83739f64942dc259573446f9925e613a29c822b3158db261d69d5fb9aa42e1468104368a2668cc535b9ee5a3e9b65ce9cdfa1e0b444d03f8d78a95ad079
+  metadata.gz: cc73ddea87f2eed0caca6361ec228aaac81d609ac1309d54d6da77aec9f9bdb6ec64182288b670f85c42f80115eb60c6372a3fd7ed240bd9e191ea253e350b9b
+  data.tar.gz: f58d6eb817231bc984a8d7928ca4f1d2319497e30debdaa46781a610949056ec5a2bdd768e7a742be77fc30dfd3288ff3006a6cc2dcf0476c7548ac48becc878

data/lib/relaton_bib/contributor.rb

@@ -123,20 +123,13 @@ module RelatonBib
     # @return [RelatonBib::LocalizedString, nil]
     attr_reader :name
 
-    # @return [Array<RelatonBib::FormattedString>]
-    attr_reader :description
-
     # @return [RelatonBib::Organization]
     attr_reader :organization
 
-    # @param organization [RelatonBib::Organization]
+    # @param organization [RelatonBib::Organization, nil]
     # @param name [RelatonBib::LocalizedString, nil]
     # @param description [Array<RelatonBib::FormattedString>]
-    def initialize(organization:, name: nil, description: [])
-      unless organization.is_a? RelatonBib::Organization
-        raise ArgumentError, "organization should be an instance of RelatonBib::Organization"
-      end
-
+    def initialize(organization: nil, name: nil, description: [])
       @name = name
       @organization = organization
       @description  = description
@@ -145,19 +138,44 @@ module RelatonBib
     # @param opts [Hash]
     # @option opts [Nokogiri::XML::Builder] :builder XML builder
     # @option opts [String] :lang language
-    def to_xml(**opts) # rubocop:disable Metrics/AbcSize
+    def to_xml(**opts)
+      return unless organization || name || description&.any?
+
       opts[:builder].affiliation do |builder|
-        builder.name { name.to_xml builder } if name
-        desc = description.select { |d| d.language&.include? opts[:lang] }
-        desc = description unless desc.any?
-        desc.each { |d| builder.description { d.to_xml builder } }
-        organization.to_xml(**opts)
+        name_xml builder
+        description_xml builder
+        organization&.to_xml(**opts)
       end
     end
 
+    def name_xml(builder)
+      builder.name { name.to_xml builder } if name
+    end
+
+    def description_xml(builder)
+      description.each { |d| builder.description { d.to_xml builder } }
+    end
+
+    #
+    # Get description.
+    #
+    # @param [String, nil] lang language if nil return all description
+    #
+    # @return return [Array<RelatonBib::FormattedString>] description
+    #
+    def description(lang = nil)
+      return @description unless lang
+
+      @description.select { |d| d.language&.include? lang }
+    end
+
+    #
+    # Render affiliation as hash.
+    #
     # @return [Hash]
+    #
     def to_hash
-      hash = organization.to_hash
+      hash = organization&.to_hash || {}
       hash["name"] = name.to_hash if name
       if description&.any?
         hash["description"] = single_element_array(description)
@@ -175,7 +193,7 @@ module RelatonBib
       description.each do |d|
         out += d.to_asciibib "#{pref}affiliation.description", description.size
       end
-      out += organization.to_asciibib "#{pref}affiliation.*"
+      out += organization.to_asciibib "#{pref}affiliation.*" if organization
       out
     end
   end

data/lib/relaton_bib/hash_converter.rb

@@ -288,9 +288,10 @@ module RelatonBib
                   end
             FormattedString.new(**cnt)
           end
+          name = LocalizedString.new(a[:name][:content], a[:name][:language], a[:name][:script]) if a[:name]
           Affiliation.new(
             organization: Organization.new(**org_hash_to_bib(a[:organization])),
-            description: a[:description],
+            description: a[:description], name: name
           )
         end
       end

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.16.1".freeze
+  VERSION = "1.16.2".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -180,13 +180,11 @@ module RelatonBib
       #
       def fetch_series(item) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/AbcSize,Metrics/MethodLength,Metrics/PerceivedComplexity
         item.xpath("./series").reduce([]) do |mem, sr|
-          abbr = sr.at "abbreviation"
-          abbreviation = abbr &&
-            LocalizedString.new(abbr.text, abbr[:language], abbr[:script])
           formattedref = fref(sr)
           title = ttitle(sr.at("title"))
           next mem unless formattedref || title
 
+          abbreviation = localized_string sr.at("abbreviation")
           mem << Series.new(
             type: sr[:type], formattedref: formattedref,
             title: title, place: sr.at("place")&.text,
@@ -310,9 +308,7 @@ module RelatonBib
       # @param title [Nokogiri::XML::Element]
       # @return [Array<RelatonBib::LocalizedString>]
       def variants(elm)
-        elm.xpath("variant").map do |v|
-          LocalizedString.new v.text, v[:language], v[:script]
-        end
+        elm.xpath("variant").map { |v| localized_string v }
       end
 
       #
@@ -388,27 +384,20 @@ module RelatonBib
       #
       # @param [Nokogiri::XML::Element] person XML element
       #
-      # @return [RelatonBib::Person] person
+      # @return [RelatonBib::Person, nil] person
       #
-      def get_person(person) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
-        affiliations = person.xpath("./affiliation").map do |a|
-          org = a.at "./organization"
-          desc = a.xpath("./description").map do |e|
-            FormattedString.new(content: e.text, language: e[:language],
-                                script: e[:script], format: e[:format])
-          end
-          Affiliation.new organization: get_org(org), description: desc
-        end
+      def get_person(person) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        return unless person
+
+        affiliations = person.xpath("./affiliation").map { |a| fetch_affiliation a }
 
         contact = parse_contact person
         identifier = person.xpath("./identifier").map do |pi|
           PersonIdentifier.new pi[:type], pi.text
         end
 
-        cn = person.at "./name/completename"
-        cname = cn && LocalizedString.new(cn.text, cn[:language], cn[:script])
-        sn = person.at "./name/surname"
-        sname = sn && LocalizedString.new(sn.text, sn[:language], sn[:script])
+        cname = localized_string person.at("./name/completename")
+        sname = localized_string person.at("./name/surname")
 
         name = FullName.new(
           completename: cname, surname: sname,
@@ -426,6 +415,22 @@ module RelatonBib
         )
       end
 
+      def fetch_affiliation(elm)
+        org = get_org elm.at("./organization")
+        desc = elm.xpath("./description").map do |e|
+          FormattedString.new(content: e.text, language: e[:language],
+                              script: e[:script], format: e[:format])
+        end
+        name = localized_string elm.at("./name")
+        Affiliation.new organization: org, description: desc, name: name
+      end
+
+      def localized_string(elm)
+        return unless elm
+
+        LocalizedString.new(elm.text, elm[:language], elm[:script])
+      end
+
       #
       # Parse contact information
       #
@@ -467,10 +472,7 @@ module RelatonBib
       # @return [RelatonBib::LocalizedString, nil] initials
       #
       def parse_initials(person)
-        inits = person.at "./name/formatted-initials"
-        return unless inits
-
-        LocalizedString.new(inits.text, inits[:language], inits[:script])
+        localized_string person.at("./name/formatted-initials")
       end
 
       #
@@ -497,24 +499,21 @@ module RelatonBib
       # @return [Array<RelatonBib::LocalizedString>] name parts
       #
       def name_part(person, part)
-        person.xpath("./name/#{part}").map do |np|
-          LocalizedString.new np.text, np[:language], np[:script]
-        end
+        person.xpath("./name/#{part}").map { |np| localized_string np }
       end
 
       # @param item [Nokogiri::XML::Element]
       # @return [Array<RelatonBib::ContributionInfo>]
       def fetch_contributors(item)
-        item.xpath("./contributor").map do |c|
-          entity = if (org = c.at "./organization") then get_org(org)
-                   elsif (person = c.at "./person") then get_person(person)
-                   end
-          role = c.xpath("./role").map do |r|
-            { type: r[:type],
-              description: r.xpath("./description").map(&:text) }
-          end
-          ContributionInfo.new entity: entity, role: role
+        item.xpath("./contributor").map { |c| fetch_contribution_info c }
+      end
+
+      def fetch_contribution_info(contrib)
+        entity = get_org(contrib.at("./organization")) || get_person(contrib.at("./person"))
+        role = contrib.xpath("./role").map do |r|
+          { type: r[:type], description: r.xpath("./description").map(&:text) }
         end
+        ContributionInfo.new entity: entity, role: role
       end
 
       # @param item [Nokogiri::XML::Element]
@@ -529,16 +528,13 @@ module RelatonBib
 
       # @param item [Nokogiri::XML::Element]
       # @return [Array<RelatonBib::CopyrightAssociation>]
-      def fetch_copyright(item) # rubocop:disable Metrics/AbcSize
+      def fetch_copyright(item)
         item.xpath("./copyright").map do |cp|
-          owner = cp.xpath("owner").map do |o|
-            ContributionInfo.new entity: get_org(o.at("organization"))
-          end
+          owner = cp.xpath("owner").map { |o| fetch_contribution_info o }
           from = cp.at("from")&.text
           to   = cp.at("to")&.text
           scope = cp.at("scope")&.text
-          CopyrightAssociation.new(owner: owner, from: from, to: to,
-                                   scope: scope)
+          CopyrightAssociation.new(owner: owner, from: from, to: to, scope: scope)
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.16.1
+  version: 1.16.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-19 00:00:00.000000000 Z
+date: 2023-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable