relaton 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e5f5a2e45afa96d71c1f426004f5b12289131836d83100cf992d74ee709df6f
-  data.tar.gz: 43e583c04af72c620126e711c4d899f0515abe091ea4cef2b59738060e44daac
+  metadata.gz: 72e07d60d1d6e31db56e06232f6295abdeed9b031eeed2d7ac227bc6104f24b9
+  data.tar.gz: 7b5f6b9e45aa669e7ae08efe993b6fec3b733c446f38593ffd7c99528c1421ad
 SHA512:
-  metadata.gz: af36320501a2ec8430bfbdb3530752f3e0251c7aad344ccee010d6f79c7a376f23b6a7cb3290c00fe9b5376c73c5f5618784ec660d398dce00e48b08fd378621
-  data.tar.gz: 24d750f23c8a4c89c0092d22f7118ac7b2917b62275b5c1e1a5b4ea3cb77c889a13b586c4e5816488fd042ad3bdd7993a8ca5097d7c5f6817d92adb20438eeae
+  metadata.gz: 8a1676216b43cdd1c1ea917fd2f0692ec8cf0c72419deb4df179c3ee1b811d83b4a0f7a0dce29a201569ef1de7a4824221ecda07572437be1314640c9819151a
+  data.tar.gz: 54b8a9540a672ea25731f95b7b1a6cf0acde3b5106537758d77d06cfb2f98304bedf21b204164298534e769e02e49e84c1329599810ff0b303b8b23a06109d25

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton (0.6.1)
+    relaton (0.6.2)
       relaton-calconnect (~> 0.2.0)
       relaton-gb (~> 0.7.0)
       relaton-iec (~> 0.5.0)
@@ -94,7 +94,7 @@ GEM
     relaton-iec (0.5.1)
       addressable
       relaton-iso-bib (~> 0.4.0)
-    relaton-ietf (0.7.1)
+    relaton-ietf (0.7.2)
       relaton-bib (~> 0.4.0)
     relaton-iso (0.7.1)
       relaton-iec (~> 0.5.0)

data/lib/relaton/db_cache.rb

@@ -28,7 +28,11 @@ module Relaton
         FileUtils::mkdir_p prefix_dir
         set_version prefix_dir
       end
-      File.write filename(key), value, encoding: "utf-8"
+      ex = if value =~ /^not_found/ then "notfound"
+           elsif value =~ /^redirection/ then "redirect"
+           else @ext
+           end
+      File.write "#{filename(key)}.#{ex}", value, encoding: "utf-8"
     end
 
     # Read item
@@ -77,7 +81,8 @@ module Relaton
     # @param key [String]
     def delete(key)
       file = filename key
-      File.delete file if File.exist? file
+      f = search_ext(file)
+      File.delete f if f
     end
 
     # Check if version of the DB match to the gem grammar hash.
@@ -128,9 +133,9 @@ module Relaton
     # @return [String, NilClass]
     def get(key)
       file = filename key
-      return unless File.exist? file
+      return unless (f = search_ext(file))
 
-      File.read(file, encoding: "utf-8")
+      File.read(f, encoding: "utf-8")
     end
 
     private
@@ -154,7 +159,22 @@ module Relaton
            else
              key.gsub(/[-:\s]/, "_")
            end
-      "#{@dir}/#{fn.sub(/(,|_$)/, '')}.#{@ext}"
+      "#{@dir}/#{fn.sub(/(,|_$)/, '')}"
+    end
+
+    #
+    # Checks if there is file with xml or txt extension and return filename with the extension.
+    #
+    # @param file [String]
+    # @return [String, NilClass]
+    def search_ext(file)
+      if File.exist?("#{file}.#{@ext}")
+        "#{file}.#{@ext}"
+      elsif File.exist? "#{file}.notfound"
+        "#{file}.notfound"
+      elsif File.exist? "#{file}.redirect"
+        "#{file}.redirect"
+      end
     end
 
     # Return item's subdir

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "0.6.1".freeze
+  VERSION = "0.6.2".freeze
 end

data/spec/relaton_spec.rb

@@ -148,7 +148,7 @@ RSpec.describe Relaton::Db do
     VCR.use_cassette "rfc_8341" do
       bib = @db.fetch "RFC 8341", nil, {}
       expect(bib).to be_instance_of RelatonIetf::IetfBibliographicItem
-      expect(bib.to_xml).to include "<bibitem id=\"RFC8341\">"
+      expect(bib.to_xml).to include "<bibitem id=\"RFC8341\" type=\"standard\">"
       expect(File.exist?("testcache")).to be true
       expect(File.exist?("testcache2")).to be true
       testcache = Relaton::DbCache.new "testcache"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2019-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: relaton-calconnect