relaton 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 855dfd4001f1fbfc76c738140f38a11b84c91f3c5d82d6ea826bf8e5a2c3ffdf
-  data.tar.gz: 70eb51f1467b58d20eac03378a08479f1082dd520502bb18d96481399e35a7a1
+  metadata.gz: 1fe630fa3e1b71d5015cb2585ddde54e3dfeb0b50557c9c21b8d99cf29d284f5
+  data.tar.gz: dc21bfb4dda47648077f5195bd3b5fdd84cab5f7b9b62a77aa79422f4057476e
 SHA512:
-  metadata.gz: 8f4115c26d4c21c48f77466879021c791c8c92f561dff7cc0c5bb88b146902aaef92202e0ada57294c62f222003bd5f74d29182ccec748c65e0d7e68a5601dfc
-  data.tar.gz: 195f1b6689c35453fd52ce1d4e0a2856cab28744c9c0d4cbf3290a676e80c92df3c099c893bf2b250e0c91a7c763825c66c19fe0c5eed77927a0ed6c9b6a716c
+  metadata.gz: 2bf91d95623237aa5d3915023d7dbe1d872988d11c44f202e7f6924443f5caca31ad232a747415f77e1a2f9aee077664983b0c373841bb669706f294b42a1117
+  data.tar.gz: f43db773f05d5975d04d17bcdbb4a049b8b0c73446c8332ac82d3031dec4fab267ed352ad5df09eac4fcc211ca564268144fbd3380dfee9b436e9a595c727c97

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    relaton (0.1.2)
+    relaton (0.1.4)
       algoliasearch
       gbbib (~> 0.2.1)
-      iev (~> 0.1.0)
+      iso-bib-item (~> 0.2.3)
       isobib (~> 0.2.0)
-      rfcbib (~> 0.2.1)
+      rfcbib (~> 0.2.2)
 
 GEM
   remote: https://rubygems.org/
@@ -16,7 +16,7 @@ GEM
       json (>= 1.5.1)
     ast (2.4.0)
     byebug (9.1.0)
-    cnccs (0.1.1)
+    cnccs (0.1.2)
     coderay (1.1.2)
     diff-lcs (1.3)
     docile (1.3.1)
@@ -24,8 +24,10 @@ GEM
       nokogiri (>= 1.4.3)
     ffi (1.9.25)
     formatador (0.2.5)
-    gbbib (0.2.1)
+    gb-agencies (0.0.3)
+    gbbib (0.2.2)
       cnccs (~> 0.1.1)
+      gb-agencies (~> 0.0.1)
       iso-bib-item (~> 0.2)
     guard (2.14.2)
       formatador (>= 0.2.4)
@@ -42,15 +44,13 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     httpclient (2.8.3)
-    iev (0.1.0)
-      nokogiri
-    iso-bib-item (0.2.2)
+    iso-bib-item (0.2.3)
       isoics (~> 0.1.6)
       nokogiri (~> 1.8.4)
       ruby_deep_clone (~> 0.8.0)
-    isobib (0.2.0)
+    isobib (0.2.1)
       algoliasearch
-      iso-bib-item (~> 0.2.0)
+      iso-bib-item (~> 0.2.3)
     isoics (0.1.6)
     jaro_winkler (1.5.1)
     json (2.1.0)
@@ -82,7 +82,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rfcbib (0.2.1)
+    rfcbib (0.2.2)
       iso-bib-item (~> 0.2.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -97,7 +97,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    rubocop (0.58.1)
+    rubocop (0.58.2)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)

data/lib/relaton/db.rb

@@ -1,4 +1,5 @@
 require "pstore"
+require "iso_bib_item"
 require_relative "registry"
 
 module Relaton
@@ -11,7 +12,7 @@ module Relaton
     # @param local_cache [String] filename of local DB
     def initialize(global_cache, local_cache)
       @db = open_cache_biblio(global_cache)
-      @local_db = open_cache_biblio(local_cache)
+      @local_db = open_cache_biblio(local_cache, global: false)
       @db_name = global_cache
       @local_db_name = local_cache
       register_gems
