relaton-oasis 1.16.2 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 186697624e16817571af23ec1665efd8a562bbba0c9b980ab3068b1d7dfb24e6
-  data.tar.gz: 327389bf02d3f0ba84ce42ae08f9473215305c9ca72017ca80cc0bc39c64ed20
+  metadata.gz: f5469967625cf054d713b017d05167fe3b0360d7ffd76472c4f5915583498702
+  data.tar.gz: d5e2d86d21472cdf36434e66549e592412ec217085c49e57904d0ede564ee902
 SHA512:
-  metadata.gz: 44148f1ebdc5e14d6ab59323192415e37f6d812df9147d0fb3fb9b73aab0a35cd65e59077c17ef3ffca684840e909df07975ebfe596bef5885e729a4814b5107
-  data.tar.gz: f9cf5995c54f4d0a086f523ed018857a38459c60667df2065fc6c5cd8e74e2d85a0c0b4c7c404d05161197c59734540dfe456aac91c48f0b5be52ef105efa569
+  metadata.gz: dde0c10159a3c48e996b0bf27e8f57b36a84aa36998dfaae20515aee8eef38ba732d0fc808a5e326c492dfd2a08eb4090deb161522937a2b26a8299d3ece4b03
+  data.tar.gz: b0b264297ebe67a008062d653907377407cacd8c5044de408df2ca37e063e0a1ede7dce5da3e702df664115d228db3b7b740af64fa8743b497146a5ecbf2008e

data/README.adoc

@@ -62,7 +62,7 @@ item = RelatonOasis::OasisBibliography.get "OASIS amqp-core"
 [source,ruby]
 ----
 item.to_xml
-=> "<bibitem id="OASISamqp-core" type="standard" schema-version="v1.2.4">
+=> "<bibitem id="OASISamqp-core" type="standard" schema-version="v1.2.5">
       <fetched>2022-12-05</fetched>
       <title type="main" format="text/plain" language="en" script="Latn">Advanced Message Queueing Protocol (AMQP) v1.0</title>
       <docidentifier type="OASIS" primary="true">OASIS amqp-core</docidentifier>
@@ -75,7 +75,7 @@ With argument `bibdata: true` it ouputs XML wrapped by `bibdata` element and add
 [source,ruby]
 ----
 item.to_xml bibdata: true
-=> "<bibdata type="standard" schema-version="v1.2.4">
+=> "<bibdata type="standard" schema-version="v1.2.5">
       <fetched>2022-12-05</fetched>
       <title type="main" format="text/plain" language="en" script="Latn">Advanced Message Queueing Protocol (AMQP) v1.0</title>
       <docidentifier type="OASIS" primary="true">OASIS amqp-core</docidentifier>
@@ -121,7 +121,7 @@ RelatonOasis::XMLParser.from_xml File.read("spec/fixtures/oasis_bibdata.xml")
 [source,ruby]
 ----
 hash = YAML.load_file "spec/fixtures/oasis_bibdata.yaml"
