relaton-iso-bib 1.8.0 → 1.10.1

data/grammars/isostandard.rng

@@ -38,6 +38,9 @@
     </define>
     <define name="BibDataExtensionType">
       <ref name="doctype"/>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
       <optional>
         <ref name="horizontal"/>
       </optional>
@@ -98,7 +101,11 @@
           <ref name="definitions"/>
         </optional>
         <oneOrMore>
-          <ref name="clause"/>
+          <choice>
+            <ref name="clause"/>
+            <ref name="term-clause"/>
+            <ref name="terms"/>
+          </choice>
         </oneOrMore>
       </element>
     </define>
@@ -133,22 +140,17 @@
       <optional>
         <ref name="section-title"/>
       </optional>
-      <group>
+      <choice>
         <choice>
-          <group>
-            <oneOrMore>
-              <ref name="BasicBlock"/>
-            </oneOrMore>
-            <zeroOrMore>
-              <ref name="note"/>
-            </zeroOrMore>
-          </group>
+          <oneOrMore>
+            <ref name="BasicBlock"/>
+          </oneOrMore>
           <ref name="amend"/>
         </choice>
         <oneOrMore>
           <ref name="clause-subsection"/>
         </oneOrMore>
-      </group>
+      </choice>
     </define>
     <define name="term">
       <element name="term">
@@ -157,6 +159,20 @@
             <data type="ID"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="language"/>
+        </optional>
+        <optional>
+          <attribute name="script"/>
+        </optional>
+        <optional>
+          <attribute name="tag"/>
+        </optional>
+        <optional>
+          <attribute name="multilingual-rendering">
+            <ref name="MultilingualRenderingType"/>
+          </attribute>
+        </optional>
         <ref name="preferred"/>
         <zeroOrMore>
           <ref name="admitted"/>
@@ -167,7 +183,7 @@
         <optional>
           <ref name="termdomain"/>
         </optional>
-        <ref name="definition"/>
+        <ref name="termdefinition"/>
         <zeroOrMore>
           <ref name="termnote"/>
         </zeroOrMore>
@@ -177,6 +193,9 @@
         <zeroOrMore>
           <ref name="termsource"/>
         </zeroOrMore>
+        <zeroOrMore>
+          <ref name="term"/>
+        </zeroOrMore>
       </element>
     </define>
     <define name="annex">
@@ -215,9 +234,6 @@
           -->
           <ref name="BasicBlock"/>
         </zeroOrMore>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
         <zeroOrMore>
           <ref name="clause-hanging-paragraph-with-footnote"/>
         </zeroOrMore>
@@ -259,6 +275,14 @@
         <value>directive</value>
       </choice>
     </define>
+    <define name="DocumentSubtype">
+      <choice>
+        <value>specification</value>
+        <value>method-of-test</value>
+        <value>vocabulary</value>
+        <value>code-of-practice</value>
+      </choice>
+    </define>
     <define name="structuredidentifier">
       <element name="structuredidentifier">
         <optional>
@@ -333,14 +357,9 @@
         <ref name="section-title"/>
       </optional>
       <choice>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
         <oneOrMore>
           <ref name="content-subsection"/>
         </oneOrMore>
@@ -457,9 +476,6 @@
         <!-- allow hanging paragraphs in annexes: they introduce lists -->
         <ref name="BasicBlock"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="note"/>
-      </zeroOrMore>
       <zeroOrMore>
         <ref name="clause-hanging-paragraph-with-footnote"/>
       </zeroOrMore>

data/grammars/reqt.rng

@@ -58,15 +58,23 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>
     <optional>
       <ref name="label"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="subject"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="reqinherit"/>
     </zeroOrMore>
@@ -80,6 +88,7 @@
         <ref name="verification"/>
         <ref name="import"/>
         <ref name="description"/>
+        <ref name="component"/>
       </choice>
     </zeroOrMore>
     <optional>
@@ -100,17 +109,23 @@
   </define>
   <define name="label">
     <element name="label">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="subject">
     <element name="subject">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="reqinherit">
     <element name="inherit">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="measurementtarget">
@@ -138,6 +153,12 @@
       <ref name="RequirementSubpart"/>
     </element>
   </define>
+  <define name="component">
+    <element name="component">
+      <attribute name="class"/>
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
   <define name="reqt_references">
     <element name="references">
       <oneOrMore>
@@ -164,6 +185,14 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <oneOrMore>
       <ref name="BasicBlock"/>
     </oneOrMore>

data/lib/relaton_iso_bib/editorial_group.rb

@@ -35,13 +35,13 @@ module RelatonIsoBib
     # @param secretariat [String, NilClass]
     def initialize(technical_committee:, **args) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/AbcSize
       @technical_committee = technical_committee.map do |tc|
-        tc.is_a?(Hash) ? IsoSubgroup.new(**tc) : tc
+        tc.is_a?(Hash) ? RelatonBib::WorkGroup.new(**tc) : tc
       end
       @subcommittee = args.fetch(:subcommittee, []).map do |sc|
