relaton-bib 1.13.6 → 1.13.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bb1128da936b194ce7e29899a6092f2767e85b4f7e7963306cdb65789af8c65
-  data.tar.gz: a3c52753f1459b6898d9780d10899b560708fbbccb5f5a8e168c8b9945bcb5c1
+  metadata.gz: 566350d7e96478f76484698d7b249e2fc7e22a454a3b2e9572d23b4ddac14723
+  data.tar.gz: 53be5f2b3ee6967f22e654aae40133cbdba560ad176bbfc4c8c0f5cee541385c
 SHA512:
-  metadata.gz: edbdefdccca25da59d741f1013e5008a63ea53beff1350f5a248c52e8810f94ef3d08040a14976005ebdb0c79405b839534784550a893b368866ed6a561c6e33
-  data.tar.gz: f0ba59355807104e7915ff731da8bbe55197299af8b10e1ae90c6ba2a23c36e643d356c629dd307bf3fbf5094257c91a4509e908bbaca510cab5f1d65764e896
+  metadata.gz: 0fbbf49b3d1cb2cd5a4e1b423f547cf03d4a9d2c8d9178b15e4089d384e8c42f15de338f9a8991c1cd9fd83e9a2ac1c1783b11b7d1f7fbd30d8b53e7652db077
+  data.tar.gz: 011acbf178b30a5b62f9180f229e49ee4c804e75cba490df2802bad897261a6fed9e1d3a40c6cbd78554375de7884c1447afbdc02e48570976f439244edbaedd

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/typed_title_string.rb

@@ -101,6 +101,7 @@ module RelatonBib
     # @param content [String]
     # @param language [String]
     # @param script [String]
+    # @param format [String]
     def initialize(**args) # rubocop:disable Metrics/MethodLength
       unless args[:title] || args[:content]
         raise ArgumentError, %{Keyword "title" or "content" should be passed.}
@@ -108,24 +109,35 @@ module RelatonBib
 
       @type = args[:type]
 
-      if args[:title]
-        @title = args[:title]
+      case args[:title]
+      when FormattedString then @title = args[:title]
+      when Hash then @title = FormattedString.new(**args[:title])
       else
         fsargs = args.select { |k, _v| ARGS.include? k }
         @title = FormattedString.new(**fsargs)
       end
     end
 
-    # @param title [String]
-    # @return [TypedTitleStringCollection]
-    def self.from_string(title, lang = nil, script = nil)
+    #
+    # Create TypedTitleStringCollection from string
+    #
+    # @param title [String] title string
+    # @param lang [String, nil] language code Iso639
+    # @param script [String, nil] script code Iso15924
+    # @param format [String] format text/html, text/plain
+    #
+    # @return [TypedTitleStringCollection] collection of TypedTitleString
+    #
+    def self.from_string(title, lang = nil, script = nil, format = "text/plain")
       types = %w[title-intro title-main title-part]
       ttls = split_title(title)
       tts = ttls.map.with_index do |p, i|
-        new type: types[i], content: p, language: lang, script: script if p
+        next unless p
+
+        new type: types[i], content: p, language: lang, script: script, format: format
       end.compact
       tts << new(type: "main", content: ttls.compact.join(" - "),
-                 language: lang, script: script)
+                 language: lang, script: script, format: format)
       TypedTitleStringCollection.new tts
     end
 
@@ -140,10 +152,10 @@ module RelatonBib
     end
 
     # @param ttls [Array<String>]
-    # @return [Array<Strin, nil>]
+    # @return [Array<String, nil>]
     def self.intro_or_part(ttls)
       if /^(Part|Partie) \d+:/.match? ttls[1]
-        [nil, ttls[0], ttls[1..-1].join(" -- ")]
+        [nil, ttls[0], ttls[1..].join(" -- ")]
       else
         parts = ttls.slice(2..-1)
         part = parts.join " -- " if parts.any?
@@ -162,13 +174,6 @@ module RelatonBib
       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
       th.merge "type" => type
     end
 
@@ -176,7 +181,7 @@ module RelatonBib
     # @param count [Integer] number of titles
     # @return [String]
     def to_asciibib(prefix = "", count = 1) # rubocop:disable Metrics/AbcSize
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       out = count > 1 ? "#{pref}title::\n" : ""
       out += "#{pref}title.type:: #{type}\n" if type
       out += title.to_asciibib "#{pref}title", 1, !(type.nil? || type.empty?)

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.13.6".freeze
+  VERSION = "1.13.8".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.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-18 00:00:00.000000000 Z
+date: 2022-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug