relaton 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fa5d8a5c2c633c1f8c28c1b9edd31b52964afade16ef80a1a294842b5dedfda
-  data.tar.gz: 1f050291e3b4c6b64226db77440cdd640669f578e16bc50db62654b0cb57010d
+  metadata.gz: 7572658c834a43892700846acb448ed8c15573ec5a3b748f947464cb086ed9c4
+  data.tar.gz: bef8f6f331b769fd2e0f719eb41223c43ab19045ec7f180b2539a871abf550de
 SHA512:
-  metadata.gz: 2cb28ec07668eb2cea8c02e1084404765dee1e642da1b820b58c4158817a184ff1a69de1963162a3dccf21f95fb56a8569f2d40ac8dc908e394df938b7a0c4e6
-  data.tar.gz: a673ab75765ccc1ba423832fadf54cf185ee9d26d6e1a41f7cba11fceff12ba15b9375e814ca5d9ae9db2ff05b043aad34812fdd5c9ecb8d65d532719c0a8646
+  metadata.gz: c2ef0a6645e2b806d8e9a36247ec50646776cc01c35d6aa19da254c1095d2f944b83635f265667ea7572cc4c174f163713478f75473a81d90c6f2d8cc253b391
+  data.tar.gz: 104efaea9d07bcb9cae61cad2077ac7a3e404aafd66cb618d7369048e508c08a0a8dbc5c12f466b933a751d40a62c592840f23a0ee8c716566903a809e4de472

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton (0.2.2)
+    relaton (0.2.3)
       algoliasearch
       gbbib (~> 0.3.1)
       iecbib (~> 0.1.1)
@@ -12,6 +12,8 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     algoliasearch (1.23.2)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
@@ -46,15 +48,17 @@ GEM
       rspec (>= 2.99.0, < 4.0)
     httpclient (2.8.3)
     iecbib (0.1.1)
+      addressable
       iso-bib-item (~> 0.3.0)
     ietfbib (0.4.1)
       iso-bib-item (~> 0.3.0)
-    iso-bib-item (0.3.0)
+    iso-bib-item (0.3.1)
       isoics (~> 0.1.6)
       nokogiri (~> 1.8.4)
       ruby_deep_clone (~> 0.8.0)
     isobib (0.3.1)
       algoliasearch
+      iecbib (~> 0.1.1)
       iso-bib-item (~> 0.3.0)
     isoics (0.1.7)
     jaro_winkler (1.5.1)
@@ -82,6 +86,7 @@ GEM
     pry-byebug (3.6.0)
       byebug (~> 10.0)
       pry (~> 0.10)
+    public_suffix (3.0.3)
     rainbow (3.0.0)
     rake (12.3.1)
     rb-fsevent (0.10.3)

data/lib/relaton/db.rb

@@ -69,12 +69,12 @@ module Relaton
 
     # list all entries as a serialization
     def to_xml
-      return nil if @db.nil?
-      @db.transaction do
+      db = @local_db || @db || return
+      db.transaction do
         Nokogiri::XML::Builder.new(encoding: "UTF-8") do |xml|
           xml.documents do
-            @db.roots.reject { |key| key == :version }.
-              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
@@ -119,16 +119,21 @@ module Relaton
     # @param stdclass [Symbol]
     def check_bibliocache(code, year, opts, stdclass)
       id, searchcode = std_id(code, year, opts, stdclass)
-      return bib_retval(new_bib_entry(searchcode, year, opts, stdclass)) if @db.nil?
-      @db.transaction do
-        @db.delete(id) unless valid_bib_entry?(@db[id], year)
-        @db[id] ||= new_bib_entry(searchcode, year, opts, stdclass)
-        if @local_db.nil? then bib_retval(@db[id])
-        else
-          @local_db.transaction do
-            @local_db[id] = @db[id] if !valid_bib_entry?(@local_db[id], year)
-            bib_retval(@local_db[id])
+      db = @local_db || @db
+      altdb = @local_db && @db ? @db : nil
+      return bib_retval(new_bib_entry(searchcode, year, opts, stdclass)) if db.nil?
+      db.transaction do
+        db.delete(id) unless valid_bib_entry?(db[id], year)
+        if altdb
+          altdb.transaction do
+            db[id] ||= altdb[id]
+            db[id] ||= new_bib_entry(searchcode, year, opts, stdclass)
+            altdb[id] = db[id] if !valid_bib_entry?(altdb[id], year)
+            bib_retval(db[id])
           end
+        else
+          db[id] ||= new_bib_entry(searchcode, year, opts, stdclass)
+          bib_retval(db[id])
         end
       end
     end

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "0.2.3".freeze
+  VERSION = "0.2.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2018-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: algoliasearch