relaton-ietf 1.13.1 → 1.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6fed6cd142a3168d65cfd06e4e1ff063dfd4e7bb2437ce7c1c332631307d369
-  data.tar.gz: 5af1d834979a4f2ae447865fa898da361b01019b37e113e087ce18402f9ba71b
+  metadata.gz: 6fe51d3e7f18e3e3b6c093ee78a24c917cdfd95d88bab7035078c8627a35f0fb
+  data.tar.gz: 29b83fa09d9a1b403fdeef78ef77297b8911d7ab222a2b4cf47a60ffd5b7a8d6
 SHA512:
-  metadata.gz: 4051003063ece4084190e58e16b5b5e75cd9d8b38790bbf6d3844e1d57e7a5e6df2bfeba1d346cb777c442ce310dc10f296952099f239652c6d070e845992aef
-  data.tar.gz: 5e4fb7efd0c16218fc675c0a3b1bca4299606fa992608dc3a165108679abf391d24d5d7cdacd38d31752aa96019408ac7e9b4c39ec22244fe1914d4f3c4f50b1
+  metadata.gz: 98e68d59cc3b1c53c6c3ed3a845a05b9f2f2ceca3a60b6f63bb952fc51dcf81cfe8ebe7e62e9fbfaadd30a2268ded0dbf1c947e6c6c3f17e91bf76bd0feb4a70
+  data.tar.gz: ccf02324637a7da4cb8b960c5ed05363e399dd4da11578f50254dc783662aa82b4da87b4ca031bd8cc9de9c5500bc41741d98e9c63314e29771bd1ef7a62be2c

data/.github/workflows/rake.yml

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

data/.github/workflows/release.yml

@@ -0,0 +1,22 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: release
+
+on:
+  workflow_dispatch:
+    inputs:
+      next_version:
+        description: |
+          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+        required: true
+        default: 'skip'
+  push:
+    tags: [ v* ]
+
+jobs:
+  release:
+    uses: relaton/support/.github/workflows/release.yml@master
+    with:
+      next_version: ${{ github.event.inputs.next_version }}
+    secrets:
+      rubygems-api-key: ${{ secrets.RELATON_CI_RUBYGEMS_API_KEY }}

data/lib/relaton_ietf/bibxml_parser.rb

@@ -3,11 +3,30 @@ module RelatonIetf
     include RelatonBib::BibXMLParser
     extend BibXMLParser
 
+    FULLNAMEORG = [
+      "IAB", "Internet Architecture Board", "IAB and IESG", "IESG",
+      "IAB Advisory Committee", "Internet Engineering Steering Group",
+      "Network Information Center. Stanford Research Institute",
+      "Information Sciences Institute University of Southern California",
+      "International Telegraph and Telephone Consultative Committee of the International Telecommunication Union",
+      "National Bureau of Standards", "International Organization for Standardization",
+      "National Research Council", "Gateway Algorithms and Data Structures Task Force",
+      "National Science Foundation", "Network Technical Advisory Group",
+      "NetBIOS Working Group in the Defense Advanced Research Projects Agency",
+      "Internet Activities Board", "End-to-End Services Task Force",
+      "Defense Advanced Research Projects Agency", "The North American Directory Forum",
+      "ESCC X.500/X.400 Task Force", "ESnet Site Coordinating Comittee (ESCC)",
+      "Energy Sciences Network (ESnet)", "RARE WG-MSG Task Force 88",
+      "Internet Assigned Numbers Authority (IANA)", "Federal Networking Council",
+      "Audio-Video Transport Working Group", "KOI8-U Working Group",
+      "The Internet Society", "Sun Microsystems"
+    ].freeze
+
     # @param attrs [Hash]
     # @return [RelatonIetf::IetfBibliographicItem]
     def bib_item(**attrs)
       unless attrs.delete(:is_relation)
-        attrs[:fetched] = Date.today.to_s
+        # attrs[:fetched] = Date.today.to_s
         # attrs[:place] = ["Fremont, CA"]
       end
       RelatonIetf::IetfBibliographicItem.new(**attrs)
@@ -46,7 +65,40 @@ module RelatonIetf
         }
       end
       contribs + super
-      # persons(reference) + organizations(reference)
+    end
+
+    #
+    # Overrade RelatonBib::BibXMLParser#full_name method
+    #
+    # @param author [Nokogiri::XML::Element]
+    # @param reference [Nokogiri::XML::Element]
+    #
+    # @return [RelatonBib::FullName]
+    #
+    def full_name(author, reference)
+      lang = language reference
+      sname, inits = parse_surname_initials author
+      initials = localized_string(inits, lang)
+      RelatonBib::FullName.new(
+        completename: localized_string(author[:fullname], lang),
+        initials: initials, forename: forename(inits, lang),
+        surname: localized_string(sname, lang)
+      )
+    end
+
+    def parse_surname_initials(author)
+      regex = /(?:[A-Z]{1,2}(?:\.[\s-]?|\s))+/
+      surname = author[:surname] || author[:fullname].sub(regex, "").strip
+      inits = author[:initials] || regex.match(author[:fullname])&.to_s&.strip
+      [surname, inits]
+    end
+
+    def parse_surname(fullname)
+      fullname.sub(/(?:[A-Z]{1,2}(?:\.[\s-]?|\s))+/, "").strip
+    end
+
+    def parse_initials(fullname)
+      fullname.match(/(?:[A-Z]{1,2}(?:\.[\s-]?|\s))+/).to_s.strip
     end
   end
 end

data/lib/relaton_ietf/data_fetcher.rb

@@ -122,7 +122,7 @@ module RelatonIetf
       last_v = HashConverter.hash_to_bib YAML.load_file("#{@output}/#{vs.last}.#{@ext}")
       bib = IetfBibliographicItem.new(
         title: last_v[:title], abstract: last_v[:abstract], formattedref: fref,
-        fetched: Date.today.to_s, docid: [docid], relation: rel
+        docid: [docid], relation: rel
       )
       save_doc bib
     end

data/lib/relaton_ietf/rfc_entry.rb

@@ -30,7 +30,6 @@ module RelatonIetf
         type: "standard",
         language: ["en"],
         script: ["Latn"],
-        fetched: Date.today.to_s,
         docid: parse_docid,
         docnumber: code,
         title: parse_title,
@@ -150,7 +149,7 @@ module RelatonIetf
     #
     # @return [Array<RelatonBib::ContributionInfo>] document contributors
     #
-    def parse_contributor # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity
+    def parse_contributor # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       @doc.xpath("./xmlns:author").map do |contrib| # rubocop:disable Metrics/BlockLength
         n = contrib.at("./xmlns:name").text
         case n
@@ -158,12 +157,16 @@ module RelatonIetf
           entity = RelatonBib::Organization.new(abbrev: n, name: "International Organization for Standardization")
         when "International Organization for Standardization"
           entity = RelatonBib::Organization.new(abbrev: "ISO", name: n)
-        when "IAB"
-          entity = RelatonBib::Organization.new(abbrev: n, name: "Internet Architecture Board")
-        when "IESG"
-          entity = RelatonBib::Organization.new(abbrev: n, name: "Internet Engineering Steering Group")
-        when "Internet Engineering Steering Group", "Federal Networking Council", "Internet Architecture Board",
-          "Internet Activities Board", "Defense Advanced Research Projects Agency", "National Science Foundation",
+        # when "IAB", "IESG", "Internet Architecture Board", "IAB and IESG",
+        #   "IAB Advisory Committee", "Internet Engineering Steering Group"
+        when /#{RelatonBib::BibXMLParser::FULLNAMEORG.join("|")}/
+          abbr = n.upcase == n ? n : n.split.reduce([]) { |a, w| w == w.upcase ? break : a << w[0] }&.join
+          entity = RelatonBib::Organization.new(abbrev: abbr, name: n)
+          desc = "BibXML author"
+        # when "IESG"
+        #   entity = RelatonBib::Organization.new(abbrev: n, name: "Internet Engineering Steering Group")
+        when "Federal Networking Council", "Internet Activities Board",
+          "Defense Advanced Research Projects Agency", "National Science Foundation",
           "National Research Council", "National Bureau of Standards"
           abbr = n.split.map { |w| w[0] if w[0] == w[0].upcase }.join
           entity = RelatonBib::Organization.new(abbrev: abbr, name: n)
@@ -194,20 +197,23 @@ module RelatonIetf
           )
           entity = RelatonBib::Person.new(name: fname)
         end
-        RelatonBib::ContributionInfo.new(entity: entity, role: parse_role(contrib))
+        RelatonBib::ContributionInfo.new(entity: entity, role: parse_role(contrib, desc))
       end
     end
 
     #
     # Parse contributors role
     #
-    # @param [Nokogiri::XML::Node] contrib <description>
+    # @param [Nokogiri::XML::Node] contrib contributor
+    # @param [String, nil] desc contributor description
     #
-    # @return [Array<Hash>] contributors role
+    # @return [Array<Hash>] contributor's role
     #
-    def parse_role(contrib)
+    def parse_role(contrib, desc = nil)
       type = contrib.at("./xmlns:title")&.text&.downcase || "author"
-      [{ type: type }]
+      role = { type: type }
+      role[:description] = [desc] if desc
+      [role]
     end
 
     #

data/lib/relaton_ietf/rfc_index_entry.rb

@@ -37,7 +37,6 @@ module RelatonIetf
     #
     def parse # rubocop:disable Metrics/MethodLength
       IetfBibliographicItem.new(
-        fetched: Date.today.to_s,
         title: make_title,
         docnumber: docnumber,
         type: "standard",

data/lib/relaton_ietf/scrapper.rb

@@ -39,7 +39,11 @@ module RelatonIetf
       uri = "#{ghurl}#{ref.sub(/\s|\u00a0/, '.')}.yaml"
       # BibXMLParser.parse get_page(uri), is_relation: is_relation, ver: ver
       resp = get_page uri
-      IetfBibliographicItem.from_hash YAML.safe_load(resp) if resp
+      return unless resp
+
+      hash = YAML.safe_load resp
+      hash["fetched"] = Date.today.to_s
+      IetfBibliographicItem.from_hash hash
     end
 
     # @param uri [String]

data/lib/relaton_ietf/version.rb

@@ -1,3 +1,3 @@
 module RelatonIetf
-  VERSION = "1.13.1".freeze
+  VERSION = "1.13.3".freeze
 end

data/relaton_ietf.gemspec

@@ -38,5 +38,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", "~> 1.13.0"
+  spec.add_dependency "relaton-bib", "~> 1.13.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ietf
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.3
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.13.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.13.10
 description: "RelatonIetf: retrieve IETF Standards for bibliographic use \nusing the
   BibliographicItem model.\n\nFormerly known as rfcbib.\n"
 email:
@@ -145,6 +145,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
@@ -180,7 +181,7 @@ homepage: https://github.com/metanorma/relaton-ietf
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -195,8 +196,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: 'RelatonIetf: retrieve IETF Standards for bibliographic use using the BibliographicItem
   model'