relaton-gb 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f93326a031ad54aa4699846ee3bb52477bb08c53cb565240ba7307b7201e73ce
-  data.tar.gz: fb559ed0b92b162c75e3acf5cd7db6af18a4ecb753320b5f25b45dec282c52e2
+  metadata.gz: 8675991461b657f6d624391f50115245029e999fc9ea076bef99e7f8bdeb3ece
+  data.tar.gz: d3eb20d7a6302ea10ada5732370972e631db752eb8febb592f75c96d5f030e67
 SHA512:
-  metadata.gz: a4b21425dbfed6364955e9a926afe30eb2e02278171323efa22d6195ed62960f6c1b6885164cf6b66c57ea37fec28105af362a4218ad4338d107ddc016c2ef6a
-  data.tar.gz: dfa27dffa74247af4bc73047614e8616b96aedef127fb357f013c0d6488b06a1cc3a0d3dd0bd86f3c2d2cbf28a206a5d97752fb816cf60480012093cc3c6a72a
+  metadata.gz: aa28fc07245bbc86dd03ce11c284ea30becb75287efd48a1621890d4180dc4338d28bbae928d49529acc6d834b169fd3c5a54292c7c5996cb89c7e5773d9c5aa
+  data.tar.gz: 60b54b035542086d2849f7781837c4a72530ac4f42fc55f451961497a71478853bead48ff7e1c04ee57ad8d34b54b4169c5ee145d0cb43042933ad6506c4d9a2

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 = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-gb
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase