relaton-gb 2.0.0.pre.alpha.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b120cebe494766b26bb882d0b0ea16adc56c3ac35b02c57425ea6af994d8ad1
-  data.tar.gz: 19f0ce8e61e8110ab1e73bd6a6d04cfc9ced139443321360110c9f6688432cd8
+  metadata.gz: c701a9e188f05fdf0e1a79dc265f90bdeddecb1c4a6df0c1dad4a8dbc2921e91
+  data.tar.gz: 80ba0baac90e966130af867db69f164201c5b9a2c2affed7faa36889205bb871
 SHA512:
-  metadata.gz: 8c5a8bfd2c7b2862ad026c046056d210283565213b6f9dcdfc6957ec85868eb0529dd0f1a5155d2647073bff667e80d971a9889b60bf90cd55757d7d57b20dfb
-  data.tar.gz: 13e570342c2efb011eb2ff71f0f0fb56916d4a73b5037a5c7f53012a8fb284234b83e7a804def400b3c05d6e6f6aa7f34a4405605ec720e6546651cc3d7024d6
+  metadata.gz: 449a58c134c1888d1f4a23e96e22b9e3eea7649e92ea7f86f0444630240f9f993fc8a4979db327a43c7fc567226bcfb2dcb365b7e477f02980dd436062367076
+  data.tar.gz: f4f9dcdf2a44d8564e6e97a47912e77d58f640fe12d63ebcf87f3dd3104ca40a6487531069f93170438535433e0041178bbba9fb93dde32bbfd1c5f14837df02

data/.gitignore

@@ -13,3 +13,4 @@
 .rspec_status
 .rubocop-https---raw-githubusercontent-com-riboseinc-oss-guides-master-ci-rubocop-yml
 Gemfile.lock
+.claude/settings.local.json

data/Gemfile

@@ -8,6 +8,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in gdbib.gemspec
 gemspec
 
+
 gem "equivalent-xml", "~> 0.6"
 gem "pry-byebug"
 gem "rake", "~> 13.0"

data/grammars/biblio.rng

@@ -2015,15 +2015,11 @@ provided that it is not the entire bibliographic item that is so related</a:docu
     <a:documentation>A version of the bibliographic item (within an edition). Can be used for drafts</a:documentation>
     <element name="version">
       <optional>
-        <ref name="revision-date">
-          <a:documentation>The date at which the current version of the bibliographic item was produced</a:documentation>
-        </ref>
-      </optional>
-      <optional>
-        <ref name="draft">
-          <a:documentation>The identifier for the current draft of the bibliographic item</a:documentation>
-        </ref>
+        <attribute name="type">
+          <a:documentation>Versioning scheme, in case of multiple versioning schemes</a:documentation>
+        </attribute>
       </optional>
+      <text/>
     </element>
   </define>
   <define name="vedition">

data/lib/relaton/gb/bibdata.rb

@@ -1,6 +1,7 @@
 module Relaton
   module Gb
     class Bibdata < Item
+      model ItemData
       include Bib::BibdataShared
     end
   end

data/lib/relaton/gb/bibitem.rb

@@ -1,6 +1,7 @@
 module Relaton
   module Gb
     class Bibitem < Item
+      model ItemData
       include Bib::BibitemShared
     end
   end

data/lib/relaton/gb/ccs.rb

@@ -1,16 +1,13 @@
 module Relaton
   module Gb
     class CCS < Bib::ICS
-      attribute :text, method: :get_text
+      xml { root "ccs" }
 
-      xml do
-        root "ccs"
-        map_element "code", to: :code
-        map_element "text", to: :text
-      end
+      def text
+        val = @text
+        return val if val && !val.empty?
 
-      def get_text
-        Cnccs.fetch(code).description if code
+        Cnccs.fetch(code)&.description if code
       end
     end
   end

data/lib/relaton/gb/ext.rb

@@ -8,10 +8,8 @@ require_relative "ccs"
 module Relaton
   module Gb
     class Ext < Bib::Ext
-      attribute :schema_version, method: :get_schema_version
       attribute :doctype, Doctype
       attribute :subdoctype, :string, values: %w[specification method-of-test vocabulary code-of-practice]
-      # attribute :gbcommittee, Committee, collection: true
       attribute :structuredidentifier, StructuredIdentifier
       attribute :stagename, StageName
       attribute :gbtype, GbType
@@ -19,16 +17,20 @@ module Relaton
       attribute :plannumber, :string
 
       xml do
-        # map_element "gbcommittee", to: :gbcommittee
         map_element "stagename", to: :stagename
         map_element "gbtype", to: :gbtype
         map_element "ccs", to: :ccs
         map_element "plannumber", to: :plannumber
       end
 
-      def get_schema_version
-        Relaton.schema_versions["relaton-model-gb"]
+      key_value do
+        map_element "stagename", to: :stagename
+        map_element "gbtype", to: :gbtype
+        map_element "ccs", to: :ccs
+        map_element "plannumber", to: :plannumber
       end
+
+      def get_schema_version = Relaton.schema_versions["relaton-model-gb"]
     end
   end
 end

data/lib/relaton/gb/gb_scraper.rb

@@ -22,8 +22,10 @@ module Relaton
           ).map do |h|
             ref = h.at "./td[2]/a"
             pid = ref[:onclick].match(/[0-9A-F]+/).to_s
-            rdate = h.at("./td[7]").text
-            Hit.new pid: pid, docref: ref.text, scraper: self, release_date: rdate
+            status = h.at("./td[7]").text.strip
+            rdate = h.at("./td[8]").text.strip
+            Hit.new pid: pid, docref: ref.text, scraper: self,
+                    release_date: rdate, status: status
           end
           HitCollection.new hits.sort_by(&:release_date).reverse
         rescue Mechanize::Error => e

data/lib/relaton/gb/scraper.rb

@@ -95,7 +95,7 @@ module Relaton
       # @param doc [Nokogiri::HTML::Document]
       # @return [Array<String>]
       def get_ccs(doc)
-        code = doc.at("//div[contains(text(), '中国标准分类号')]/following-sibling::div").text.delete("\r\n\t\t")
+        code = doc.at("//div[contains(text(), '中国标准分类号')]/following-sibling::div").text.strip
         [CCS.new(code: code)]
       end
 
@@ -106,7 +106,7 @@ module Relaton
                     " | //dt[contains(text(), '国际标准分类号')]/following-sibling::dd")
         return [] unless ics
 
-        code = ics.text.delete("\r\n\t\t")
+        code = ics.text.strip
         [Bib::ICS.new(code: code)]
       end
 

data/lib/relaton/gb/sec_scraper.rb

@@ -56,15 +56,8 @@ module Relaton
         # @param doc [Nokogiri::HTML::Document]
         # @return [Array<Relaton::Bib::Title>]
         def get_titles(doc)
-          # titles = [{ title_main: doc.at("//h4").text.delete("\r\n\t"),
-          #             title_intro: nil, language: "zh", script: "Hans" }]
           tzh = doc.at("//h4").text.delete("\r\n\t")
-          [Bib::Title.from_string(tzh, "zh", "Hans")]
-          # title_main = doc.at("//td[contains(text(), '英文标准名称')]").text.match(/[\w\s]+/).to_s
-          # unless title_main.empty?
-          #   titles << { title_main: title_main, title_intro: nil, language: "en", script: "Latn" }
-          # end
-          # titles
+          Bib::Title.from_string(tzh, "zh", "Hans")
         end
 
         # @param _doc [Nokogiri::HTML::Document]

data/lib/relaton/gb/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Gb
-    VERSION = "2.0.0-alpha.2".freeze
+    VERSION = "2.1.0".freeze
   end
 end

data/{relaton_gb.gemspec → relaton-gb.gemspec}

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "gb-agencies", "~> 0.0.1"
   spec.add_dependency "mechanize", "~> 2.10"
   spec.add_dependency "relaton-core", "~> 0.0.13"
-  spec.add_dependency "relaton-iso", "~> 2.0.0-alpha.7"
+  spec.add_dependency "relaton-iso", "~> 2.1.0"
   spec.add_dependency "csv", "~> 3.0"
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-gb
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Ribose Inc.
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cnccs
@@ -71,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.7
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.7
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement
@@ -144,11 +145,12 @@ files:
 - lib/relaton/gb/util.rb
 - lib/relaton/gb/version.rb
 - lib/relaton/gb/yaml/prefixes.yaml
-- relaton_gb.gemspec
+- relaton-gb.gemspec
 homepage: https://github.com/metanorma/relaton_gb
 licenses:
 - BSD-2-Clause
 metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -163,7 +165,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: 'Relaton::Gb: retrieve Chinese GB Standards for bibliographic use using the
   BibliographicItem model.'