@@ -66,17 +67,13 @@ module Relaton
       @db.transaction do
         Nokogiri::XML::Builder.new(encoding: "UTF-8") do |xml|
           xml.documents do
-            @db.roots.each { |key| @db[key]&.fetch("bib")&.to_xml(xml, {}) }
+            @db.roots.reject { |key| key == :version }.
+              each { |key| @db[key]&.fetch("bib")&.to_xml(xml, {}) }
           end
         end.to_xml
       end
     end
 
-    # def save
-    #   save_cache_biblio(@db, @db_name)
-    #   save_cache_biblio(@local_db, @local_db_name)
-    # end
-
     private
 
     def standard_class(code)
@@ -144,15 +141,37 @@ module Relaton
     end
 
     # @param filename [String] DB filename
-    # @return [Hash]
-    def open_cache_biblio(filename)
+    # @param global [TrueClass, FalseClass]
+    # @return [PStore]
+    def open_cache_biblio(filename, global: true)
       return nil if filename.nil?
-      PStore.new filename
-      # biblio = {}
-      # return {} unless !filename.nil? && Pathname.new(filename).file?
-      # File.open(filename, "r") { |f| biblio = JSON.parse(f.read) }
-      # biblio.each { |_k, v| v["bib"] && (v["bib"] = from_xml(v["bib"])) }
-      # biblio
+      db = PStore.new filename
+      if File.exist? filename
+        if global
+          unless check_cache_version(db)
+            File.delete filename
+            warn "Global cache version is obsolete and cleared."
+          end
+          set_cache_version db
+        elsif check_cache_version(db) then db
+        else
+          warn "Local cache version is obsolete."
+          nil
+        end
+      else
+        set_cache_version db
+      end
+    end
+
+    def check_cache_version(cache_db)
+      cache_db.transaction { cache_db[:version] == VERSION }
+    end
+
+    def set_cache_version(cache_db)
+      unless File.exist? cache_db.path
+        cache_db.transaction { cache_db[:version] = VERSION }
+      end
+      cache_db
     end
 
     # @param enstry [String] entry in XML format

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "0.1.3".freeze
+  VERSION = "0.1.4".freeze
 end

data/relaton.gemspec

@@ -29,9 +29,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "algoliasearch"
   spec.add_dependency "gbbib", "~> 0.2.1"
-  spec.add_dependency "iev", "~> 0.1.0"
   spec.add_dependency "isobib", "~> 0.2.0"
-  spec.add_dependency "rfcbib", "~> 0.2.1"
+  spec.add_dependency "rfcbib", "~> 0.2.2"
+  spec.add_dependency 'iso-bib-item', '~> 0.2.3'
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"

data/spec/relaton/relaton_spec.rb

@@ -1,27 +1,28 @@
 require "spec_helper"
 
 RSpec.describe Relaton::Db do
-  let!(:db) { Relaton::Db.new("testcache", "testcache2") }
+  # let!(:db) { Relaton::Db.new("testcache", "testcache2") }
 
   before :each do
     system "rm testcache testcache2"
+    @db = Relaton::Db.new "testcache", "testcache2"
   end
 
   it "rejects an illegal reference prefix" do
-    expect { db.fetch("XYZ XYZ", nil, {}) }.to output(/does not have a recognised prefix/).to_stderr
+    expect { @db.fetch("XYZ XYZ", nil, {}) }.to output(/does not have a recognised prefix/).to_stderr
     testcache = PStore.new "testcache"
     testcache.transaction do
-      expect(testcache.roots.size).to eq 0
+      expect(testcache.roots.size).to eq 1
     end
     testcache = PStore.new "testcache2"
     testcache.transaction do
-      expect(testcache.roots.size).to eq 0
+      expect(testcache.roots.size).to eq 1
     end
   end
 
   it "gets an ISO reference and caches it" do
     stub_bib Isobib::IsoBibliography
-    bib = db.fetch("ISO 19115-1", nil, {})
+    bib = @db.fetch("ISO 19115-1", nil, {})
     expect(bib).to be_instance_of IsoBibItem::IsoBibliographicItem
     expect(bib.to_xml).to include "<bibitem type=\"international-standard\" id=\"ISO19115-1\">"
     expect(File.exist?("testcache")).to be true
@@ -38,7 +39,7 @@ RSpec.describe Relaton::Db do
 
   it "deals with a non-existant ISO reference" do
     stub_bib Isobib::IsoBibliography
-    bib = db.fetch("ISO 111111119115-1", nil, {})
+    bib = @db.fetch("ISO 111111119115-1", nil, {})
     expect(bib).to be_nil
     expect(File.exist?("testcache")).to be true
     expect(File.exist?("testcache2")).to be true
@@ -56,22 +57,22 @@ RSpec.describe Relaton::Db do
 
   it "list all elements as a serialization" do
     stub_bib Isobib::IsoBibliography, 2
-    db.fetch "ISO 19115-1", nil, {}
-    db.fetch "ISO 19115-2", nil, {}
+    @db.fetch "ISO 19115-1", nil, {}
+    @db.fetch "ISO 19115-2", nil, {}
     file = "spec/support/list_entries.xml"
-    File.write file, db.to_xml unless File.exist? file
-    expect(db.to_xml).to eq File.read file
+    File.write file, @db.to_xml unless File.exist? file
+    expect(@db.to_xml).to eq File.read file
   end
 
   it "save/load entry" do
-    db.save_entry "test key", value: "test value"
-    expect(db.load_entry("test key")[:value]).to eq "test value"
-    expect(db.load_entry("not existed key")).to be_nil
+    @db.save_entry "test key", value: "test value"
+    expect(@db.load_entry("test key")[:value]).to eq "test value"
+    expect(@db.load_entry("not existed key")).to be_nil
   end
 
   it "get GB reference and cache it" do
     stub_bib Gbbib::GbBibliography
-    bib = db.fetch "GB Standard GB/T 20223", "2006", {}
+    bib = @db.fetch "GB Standard GB/T 20223", "2006", {}
     expect(bib).to be_instance_of Gbbib::GbBibliographicItem
     expect(bib.to_xml).to include "<bibitem type=\"standard\" id=\"GB/T20223\">"
     expect(File.exist?("testcache")).to be true
@@ -85,10 +86,10 @@ RSpec.describe Relaton::Db do
       expect(testcache["GB Standard GB/T 20223:2006"]["bib"].to_xml).to include "<bibitem type=\"standard\" id=\"GB/T20223\">"
     end
   end
-  
+
   it "get RFC reference and cache it" do
     stub_bib RfcBib::RfcBibliography
-    bib = db.fetch "RFC 8341", nil, {}
+    bib = @db.fetch "RFC 8341", nil, {}
     expect(bib).to be_instance_of IsoBibItem::BibliographicItem
     expect(bib.to_xml).to include "<bibitem id=\"RFC8341\">"
     expect(File.exist?("testcache")).to be true
@@ -103,6 +104,20 @@ RSpec.describe Relaton::Db do
     end
   end
 
+  it "shoul clear global cache if version is changed" do
+    @db.save_entry "test_key", value: "test_value"
+    expect(File.exist?("testcache")).to be_truthy
+    expect(File.exist?("testcache2")).to be_truthy
+    stub_const "Relaton::VERSION", "new_version"
+    db = Relaton::Db.new "testcache", "testcache2"
+    testcache = db.instance_variable_get :@db
+    testcache.transaction do
+      expect(testcache.root?("test_key")).to be_falsey
+    end
+    testcache = db.instance_variable_get :@local_db
+    expect(testcache).to be_nil
+  end
+
   private
 
   # @param count [Integer] number of stubbing

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: algoliasearch
@@ -39,47 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.1
 - !ruby/object:Gem::Dependency
-  name: iev
+  name: isobib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: isobib
+  name: rfcbib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
-  name: rfcbib
+  name: iso-bib-item
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement