relaton-bib 1.17.1 → 1.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a507a7fa74bc5be4e5148c8f80f91dc77a602b356187168d412beb958d30ad67
-  data.tar.gz: 41d821df9469b709f76d98288d6ec80fa0959d3d6e7ab867f08095283ed3eaf9
+  metadata.gz: 46d18122233ea0790d42f293b18648a094be8739cac59714cdf2419a5510062b
+  data.tar.gz: 918ef1f018e38e6cdfc0f0cafdf886311794910af463a08f15e5d21088e21062
 SHA512:
-  metadata.gz: 0d1daace14ed81e05633e2340d26c1f591afcb8d5ea8b742c3cabe66e74f92def40966a20fadbd182b1b4808e6cbfa3cae9f1abb3dd40035ad2c2bc118392d85
-  data.tar.gz: a08ae4ae1f9c3563c242d8940172cf44bd23e182237b39d91a37f572719694695bbaf9b5805bfcafb76e201eaead8506a8bd878ec8f0aed7722c7d6815e19441
+  metadata.gz: 61a55508abb720be6180365bbd839987eeadcdc38ccc6160d9c03453303f38ba4b4b16731d03236db4e5b767871bdb00b29aa5eab91ca70bf6b9e69eeab0b22f
+  data.tar.gz: 5e4400c78c97db49cbd30d4bf4f105dfa365ecc570a876a594c10389913190c2d5536412f76cc41458c18ea78ea3f0f5e90681a698f99213076a2995ced94a51

data/grammars/versions.json

@@ -30,5 +30,5 @@
 "relaton-model-jis": "v0.0.1",
 "relaton-model-etsi": "v0.0.3",
 "metanorma-model": "v1.2.9",
-"date": "2023-12-02T16:19:25Z"
+"date": "2023-12-04T16:12:14Z"
 }

data/lib/relaton_bib/bibtex_parser.rb

@@ -78,54 +78,50 @@ module RelatonBib
 
       # @param bibtex [BibTeX::Entry]
       # @return [Array<Hash>]
-      def fetch_contributor(bibtex) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
-        contributor = []
-        fetch_person(bibtex["author"]).each do |entity|
-          contributor << { entity: entity, role: [{ type: "author" }] }
-        end
+      def fetch_contributor(bibtex) # rubocop:disable Metrics/AbcSize
+        contribs = []
+        fetch_person(bibtex, "author") { |author| contribs << author }
+        fetch_person(bibtex, "editor") { |editor| contribs << editor }
 
-        fetch_person(bibtex["editor"]).each do |entity|
-          contributor << { entity: entity, role: [{ type: "editor" }] }
-        end
+        fetch_org(bibtex["publisher"], "publisher") { |pub| contribs << pub }
+        fetch_org(bibtex["institution"], "distributor", "sponsor") { |distr| contribs << distr }
+        fetch_org(bibtex["organization"], "distributor", "sponsor") { |org| contribs << org }
+        fetch_org(bibtex["school"], "distributor", "sponsor") { |school| contribs << school }
 
-        if bibtex["publisher"]
-          contributor << { entity: { name: bibtex.publisher.to_s }, role: [{ type: "publisher" }] }
-        end
+        fetch_howpublished(bibtex) { |pub| contribs << pub }
 
-        if bibtex["institution"]
-          contributor << {
-            entity: { name: bibtex.institution.to_s },
-            role: [{ type: "distributor", description: ["sponsor"] }],
-          }
-        end
+        contribs
+      end
 
-        if bibtex["organization"]
-          contributor << {
-            entity: { name: bibtex.organization.to_s },
-            role: [{ type: "distributor", description: ["sponsor"] }],
-          }
-        end
+      def fetch_howpublished(bibtex, &_)
+        return unless bibtex["howpublished"]
 
-        if bibtex["school"]
-          contributor << {
-            entity: { name: bibtex.school.to_s },
-            role: [{ type: "distributor", description: ["sponsor"] }],
-          }
-        end
-        contributor
+        /\\publisher\{(?<name>.+)\},\\url\{(?<url>.+)\}/ =~ bibtex.howpublished.to_s
+        return unless name && url
+
+        name.gsub!(/\{\\?([^\\]+)\}/, '\1')
+        org = Organization.new(name: name, url: url)
+        yield entity: org, role: [{ type: "publisher" }]
+      end
+
+      def fetch_org(org, type, desc = nil, &_)
+        return unless org
+
+        role = { type: type }
+        role[:description] = [desc] if desc
+        yield entity: Organization.new(name: org.to_s), role: [role]
       end
 
       # @param bibtex [BibTeX::Entry]
       # @return [Array<RelatonBib::Person>]
-      def fetch_person(person)
-        return [] unless person
-
-        person.map do |name|
+      def fetch_person(bibtex, role, &_) # rubocop:disable Metrics/AbcSize
+        bibtex[role]&.each do |name|
           parts = name.split ", "
           surname = LocalizedString.new parts.first
           fname = parts.size > 1 ? parts[1].split : []
           forename = fname.map { |fn| Forename.new content: fn }
-          Person.new name: FullName.new(surname: surname, forename: forename)
+          name = FullName.new(surname: surname, forename: forename)
+          yield entity: Person.new(name: name), role: [{ type: role }]
         end
       end
 
@@ -147,7 +143,7 @@ module RelatonBib
 
       # @param bibtex [BibTeX::Entry]
       # @return [RelatonBib::BiblioNoteCollection]
-      def fetch_note(bibtex)
+      def fetch_note(bibtex) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
         bibtex.select do |k, _v|
           %i[annote howpublished comment note content].include? k
         end.reduce(BiblioNoteCollection.new([])) do |mem, note|
@@ -156,6 +152,8 @@ module RelatonBib
                  when :content then "tableOfContents"
                  else note[0].to_s
                  end
+          next mem if type == "howpublished" && note[1].to_s.match?(/^\\publisher\{.+\},\\url\{.+\}$/)
+
           mem << BiblioNote.new(type: type, content: note[1].to_s)
         end
       end

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.17.1".freeze
+  VERSION = "1.17.2".freeze
 end

metadata

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