relaton-gb 0.11.0 → 1.0.2

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/scrapper.rb

@@ -55,18 +55,28 @@ module RelatonGb
     # @param docref [Strings]
     # @return [Array<Hash>]
     def get_contributors(doc, docref)
-      gb_en = GbAgencies::Agencies.new("en", {}, "")
-      gb_zh = GbAgencies::Agencies.new("zh", {}, "")
       name = docref.match(/^[^\s]+/).to_s
       name.sub!(%r{/[TZ]$}, "") unless name =~ /^GB/
       gbtype = get_gbtype(doc, docref)
-      entity = RelatonBib::Organization.new name: [
-        { language: "en", content: gb_en.standard_agency1(gbtype[:scope], name, gbtype[:mandate]) },
-        { language: "zh", content: gb_zh.standard_agency1(gbtype[:scope], name, gbtype[:mandate]) },
-      ]
+      orgs = %w[en zh].map { |l| org(l, name, gbtype) }.compact
+      return [] unless orgs.any?
+
+      entity = RelatonBib::Organization.new name: orgs
       [{ entity: entity, role: [type: "publisher"] }]
     end
 
+    # @param lang [String]
+    # @param name [String]
+    # @param gbtype [Hash]
+    # @return [Hash]
+    def org(lang, name, gbtype)
+      ag = GbAgencies::Agencies.new(lang, {}, "")
+      content = ag.standard_agency1(gbtype[:scope], name, gbtype[:mandate])
+      return unless content
+
+      { language: lang, content: content }
+    end
+
     # @param doc [Nokogiri::HTML::Document]
     # @return [Array<Hash>]
     #   * :title_intro [String]

data/lib/relaton_gb/version.rb

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

data/lib/relaton_gb/xml_parser.rb

@@ -6,7 +6,11 @@ module RelatonGb
       def from_xml(xml)
         doc = Nokogiri::XML(xml)
         gbitem = doc.at "/bibitem|/bibdata"
-        GbBibliographicItem.new item_data(gbitem)
+        if gbitem
+          GbBibliographicItem.new item_data(gbitem)
+        else
+          warn "[relato-gb] can't find bibitem or bibdata element in the XML"
+        end
       end
 
       private

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", ">= 1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-gb
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -182,16 +182,16 @@ dependencies:
   name: relaton-iso-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.0.1
 description: 'RelatonGb: retrieve Chinese GB Standards for bibliographic use using
   the BibliographicItem model.'
 email: