relaton-3gpp 1.12.0 → 1.14.0

data/grammars/{3gpp.rng → relaton-3gpp.rng}

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <include href="isodoc.rng">
-    <start>
-      <ref name="iso-standard"/>
-    </start>
+  <include href="biblio-standoc.rng">
     <define name="DocumentType">
       <choice>
         <value>TR</value>
@@ -17,6 +14,9 @@
       </choice>
     </define>
     <define name="BibDataExtensionType">
+      <optional>
+        <attribute name="schema-version"/>
+      </optional>
       <ref name="doctype"/>
       <optional>
         <ref name="docsubtype"/>
@@ -64,42 +64,66 @@
   </define>
   <define name="release">
     <element name="release">
-      <element name="version2G">
-        <text/>
-      </element>
-      <element name="version3G">
-        <text/>
-      </element>
-      <element name="defunct">
-        <data type="boolean"/>
-      </element>
-      <element name="wpm-code-2G">
-        <text/>
-      </element>
-      <element name="wpm-code-3G">
-        <text/>
-      </element>
-      <element name="freeze-meeting">
-        <text/>
-      </element>
-      <element name="freeze-stage1-meeting">
-        <text/>
-      </element>
-      <element name="freeze-stage2-meeting">
-        <text/>
-      </element>
-      <element name="freeze-stage3-meeting">
-        <text/>
-      </element>
-      <element name="close-meeting">
-        <text/>
-      </element>
-      <element name="project-start">
-        <data type="date"/>
-      </element>
-      <element name="project-end">
-        <data type="date"/>
-      </element>
+      <optional>
+        <element name="version2G">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="version3G">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="defunct">
+          <data type="boolean"/>
+        </element>
+      </optional>
+      <optional>
+        <element name="wpm-code-2G">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="wpm-code-3G">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="freeze-meeting">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="freeze-stage1-meeting">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="freeze-stage2-meeting">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="freeze-stage3-meeting">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="close-meeting">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="project-start">
+          <data type="date"/>
+        </element>
+      </optional>
+      <optional>
+        <element name="project-end">
+          <data type="date"/>
+        </element>
+      </optional>
     </element>
   </define>
 </grammar>

data/lib/relaton_3gpp/bibliographic_item.rb

@@ -31,6 +31,27 @@ module Relaton3gpp
       super(**args)
     end
 
+    #
+    # Fetch the flavor shcema version
+    #
+    # @return [String] schema version
+    #
+    def ext_schema
+      @ext_schema ||= schema_versions["relaton-model-3gpp"]
+    end
+
+    #
+    # @override RelatonBib::BibliographicItem#makeid
+    #
+    # @param [RelatonBib::DocumentIdentifier, nil] identifier <description>
+    # @param [Boolean, nil] attribute true if the ID attribute is needed
+    #
+    # @return [String, nil] id
+    #
+    def makeid(identifier, attribute)
+      super&.sub(/^3GPP/, "")
+    end
+
     # @param opts [Hash]
     # @option opts [Nokogiri::XML::Builder] :builder XML builder
     # @option opts [Boolean] :bibdata
@@ -40,15 +61,16 @@ module Relaton3gpp
       super do |b|
         if block_given? then yield b
         elsif opts[:bibdata] && has_ext_attrs?
-          b.ext do
+          ext = b.ext do
             b.doctype doctype if doctype
             b.subdoctype subdoctype if subdoctype
             editorialgroup&.to_xml b
             ics.each { |i| i.to_xml b }
             b.radiotechnology @radiotechnology if @radiotechnology
-            b.send "common-ims-spec", @common_ims_spec if @common_ims_spec
-            @release&.to_xml b if @release
+            b.send :"common-ims-spec", @common_ims_spec if @common_ims_spec
+            @release&.to_xml b
           end
+          ext["schema-version"] = ext_schema unless opts[:embedded]
         end
       end
     end

data/lib/relaton_3gpp/bibliography.rb

@@ -8,7 +8,7 @@ module Relaton3gpp
 
     # @param text [String]
     # @return [RelatonBib::BibliographicItem]
-    def search(text) # rubocop:disable Metrics/MethodLength
+    def search(text) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       file = text.sub(/^3GPP\s/, "").gsub(/[\s,:\/]/, "_").squeeze("_").upcase
       url = "#{SOURCE}#{file}.yaml"
       resp = Net::HTTP.get_response URI(url)
@@ -16,6 +16,7 @@ module Relaton3gpp
 
       hash = YAML.safe_load resp.body
       bib_hash = Relaton3gpp::HashConverter.hash_to_bib(hash)
+      bib_hash[:fetched] = Date.today.to_s
       Relaton3gpp::BibliographicItem.new(**bib_hash)
     rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET,
            EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,

data/lib/relaton_3gpp/data_fetcher.rb

@@ -28,7 +28,7 @@ module Relaton3gpp
     def self.fetch(output: "data", format: "yaml")
       t1 = Time.now
       puts "Started at: #{t1}"
-      FileUtils.mkdir_p output unless Dir.exist? output
+      FileUtils.mkdir_p output
       new(output, format).fetch
       t2 = Time.now
       puts "Stopped at: #{t2}"

data/lib/relaton_3gpp/parser.rb

@@ -46,7 +46,6 @@ module Relaton3gpp
 
       Relaton3gpp::BibliographicItem.new(
         type: "standard",
-        fetched: Date.today.to_s,
         language: ["en"],
         script: ["Latn"],
         title: parse_title,

data/lib/relaton_3gpp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Relaton3gpp
-  VERSION = "1.12.0"
+  VERSION = "1.14.0"
 end

data/relaton_3gpp.gemspec

@@ -46,6 +46,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mdb", "~> 0.5.0"
   spec.add_dependency "net-ftp", "~> 0.1.0"
-  spec.add_dependency "relaton-bib", "~> 1.12.0"
+  spec.add_dependency "relaton-bib", "~> 1.14.0"
   spec.add_dependency "rubyzip", "~> 2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-3gpp
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-25 00:00:00.000000000 Z
+date: 2022-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -186,6 +186,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -196,11 +197,11 @@ files:
 - bin/console
 - bin/rspec
 - bin/setup
-- grammars/3gpp.rng
 - grammars/basicdoc.rng
+- grammars/biblio-standoc.rng
 - grammars/biblio.rng
-- grammars/isodoc.rng
-- grammars/reqt.rng
+- grammars/relaton-3gpp-compile.rng
+- grammars/relaton-3gpp.rng
 - lib/relaton_3gpp.rb
 - lib/relaton_3gpp/bibliographic_item.rb
 - lib/relaton_3gpp/bibliography.rb