gbbib 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18b85e35f313100356d7f8afcc53cf27cd49c5e255b9e89456dd91f1d413f932
-  data.tar.gz: 64603146155ab214747fe59aa4dce48eca374611a298878ffd9cd31eee6bf67b
+  metadata.gz: b3e3ee80ed7fef30b07a956b8ec13313615c0e164ac523824fff69e63850539f
+  data.tar.gz: 9a753e31b51f631f710f96d3f38ba6bff254980f4faa5ed51571288acf5dc40d
 SHA512:
-  metadata.gz: 2a5d9f1cadb9623e82d7b61564fe1909e9b38f3873580bccc59b6808f284eb94ef5dd59faac3f051654261bbf906a44d0e81d3c36aac017a83709e562f90b93b
-  data.tar.gz: 7a674cf192020d60a91a32e68d92e65ac1daebb8ba7d67aec66552da9ce5937433316e5f64c515457985b62710fc5d3a1946dd2b6f74573bc34f6d3693fbea23
+  metadata.gz: c5ed82a9de4bb8cf57de8d5271f0e3de47f64496509581600dc2f398e64042adc621f2a3ac3ff5321f11bddfea5ac5b5a11c9dca35ae642e702de8fc7624e5b4
+  data.tar.gz: 21954b24468a3ea22ad0db05b606be95b37a19e1dae13d35d9ce2a766ba212366978f35d3991bb24b6d403bb8cc26c9d7c7bdbc0477c58c1d760839b5e01d03d

data/Gemfile.lock

@@ -1,21 +1,23 @@
 PATH
   remote: .
   specs:
-    gbbib (0.2.1)
+    gbbib (0.2.2)
       cnccs (~> 0.1.1)
+      gb-agencies (~> 0.0.1)
       iso-bib-item (~> 0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     byebug (10.0.2)
-    cnccs (0.1.1)
+    cnccs (0.1.2)
     coderay (1.1.2)
     diff-lcs (1.3)
     docile (1.3.1)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    iso-bib-item (0.2.2)
+    gb-agencies (0.0.1)
+    iso-bib-item (0.2.3)
       isoics (~> 0.1.6)
       nokogiri (~> 1.8.4)
       ruby_deep_clone (~> 0.8.0)

data/gbbib.gemspec

@@ -32,4 +32,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'cnccs', "~> 0.1.1"
   spec.add_dependency 'iso-bib-item', "~> 0.2"
+  spec.add_dependency 'gb-agencies', "~> 0.0.1"
 end

data/lib/gbbib/gb_bibliographic_item.rb

@@ -58,6 +58,15 @@ module Gbbib
       inspect
     end
 
+    def id(attribute, delim = '')
+      return nil if attribute && !@id_attribute
+      idstr = "#{@docidentifier.prefix}#{delim}#{@docidentifier.project_number}"
+      if @docidentifier.part_number&.size&.positive?
+        idstr = idstr + "-#{@docidentifier.part_number}"
+      end
+      idstr.strip
+    end
+
     private
 
     # @param builder [Nokogiri::XML::Builder]

data/lib/gbbib/scrapper.rb

@@ -1,7 +1,8 @@
 # encoding: UTF-8
 # frozen_string_literal: true
 
-require 'yaml'
+require "yaml"
+require "gb_agencies"
 
 module Gbbib
   # Common scrapping methods.
@@ -37,12 +38,20 @@ module Gbbib
     #   * :part_number [String]
     def get_docid(doc, xpt = '//dt[text()="标准号"]/following-sibling::dd[1]')
       item_ref = doc.xpath(xpt).text.match(/(?<=\s)(\d+)\.?((?<=\.)\d+|)/)
-      { project_number: item_ref[1], part_number: item_ref[2] }
+      prefix = doc.xpath(xpt).text.match(/^[^\s]+/).to_s
+      { project_number: item_ref[1], part_number: item_ref[2], prefix: prefix }
     end
 
     def get_contributors(doc, xpt = '//dt[text()="标准号"]/following-sibling::dd[1]')
+      gb_en = GbAgencies::Agencies.new("en", {}, "")
+      gb_zh = GbAgencies::Agencies.new("zh", {}, "")
       name = doc.xpath(xpt).text.match(/^[^\s]+/).to_s
-      entity = IsoBibItem::Organization.new name: name, abbreviation: name
+      name.sub!(%r{/[TZ]$}, "") unless name.match(/^GB/)
+      gbtype = get_gbtype(doc)
+      entity = IsoBibItem::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]) },
+      ]
       [{ entity: entity, roles: ['publisher'] }]
     end
     
@@ -103,7 +112,7 @@ module Gbbib
     # @param doc [Nokogiri::HTML::Document]
     # @return [Array<String>]
     def get_ccs(doc)
-      [doc.xpath('//dt[text()="中国标准分类号"]/following-sibling::dd[1]').text]
+      [doc&.xpath('//dt[text()="中国标准分类号"]/following-sibling::dd[1]')&.text]
     end
 
     # @param doc [Nokogiri::HTML::Document]
@@ -113,6 +122,7 @@ module Gbbib
     #   * :subgroup [String]
     def get_ics(doc)
       ics = doc.xpath('//dt[(.="国际标准分类号")]/following-sibling::dd[1]/span')
+      ics.empty? and return []
       field, group, subgroup = ics.text.split '.'
       [{ field: field, group: group.ljust(3, '0'), subgroup: subgroup }]
     end

data/lib/gbbib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gbbib
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gbbib
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2018-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: gb-agencies
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 description: 'GdBib: retrieve Chinese GB Standards for bibliographic use using the
   BibliographicItem model.'
 email: