relaton-iso-bib 1.12.1 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8d41928d985192615e72143dc84e0ffb8165f6b0a998d4e2e85c2260f87c22b
-  data.tar.gz: d32aa43dff5a50b7dd9b2d684ab9b37b4f42383edce09d4ea0248ee3d2b90999
+  metadata.gz: b6108f40cdf5538df2b0dddc35aad58ac942e74b80872f8b86bf8bcb3564548f
+  data.tar.gz: c5cc9a8c77d7d4e287ad7340bb0551f8469749889efc70601edca2ac063d1468
 SHA512:
-  metadata.gz: fcefb75aaae4692509e58a7fecb4c89b281c2d78dbae461bdeb1115402fa437a7e6660cfd1607b26959745a407794d15ebb218b9f679f0234a25cb77fb80968e
-  data.tar.gz: 84cc1655d8fedba8c55210fd8430288157f9917b87a4a90c7bb93490636aafa0ff2e41bce3d87549280b6f05a5af63b6b7c941f71acf067be79d4e4fe05f56ce
+  metadata.gz: 300a7636f43743f323e2ef175ec7b8176c5864ee03bfca7df84a4c785c8d93f80a1849f67239ad2cba561b05033ea71d6b3198b5e4cce668b4cafabb04fedf52
+  data.tar.gz: 4490673960ee031d455eaea27b6fe4d36c5ea4fe1f789e5a907236f4d764dcfd70cfb4bb8bba75e978c3fc6a7faeb7882fe93af486cc69260a2a9d24939606ff

data/grammars/biblio.rng

@@ -225,9 +225,9 @@
         <zeroOrMore>
           <ref name="forename"/>
         </zeroOrMore>
-        <zeroOrMore>
-          <ref name="initial"/>
-        </zeroOrMore>
+        <optional>
+          <ref name="formatted-initials"/>
+        </optional>
         <ref name="surname"/>
         <zeroOrMore>
           <ref name="addition"/>
@@ -247,8 +247,8 @@
       <ref name="LocalizedString"/>
     </element>
   </define>
-  <define name="initial">
-    <element name="initial">
+  <define name="formatted-initials">
+    <element name="formatted-initials">
       <ref name="LocalizedString"/>
     </element>
   </define>
@@ -264,6 +264,9 @@
   </define>
   <define name="forename">
     <element name="forename">
+      <optional>
+        <attribute name="initial"/>
+      </optional>
       <ref name="LocalizedString"/>
     </element>
   </define>

data/grammars/isodoc.rng

@@ -69,6 +69,17 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="AdmonitionType">
+      <choice>
+        <value>warning</value>
+        <value>note</value>
+        <value>tip</value>
+        <value>important</value>
+        <value>caution</value>
+        <value>statement</value>
+        <value>editorial</value>
+      </choice>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -1274,7 +1285,12 @@
   </define>
   <define name="span">
     <element name="span">
-      <attribute name="class"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -2493,6 +2509,16 @@
           <text/>
         </element>
       </optional>
+      <optional>
+        <element name="amendment">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="corrigendum">
+          <text/>
+        </element>
+      </optional>
       <optional>
         <element name="language">
           <text/>

data/lib/relaton_iso_bib/structured_identifier.rb

@@ -1,26 +1,26 @@
 module RelatonIsoBib
   # Document structured identifier.
   class StructuredIdentifier
-    # @return [Integer, NilClass]
+    # @return [Integer, nil]
     attr_reader :tc_document_number
 
     # @return [String]
     attr_reader :project_number
 
-    # @return [Integer, NilClass]
+    # @return [Integer, nil]
     attr_reader :part
 
-    # @return [Integer, NilClass]
+    # @return [Integer, nil]
     attr_reader :subpart
 
-    # @return [String, NilClass]
+    # @return [String, nil]
     attr_reader :type
 
-    # @param tc_document_number [Integer, NilClass]
+    # @param tc_document_number [Integer, nil]
     # @param project_number [String]
-    # @param part [String, NilClass]
-    # @param subpart [String, NilClass]
-    # @param type [String, NilClass]
+    # @param part [String, nil]
+    # @param subpart [String, nil]
+    # @param type [String, nil]
     def initialize(**args)
       @tc_document_number = args[:tc_document_number]
       @project_number = args[:project_number]
@@ -50,7 +50,7 @@ module RelatonIsoBib
     end
 
     def all_parts
-      @project_number = @project_number + " (all parts)"
+      @project_number = "#{@project_number} (all parts)"
     end
 
     def id
@@ -58,20 +58,20 @@ module RelatonIsoBib
     end
 
     # @param builder [Nokogiri::XML::Builder]
-    def to_xml(builder)
+    def to_xml(builder) # rubocop:disable Metrics/AbcSize
       xml = builder.structuredidentifier do
-        pn = builder.send "project-number", project_number
+        pn = builder.send :"project-number", project_number
         pn[:part] = part if part
         pn[:subpart] = subpart if subpart
         if tc_document_number
-          builder.send "tc-document-number", tc_document_number
+          builder.send :"tc-document-number", tc_document_number
         end
       end
       xml[:type] = type if type
     end
 
     # @return [Hash]
-    def to_hash
+    def to_hash # rubocop:disable Metrics/AbcSize
       hash = {}
       hash["tc_document_number"] = tc_document_number if tc_document_number
       hash["project_number"] = project_number if project_number
@@ -84,7 +84,7 @@ module RelatonIsoBib
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix = "") # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       pref += "structured_identifier"
       out = ""
       if tc_document_number

data/lib/relaton_iso_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonIsoBib
-  VERSION = "1.12.1".freeze
+  VERSION = "1.13.0".freeze
 end

data/relaton_iso_bib.gemspec

@@ -36,5 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
 
   spec.add_dependency "isoics", "~> 0.1.6"
-  spec.add_dependency "relaton-bib", "~> 1.12.0"
+  spec.add_dependency "relaton-bib", "~> 1.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso-bib
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.13.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-29 00:00:00.000000000 Z
+date: 2022-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
 description: 'RelatonIsoBib: Ruby ISOXMLDOC impementation.'
 email:
 - open.source@ribose.com