-=> {"schema-version"=>"v1.2.4",
+=> {"schema-version"=>"v1.2.5",
  "id"=>"OASISamqp-core",
 ...
 

data/grammars/basicdoc.rng

@@ -346,6 +346,8 @@
           <ref name="keyword"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </oneOrMore>
     </element>
@@ -623,6 +625,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -636,6 +640,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -648,6 +654,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -655,7 +663,11 @@
   <define name="keyword">
     <element name="keyword">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -676,7 +688,11 @@
   <define name="strike">
     <element name="strike">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>

data/grammars/biblio.rng

@@ -942,6 +942,7 @@
       <value>obsoleted</value>
       <value>confirmed</value>
       <value>updated</value>
+      <value>corrected</value>
       <value>issued</value>
       <value>transmitted</value>
       <value>copied</value>

data/lib/relaton_oasis/data_parser_utils.rb

@@ -150,16 +150,17 @@ module RelatonOasis
     #
     # Parse document type.
     #
-    # @return [String] document type
+    # @return [RelatonOasis::DocumentType] document type
     #
     def parse_doctype
-      case text
-      when /OASIS Project Specification/, /Committee Specification/
-        "specification"
-      when /Technical Memorandum/ then "memorandum"
-      when /Technical Resolution/ then "resolution"
-      else "standard"
-      end
+      type =  case text
+              when /OASIS Project Specification/, /Committee Specification/
+                "specification"
+              when /Technical Memorandum/ then "memorandum"
+              when /Technical Resolution/ then "resolution"
+              else "standard"
+              end
+      DocumentType.new(type: type)
     end
 
     #

data/lib/relaton_oasis/document_type.rb

@@ -0,0 +1,16 @@
+module RelatonOasis
+  class DocumentType < RelatonBib::DocumentType
+    DCTYPES = %w[specification memorandum resolution standard].freeze
+
+    def initialize(type:, abbreviation: nil)
+      chceck_type type
+      super
+    end
+
+    def chceck_type(type)
+      unless DCTYPES.include? type
+        Util.warn "WARNING: invalid doctype: `#{type}`"
+      end
+    end
+  end
+end

data/lib/relaton_oasis/hash_converter.rb

@@ -1,15 +1,20 @@
 module RelatonOasis
-  class HashConverter < RelatonBib::HashConverter
+  module HashConverter
+    include RelatonBib::HashConverter
+    extend self
+
     @@acronyms = nil
 
-    class << self
-      private
+    private
+
+    # @param item_hash [Hash]
+    # @return [RelatonBib::BibliographicItem]
+    def bib_item(item_hash)
+      OasisBibliographicItem.new(**item_hash)
+    end
 
-      # @param item_hash [Hash]
-      # @return [RelatonBib::BibliographicItem]
-      def bib_item(item_hash)
-        OasisBibliographicItem.new(**item_hash)
-      end
+    def create_doctype(**args)
+      DocumentType.new(**args)
     end
   end
 end

data/lib/relaton_oasis/oasis_bibliographic_item.rb

@@ -53,11 +53,11 @@ module RelatonOasis
     #
     # @return [String] XML representation of bibliographic item
     #
-    def to_xml(**opts)
+    def to_xml(**opts) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity
       super(**opts) do |b|
         if opts[:bibdata] && technology_area.any?
           ext = b.ext do
-            b.doctype doctype if doctype
+            doctype&.to_xml b
             editorialgroup&.to_xml b
             technology_area.each { |ta| b.send :"technology-area", ta }
           end

data/lib/relaton_oasis/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonOasis
-  VERSION = "1.16.2"
+  VERSION = "1.17.0"
 end

data/lib/relaton_oasis.rb

@@ -6,6 +6,7 @@ require "relaton_bib"
 require_relative "relaton_oasis/version"
 require_relative "relaton_oasis/config"
 require_relative "relaton_oasis/util"
+require_relative "relaton_oasis/document_type"
 require_relative "relaton_oasis/oasis_bibliographic_item"
 require_relative "relaton_oasis/xml_parser"
 require_relative "relaton_oasis/hash_converter"

data/relaton_oasis.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mechanize", "~> 2.8.0"
   spec.add_dependency "multi_json", "~> 1.15.0"
-  spec.add_dependency "relaton-bib", "~> 1.16.0"
+  spec.add_dependency "relaton-bib", "~> 1.17.0"
   spec.add_dependency "relaton-index", "~> 0.2.0"
 
   # For more information and examples about making a new gem, checkout our

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-oasis
 version: !ruby/object:Gem::Version
-  version: 1.16.2
+  version: 1.17.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-18 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +97,7 @@ files:
 - lib/relaton_oasis/data_parser.rb
 - lib/relaton_oasis/data_parser_utils.rb
 - lib/relaton_oasis/data_part_parser.rb
+- lib/relaton_oasis/document_type.rb
 - lib/relaton_oasis/hash_converter.rb
 - lib/relaton_oasis/index.rb
 - lib/relaton_oasis/oasis_bibliographic_item.rb