relaton-index 0.2.17 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 788bf4331c7923b1671faeb8b9655aab2caaa856dcf5f6fb6b9a95a930c9376c
-  data.tar.gz: 6d6e14df3e79b577e04e654579cdb4fb1c2dfdbe458763de1aabc28ca1d3af84
+  metadata.gz: 0e0ad0db979d523bfd05a561b5f81ba0aab46f41f02d524c804c4767fa50e57b
+  data.tar.gz: f9e2c9fc9bdc73f8ae55cc5badd54190fbb0d2bef812c16c42ff6a4ed126958f
 SHA512:
-  metadata.gz: f1b8d3dfe3686f754cf65a592daaa6ac475f6370aa0473da8eb77d48f9d53fc6694d0a71cad06a0fe3657829e2fd29d5928ecbaf5bd333547148b8066cb8bbfa
-  data.tar.gz: d6b868fa97d70774e5fcc865c390dabb64c8321be488c47127278cc33767f5725763e1da67848975a73c9ae539a432d8aa55d29e609c6d95a02e9aec0986bfd2
+  metadata.gz: d53ca914ea49bc69a1c80833ad7996a6bde8b5c583dfd7b8ac4aa858e5a3bb5031050271adafbbb58a511f987769e4133b5bbac0479e5455a2c36b0a708031a2
+  data.tar.gz: e01cdbea3d72c1c76d48a735adba13af8af34f9c3cdd994de8532a8c8eef815548396c9d254a7824a1d7a83ce3d38ab41ca61602f851479f6111c35b035bbacf

data/.rubocop.yml

@@ -7,6 +7,6 @@ require: rubocop-rails
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.1
 Rails:
   Enabled: false

data/lib/relaton/index/file_io.rb

@@ -8,6 +8,9 @@ module Relaton
     class FileIO
       attr_reader :url, :pubid_class
 
+      @@file_locks = {}
+      @@file_locks_mutex = Mutex.new
+
       #
       # Initialize FileIO
       #
@@ -39,7 +42,9 @@ module Relaton
       def read
         case url
         when String
-          check_file || fetch_and_save
+          with_file_lock do
+            check_file || fetch_and_save
+          end
         else
           read_file || []
         end
@@ -146,20 +151,22 @@ module Relaton
           warn_local_index_error "YAML parsing error when reading"
         end
       end
+
       #
       # Fetch index from external repository and save it to storage
       #
       # @return [Array<Hash>] index
       #
       def fetch_and_save
-        resp = StringIO.new(URI(url).read)
+        uri = URI.parse(url)
+        body = Net::HTTP.get(uri)
         yaml = nil
-        Zip::File.open_buffer(resp) do |zip|
+        Zip::File.open_buffer(body) do |zip|
           entry = zip.entries.first
           yaml = entry.get_input_stream.read
         end
         Util.info "Downloaded index from `#{url}`", progname
-        load_index(yaml, save = true)
+        load_index(yaml, true)
       end
 
       def warn_remote_index_error(reason)
@@ -176,8 +183,10 @@ module Relaton
       # @return [void]
       #
       def save(index)
-        Index.config.storage.write file,
-          index.map { |item| item.transform_values { |value| value.is_a?(Pubid::Core::Identifier::Base) ? value.to_h : value } }.to_yaml
+        yaml = index.map do |item|
+          item.transform_values { |value| value.is_a?(Pubid::Core::Identifier::Base) ? value.to_h : value }
+        end.to_yaml
+        Index.config.storage.write file, yaml
       end
 
       #
@@ -189,6 +198,16 @@ module Relaton
         Index.config.storage.remove file
         []
       end
+
+      private
+
+      def with_file_lock(&)
+        @@file_locks_mutex.synchronize do
+          @@file_locks[file] ||= Mutex.new
+        end
+
+        @@file_locks[file].synchronize(&)
+      end
     end
   end
 end

data/lib/relaton/index/version.rb

@@ -2,6 +2,6 @@
 
 module Relaton
   module Index
-    VERSION = "0.2.17"
+    VERSION = "0.2.19"
   end
 end

data/relaton-index.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary = "Relaton Index is a library for indexing Relaton files."
   spec.homepage = "https://github.com/relaton/relaton-index"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.1.0"
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
 
@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "openssl", "~> 3.3.2"
   spec.add_dependency "pubid-core", "~> 1.15.0"
   spec.add_dependency "relaton-logger", "~> 0.2.0"
   spec.add_dependency "rubyzip", "~> 2.3.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-index
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.19
 platform: ruby
 authors:
 - Ribose Inc.
@@ -9,6 +9,20 @@ bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: openssl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.3.2
 - !ruby/object:Gem::Dependency
   name: pubid-core
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="