relaton-3gpp 1.19.1 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45004cd52d3255e9882f17e3c4331025aaf389c21ad1c756ba3aeccd5953f5b0
-  data.tar.gz: d87bbfcdbdd04d17726554e7bcbd7438b8edc5f31dcc7030553522f292ea9ec2
+  metadata.gz: 74bc486a5a0d3e66901c7640aa55f126d9450c51df3bdf89862f5a3b0b691f49
+  data.tar.gz: fc8f0453409f49844546bf9ab06cea41003bd2cc8fea6a0a397e4be3fe460ecd
 SHA512:
-  metadata.gz: 9e11c551066552effe3e897850210ba5b7e06f033b5ddc2798f1ec74b68534cd3b87772b6175f506af4909e376f55c078701035a2a4353399ab8f88f4ffc1d76
-  data.tar.gz: 2303de76da8eebe06ac967b54fe08b4e2cb78215f66cf8a789182f8c81d89286ca97034e1617dee50b0efb0e92a90c7aa75914903c0e79a336b830daa613e2d4
+  metadata.gz: 169902768cd60d092d4928972d9126de1e749ab958645f9eb7b5f383552f0bbaa148ba899a07bf2f09625e760b6625487ee259661b75ce265a699e7e474b65f0
+  data.tar.gz: 5d80742c1ec0afb5c6c83165ef5adfef79644fe245a7cab2ebd27ee35894c4a4c29f85414fb5e7ab51b6ad1dc888f2a5d0b771aa785babe9dd4d255c024bb13e

data/README.adoc

@@ -127,7 +127,7 @@ Relaton3gpp::BibliographicItem.new(**bib_hash)
 
 === Fetch data
 
-There is a 3GPP dataset ftp://www.3gpp.org/Information/Databases/Spec_Status/[latest *.zip] which can be converted into RelatonXML/BibXML/BibYAML formats.
+There is a 3GPP dataset ftp://www.3gpp.org/Information/Databases/[latest *.csv] which can be converted into RelatonXML/BibXML/BibYAML formats.
 
 The method `Relaton3GPP::DataFetcher.fetch(output: "data", format: "yaml")` converts all the documents from the dataset and save them to the `./data` folder in YAML format.
 Arguments:

data/lib/relaton_3gpp/bibliographic_item.rb

@@ -3,12 +3,15 @@ module Relaton3gpp
     DOCSUBTYPES = %w[spec release].freeze
     RADIOTECHNOLOGIES = %w[2G 3G LTE 5G].freeze
 
+    # @return [String, nil]
+    attr_reader :radiotechnology, :release
+
     #
     # Initialize bibliographic item.
     #
-    # @param [String] radiotechnology
+    # @param [String, nil] radiotechnology
     # @param [Boolean] common_ims_spec
-    # @param [Relaton3gpp::Release] release
+    # @param [Relaton3gpp::Release, nil] release
     #
     def initialize(**args) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       Util.warn "Doctype is missing" if args[:type].nil?
@@ -61,9 +64,9 @@ module Relaton3gpp
             b.subdoctype subdoctype if subdoctype
             editorialgroup&.to_xml b
             ics.each { |i| i.to_xml b }
-            b.radiotechnology @radiotechnology if @radiotechnology
+            b.radiotechnology radiotechnology if radiotechnology
             b.send :"common-ims-spec", @common_ims_spec if @common_ims_spec
-            @release&.to_xml b
+            release&.to_xml b
           end
           ext["schema-version"] = ext_schema unless opts[:embedded]
         end
@@ -71,8 +74,8 @@ module Relaton3gpp
     end
 
     def has_ext_attrs? # rubocop:disable Metrics/CyclomaticComplexity
-      doctype || subdoctype || editorialgroup || ics.any? || @radiotechnology ||
-        @common_ims_spec || @release
+      doctype || subdoctype || editorialgroup || ics.any? || radiotechnology ||
+        @common_ims_spec || release
     end
 
     #
@@ -82,10 +85,14 @@ module Relaton3gpp
     #
     def to_hash(embedded: false)
       hash = super
-      hash["radiotechnology"] = @radiotechnology if @radiotechnology
-      hash["common-ims-spec"] = @common_ims_spec if @common_ims_spec
-      hash["release"] = @release.to_hash if @release
+      hash["ext"]["radiotechnology"] = radiotechnology if radiotechnology
+      hash["ext"]["common-ims-spec"] = @common_ims_spec if @common_ims_spec
+      hash["ext"]["release"] = release.to_hash if release
       hash
     end
+
+    def has_ext?
+      super || radiotechnology || @common_ims_spec || release
+    end
   end
 end

data/lib/relaton_3gpp/hash_converter.rb

@@ -5,12 +5,17 @@ module Relaton3gpp
 
     def hash_to_bib(args)
       hash = super
+      hash[:radiotechnology] = hash[:ext][:radiotechnology] if hash.dig(:ext, :radiotechnology)
+      hash[:common_ims_spec] = hash[:ext][:"common-ims-spec"] if hash.dig(:ext, :"common-ims-spec")
       release_hash_to_bib(hash)
       hash
     end
 
     def release_hash_to_bib(hash)
-      hash[:release] &&= Release.new(**hash[:release])
+      release = hash.dig(:ext, :release) || hash[:release] # @TODO remove hash[:release] after release is moved to ext
+      return unless release
+
+      hash[:release] = Release.new(**release)
     end
 
     # @param item_hash [Hash]

data/lib/relaton_3gpp/parser.rb

@@ -40,6 +40,7 @@ module Relaton3gpp
         date: parse_date,
         doctype: parse_doctype,
         editorialgroup: parse_editorialgroup,
+        version: parse_version,
         # biblionote: parse_note,
         # docstatus: parse_status,
         radiotechnology: parse_radiotechnology,
@@ -100,7 +101,15 @@ module Relaton3gpp
     def number
       num = "#{doctype_abbr} #{@row[0]}"
       num += ":#{release}" if release
-      "#{num}/#{@row['Version']}"
+      "#{num}/#{version}"
+    end
+
+    def version
+      @row["Version"]
+    end
+
+    def parse_version
+      [RelatonBib::BibliographicItem::Version.new(nil, version)]
     end
 
     def doctype_abbr
@@ -199,11 +208,11 @@ module Relaton3gpp
     # @return [String] radio technology
     #
     def parse_radiotechnology
-      case @row[:"WPM Code 3G"]
+      case @row["WPM Code 3G"]
       when /5G/ then "5G"
       when /4G/ then "LTE"
       when /3G/ then "3G"
-      else @row[:"WPM Code 2G"] && "2G"
+      else @row["WPM Code 2G"] && "2G"
       end
     end
 

data/lib/relaton_3gpp/version.rb

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

data/relaton_3gpp.gemspec

@@ -38,6 +38,6 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
 
   spec.add_dependency "csv"
   spec.add_dependency "net-ftp", "~> 0.1.0"
-  spec.add_dependency "relaton-bib", "~> 1.19.1"
+  spec.add_dependency "relaton-bib", "~> 1.20.0"
   spec.add_dependency "relaton-index", "~> 0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-3gpp
 version: !ruby/object:Gem::Version
-  version: 1.19.1
+  version: 1.20.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-12 00:00:00.000000000 Z
+date: 2024-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.1
+        version: 1.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.1
+        version: 1.20.0
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ licenses:
 - BSD-2-Clause
 metadata:
   homepage_uri: https://github.com/relaton/relaton-3gpp
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: 'Relaton3gpp: Ruby XMLDOC impementation.'
 test_files: []