relaton-ccsds 1.14.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de41538113c775736c47d2c576b11e087fd965706cc356d14c29ec9b9ec49294
-  data.tar.gz: 211bd83661e30589ae435885afc1fac89a9b336c2e9b0abfa4bae75dfcf9722f
+  metadata.gz: bb70be3294be3ba408274ff671392077b6be402928798bdf42be8a445d26f281
+  data.tar.gz: 64c27dfa9fb804c04e9a4381a68001e18d85af4e467162380ab289db234ad3ef
 SHA512:
-  metadata.gz: 602946077b688c1fbf035073d632a1d1abf2b1459261a40b72550b9b3bba7cdcd79bd9a3cbcff3188073ea5afeabee97396822c3b56fa3d1d1f47e4747fe3489
-  data.tar.gz: 450a9e0b4fa07ebcd2bdd75637423fda646ae5dd3899b9ef5fb4063eb6e42fa861997938bb0f9829e076c71616bc6a0249241684838dcbd214fd60093dff011a
+  metadata.gz: b33be383d1200e0a976a5d3c48a296cd957314baf342299e712ea7e606eb23d123e91a08dcd3a6b0c17f808ac156e8a97352413900c34281e29a784ad8768625
+  data.tar.gz: 8fb7ee5bf02d2b3590cc2b9badb9f0e5a7de8da197d055936f8611158ca772af7d3b3c9f53f1eb6c3a0b3fac7583647875f37e77ef7b03cfdfa521f3d3be720e

data/README.adoc

@@ -43,7 +43,7 @@ item = hits[0].fetch
 [source,ruby]
 ----
 item.to_xml
-=> "<bibitem id="CCSDS230.2-G-1" schema-version="v1.2.3">
+=> "<bibitem id="CCSDS230.2-G-1" schema-version="v1.2.4">
       <fetched>2023-08-25</fetched>
       <title format="text/plain" language="en" script="Latn">Next Generation Uplink</title>
       <uri type="pdf">https://public.ccsds.org/Pubs/230x2g1.pdf</uri>
@@ -55,7 +55,7 @@ With argument `bibdata: true` it outputs XML wrapped by `bibdata` element and ad
 [source,ruby]
 ----
 item.to_xml bibdata: true
-=> "<bibdata schema-version="v1.2.3">
+=> "<bibdata schema-version="v1.2.4">
       <fetched>2023-08-25</fetched>
       <title format="text/plain" language="en" script="Latn">Next Generation Uplink</title>
       <uri type="pdf">https://public.ccsds.org/Pubs/230x2g1.pdf</uri>
@@ -120,7 +120,7 @@ RelatonCcsds::XMLParser.from_xml File.read('spec/fixtures/ccsds_230_2-g-1.xml')
 [source,ruby]
 ----
 hash = YAML.load_file 'spec/fixtures/ccsds_230_2-g-1.yaml'
