relaton 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42d388ac89c1d26d3cee93b0129d4c7393d7799849d94b2a84266830b3f9436d
-  data.tar.gz: bf8af87b24de874c0693711b48b821f9f347a5b1efe8c0158b82e7df88f5529b
+  metadata.gz: 855dfd4001f1fbfc76c738140f38a11b84c91f3c5d82d6ea826bf8e5a2c3ffdf
+  data.tar.gz: 70eb51f1467b58d20eac03378a08479f1082dd520502bb18d96481399e35a7a1
 SHA512:
-  metadata.gz: 8f34dd9a4738927f277c0e71ec36d0213e45e70f31a260819bcbcad8e7519e87ce2c1e883c53111e52ab73d9cbc580ab1d8cb8c8afd9ebce4257d1a287f73f48
-  data.tar.gz: 1bbf4542a44735cbf8078ae18249fab3e43c5d081db6a8645d89d554c82e8028dc85296650cc909252da690db8be8bc3dafb81fd4ecfb186ce470bd2ee346744
+  metadata.gz: 8f4115c26d4c21c48f77466879021c791c8c92f561dff7cc0c5bb88b146902aaef92202e0ada57294c62f222003bd5f74d29182ccec748c65e0d7e68a5601dfc
+  data.tar.gz: 195f1b6689c35453fd52ce1d4e0a2856cab28744c9c0d4cbf3290a676e80c92df3c099c893bf2b250e0c91a7c763825c66c19fe0c5eed77927a0ed6c9b6a716c

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    relaton (0.1.1)
+    relaton (0.1.2)
       algoliasearch
-      gbbib (~> 0.2.0)
+      gbbib (~> 0.2.1)
       iev (~> 0.1.0)
       isobib (~> 0.2.0)
-      rfcbib (~> 0.2.0)
+      rfcbib (~> 0.2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -24,7 +24,7 @@ GEM
       nokogiri (>= 1.4.3)
     ffi (1.9.25)
     formatador (0.2.5)
-    gbbib (0.2.0)
+    gbbib (0.2.1)
       cnccs (~> 0.1.1)
       iso-bib-item (~> 0.2)
     guard (2.14.2)
@@ -44,7 +44,7 @@ GEM
     httpclient (2.8.3)
     iev (0.1.0)
       nokogiri
-    iso-bib-item (0.2.1)
+    iso-bib-item (0.2.2)
       isoics (~> 0.1.6)
       nokogiri (~> 1.8.4)
       ruby_deep_clone (~> 0.8.0)
@@ -82,7 +82,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rfcbib (0.2.0)
+    rfcbib (0.2.1)
       iso-bib-item (~> 0.2.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)

data/lib/relaton/db.rb

@@ -80,11 +80,6 @@ module Relaton
     private
 
     def standard_class(code)
-=begin
-      %r{^GB Standard }.match? code and return :gbbib
-      %r{^IETF }.match? code and return :rfcbib
-      %r{^(ISO|IEC)[ /]|IEV($| )}.match? code and return :isobib
-=end
       @registry.processors.each do |name, processor|
         processor.prefix.match?(code) and return name
       end
@@ -100,7 +95,8 @@ module Relaton
       ret = code
       ret += ":#{year}" if year
       ret += " (all parts)" if opts[:all_parts]
-      ret
+      code = code.sub(/^(GB Standard|IETF( Standard)?) /, "")
+      [ret, code]
     end
 
     def bib_retval(entry)
@@ -112,11 +108,11 @@ module Relaton
     # @param opts [Hash]
     # @param stdclass [Symbol]
     def check_bibliocache(code, year, opts, stdclass)
-      id = std_id(code, year, opts, stdclass)
-      return bib_retval(new_bib_entry(code, year, opts, stdclass)) if @db.nil?
+      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(code, year, opts, stdclass)
+        @db[id] ||= new_bib_entry(searchcode, year, opts, stdclass)
         if @local_db.nil? then bib_retval(@db[id])
         else
           @local_db.transaction do

data/lib/relaton/version.rb

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

data/relaton.gemspec

@@ -28,10 +28,10 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "algoliasearch"
-  spec.add_dependency "gbbib", "~> 0.2.0"
+  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.0"
+  spec.add_dependency "rfcbib", "~> 0.2.1"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"

data/spec/relaton/relaton_spec.rb

@@ -71,14 +71,36 @@ RSpec.describe Relaton::Db do
 
   it "get GB reference and cache it" do
     stub_bib Gbbib::GbBibliography
-    bib = db.fetch "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
+    expect(File.exist?("testcache2")).to be true
+    testcache = PStore.new "testcache"
+    testcache.transaction true do
+      expect(testcache["GB Standard GB/T 20223:2006"]["bib"].to_xml).to include "<bibitem type=\"standard\" id=\"GB/T20223\">"
+    end
+    testcache = PStore.new "testcache2"
+    testcache.transaction 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, {}
     expect(bib).to be_instance_of IsoBibItem::BibliographicItem
+    expect(bib.to_xml).to include "<bibitem id=\"RFC8341\">"
+    expect(File.exist?("testcache")).to be true
+    expect(File.exist?("testcache2")).to be true
+    testcache = PStore.new "testcache"
+    testcache.transaction true do
+      expect(testcache["RFC 8341"]["bib"].to_xml).to include "<bibitem id=\"RFC8341\">"
+    end
+    testcache = PStore.new "testcache2"
+    testcache.transaction do
+      expect(testcache["RFC 8341"]["bib"].to_xml).to include "<bibitem id=\"RFC8341\">"
+    end
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-22 00:00:00.000000000 Z
+date: 2018-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: algoliasearch
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: iev
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement