relaton-gb 1.12.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 470fd611ac4b5a75b5731a6f3ad632559dd6c21b5f5df0845265641329b6bddd
-  data.tar.gz: '080c1b5148f7971ae800963c810d437c3dc3d323d4a00b8b27c1c44e3debc010'
+  metadata.gz: 2428a14a41dedaa3593734a0af63e49d959468b60d0ee6f7c9671f5a554d42d2
+  data.tar.gz: 4b7080ea176fa7f02630faf497e3acce7ed1478f61bc75468599f055affcc359
 SHA512:
-  metadata.gz: e0b0be08a47ee2c6904df4abb18aaf9943c4b3522c3d375f1c81a959bcd5ebc8faf175c88fb2ac47ee56c77c3e6599e849f6f081017540128fca0588ac0b4b0d
-  data.tar.gz: d6a0c996d1c778868774940066c8e3923c99d52448c3221d576bb4e8271f08bf3569d5e856aa55e24c9d0f611693b34b9775b13bf29eaf3406c45908022f28af
+  metadata.gz: 1d58812cd6f9b8789d3d4496fc82ad544ff7d02b33a762efc45e4d46b15fde5726197fa7f5fa0b9cd3d3ea84a2e7d3578a94cdb3d995bd3c76799f66cdfdc2b6
+  data.tar.gz: 7a4ccde3cb418d0a70354b14f26e3a13a2b019b9778de10e23985b5e626e7c85d073826ffe17131f260f4a2eb8c78c67f5162db2083d7a42a37763f972e41eb9

data/lib/relaton_gb/gb_scrapper.rb

@@ -47,7 +47,7 @@ module RelatonGb
       #   * :type [String]
       #   * :name [String]
       def get_committee(doc, _ref)
-        name = doc.at("//div[contains(text(), '归口单位')]/following-sibling::div")
+        name = doc.at("//div[contains(., '归口单位') or contains(., '归口部门')]/following-sibling::div")
         { type: "technical", name: name.text.delete("\r\n\t\t") }
       end
     end

data/lib/relaton_gb/hash_converter.rb

@@ -27,8 +27,8 @@ module RelatonGb
       end
 
       def ccs_hash_to_bib(ret)
-        ret[:ccs] = array(ret[:ccs]).map do |ccs|
-          ccs[:code] ? Cnccs.fetch(ccs[:code]) : Cnccs.fetch(ccs)
+        ret[:ccs] = RelatonBib.array(ret[:ccs]).map do |ccs|
+          (ccs[:code] && Cnccs.fetch(ccs[:code])) || Cnccs.fetch(ccs)
         end
       end
     end

data/lib/relaton_gb/hit.rb

@@ -38,9 +38,9 @@ module RelatonGb
 
     # @return [String]
     def inspect
-      "<#{self.class}:#{format('%<id>#.14x', id: object_id << 1)} "\
-      "@fullIdentifier=\"#{@fetch&.shortref}\" "\
-      "@docref=\"#{docref}\">"
+      "<#{self.class}:#{format('%<id>#.14x', id: object_id << 1)} " \
+        "@fullIdentifier=\"#{@fetch&.shortref}\" " \
+        "@docref=\"#{docref}\">"
     end
   end
 end

data/lib/relaton_gb/scrapper.rb

@@ -14,12 +14,11 @@ module RelatonGb
 
     @prefixes = nil
 
-    # rubocop:disable Metrics/MethodLength
     # @param doc [Nokogiri::HTML::Document]
     # @param src [String]
     # @param hit [RelatonGb::Hit]
     # @return [Hash]
-    def scrapped_data(doc, src, hit)
+    def scrapped_data(doc, src, hit) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       {
         fetched: Date.today.to_s,
         committee: get_committee(doc, hit.docref),
@@ -38,7 +37,6 @@ module RelatonGb
         structuredidentifier: fetch_structuredidentifier(hit.docref),
       }
     end
-    # rubocop:enable Metrics/MethodLength
 
     # @param docref [String]
     # @return [Array<RelatonBib::DocumentIdentifier>]

data/lib/relaton_gb/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-gb
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-25 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml