relaton-gb 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dde73dc09260674db2ebe47a9b589e5c60bc0b1d5ea1096df990301b841e91b
-  data.tar.gz: bddb4a7fe6e4e8b3119dc272634cf6492f6388f8151fe4262857d6afb5137756
+  metadata.gz: 852074eca70e37185fece3ea6d720f0b23af4144ba7d4f28c8c4a04a3516abee
+  data.tar.gz: e22768cb97a2b566cc89845be62064a77ea7626bf928aee4a2b93304f9a7ebb9
 SHA512:
-  metadata.gz: 99d20c25fed779ef7c8285ad97ae0b7352393e4d6804785cfe40c5c7d0fab4453ba550c290d9a25f9d3001430869c99420be94457cf3c79dab9f04c11cd40308
-  data.tar.gz: 6f1c161f0f480b4209a2b155bbaaa0d62e5cfd2bce6be9542561c7a37f6aa7ecba5daeeae9a2cef93f5dc0bd1fafa813bd73db06c08371ccabcc79c4bece4e86
+  metadata.gz: 12790bcbf1c3837ba7d01647fb2fbc6e5cc70a372841c1f444ef6aa6c8d387f146190c03279578c73f652ce9875c73441453136ff1e12d717ef7863ffd5be63d
+  data.tar.gz: 61b70387d0f4d67984726d6696b055dc2b6ea35a1095ae9749dc7c5207bad34b9207108f842a665a2b478e686eb3fc1d8fe3bd72fdc7f507db0e3001a4abe2ac

data/lib/relaton_gb/gb_bibliography.rb

@@ -54,8 +54,8 @@ module RelatonGb
         ret = get1(code, year, opts)
         return nil if ret.nil?
 
-        ret.to_most_recent_reference unless year
-        ret.to_all_parts if opts[:all_parts]
+        ret = ret.to_most_recent_reference unless year
+        ret = ret.to_all_parts if opts[:all_parts]
         ret
       end
 
@@ -63,15 +63,15 @@ module RelatonGb
 
       def fetch_ref_err(code, year, missed_years)
         id = year ? "#{code}:#{year}" : code
-        warn "WARNING: no match found on the GB website for #{id}. "\
+        warn "[relaton-gb] WARNING: no match found on the GB website for #{id}. "\
           "The code must be exactly like it is on the website."
-        warn "(There was no match for #{year}, though there were matches "\
+        warn "[relaton-gb] (There was no match for #{year}, though there were matches "\
           "found for #{missed_years.join(', ')}.)" unless missed_years.empty?
         if /\d-\d/ =~ code
-          warn "The provided document part may not exist, or the document "\
+          warn "[relaton-gb] The provided document part may not exist, or the document "\
             "may no longer be published in parts."
         else
-          warn "If you wanted to cite all document parts for the reference, "\
+          warn "[relaton-gb] If you wanted to cite all document parts for the reference, "\
             "use \"#{code} (all parts)\".\nIf the document is not a standard, "\
             "use its document type abbreviation (TS, TR, PAS, Guide)."
         end
@@ -83,15 +83,18 @@ module RelatonGb
         searchcode = code + (year.nil? ? "" : "-#{year}")
         result = search_filter(searchcode) || return
         ret = results_filter(result, year)
-        return ret[:ret] if ret[:ret]
-
-        fetch_ref_err(code, year, ret[:years])
+        if ret[:ret]
+          warn "[relaton-gb] (\"#{code}\") found #{ret[:ret].docidentifier.first.id}"
+          ret[:ret]
+        else
+          fetch_ref_err(code, year, ret[:years])
+        end
       end
 
       def search_filter(code)
         # search filter needs to incorporate year
         docidrx = %r{^[^\s]+\s[\d\.-]+}
-        warn "fetching #{code}..."
+        warn "[relaton-gb] (\"#{code}\") fetching..."
         result = search(code)
         result.select do |hit|
           hit.docref && hit.docref.match(docidrx).to_s.include?(code)

data/lib/relaton_gb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonGb
-  VERSION = "0.11.1"
+  VERSION = "0.12.0"
 end

data/relaton_gb.gemspec

@@ -37,5 +37,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "cnccs", "~> 0.1.1"
   spec.add_dependency "gb-agencies", "~> 0.0.1"
-  spec.add_dependency "relaton-iso-bib", "~> 0.8.0"
+  spec.add_dependency "relaton-iso-bib", "~> 0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-gb
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2020-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 description: 'RelatonGb: retrieve Chinese GB Standards for bibliographic use using
   the BibliographicItem model.'
 email: