relaton-3gpp 1.14.1 → 1.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b517c9d22d68ff8b15cac60a6ecc2d6a943e42143f93e7db5eec0cdf840953f
-  data.tar.gz: cead26203248e1acff2ac1eb4101b596ef0f3759434d6d0ecb68ebb95d99e6b8
+  metadata.gz: 9e8d98ffac2c963fb2b403b0db8d549218150a7a23cb13ed17fd65604287fd54
+  data.tar.gz: dafdb6e3178f868bf6b25cf1cb8fc250a4e92d694a18d7d9396b3f6df1088402
 SHA512:
-  metadata.gz: d96c27426f3fd56f74d310afb3c2f1da70d0ad0fea25ee768e3005597986fc160e20c6e8c719c7ca51e45f631ca49d0ad04f0fc867713112aac82697ba690bcb
-  data.tar.gz: b7c2c50c0e06fd11cc4f9a128e9a8c955856b86a55b0580beb96488021b37698515a40a58e56455400b6c47b8a527f188ad2e131bcadf81ab56c06ae8d3ab2f4
+  metadata.gz: 98c8bc6c6460f8e11670d03abcf4d67be9855cbe46cb1770847f02e0a0674600b8dcfba2b444ae9c7a5ae7d2f58b11d6b1435a3fb80a218a327dea7967d7686d
+  data.tar.gz: 6bbf146a6e1b27e47e0340f50835dff409a22c647b6e63ade2c5dbc3d9ed6da326fa3b06e736d29f3dcd94d1e9bb7939d52d1fdd3ce0f34350103b3bd99911d5

data/README.adoc

@@ -132,12 +132,13 @@ There is a 3GPP dataset ftp://www.3gpp.org/Information/Databases/Spec_Status/[la
 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:
 
+- `source` - a data source name. Possible values are: `status-smg-3GPP` and `status-smg-3GPP-force`. The first one only downloads a dataset if it's updated. The second one forces this gem to download the latest dataset.
 - `output` - folder to save documents (default './data').
 - `format` - a format in which the documents are saved. Possible formats are: `yaml`, `xml`, `bibxml` (default `yaml`).
 
 [source,ruby]
 ----
-Relaton3GPP::DataFetcher.fetch output: "data", format: "yaml"
+Relaton3GPP::DataFetcher.fetch "status-smg-3GPP" output: "data", format: "yaml"
 Started at: 2021-12-10 19:58:46 +0100
 Stopped at: 2021-12-10 20:08:03 +0100
 Done in: 557 sec.

data/lib/relaton_3gpp/data_fetcher.rb

@@ -22,14 +22,15 @@ module Relaton3gpp
     #
     # Initialize fetcher and run fetch
     #
+    # @param [Strin] source source name
     # @param [Strin] output directory to save files, default: "data"
     # @param [Strin] format format of output files (xml, yaml, bibxml), default: yaml
     #
-    def self.fetch(output: "data", format: "yaml")
+    def self.fetch(source, output: "data", format: "yaml")
       t1 = Time.now
       puts "Started at: #{t1}"
       FileUtils.mkdir_p output
-      new(output, format).fetch
+      new(output, format).fetch(source == "status-smg-3GPP-force")
       t2 = Time.now
       puts "Stopped at: #{t2}"
       puts "Done in: #{(t2 - t1).round} sec."
@@ -38,8 +39,10 @@ module Relaton3gpp
     #
     # Parse documents
     #
-    def fetch # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-      file = get_file
+    # @param [Boolean] renewal force to update all documents
+    #
+    def fetch(renewal) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      file = get_file renewal
       return unless file
 
       Zip::File.open(file) do |zip_file|
@@ -53,7 +56,7 @@ module Relaton3gpp
       specrels = dbs["Specs_GSM+3G_release-info"]
       releases = dbs["Releases"]
       tstatus = dbs["temp-status"]
-      FileUtils.rm_rf @output if dbs["2001-04-25_schedule"].any?
+      FileUtils.rm_f File.join(@output, "/*") if renewal && dbs["2001-04-25_schedule"].any?
       dbs["2001-04-25_schedule"].each do |row|
         fetch_doc row, specs, specrels, releases, tstatus
       end
@@ -63,9 +66,11 @@ module Relaton3gpp
     #
     # Get file from FTP
     #
+    # @param [Boolean] renewal force to update all documents
+    #
     # @return [String] file name
     #
-    def get_file # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity
+    def get_file(renewal) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       @current = YAML.load_file CURRENT if File.exist? CURRENT
       @current ||= {}
       n = 0
@@ -75,8 +80,10 @@ module Relaton3gpp
         ftp.login
         ftp.chdir "/Information/Databases/Spec_Status/"
         d, t, _, file = ftp.list("*.zip").first.split
-        dt = DateTime.strptime("#{d} #{t}", "%m-%d-%y %I:%M%p")
-        return if file == @current["file"] && dt == DateTime.parse(@current["date"])
+        unless renewal
+          dt = DateTime.strptime("#{d} #{t}", "%m-%d-%y %I:%M%p")
+          return if file == @current["file"] && dt == DateTime.parse(@current["date"])
+        end
 
         ftp.getbinaryfile file
       rescue Net::ReadTimeout => e

data/lib/relaton_3gpp/processor.rb

@@ -9,7 +9,7 @@ module Relaton3gpp
       @prefix = "3GPP"
       @defaultprefix = %r{^3GPP\s}
       @idtype = "3GPP"
-      @datasets = %w[status-smg-3GPP]
+      @datasets = %w[status-smg-3GPP status-smg-3GPP-force]
     end
 
     # @param code [String]
@@ -23,13 +23,13 @@ module Relaton3gpp
     #
     # Fetch all the documents from http://xml2rfc.tools.ietf.org/public/rfc/bibxml-3gpp-new/
     #
-    # @param [String] _source source name
+    # @param [String] source source name
     # @param [Hash] opts
     # @option opts [String] :output directory to output documents
     # @option opts [String] :format
     #
-    def fetch_data(_source, opts)
-      DataFetcher.fetch(**opts)
+    def fetch_data(source, opts)
+      DataFetcher.fetch(source, **opts)
     end
 
     # @param xml [String]

data/lib/relaton_3gpp/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-3gpp
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.14.3
 platform: ruby
 authors:
 - Ribose Inc.