-        sc.is_a?(Hash) ? IsoSubgroup.new(**sc) : sc
+        sc.is_a?(Hash) ? RelatonBib::WorkGroup.new(**sc) : sc
       end
       @workgroup = args.fetch(:workgroup, []).map do |wg|
-        wg.is_a?(Hash) ? IsoSubgroup.new(**wg) : wg
+        wg.is_a?(Hash) ? RelatonBib::WorkGroup.new(**wg) : wg
       end
       @secretariat = args[:secretariat]
     end
@@ -86,7 +86,7 @@ module RelatonIsoBib
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix = "") # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       pref += "editorialgroup"
       out = ""
       technical_committee.each do |tc|
@@ -105,48 +105,48 @@ module RelatonIsoBib
   end
 
   # ISO subgroup.
-  class IsoSubgroup
-    # @return [String, NilClass]
-    attr_reader :type
-
-    # @return [Integer, NilClass]
-    attr_reader :number
-
-    # @return [String]
-    attr_reader :name
-
-    # @param name [String]
-    # @param type [String, NilClass]
-    # @param number [Integer, NilClass]
-    def initialize(name:, type: nil, number: nil)
-      @name   = name
-      @type   = type
-      @number = number
-    end
-
-    # @param builder [Nokogiri::XML::Builder]
-    def to_xml(builder)
-      builder.parent[:number] = number if number
-      builder.parent[:type] = type if type
-      builder.text name
-    end
-
-    # @return [Hash]
-    def to_hash
-      hash = { "name" => name }
-      hash["type"] = type if type
-      hash["number"] = number if number
-      hash
-    end
-
-    # @param prefix [String]
-    # @param count [Integer] number of the elements
-    def to_asciibib(prefix, count = 1)
-      out = count > 1 ? "#{prefix}::\n" : ""
-      out += "#{prefix}.type:: #{type}\n" if type
-      out += "#{prefix}.number:: #{number}\n" if number
-      out += "#{prefix}.name:: #{name}\n"
-      out
-    end
-  end
+  # class IsoSubgroup
+  #   # @return [String, NilClass]
+  #   attr_reader :type
+
+  #   # @return [Integer, NilClass]
+  #   attr_reader :number
+
+  #   # @return [String]
+  #   attr_reader :name
+
+  #   # @param name [String]
+  #   # @param type [String, NilClass]
+  #   # @param number [Integer, NilClass]
+  #   def initialize(name:, type: nil, number: nil)
+  #     @name   = name
+  #     @type   = type
+  #     @number = number
+  #   end
+
+  #   # @param builder [Nokogiri::XML::Builder]
+  #   def to_xml(builder)
+  #     builder.parent[:number] = number if number
+  #     builder.parent[:type] = type if type
+  #     builder.text name
+  #   end
+
+  #   # @return [Hash]
+  #   def to_hash
+  #     hash = { "name" => name }
+  #     hash["type"] = type if type
+  #     hash["number"] = number if number
+  #     hash
+  #   end
+
+  #   # @param prefix [String]
+  #   # @param count [Integer] number of the elements
+  #   def to_asciibib(prefix, count = 1)
+  #     out = count > 1 ? "#{prefix}::\n" : ""
+  #     out += "#{prefix}.type:: #{type}\n" if type
+  #     out += "#{prefix}.number:: #{number}\n" if number
+  #     out += "#{prefix}.name:: #{name}\n"
+  #     out
+  #   end
+  # end
 end

data/lib/relaton_iso_bib/hash_converter.rb

@@ -18,7 +18,7 @@ module RelatonIsoBib
       # @param title [Hash]
       # @return [RelatonBib::TypedTitleString]
       def typed_title_strig(title)
-        RelatonBib::TypedTitleString.new **title
+        RelatonBib::TypedTitleString.new(**title)
       end
 
       # @param ret [Hash]

data/lib/relaton_iso_bib/ics.rb

@@ -27,6 +27,7 @@ module RelatonIsoBib
     def to_hash
       hash = {}
       hash["code"] = code if code
+      hash["text"] = description if description
       hash
     end
 

data/lib/relaton_iso_bib/iso_bibliographic_item.rb

@@ -27,6 +27,8 @@ module RelatonIsoBib
       amendment technical-corrigendum directive
     ].freeze
 
+    SUBDOCTYPES = %w[specification method-of-test vocabulary code-of-practice].freeze
+
     # @return [RelatonIsoBib::StructuredIdentifier]
     attr_reader :structuredidentifier
 
@@ -66,6 +68,7 @@ module RelatonIsoBib
     # @param validity [RelatonBib:Validity, NilClass]
     # @param docid [Array<RelatonBib::DocumentIdentifier>]
     # @param doctype [String, nil]
+    # @param subdoctype [String, nil]
     # @param horizontal [Boolean, nil]
     # @param structuredidentifier [RelatonIsoBib::StructuredIdentifier]
     # @param stagename [String, NilClass]
@@ -130,13 +133,14 @@ module RelatonIsoBib
     def initialize(**args)
       check_doctype args[:doctype]
 
-      super_args = args.select do |k|
-        %i[id title docnumber language script docstatus date abstract
-           contributor edition version relation biblionote series medium place
-           copyright link fetched docid formattedref extent accesslocation
-           classification validity doctype keyword].include? k
-      end
-      super **super_args
+      arg_names = %i[
+        id title docnumber language script docstatus date abstract contributor
+        edition version relation biblionote series medium place copyright link
+        fetched docid formattedref extent accesslocation classification validity
+        editorialgroup doctype keyword
+      ]
+      super_args = args.select { |k| arg_names.include? k }
+      super(**super_args)
 
       @type = args[:type] || "standard"
 
@@ -147,6 +151,10 @@ module RelatonIsoBib
                           end
       end
 
+      if args[:subdoctype] && !SUBDOCTYPES.include?(args[:subdoctype])
+        warn "Invald subdoctype '#{args[:subdoctype]}'. Allowed values are: #{SUBDOCTYPES.join(', ')}"
+      end
+      @subdoctype = args[:subdoctype]
       @structuredidentifier = args[:structuredidentifier]
       @horizontal = args[:horizontal]
       @ics = args.fetch(:ics, []).map { |i| i.is_a?(Hash) ? Ics.new(**i) : i }
@@ -160,23 +168,17 @@ module RelatonIsoBib
     # @option opts [String] :lang language
     # @return [String] XML
     def to_xml(**opts)
-      super **opts do |b|
+      super(**opts) do |b|
         if block_given? then yield b
         elsif opts[:bibdata] && has_ext_attrs?
           b.ext do
             b.doctype doctype if doctype
+            b.subdoctype subdoctype if subdoctype
             b.horizontal horizontal unless horizontal.nil?
-            # b.docsubtype docsubtype if respond_to?(:docsubtype) && docsubtype
-            # GB renders gbcommittee elements istead of an editorialgroup
-            # if respond_to? :committee
-            #   committee&.to_xml b
-            # else
             editorialgroup&.to_xml b
-            # end
             ics.each { |i| i.to_xml b }
             structuredidentifier&.to_xml b
             b.stagename stagename if stagename
-            # yield b if block_given?
           end
         end
       end
@@ -208,7 +210,8 @@ module RelatonIsoBib
     # @raise ArgumentError
     def check_doctype(doctype)
       if doctype && !self.class::TYPES.include?(doctype)
-        warn "[relaton-iso-bib] invalid doctype: #{doctype}"
+        warn "[relaton-iso-bib] WARNING: invalid doctype: #{doctype}"
+        warn "[relaton-iso-bib] Allowed doctypes are: #{self.class::TYPES.join(', ')}"
       end
     end
 

data/lib/relaton_iso_bib/structured_identifier.rb

@@ -31,8 +31,8 @@ module RelatonIsoBib
 
     # in docid manipulations, assume ISO as the default: id-part:year
     def remove_part
-      @part_number = nil
-      @subpart_number = nil
+      @part = nil
+      @subpart = nil
       @project_number = case @type
                         when "Chinese Standard"
                           @project_number.sub(/\.\d+/, "")

data/lib/relaton_iso_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonIsoBib
-  VERSION = "1.8.0".freeze
+  VERSION = "1.10.1".freeze
 end

data/lib/relaton_iso_bib/xml_parser.rb

@@ -23,7 +23,7 @@ module RelatonIsoBib
       # @param item_hash [Hash]
       # @return [RelatonIsoBib::IsoBibliographicItem]
       def bib_item(item_hash)
-        IsoBibliographicItem.new **item_hash
+        IsoBibliographicItem.new(**item_hash)
       end
 
       # @param ext [Nokogiri::XML::Element]
@@ -60,8 +60,8 @@ module RelatonIsoBib
       def iso_subgroup(com)
         return nil if com.nil?
 
-        IsoSubgroup.new(name: com.text, type: com[:type],
-                        number: com[:number]&.to_i)
+        RelatonBib::WorkGroup.new(name: com.text, type: com[:type],
+                                  number: com[:number]&.to_i)
       end
     end
   end

data/relaton_iso_bib.gemspec

@@ -24,17 +24,17 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   # spec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   # spec.add_development_dependency "ruby-debug-ide"
   spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"
 
   spec.add_dependency "isoics", "~> 0.1.6"
-  spec.add_dependency "relaton-bib", "~> 1.8.0"
+  spec.add_dependency "relaton-bib", "~> 1.10.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso-bib
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2022-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.10.1
 description: 'RelatonIsoBib: Ruby ISOXMLDOC impementation.'
 email:
 - open.source@ribose.com
@@ -138,6 +138,7 @@ files:
 - README.adoc
 - Rakefile
 - bin/console
+- bin/rspec
 - bin/setup
 - grammars/basicdoc.rng
 - grammars/biblio.rng
@@ -166,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="