relaton-bib 1.13.6 → 1.13.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bb1128da936b194ce7e29899a6092f2767e85b4f7e7963306cdb65789af8c65
-  data.tar.gz: a3c52753f1459b6898d9780d10899b560708fbbccb5f5a8e168c8b9945bcb5c1
+  metadata.gz: 493716815449edfed921ea2239b0c066b614211c2722f261bf4f59d5aa094e54
+  data.tar.gz: 661ad28bf88fcb3e5b27888885696c14385fbb9bfc891f4b20ea91d7e6dba1f1
 SHA512:
-  metadata.gz: edbdefdccca25da59d741f1013e5008a63ea53beff1350f5a248c52e8810f94ef3d08040a14976005ebdb0c79405b839534784550a893b368866ed6a561c6e33
-  data.tar.gz: f0ba59355807104e7915ff731da8bbe55197299af8b10e1ae90c6ba2a23c36e643d356c629dd307bf3fbf5094257c91a4509e908bbaca510cab5f1d65764e896
+  metadata.gz: 2e5ef5a5bd17eafad776a09434fb8e7df82ec2ca3b4fc1e59a6e7d722a72e1c1f57ec75a80dfb1c651a7cea71160c04fb1083517169a68ba341bc3f607c8219c
+  data.tar.gz: 7b556666124417d87dc58709325b4be7970fb4af443686e332376b739edaa8ad0041e0a26145954577a2b1f8674b078a31405ac2447868caa8df06b3eb25158c

data/.github/workflows/rake.yml

@@ -5,7 +5,6 @@ name: rake
 on:
   push:
     branches: [ master, main ]
-    tags: [ v* ]
   pull_request:
 
 jobs:

data/lib/relaton_bib/bibliographic_item.rb

@@ -956,7 +956,7 @@ module RelatonBib
         builder.author do |xml|
           xml.parent[:role] = "editor" if c.role.detect { |r| r.type == "editor" }
           if c.entity.is_a?(Person) then render_person xml, c.entity
-          else render_organization xml, c.entity
+          else render_organization xml, c.entity, c.role
           end
           render_address xml, c
         end
@@ -1039,14 +1039,18 @@ module RelatonBib
     # @param [Nokogiri::XML::Builder] builder xml builder
     # @param [RelatonBib::Organization] org organization
     #
-    def render_organization(builder, org) # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
+    def render_organization(builder, org, role = []) # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/AbcSize
       ab = org&.abbreviation&.content
       on = org&.name&.first&.content
       orgname = if BibXMLParser::ORGNAMES.key?(ab) then ab
                 else BibXMLParser::ORGNAMES.key(on) || on || ab
                 end
-      o = builder.organization orgname
-      o[:abbrev] = ab if ab
+      if role.detect { |r| r.description.detect { |d| d.content == "BibXML author" } }
+        builder.parent[:fullname] = orgname
+      else
+        o = builder.organization orgname
+        o[:abbrev] = ab if ab
+      end
     end
   end
 end

data/lib/relaton_bib/bibxml_parser.rb

@@ -12,6 +12,11 @@ module RelatonBib
       "3GPP" => "3rd Generation Partnership Project",
     }.freeze
 
+    FULLNAMEORG = [
+      "IAB", "Internet Architecture Board", "IAB and IESG", "IESG",
+      "IAB Advisory Committee", "Internet Engineering Steering Group"
+    ].freeze
+
     #
     # Parse BibXML content
     #
@@ -215,19 +220,24 @@ module RelatonBib
     # @return [Array<Hash>]
     def contributors(reference)
       reference.xpath("./front/author").map do |contrib|
-        if contrib[:fullname] || contrib[:surname] then person(contrib, reference)
-        else organization(contrib)
-        end
+        full_name_org(contrib) || person(contrib, reference) || organization(contrib)
       end.compact
-      # persons(reference) + organizations(reference)
+    end
+
+    def full_name_org(contrib)
+      return unless FULLNAMEORG.include? contrib[:fullname]
+
+      role = contributor_role(contrib)
+      role[:description] = ["BibXML author"]
+      { entity: new_org(contrib[:fullname]), role: [role] }
     end
 
     # @param author [Nokogiri::XML::Element]
     # @param reference [Nokogiri::XML::Element]
     # @return [Array<Hash{Symbol=>RelatonBib::Person,Symbol=>Array<String>}>]
     def person(author, reference)
-      # reference.xpath("./front/author[@surname]|./front/author[@fullname]")
-      #   .map do |author|
+      return unless author[:fullname] || author[:surname]
+
       entity = Person.new(
         name: full_name(author, reference),
         affiliation: affiliation(author),
@@ -241,15 +251,6 @@ module RelatonBib
     # @return [Array<Hash{Symbol=>RelatonBib::Organization,
     #   Symbol=>Array<String>}>]
     def organization(contrib)
-      # publisher = { entity: new_org, role: [type: "publisher"] }
-      # orgs = reference.xpath("./seriesinfo").reduce([]) do |mem, si|
-      #   next mem unless si[:stream]
-
-      #   mem << { entity: new_org(si[:stream], nil), role: [type: "author"] }
-      # end
-      # orgs + reference.xpath(
-      #   "front/author[not(@surname)][not(@fullname)]/organization",
-      # ).map do |org|
       org = contrib.at("./organization")
       orgname = org.text.strip
       return if orgname.empty?
@@ -299,10 +300,9 @@ module RelatonBib
     end
 
     # @param name [String]
-    # @param abbr [String]
+    # @param abbr [String, nil]
     # @return [RelatonBib::Organization]
-    def new_org(name, abbr)
-      # (name = "Internet Engineering Task Force", abbr = "IETF")
+    def new_org(name, abbr = nil)
       Organization.new name: name, abbreviation: abbr
     end
 

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.13.6".freeze
+  VERSION = "1.13.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.13.6
+  version: 1.13.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-18 00:00:00.000000000 Z
+date: 2022-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug