relaton-index 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae7a2387f5e09bff4b3d07563d7e6b3daec43720e7af59d5387f62c41d3892e4
-  data.tar.gz: 8cd557981092f4f37c7d5a318eb6655472895f1a383044af469615e4e99430c0
+  metadata.gz: f1f22ce8f232dc77b5b791d5eaa6fb5b80bf62697f8a1a7cd9d18e7515ff7d65
+  data.tar.gz: 86884150296d335342dba8ebf3c2808f662fd08709378ce9674e91965494c600
 SHA512:
-  metadata.gz: aebc8bc1def475961474cb000a79d02d8341f1f9687d93d93559f0126cbf7d091a88fcdfdb0308f181bda3bfc9539cfd876f159936f488cd6117fc21baaf1cac
-  data.tar.gz: 35ad2ae0c5c84328860147a1c5422548bf99437496085d1d0f29f3b2515344e8dca01bad75f40a6f21a84838576763c811d9f873b06afde1ff90e73623f4b4bc
+  metadata.gz: 3c59bccab496f4be0a8a7d228dcb676c148daf9e6d84308623d1877bd0fe85a6738a5f151219f787385ac53faae430f43bfa928b40e2e399d62082abcfb86600
+  data.tar.gz: 33ef8426b9e9e72cfb2488d78ef16d65e5083d3a50376b9e530d95b213744c69763d9fa2fa4c39395cd3428fdf7e8954ea3a47047c2ce029b2cdbb580ff406a0

data/README.adoc

@@ -22,18 +22,33 @@ If bundler is not being used to manage dependencies, install the gem by executin
 
 == Usage
 
+[source,ruby]
+----
+require 'relaton/index'
+
+# Create a new index object. The first argument is the type of dataset (ISO, IEC, IHO, etc.) URL and filename are optional.
+Relaton::Index.find_or_create :IHO, url: "https://raw.githubusercontent.com/relaton/relaton-data-iho/master/index.zip", filename: "index-iho.yaml"
+
+# Find an existing index object (created before).
+Relaton::Index.find_or_create :IHO
+
+# If a new value of URL or filename is specified and has a new value (different from what it was before), the index object will be recreated.
+Relaton::Index.find_or_create :IHO, url: nil, filename: "index.yaml"
+
+# Remove the index from the pool.
+Relaton::Index.close :IHO
+----
+
 The aim of this gem is to be used by Relaton libraries in two ways:
 - indexing documents' files in GitHub repositories
 - searching a document by a reference when the Relaton library fetches a document
 
 === Indexing
 
-In this case, the Relaton library creates an index object and adds documents' files to it. By default, the index object is saved to the `index.yaml` file in the root of the repository. The filename can be changed using the `filename` setting
+In this case, the Relaton library creates an index object and adds documents' files to it. By default, the index object is saved to the `index.yaml` file in the root of the repository. The filename can be changed using the `filename` setting.
 
 [source,ruby]
 ---- 
-require 'relaton/index' 
-
 # Create a new index object or fetch an existing one. The first argument is the type of dataset (ISO, IEC, IHO, etc.) URL should not be specified.
 index = Relaton::Index.find_or_create :IHO
 
@@ -50,9 +65,7 @@ In this case, the Relaton library should create an index object and search for a
 
 [source,ruby]
 ----
-require 'relaton/index' 
-
-# Create a new index object or fetch an existing one. URL should be specified. If the index file is not found or is older than 24 hours, it will be downloaded from the URL. By default, the index file is saved to the `/[HOME]/.relaton/iho/index.yaml` file.
+# Create a new index object or fetch an existing one. URL should be specified. If the index file is not found or is older than 24 hours, it will be downloaded from the URL. By default, the index is saved as `index.yaml` file to the `/[HOME]/.relaton/iho/` folder.
 index = Relaton::Index.find_or_create :IHO, url: "https://raw.githubusercontent.com/relaton/relaton-data-iho/master/index.zip"
 
 
@@ -66,9 +79,6 @@ index.search do |row|
   row[:id] == "B-4"
 end
 # => [{ id: "B-4 2.19.0", file: "data/b-4_2_19_0.xml" }] 
-
-# Remove the index from the pool.
-Relaton::Index.close :IHO
 ----
 
 === Configuration
@@ -88,6 +98,12 @@ Relaton::Index.config do |config|
 end
 ----
 
+It's also possible to redefine file name for a specific type of index:
+[source,ruby]
+----
+index = Relaton::Index.find_or_create :IHO, filename: "index-iho.yaml"
+----
+
 == Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/relaton/index/file_io.rb

@@ -6,6 +6,8 @@ module Relaton
     # In index mode url should be nil.
     #
     class FileIO
+      attr_reader :url
+
       #
       # Initialize FileIO
       #
@@ -14,9 +16,10 @@ module Relaton
       #   (if not exists, or older than 24 hours) or nil if index is used to
       #   index files
       #
-      def initialize(dir, url)
+      def initialize(dir, url, filename)
         @dir = dir
         @url = url
+        @filename = filename
       end
 
       #
@@ -25,11 +28,11 @@ module Relaton
       # @return [Array<Hash>] index
       #
       def read
-        if @url
-          @file ||= File.join(Index.config.storage_dir, ".relaton", @dir, Index.config.filename)
+        if url
+          @file ||= File.join(Index.config.storage_dir, ".relaton", @dir, @filename)
           check_file || fetch_and_save
         else
-          @file ||= Index.config.filename
+          @file ||= @filename
           read_file
         end
       end
@@ -64,7 +67,7 @@ module Relaton
       # @return [Array<Hash>] index
       #
       def fetch_and_save
-        resp = URI(@url).open
+        resp = URI(url).open
         zip = Zip::InputStream.new resp
         entry = zip.get_next_entry
         index = YAML.safe_load(entry.get_input_stream.read, permitted_classes: [Symbol])

data/lib/relaton/index/pool.rb

@@ -13,11 +13,16 @@ module Relaton
       #
       # @param [String] type <description>
       # @param [String, nil] url external URL to index, used to fetch index for searching files
+      # @param [String, nil] file output file name
       #
       # @return [Relaton::Index::Type] typed index
       #
-      def type(type, url)
-        @pool[type.upcase.to_sym] ||= Type.new(type, url)
+      def type(type, **args)
+        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])
+        end
       end
 
       #

data/lib/relaton/index/type.rb

@@ -9,12 +9,19 @@ module Relaton
       #
       # @param [String, Symbol] type type of index (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
       #
-      def initialize(type, url = nil)
-        @file_io = FileIO.new type.to_s.downcase, url
+      def initialize(type, url = nil, file = nil)
+        @file = file
+        filename = file || Index.config.filename
+        @file_io = FileIO.new type.to_s.downcase, url, filename
         @index = @file_io.read
       end
 
+      def actual?(**args)
+        (!args.key?(:url) || args[:url] == @file_io.url) && (!args.key?(:file) || args[:file] == @file)
+      end
+
       #
       # Add or update index item
       #

data/lib/relaton/index/version.rb

@@ -2,6 +2,6 @@
 
 module Relaton
   module Index
-    VERSION = "0.1.3"
+    VERSION = "0.1.5"
   end
 end

data/lib/relaton/index.rb

@@ -20,11 +20,12 @@ module Relaton
       #
       # @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
       #
       # @return [Relaton::Index::Type] typed index
       #
-      def find_or_create(type, url: nil)
-        pool.type(type, url)
+      def find_or_create(type, url: nil, file: nil)
+        pool.type(type, url: url, file: file)
       end
 
       def close(type)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-index
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-10 00:00:00.000000000 Z
+date: 2023-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip