relaton-index 0.2.14 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 074e4a9ad24460b1c4ae2b34bfbfe37e0674e204517d5137665b47ade1296295
-  data.tar.gz: 6b8df9730b13c94331942d2ed21f7ea27673d47e5e6fe4d9d4099e919a17de47
+  metadata.gz: 4108f8054c21d68ee61c745be7a61c9d35f1dfdc054b1bf3a98b0d3d4bbe7ce1
+  data.tar.gz: 765718355ee7cb6182ef08513a2235be8efc45b4e2b086585c9ba6d7c7ff2006
 SHA512:
-  metadata.gz: d014942345f4a0b208390fd2e1404c630acdc6c7112175883850a8a1118750565be104625fe1b0c470e92c55ac3ae1357a1b487f131cc2d515ed14b959e38641
-  data.tar.gz: 0cde39c9290fb2c7267aa8c5f9d61433eef2bdbbf5e17829d45921bada82feedba109532b2d08a28b117d1b0177acba54335b27d82e4792de4d205c6cf577693
+  metadata.gz: 33a29690bd1296f6c44358a513d016ab433a34f89de508466d919b22a76f834d077a6fb5fb69579b694fcfd440458e53dd5931943c3bd8cb12d4f725509fe265
+  data.tar.gz: 1f23d97956f434d7ceb76688da5086e7ee545c7685455f9964ece8db783f326f591a5d4ef984694ce09ee0cd6786fb63d8f24eff06875fc51157985bf8cfef63

data/lib/relaton/index/file_io.rb

@@ -106,12 +106,7 @@ module Relaton
         yaml = Index.config.storage.read(file)
         return unless yaml
 
-        index = YAML.safe_load yaml, permitted_classes: [Symbol]
-        return deserialize_pubid(index) if check_format index
-
-        warn_local_index_error "Wrong structure of the"
-      rescue Psych::SyntaxError
-        warn_local_index_error "YAML parsing error when reading"
+        load_index(yaml) || []
       end
 
       def deserialize_pubid(index)
@@ -134,6 +129,23 @@ module Relaton
         @progname ||= "relaton-#{@dir}"
       end
 
+      def load_index(yaml, save = false)
+        index = YAML.safe_load(yaml, permitted_classes: [Symbol])
+        save index if save
+        return deserialize_pubid(index) if check_format index
+
+        if save
+          warn_remote_index_error "Wrong structure of"
+        else
+          warn_local_index_error "Wrong structure of"
+        end
+      rescue Psych::SyntaxError
+        if save
+          warn_remote_index_error "YAML parsing error when reading"
+        else
+          warn_local_index_error "YAML parsing error when reading"
+        end
+      end
       #
       # Fetch index from external repository and save it to storage
       #
@@ -144,14 +156,8 @@ module Relaton
         zip = Zip::InputStream.new resp
         entry = zip.get_next_entry
         yaml = entry.get_input_stream.read
-        index = YAML.safe_load(yaml, permitted_classes: [Symbol])
-        save index
         Util.info "Downloaded index from `#{url}`", progname
-        return index if check_format index
-
-        warn_remote_index_error "Wrong structure of"
-      rescue Psych::SyntaxError
-        warn_remote_index_error "YAML parsing error when reading"
+        load_index(yaml, save = true)
       end
 
       def warn_remote_index_error(reason)

data/lib/relaton/index/pool.rb

@@ -22,7 +22,7 @@ module Relaton
         if @pool[type.upcase.to_sym]&.actual?(**args)
           @pool[type.upcase.to_sym]
         else
-          @pool[type.upcase.to_sym] = Type.new(type, args[:url], args[:file], args[:id_keys])
+          @pool[type.upcase.to_sym] = Type.new(type, args[:url], args[:file], args[:id_keys], args[:pubid_class])
         end
       end
 

data/lib/relaton/index/type.rb

@@ -80,7 +80,7 @@ module Relaton
       # @return [void]
       #
       def save
-        @file_io.save @index
+        @file_io.save(@index || [])
       end
 
       #

data/lib/relaton/index/version.rb

@@ -2,6 +2,6 @@
 
 module Relaton
   module Index
-    VERSION = "0.2.14"
+    VERSION = "0.2.16"
   end
 end

data/lib/relaton/index.rb

@@ -19,17 +19,10 @@ module Relaton
 
     class << self
       #
-      # Find or create index
+      # Proxy for Pool#type
       #
-      # @param [String] type index type (ISO, IEC, etc.)
-      # @param [String, nil] url external URL to index, used to fetch index for searching files
-      # @param [String, nil] file output file name, default is config.filename
-      # @param [Array<Symbol>, nil] id_keys keys to check if index is correct
-      #
-      # @return [Relaton::Index::Type] typed index
-      #
-      def find_or_create(type, url: nil, file: nil, id_keys: nil)
-        pool.type(type, url: url, file: file, id_keys: id_keys)
+      def find_or_create(type, **args)
+        pool.type(type, **args)
       end
 
       def close(type)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-index
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.16
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-03 00:00:00.000000000 Z
+date: 2024-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pubid-core