relaton-index 0.2.15 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ce9d7205daf0975990050a9f2652f35d7fc9cd02a840f49cc268ee3114c0870
-  data.tar.gz: b0a56e175a3ca0ed09dea40d2b0d6cb1d6b7400f5cb61d67a86185f00d9309d6
+  metadata.gz: 4108f8054c21d68ee61c745be7a61c9d35f1dfdc054b1bf3a98b0d3d4bbe7ce1
+  data.tar.gz: 765718355ee7cb6182ef08513a2235be8efc45b4e2b086585c9ba6d7c7ff2006
 SHA512:
-  metadata.gz: 21cd6e533b27e00ee9b0604eb3a11112dba1c8f69db15996beede0b7ce763ae54ac30242e8a75118c6e525b4bde510bd7b68f347ccbdd180479d38b77f2c88c0
-  data.tar.gz: 2788d0c92aa0e4fe6540eb4fb5ae4b30917abb304f91b09add060efbcd81977427503c5e7ddc15c17afd1db9735a1abecdfe0a0b760de3d7b89d9e3a41476c59
+  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/version.rb

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

metadata

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