relaton-bib 1.17.0 → 1.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f5805d9364d7a5f74ce37acdeb99ea547d928d276541ec7d01870621330f2f1
-  data.tar.gz: 2aff2d7bd6fca3bb87a34509a7b61995f3dcd0eb4bdb68b60e940887eedc4c78
+  metadata.gz: 46d18122233ea0790d42f293b18648a094be8739cac59714cdf2419a5510062b
+  data.tar.gz: 918ef1f018e38e6cdfc0f0cafdf886311794910af463a08f15e5d21088e21062
 SHA512:
-  metadata.gz: 7c061fc2df92d1c1418aa9a807e496ec736eec5eddfe5734ce0bdcc3c21995c3abd22fbc9162383f2370a7546f7836b325732f92bbc65ae9484124740cf5f406
-  data.tar.gz: 21c72729a63efff9cf5a312018206b22a8da1a77e4708e27610b2c92c8a4571c0a1cb5b0af973eb5285b4e0fb111353e73499ef00bee45d40cbce7cdc5d7d0f2
+  metadata.gz: 61a55508abb720be6180365bbd839987eeadcdc38ccc6160d9c03453303f38ba4b4b16731d03236db4e5b767871bdb00b29aa5eab91ca70bf6b9e69eeab0b22f
+  data.tar.gz: 5e4400c78c97db49cbd30d4bf4f105dfa365ecc570a876a594c10389913190c2d5536412f76cc41458c18ea78ea3f0f5e90681a698f99213076a2995ced94a51

data/grammars/basicdoc.rng

@@ -914,44 +914,47 @@
   -->
   <define name="image">
     <element name="image">
-      <attribute name="id">
-        <data type="ID"/>
+      <ref name="Image"/>
+    </element>
+  </define>
+  <define name="Image">
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <attribute name="src">
+      <data type="anyURI"/>
+    </attribute>
+    <attribute name="mimetype"/>
+    <optional>
+      <attribute name="filename"/>
+    </optional>
+    <optional>
+      <attribute name="width">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
       </attribute>
-      <attribute name="src">
+    </optional>
+    <optional>
+      <attribute name="height">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="alt"/>
+    </optional>
+    <optional>
+      <attribute name="title"/>
+    </optional>
+    <optional>
+      <attribute name="longdesc">
         <data type="anyURI"/>
       </attribute>
-      <attribute name="mimetype"/>
-      <optional>
-        <attribute name="filename"/>
-      </optional>
-      <optional>
-        <attribute name="width">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="height">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="alt"/>
-      </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
-      <optional>
-        <attribute name="longdesc">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-    </element>
+    </optional>
   </define>
   <define name="video">
     <element name="video">

data/grammars/biblio.rng

@@ -348,6 +348,9 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
+      <optional>
+        <ref name="logo"/>
+      </optional>
     </element>
   </define>
   <define name="orgname">
@@ -366,6 +369,21 @@
       </choice>
     </element>
   </define>
+  <define name="logo">
+    <element name="logo">
+      <ref name="image"/>
+    </element>
+  </define>
+  <define name="depiction">
+    <element name="depiction">
+      <optional>
+        <attribute name="scope"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="image"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="NameWithVariants">
     <element name="primary">
       <ref name="LocalizedString"/>
@@ -752,6 +770,9 @@
     <optional>
       <ref name="validity"/>
     </optional>
+    <optional>
+      <ref name="depiction"/>
+    </optional>
   </define>
   <define name="ReducedBibliographicItem">
     <optional>

data/grammars/versions.json

@@ -1,8 +1,8 @@
 {
-"relaton-models": "v1.2.5",
+"relaton-models": "v1.2.7",
 "basicdoc-models": "v1.0.3",
 "metanorma-requirements-models": "v1.0.0",
-"relaton-model-ieee": "v1.0.0",
+"relaton-model-ieee": "v1.0.1",
 "relaton-model-iso": "v1.0.0",
 "relaton-model-iec": "v1.0.0",
 "relaton-model-bsi": "v1.0.2",
@@ -28,7 +28,7 @@
 "relaton-model-omg": "v1.0.0",
 "relaton-model-oasis": "v1.0.1",
 "relaton-model-jis": "v0.0.1",
-"relaton-model-etsi": "v0.0.1",
-"metanorma-model": "v1.2.8",
-"date": "2023-11-13T23:08:26Z"
+"relaton-model-etsi": "v0.0.3",
+"metanorma-model": "v1.2.9",
+"date": "2023-12-04T16:12:14Z"
 }

data/lib/relaton_bib/bibliographic_item.rb

@@ -324,7 +324,7 @@ module RelatonBib
       end
     end
 
-    # @param identifier [RelatonBib::DocumentIdentifier]
+    # @param identifier [RelatonBib::DocumentIdentifier, nil]
     # @param attribute [Boolean, nil]
     # @return [String]
     def makeid(identifier, attribute)
@@ -333,11 +333,7 @@ module RelatonBib
       identifier ||= @docidentifier.reject { |i| i.type == "DOI" }[0]
       return unless identifier
 
-      # contribs = publishers.map { |p| p&.entity&.abbreviation }.join '/'
-      # idstr = "#{contribs}#{delim}#{id.project_number}"
-      # idstr = id.project_number.to_s
-      idstr = identifier.id.gsub(/[:\/]/, "-").gsub(/\s/, "")
-      # if id.part_number&.size&.positive? then idstr += "-#{id.part_number}"
+      idstr = identifier.id.gsub(/[:\/]/, "-").gsub(/[\s\(\)]/, "")
       idstr.strip
     end
 

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.0".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.0
+  version: 1.17.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-27 00:00:00.000000000 Z
+date: 2023-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable