relaton 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bec19dd26e20ad03b8e537bbfcaab9f5cf75dc005ab71d83a094c99b80f08aaa
-  data.tar.gz: 161b82000e567929a9a3faa39669acbfd4528dd6c1ff6dab6610314248b85553
+  metadata.gz: bdc3737ec5342a53ecbfe76300389b0afb81b32bd6c7aaa45ccbf450f679d886
+  data.tar.gz: 596df09db41419e1aa452d6a0dee24556c4a6b885c121c31b7b3426c42233297
 SHA512:
-  metadata.gz: c56f8d929682c8bde40d0b559cb3f5879107dd9bae7032551dbe6a6923555cc5c8107411f73db57d7150b35f8fa8cd9cb807a67b4a170ef855921fbf07ba8e21
-  data.tar.gz: 51c4e74ee9e8610b1bd49d972bbcda8e210355f949be4f264af8beb632fe7eb5fc27ed2dcbbd15201e38c5a91f107e6957e9c6fbfc380ba5728fe3469bd7ac35
+  metadata.gz: 1511495c2d16d1364682f7d5cb0f0d3e61bab30e97611b5fefa563ee7cd7653a205f0b1405293c95a4212e67c42aeb528211302560a123d4ee38be6170423f92
+  data.tar.gz: 5ed4ef760452c3e1bc60644ae773548e5d8683b29663bc0ded1a9cc77e227a9c556c3bfe289ced91dc836c3d60259984dd671a788f1d72c9caa8689fd36ee744

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton (0.0.2)
+    relaton (0.1.1)
       algoliasearch
       gbbib (~> 0.1.0)
       iev (~> 0.1.0)
@@ -44,7 +44,7 @@ GEM
     httpclient (2.8.3)
     iev (0.1.0)
       nokogiri
-    iso-bib-item (0.2.0)
+    iso-bib-item (0.2.1)
       isoics (~> 0.1.6)
       nokogiri (~> 1.8.4)
       ruby_deep_clone (~> 0.8.0)

data/lib/relaton/db.rb

@@ -44,8 +44,10 @@ module Relaton
     # @param key [String]
     # @return [Hash]
     def load_entry(key)
-      entry = @local_db.transaction { @local_db[key] }
-      return entry if entry
+      unless @local_db.nil?
+        entry = @local_db.transaction { @local_db[key] }
+        return entry if entry
+      end
       @db.transaction { @db[key] }
     end
 
@@ -54,12 +56,13 @@ module Relaton
     # @option value [Date] "fetched"
     # @option value [IsoBibItem::IsoBibliographicItem] "bib"
     def save_entry(key, value)
-      @db.transaction { @db[key] = value }
-      @local_db.transaction { @local_db[key] = value }
+      @db.nil? or @db.transaction { @db[key] = value }
+      @local_db.nil? or @local_db.transaction { @local_db[key] = value }
     end
 
     # list all entris as a serialization
     def to_xml
+      return nil if @db.nil?
       @db.transaction do
         Nokogiri::XML::Builder.new(encoding: "UTF-8") do |xml|
           xml.documents do
@@ -100,19 +103,26 @@ module Relaton
       ret
     end
 
+    def bib_retval(entry)
+      entry["bib"] == "not_found" ? nil : entry["bib"]
+    end
+
     # @param code [String]
     # @param year [String]
     # @param opts [Hash]
     # @param stdclass [Symbol]
     def check_bibliocache(code, year, opts, stdclass)
       id = std_id(code, year, opts, stdclass)
-      return nil if @db.nil? # signals we will not be using isobib
+      return bib_retval(new_bib_entry(code, year, opts, stdclass)) if @db.nil?
       @db.transaction do
         @db.delete(id) unless valid_bib_entry?(@db[id], year)
         @db[id] ||= new_bib_entry(code, year, opts, stdclass)
-        @local_db.transaction do
-          @local_db[id] = @db[id] if !valid_bib_entry?(@local_db[id], year)
-          @local_db[id]["bib"] == "not_found" ? nil : @local_db[id]["bib"]
+        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])
+          end
         end
       end
     end
@@ -134,12 +144,13 @@ module Relaton
     # @param year [String]
     def valid_bib_entry?(bib, year)
       bib&.is_a?(Hash) && bib&.has_key?("bib") && bib&.has_key?("fetched") &&
-        (year || Date.today - bib["fetched"] < 60)
+        (year || Date.today - Date.iso8601(bib["fetched"]) < 60)
     end
 
     # @param filename [String] DB filename
     # @return [Hash]
     def open_cache_biblio(filename)
+      return nil if filename.nil?
       PStore.new filename
       # biblio = {}
       # return {} unless !filename.nil? && Pathname.new(filename).file?

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "0.1.0".freeze
+  VERSION = "0.1.1".freeze
 end

data/spec/relaton/relaton_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe Relaton::Db do
     system "rm testcache testcache2"
     db = Relaton::Db.new("testcache", "testcache2")
     bib = db.fetch("ISO 19115-1", nil, {})
-    db.fetch("ISO 19115-1", nil, {})
+    #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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ribose Inc.