relaton 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e446497655bcb343d4bb1846cee85481c1f239fb8b2669b0f960f6f5ef539bf8
-  data.tar.gz: 7ff5bdf7f8e567a0b02be1250ce2c0789e9343275670104ed1df7794e85b0587
+  metadata.gz: 1c97ee373e8454f0e9bc2050074e3a291dd19af6eb7e4caf82b4fdf7f1a81f85
+  data.tar.gz: c295361c298708f5cc21155d15b5f7c96e7526f46e1986d0c7d5dea8ef466ddb
 SHA512:
-  metadata.gz: 2a7951825e48b973a89ff2ebd231b375f210ab18c0cb1e453551241ca45055d0015759f8422f3a72316ed1ab6531df9ae705f29ee7ad9ed97fff3f908bd75042
-  data.tar.gz: 666fc454ae89e31ca71423a478f75960e24258a15e2e42ba51841402e24e2f04c13551fbbe1f231d63b9d642f2c08ff74fdba4ffc204f51d2895ae4dfcfe50db
+  metadata.gz: 2dc0a45b6022acc12df6026babdf0a3e1aadc1af73a08238afce32a4b4053f7db36290cfcc1edd14aa1ef5401fb3b9f16e71e25c931944afd549a5b5cc19f414
+  data.tar.gz: e9b37a99f8269b7bcf48be11c5ac2cd6955c00fa32d2b21416fbd60f377473c93b47e26d3af96a62e45e9d3fecf4ff873953fe91ecfdeffd584f94ca7a6413a1

data/lib/relaton.rb

@@ -1,4 +1,4 @@
-require_relative "relaton/relaton"
+require_relative "relaton/db"
 require_relative "relaton/version"
 require_relative "relaton/registry"
 require_relative "relaton/processor"

data/lib/relaton/{relaton.rb → db.rb}

@@ -4,8 +4,6 @@ module Relaton
   class RelatonError < StandardError; end
 
   class Db
-    #PREFIXES = ["GB Standard", "IETF", "ISO", "IEC", "IEV"]
-
     SUPPORTED_GEMS = %w[ isobib rfcbib gbbib ].freeze
 
     def initialize(global_cache, local_cache)
@@ -21,9 +19,11 @@ module Relaton
       puts "[relaton] detecting backends:"
       SUPPORTED_GEMS.each do |b|
         puts b
-        require b
-      rescue LoadError
-        puts "[relaton] backend #{b} not present"
+        begin
+          require b
+        rescue LoadError
+          puts "[relaton] backend #{b} not present"
+        end
       end
     end
 
@@ -34,11 +34,11 @@ module Relaton
     # @param opts [Hash] options; restricted to :all_parts if all-parts reference is required
     # @return [String] Relaton XML serialisation of reference
     def fetch(code, year = nil, opts = {})
-      stdclass = standard_class(code)
+      stdclass = standard_class(code) or return nil
       check_bibliocache(code, year, opts, stdclass)
     end
 
-    def save()
+    def save
       save_cache_biblio(@bibdb, @bibdb_name)
       save_cache_biblio(@local_bibdb, @local_bibdb_name)
     end
@@ -54,12 +54,12 @@ module Relaton
       @registry.processors.each do |name, processor|
         processor.prefix.match? code and return name
       end
-      raise(RelatonError, 
-            "#{code} does not have a recognised prefix: "\
-            "#{@registry.supported_processors.join(', ')}")
+      warn "#{code} does not have a recognised prefix: "\
+        "#{@registry.processors.inject([]) { |m, (k, v)| m << v.prefix.inspect }.join(', ')}"
       nil
     end
 
+    # TODO: i18n
     def std_id(code, year, opts, _stdclass)
       ret = code
       ret += ":#{year}" if year
@@ -74,6 +74,7 @@ module Relaton
       @bibdb[id] ||= new_bibcache_entry(code, year, opts, stdclass)
       @local_bibdb[id] = @bibdb[id] if !@local_bibdb.nil? &&
         !is_valid_bibcache_entry?(@local_bibdb[id], year)
+      return nil if @bibdb[id].nil?
       return @local_bibdb[id]["bib"] unless @local_bibdb.nil?
       @bibdb[id]["bib"]
     end

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "0.0.1".freeze
+  VERSION = "0.0.2".freeze
 end

data/spec/relaton/relaton_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe Relaton::Db do
   it "rejects an illegal reference prefix" do
     system "rm testcache.json testcache2.json"
     db = Relaton::Db.new("testcache.json", "testcache2.json")
-    expect{db.fetch("XYZ XYZ", nil, {})}.to raise_error(Relaton::RelatonError)
+    expect{db.fetch("XYZ XYZ", nil, {})}.to output(/does not have a recognised prefix/).to_stderr
     db.save()
     expect(File.exist?("testcache.json")).to be true
     expect(File.exist?("testcache2.json")).to be true
@@ -30,6 +30,22 @@ RSpec.describe Relaton::Db do
     expect(testcache).to include "<bibitem type=\\\"international-standard\\\" id=\\\"ISO19115-1\\\">"
   end
 
+  it "deals with a non-existant ISO reference" do
+    mock_algolia 2
+    system "rm testcache.json testcache2.json"
+    db = Relaton::Db.new("testcache.json", "testcache2.json")
+    bib = db.fetch("ISO 111111119115-1", nil, {})
+    expect(bib).to be_nil
+    db.save()
+    expect(File.exist?("testcache.json")).to be true
+    expect(File.exist?("testcache2.json")).to be true
+    testcache = File.read "testcache.json"
+    expect(testcache).to include %("ISO 111111119115-1":null)
+    testcache = File.read "testcache2.json"
+    expect(testcache).to include %("ISO 111111119115-1":null)
+  end
+
+
   private
 
   # rubocop:disable Naming/UncommunicativeBlockParamName, Naming/VariableName

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-07 00:00:00.000000000 Z
+date: 2018-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -269,9 +269,9 @@ files:
 - README.adoc
 - bin/rspec
 - lib/relaton.rb
+- lib/relaton/db.rb
 - lib/relaton/processor.rb
 - lib/relaton/registry.rb
-- lib/relaton/relaton.rb
 - lib/relaton/version.rb
 - relaton.gemspec
 - spec/relaton/relaton_spec.rb