-=> {"schema-version"=>"v1.2.3",
+=> {"schema-version"=>"v1.2.4",
  "id"=>"CCSDS230.2-G-1",
 ...
 

data/grammars/biblio.rng

@@ -1283,7 +1283,7 @@
       <value>mergedInto</value>
       <value>splits</value>
       <value>splitInto</value>
-      <value>instance</value>
+      <value>instanceOf</value>
       <value>hasInstance</value>
       <value>exemplarOf</value>
       <value>hasExemplar</value>

data/lib/relaton_ccsds/bibliographic_item.rb

@@ -37,7 +37,7 @@ module RelatonCcsds
     end
 
     # @return [Hash]
-    def to_hash
+    def to_hash(embedded: false)
       hash = super
       if technology_area
         hash["ext"] ||= {}

data/lib/relaton_ccsds/data_fetcher.rb

@@ -15,6 +15,8 @@ module RelatonCcsds
       FileRef,ISO_x0020_Number,Patents,Extra_x0020_Link,Area,calHtmlColorCode&$filter=Book_x0020_Type%20eq%20%27Silver%20Book%27
     URL
 
+    TRRGX = /\s-\s\w+\sTranslated$/.freeze
+
     def initialize(output, format)
       @output = output
       @format = format
@@ -68,18 +70,64 @@ module RelatonCcsds
     end
 
     def save_bib(bib)
+      search_translation bib
       id = bib.docidentifier.first.id
-      file = File.join @output, "#{id.gsub(/[.\s]+/, '-')}.#{@ext}"
-      if @files.include? file
+      file = File.join @output, "#{id.gsub(/[.\s-]+/, '-')}.#{@ext}"
+      if @files.include?(file)
         puts "(#{file}) file already exists. Trying to merge links ..."
         merge_links bib, file
-      else
-        @files << file
+      else @files << file
       end
       File.write file, content(bib), encoding: "UTF-8"
       index.add_or_update id, file
     end
 
+    def search_translation(bib) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      bibid = bib.docidentifier.first.id.dup
+      if bibid.sub!(TRRGX, "")
+        index.search do |row|
+          id = row[:id].sub(TRRGX, "")
+          next if id != bibid || row[:id] == bib.docidentifier.first.id
+
+          create_translation_relation bib, row[:file]
+        end
+      else
+        index.search do |row|
+          next unless row[:id].match?(/^#{bibid}#{TRRGX}/)
+
+          create_instance_relation bib, row[:file]
+        end
+      end
+    end
+
+    def create_translation_relation(bib, file) # rubocop:disable Metrics/MethodLength
+      hash = YAML.load_file file
+      inst = BibliographicItem.from_hash hash
+      if inst.docidentifier.first.id.match?(TRRGX)
+        type1 = type2 = "hasTranslation"
+      else
+        type1 = "instanceOf"
+        type2 = "hasInstance"
+      end
+      create_relation(bib, inst, type1)
+      create_relation(inst, bib, type2)
+      File.write file, content(inst), encoding: "UTF-8"
+    end
+
+    def create_instance_relation(bib, file)
+      hash = YAML.load_file file
+      inst = BibliographicItem.from_hash hash
+      create_relation bib, inst, "hasInstance"
+      create_relation inst, bib, "instanceOf"
+      File.write file, content(inst), encoding: "UTF-8"
+    end
+
+    def create_relation(bib1, bib2, type)
+      fref = RelatonBib::FormattedRef.new content: bib2.docidentifier.first.id
+      rel = BibliographicItem.new docid: bib2.docidentifier, formattedref: fref
+      bib1.relation << RelatonBib::DocumentRelation.new(type: type, bibitem: rel)
+    end
+
     def merge_links(bib, file) # rubocop:disable Metrics/AbcSize
       hash = YAML.load_file file
       bib2 = BibliographicItem.from_hash hash

data/lib/relaton_ccsds/data_parser.rb

@@ -76,13 +76,13 @@ module RelatonCcsds
     end
 
     def parse_edition
-      @doc["Issue_x0020_Number"]
+      @doc["Issue_x0020_Number"].match(/^\d+/)&.to_s
     end
 
     def parse_relation
       @docs.each_with_object(successor + adopted) do |d, a|
         id = docidentifier d["Document_x0020_Number"].strip
-        type = relaton_type id
+        type = relation_type id
         next unless type
 
         a << create_relation(type, id)
@@ -104,12 +104,14 @@ module RelatonCcsds
       [create_relation("hasSuccessor", @successor.docidentifier[0].id)]
     end
 
-    def relaton_type(rel_id)
-      same = rel_id == docidentifier
-      if rel_id.include?(docidentifier) && !same
-        "hasEdition"
-      elsif docidentifier.include?(rel_id) && !same
-        "editionOf"
+    def relation_type(rel_id)
+      return if rel_id == docidentifier ||
+        rel_id.match(DataFetcher::TRRGX).to_s != docidentifier.match(DataFetcher::TRRGX).to_s
+
+      if rel_id.include?(docidentifier.sub(DataFetcher::TRRGX, ""))
+        "updatedBy"
+      elsif docidentifier.include?(rel_id.sub(DataFetcher::TRRGX, ""))
+        "updates"
       end
     end
 

data/lib/relaton_ccsds/processor.rb

@@ -54,7 +54,7 @@ module RelatonCcsds
     # Remove index file
     #
     def remove_index_file
-      Relaton::Index.find_or_create(:CC, url: true, file: HitCollection::INDEX_FILE).remove_file
+      Relaton::Index.find_or_create(:ccsds, url: true, file: HitCollection::INDEX_FILE).remove_file
     end
   end
 end

data/lib/relaton_ccsds/version.rb

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

data/lib/relaton_ccsds.rb

@@ -20,9 +20,9 @@ module RelatonCcsds
   # Your code goes here...
 
   def self.grammar_hash
-    gem_path = File.expand_path "..", __dir__
-    grammars_path = File.join gem_path, "grammars", "*"
-    grammars = Dir[grammars_path].sort.map { |gp| File.read gp }.join
-    Digest::MD5.hexdigest grammars
+    # gem_path = File.expand_path "..", __dir__
+    # grammars_path = File.join gem_path, "grammars", "*"
+    # grammars = Dir[grammars_path].sort.map { |gp| File.read gp }.join
+    Digest::MD5.hexdigest RelatonCcsds::VERSION + RelatonBib::VERSION # grammars
   end
 end

data/relaton_ccsds.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   spec.add_dependency "mechanize", "~> 2.7"
-  spec.add_dependency "relaton-bib", "~> 1.14.13"
+  spec.add_dependency "relaton-bib", "~> 1.16.0"
   spec.add_dependency "relaton-index", "~> 0.2.0"
 
   # For more information and examples about making a new gem, check out our

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ccsds
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.16.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-26 00:00:00.000000000 Z
+date: 2023-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.13
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.13
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement