relaton 0.5.19 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cdab984184fc9dc9f82f55daa2d776167590bd71ec824f358a078c09c15deb0
-  data.tar.gz: b1348535102098807a0976edb9e621f7765a0fef6a349a2f4a6a113b4232f911
+  metadata.gz: 70ae198486401afb2fec19755bf580876116b3b7f9b792c5481c3103c18cc8cc
+  data.tar.gz: 6810017f3916e3b1076fe67651aabaccb38020170c365a36d2c21982c8d74e32
 SHA512:
-  metadata.gz: 1f92b3be1be13d4cc3a3a7a01021a5d8e21f0db612540286092ddd8c124e231f37b026946f8fbe091a1301ba81265c63b01de0976054d67e7c4be6e1bb83b3af
-  data.tar.gz: 97c03af34ebdc84fe18dc84fda1d8ce598ad3f609c9e425300eeecf287bb2f0e445e2d5c44c2bc5893585c8ad27394ef6d2f481b5c11b780f61feb7027da69d9
+  metadata.gz: 04765c206b5d136190b6fa79f82864f0933859b4f55aa6b196e347cd646d7fb28afa3e958ab54967beee9c6c8b6689bb975fd8c93fbc196b7d08a7c13e3416c6
+  data.tar.gz: 7746f838fe703e82517548027b5e5ed0251e091572c83d53a35bd63aead54672d8d0cdc51c7fb00014e34453b3cd8db847c84d70571c86c9d97d4c71d7c01bd5

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    relaton (0.5.19)
-      relaton-calconnect (~> 0.1.0)
-      relaton-gb (~> 0.6.0)
-      relaton-iec (~> 0.4.0)
-      relaton-ietf (~> 0.6.0)
-      relaton-iso (~> 0.6.0)
-      relaton-itu (~> 0.3.0)
-      relaton-nist (~> 0.3.0)
-      relaton-ogc (~> 0.1.0)
+    relaton (0.6.0)
+      relaton-calconnect (~> 0.2.0)
+      relaton-gb (~> 0.7.0)
+      relaton-iec (~> 0.5.0)
+      relaton-ietf (~> 0.7.0)
+      relaton-iso (~> 0.7.0)
+      relaton-itu (~> 0.4.0)
+      relaton-nist (~> 0.4.0)
+      relaton-ogc (~> 0.2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -60,7 +60,7 @@ GEM
     mini_portile2 (2.4.0)
     multipart-post (2.1.1)
     nenv (0.3.0)
-    nokogiri (1.10.5)
+    nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -81,36 +81,36 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    relaton-bib (0.3.12)
+    relaton-bib (0.4.0)
       addressable
       nokogiri
-    relaton-calconnect (0.1.2)
+    relaton-calconnect (0.2.0)
       faraday
-      relaton-iso-bib (~> 0.3.0)
-    relaton-gb (0.6.8)
+      relaton-iso-bib (~> 0.4.0)
+    relaton-gb (0.7.0)
       cnccs (~> 0.1.1)
       gb-agencies (~> 0.0.1)
-      relaton-iso-bib (~> 0.3.0)
-    relaton-iec (0.4.12)
+      relaton-iso-bib (~> 0.4.0)
+    relaton-iec (0.5.0)
       addressable
-      relaton-iso-bib (~> 0.3.0)
-    relaton-ietf (0.6.10)
-      relaton-bib (~> 0.3.0)
-    relaton-iso (0.6.10)
-      relaton-iec (~> 0.4.0)
-      relaton-iso-bib (~> 0.3.0)
-    relaton-iso-bib (0.3.12)
+      relaton-iso-bib (~> 0.4.0)
+    relaton-ietf (0.7.0)
+      relaton-bib (~> 0.4.0)
+    relaton-iso (0.7.0)
+      relaton-iec (~> 0.5.0)
+      relaton-iso-bib (~> 0.4.0)
+    relaton-iso-bib (0.4.0)
       isoics (~> 0.1.6)
-      relaton-bib (~> 0.3.0)
+      relaton-bib (~> 0.4.0)
       ruby_deep_clone (~> 0.8.0)
-    relaton-itu (0.3.11)
-      relaton-iso-bib (~> 0.3.0)
-    relaton-nist (0.3.9)
-      relaton-bib (~> 0.3.0)
+    relaton-itu (0.4.0)
+      relaton-iso-bib (~> 0.4.0)
+    relaton-nist (0.4.0)
+      relaton-bib (~> 0.4.0)
       rubyzip
-    relaton-ogc (0.1.4)
+    relaton-ogc (0.2.0)
       faraday
-      relaton-iso-bib (~> 0.3.0)
+      relaton-iso-bib (~> 0.4.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)

data/lib/relaton/db.rb

@@ -10,7 +10,6 @@ module Relaton
     # @param local_cache [String] directory of local DB
     def initialize(global_cache, local_cache)
       @registry = Relaton::Registry.instance
-      # @registry.register_gems
       @db = open_cache_biblio(global_cache, type: :global)
       @local_db = open_cache_biblio(local_cache, type: :local)
       @db_name = global_cache
@@ -144,7 +143,8 @@ module Relaton
     # @param stdclass [Symbol]
     # @return [NilClass, RelatonIsoBib::IsoBibliographicItem,
     #   RelatonItu::ItuBibliographicItem, RelatonIetf::IetfBibliographicItem,
-    #   RelatonNist::NistBibliongraphicItem, RelatonGb::GbbibliographicItem]
+    #   RelatonNist::NistBibliongraphicItem, RelatonGb::GbbibliographicItem,
+    #   RelatonOgc::OgcBibliographicItem, RelatonCalconnect::CcBibliographicItem]
     def check_bibliocache(code, year, opts, stdclass)
       id, searchcode = std_id(code, year, opts, stdclass)
       yaml = @static_db[id]
@@ -209,16 +209,21 @@ module Relaton
       return nil if dir.nil?
 
       db = DbCache.new dir, type == :static ? "yml" : "xml"
-      return db if db.check_version?
-
-      case type
-      when :global
-        FileUtils.rm_rf(Dir.glob(dir + "/*"), secure: true)
-        warn "Global cache version is obsolete and cleared."
-        db.set_version
-      when :static then warn "Static cache version is obsolete."
-      else warn "Local cache version is obsolete."
+      # return db if db.check_version?
+
+      Dir["#{dir}/*/"].each do |fdir|
+        next if type == :static || db.check_version?(fdir)
+
+        # case type
+        # when :global
+        # else
+        FileUtils.rm_rf(Dir.glob(fdir + "/*"), secure: true)
+        warn "Cache #{fdir}: version is obsolete and cahe is cleared."
+          # db.set_version fdir
+        # else warn "Local cache #{fdir}: version is obsolete."
+        # end
       end
+      db
     end
   end
 end

data/lib/relaton/db_cache.rb

@@ -10,8 +10,8 @@ module Relaton
       @dir = dir
       @ext = ext
       FileUtils::mkdir_p @dir
-      file_version = "#{@dir}/version"
-      set_version unless File.exist? file_version
+      # file_version = "#{@dir}/version"
+      # set_version # unless File.exist? file_version
     end
 
     # Save item
@@ -24,7 +24,10 @@ module Relaton
       end
 
       prefix_dir = "#{@dir}/#{prefix(key)}"
-      FileUtils::mkdir_p prefix_dir
+      unless Dir.exist? prefix_dir
+        FileUtils::mkdir_p prefix_dir
+        set_version prefix_dir
+      end
       File.write filename(key), value, encoding: "utf-8"
     end
 
@@ -63,7 +66,7 @@ module Relaton
     end
 
     # Returns all items
-    # @return [Array<Hash>]
+    # @return [Array<String>]
     def all
       Dir.glob("#{@dir}/**/*.xml").sort.map do |f|
         File.read(f, encoding: "utf-8")
@@ -77,17 +80,25 @@ module Relaton
       File.delete file if File.exist? file
     end
 
-    # Check if version of the DB match to the gem version.
+    # Check if version of the DB match to the gem grammar hash.
+    # @param fdir [String] dir pathe to flover cache
     # @return [TrueClass, FalseClass]
-    def check_version?
-      v = File.read @dir + "/version", encoding: "utf-8"
-      v.strip == VERSION
+    def check_version?(fdir)
+      version_dir = fdir + "/version"
+      return false unless File.exist? version_dir
+
+      v = File.read version_dir, encoding: "utf-8"
+      v.strip == grammar_hash(fdir)
     end
 
-    # Set version of the DB to the gem version.
+    # Set version of the DB to the gem grammar hash.
+    # @param fdir [String] dir pathe to flover cache
     # @return [Relaton::DbCache]
-    def set_version
-      File.write @dir + "/version", VERSION, encoding: "utf-8"
+    def set_version(fdir)
+      file_version = "#{fdir}/version"
+      unless File.exist? file_version
+        File.write file_version, grammar_hash(fdir), encoding: "utf-8"
+      end
       self
     end
 
@@ -104,6 +115,13 @@ module Relaton
 
     protected
 
+    # @param fdir [String] dir pathe to flover cache
+    # @return [String]
+    def grammar_hash(fdir)
+      type = fdir.split("/").last
+      Relaton::Registry.instance.by_type(type).grammar_hash
+    end
+
     # Reads file by a key
     #
     # @param key [String]

data/lib/relaton/registry.rb

@@ -55,9 +55,11 @@ module Relaton
     # Find processor by type
     #
     # @param type [String]
-    # @return [Relaton::RelatonIso::Processor]
+    # @return [RelatonIso::Processor, RelatonIec::Processor, RelatonNist::Processor,
+    #   RelatonIetf::Processot, RelatonItu::Processor, RelatonGb::Processor,
+    #   RelatonOgc::Processor, RelatonCalconnect::Processor]
     def by_type(type)
-      processors.values.detect { |v| v.idtype == type.upcase }
+      processors.values.detect { |v| v.prefix == type.upcase }
     end
 
     private

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "0.5.19".freeze
+  VERSION = "0.6.0".freeze
 end

data/relaton.gemspec

@@ -29,14 +29,14 @@ model.
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   # spec.add_dependency "algoliasearch"
-  spec.add_dependency "relaton-calconnect", "~> 0.1.0"
-  spec.add_dependency "relaton-gb", "~> 0.6.0"
-  spec.add_dependency "relaton-iec", "~> 0.4.0"
-  spec.add_dependency "relaton-ietf", "~> 0.6.0"
-  spec.add_dependency "relaton-iso", "~> 0.6.0"
-  spec.add_dependency "relaton-itu", "~> 0.3.0"
-  spec.add_dependency "relaton-nist", "~> 0.3.0"
-  spec.add_dependency "relaton-ogc", "~> 0.1.0"
+  spec.add_dependency "relaton-calconnect", "~> 0.2.0"
+  spec.add_dependency "relaton-gb", "~> 0.7.0"
+  spec.add_dependency "relaton-iec", "~> 0.5.0"
+  spec.add_dependency "relaton-ietf", "~> 0.7.0"
+  spec.add_dependency "relaton-iso", "~> 0.7.0"
+  spec.add_dependency "relaton-itu", "~> 0.4.0"
+  spec.add_dependency "relaton-nist", "~> 0.4.0"
+  spec.add_dependency "relaton-ogc", "~> 0.2.0"
 
   spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "byebug", "~> 10.0"

data/spec/relaton/db_cache_spec.rb

@@ -1,11 +1,11 @@
 RSpec.describe Relaton::DbCache do
   it "creates default caches" do
-    FileUtils.mv File.expand_path("~/.relaton"), "relaton1", force: true
+    FileUtils.mv File.expand_path("~/.relaton/cache"), "relaton1/cache", force: true
     FileUtils.rm_rf %w(relaton)
     Relaton::DbCache.init_bib_caches(global_cache: true, local_cache: "", flush_caches: true)
-    expect(File.exist?(File.expand_path("~/.relaton"))).to be true
+    expect(File.exist?(File.expand_path("~/.relaton/cache"))).to be true
     expect(File.exist?("relaton")).to be true
-    FileUtils.mv "relaton1", File.expand_path("~/.relaton") if File.exist? "relaton1"
+    FileUtils.mv "relaton1/cache", File.expand_path("~/.relaton/cache") if File.exist? "relaton1"
   end
 
   # it "returns fetched" do

data/spec/relaton_spec.rb

@@ -173,14 +173,17 @@ RSpec.describe Relaton::Db do
   end
 
   it "should clear global cache if version is changed" do
-    @db.save_entry "test_key", value: "test_value"
+    @db.save_entry "iso(test_key)", value: "test_value"
     expect(File.exist?("testcache")).to be true
     expect(File.exist?("testcache2")).to be true
-    stub_const "Relaton::VERSION", "new_version"
+    # stub_const "Relaton::VERSION", "new_version"
+    processor = double
+    expect(processor).to receive(:grammar_hash).and_return("new_version").exactly(2).times
+    expect(Relaton::Registry.instance).to receive(:by_type).and_return(processor).exactly(2).times
     db = Relaton::Db.new "testcache", "testcache2"
     testcache = db.instance_variable_get :@db
-    expect(testcache.all.any?).to be false
+    expect(testcache.all).not_to be_any
     testcache = db.instance_variable_get :@local_db
-    expect(testcache).to be_nil
+    expect(testcache.all).not_to be_any
   end
 end