relaton-ccsds 1.19.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d13a1ff82cb418e8778c916807bb43c5e8a3fe31f48f8f572c32e6f1631a59b1
-  data.tar.gz: 499cafc2a2dcfd2aa2f8b1040a6d0f2a7af4ad14851df92b980e73697b95ace2
+  metadata.gz: 5dbc82b9af321507bb207dc43ecb39b7ab7704f167f479fd3a6170cd3f5283e1
+  data.tar.gz: 22633dcbb3b00c5082f5e1db82a7c693ba915ffafa16abead42d62d7b3209252
 SHA512:
-  metadata.gz: 9cbac64eb97f0ca87f19c1274d9ff2864597fb62912a599ea8bd65c4ce722eb9c73e4c2466cdc915385425f9c08bab9f0392de64e62111c579c56df8ca6750c7
-  data.tar.gz: 37ccb6686d9b6cc55990561a205641d809d8ced600468f919588b7a56aa8c252e06076cee066bf3a97e17dbc76d12a05124d43069e5e1f8cab2d6376996fb91a
+  metadata.gz: 1267cd4023932a5702bcbd5c6efbaca487d74b26659de634da34f6620d42805f70d8ef6e12e484a00dff6ffeb23bb5c46c0e5f53d2d7a5df231c77f341bbe287
+  data.tar.gz: 13d9d28ba550bf1a4da1bd62a35f0db7a3eb70d690edab271fae33bc68610995e23833ef41a7a8f2dcdf7a76c7d1eb1fb93dcbf8c4bd43b617c53ab8e7ec6836

data/lib/relaton_ccsds/data_fetcher.rb

@@ -39,7 +39,11 @@ module RelatonCcsds
     end
 
     def index
-      @index ||= Relaton::Index.find_or_create "CCSDS", file: "index-v1.yaml"
+      @index ||= Relaton::Index.find_or_create "CCSDS", file: "index-v2.yaml", pubid_class: Pubid::Ccsds::Identifier
+    end
+
+    def old_index
+      @old_index ||= Relaton::Index.find_or_create "CCSDS", file: "index-v1.yaml"
     end
 
     #
@@ -64,6 +68,7 @@ module RelatonCcsds
       fetch_docs ACTIVE_PUBS_URL
       fetch_docs OBSOLETE_PUBS_URL, retired: true
       index.save
+      old_index.save
     end
 
     #
@@ -100,6 +105,10 @@ module RelatonCcsds
       save_bib bibitem
     end
 
+    def get_output_file(id)
+      File.join @output, "#{id.gsub(/[.\s-]+/, '-')}.#{@ext}"
+    end
+
     #
     # Save bibitem to file
     #
@@ -109,15 +118,11 @@ module RelatonCcsds
     #
     def save_bib(bib)
       search_instance_translation bib
-      id = bib.docidentifier.first.id
-      file = File.join @output, "#{id.gsub(/[.\s-]+/, '-')}.#{@ext}"
-      if @files.include?(file)
-        Util.info "(#{file}) file already exists. Trying to merge links ..."
-        merge_links bib, file
-      else @files << file
-      end
+      file = get_output_file(bib.docidentifier.first.id)
+      merge_links bib, file
       File.write file, content(bib), encoding: "UTF-8"
-      index.add_or_update id, file
+      index.add_or_update Pubid::Ccsds::Identifier.parse(bib.docidentifier.first.id), file
+      old_index.add_or_update bib.docidentifier.first.id, file
     end
 
     #
@@ -146,7 +151,8 @@ module RelatonCcsds
     #
     def search_relations(bibid, bib)
       index.search do |row|
-        id = row[:id].sub(TRRGX, "")
+        id = row[:id].exclude(:language)
+        # TODO: smiplify this line?
         next if id != bibid || row[:id] == bib.docidentifier.first.id
 
         create_relations bib, row[:file]
@@ -154,8 +160,10 @@ module RelatonCcsds
     end
 
     def search_translations(bibid, bib)
+      # will call create_instance_relation if
+      # there are same identifiers in index but with word "Translated"
       index.search do |row|
-        next unless row[:id].match?(/^#{bibid}#{TRRGX}/)
+        next unless row[:id].language && row[:id].exclude(:language) == bibid
 
         create_instance_relation bib, row[:file]
       end
@@ -232,6 +240,14 @@ module RelatonCcsds
     # @return [void]
     #
     def merge_links(bib, file) # rubocop:disable Metrics/AbcSize
+      # skip merging when new file
+      unless @files.include?(file)
+        @files << file
+        return
+      end
+
+      puts "(#{file}) file already exists. Trying to merge links ..."
+
       hash = YAML.load_file file
       bib2 = BibliographicItem.from_hash hash
       if bib.link[0].type == bib2.link[0].type

data/lib/relaton_ccsds/data_parser.rb

@@ -38,7 +38,10 @@ module RelatonCcsds
     end
 
     def parse_docid
-      [RelatonBib::DocumentIdentifier.new(id: docidentifier, type: "CCSDS", primary: true)]
+      [RelatonBib::DocumentIdentifier.new(
+        id: docidentifier,
+        type: "CCSDS", primary: true
+      )]
     end
 
     def docidentifier(id = nil)
@@ -104,6 +107,7 @@ module RelatonCcsds
       [create_relation("hasSuccessor", @successor.docidentifier[0].id)]
     end
 
+    # TODO: cover this
     def relation_type(rel_id)
       return if rel_id == docidentifier ||
         rel_id.match(DataFetcher::TRRGX).to_s != docidentifier.match(DataFetcher::TRRGX).to_s

data/lib/relaton_ccsds/hit_collection.rb

@@ -1,7 +1,7 @@
 module RelatonCcsds
   class HitCollection < RelatonBib::HitCollection
     GHURL = "https://raw.githubusercontent.com/relaton/relaton-data-ccsds/main/".freeze
-    INDEX_FILE = "index-v1.yaml".freeze
+    INDEX_FILE = "index-v2.yaml".freeze
 
     #
     # Search his in index.
@@ -9,7 +9,13 @@ module RelatonCcsds
     # @return [<Type>] <description>
     #
     def fetch
-      rows = index.search text
+      pubid = Pubid::Ccsds::Identifier.parse(text)
+      rows = if pubid.edition
+               index.search(pubid)
+               # index.search { |r| Pubid::Ccsds::Identifier.create(**r[:id]) == pubid }
+             else
+               index.search { |r| r[:id].exclude(:edition) == pubid }
+             end
       @array = rows.map { |row| Hit.new code: row[:id], url: "#{GHURL}#{row[:file]}" }
       self
     rescue SocketError, OpenURI::HTTPError, OpenSSL::SSL::SSLError, Errno::ECONNRESET => e
@@ -17,7 +23,7 @@ module RelatonCcsds
     end
 
     def index
-      @index ||= Relaton::Index.find_or_create :ccsds, url: "#{GHURL}index-v1.zip", file: INDEX_FILE
+      @index ||= Relaton::Index.find_or_create :ccsds, url: "#{GHURL}index-v2.zip", file: INDEX_FILE
     end
   end
 end

data/lib/relaton_ccsds/version.rb

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

data/lib/relaton_ccsds.rb

@@ -3,6 +3,7 @@
 require "mechanize"
 require "relaton_bib"
 require "relaton/index"
+require "pubid-ccsds"
 require_relative "relaton_ccsds/version"
 require_relative "relaton_ccsds/bibliographic_item"
 require_relative "relaton_ccsds/util"

data/relaton_ccsds.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
   # Uncomment to register a new dependency of your gem
   spec.add_dependency "mechanize", "~> 2.10"
   spec.add_dependency "relaton-bib", "~> 1.19.0"
-  spec.add_dependency "relaton-index", "~> 0.2.0"
-
+  spec.add_dependency "relaton-index", "~> 0.2.13"
+  spec.add_dependency "pubid-ccsds", "~> 0.1.6"
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ccsds
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.20.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-03 00:00:00.000000000 Z
+date: 2024-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -44,14 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.13
+- !ruby/object:Gem::Dependency
+  name: pubid-ccsds
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.6
 description: 'RelatonCcsds: retrive www.ccsds.org Standards'
 email:
 - open.source@ribose.com