relaton-gb 2.0.0 → 2.2.0.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52c9c362e38878ac808061c4128429abecb72214497a7cd79e0ac164307e234c
-  data.tar.gz: b1cb30ea18386e35eab1f825e552e25f0b1308aa27853c9ad4fada10ec971f31
+  metadata.gz: 111cc285ffa9c8c1ca502bf601c5c32c9a157d27a665bcc479072c21d8652c12
+  data.tar.gz: e945c436cf9fdea941d7db519741068f82b0522186a56dcc8b3d4c065cda5a9d
 SHA512:
-  metadata.gz: 361139f4ca7618efc5b299f52ea25cf0e9fdd3bade371bb90a6c47e30e22033900a378df173163507d8fbf6d00807e7907cad6a555d244e4fc2fd91220a38bf8
-  data.tar.gz: bce6c28651c076beaea6e52a72c3d2b7935a80d6b1e8362f5b5170011cb61469054ffa339b8cfef5836178c87cff3ad594082681e057138e37c48a84054b4650
+  metadata.gz: 2cca7dde4feddea94b0d61cef4e1e3902695753dcfe53326e87bf5691438a386008e7235b020ad0866cfabb5f6630f562362dbf0df4b8db87efb1a1167dd4b38
+  data.tar.gz: 4b778029628015da4e944d21e926f562b82b7351b700bb09d78fb07861ff4be053461a0e56f13faa342ddccea21284a08d5c33869e70c59a16d4f13e64d0396a

data/.github/workflows/rake.yml

@@ -4,7 +4,7 @@ name: rake
 
 on:
   push:
-    branches: [ master, main ]
+    branches: [ master, main, lutaml-integration ]
     tags: [ v* ]
   pull_request:
 

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,15 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in gdbib.gemspec
 gemspec
 
+# Use local monorepo sibling gems where available.
+Dir["../*/"].each do |dir|
+  name = File.basename(dir)
+  next if name == File.basename(__dir__)
+  next unless File.exist?(File.join(dir, "#{name}.gemspec"))
+  gem name, path: dir
+end
+
+
 gem "equivalent-xml", "~> 0.6"
 gem "pry-byebug"
 gem "rake", "~> 13.0"

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

@@ -22,7 +22,8 @@ module Relaton
         def scrape_page(text)
           # uri = URI "http://www.std.gov.cn/hb/search/hbPage?searchText=#{text}"
           uri = URI "https://hbba.sacinfo.org.cn/stdQueryList"
-          resp = Net::HTTP.post uri, URI.encode_www_form({ key: text })
+          resp = Net::HTTP.post uri, URI.encode_www_form({ key: text }),
+                                "Content-Type" => "application/x-www-form-urlencoded"
           # res = JSON.parse Net::HTTP.get(uri)
           json = JSON.parse resp.body
           hits = json["records"].map do |h|
@@ -56,15 +57,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".freeze
+    VERSION = "2.2.0.pre.alpha.1".freeze
   end
 end

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

@@ -22,12 +22,12 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.3.0")
 
   spec.add_dependency "cnccs", "~> 0.1.1"
+  spec.add_dependency "csv", "~> 3.0"
   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"
-  spec.add_dependency "csv", "~> 3.0"
+  spec.add_dependency "relaton-core", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-iso", "~> 2.2.0.pre.alpha.1"
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-gb
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0.pre.alpha.1
 platform: ruby
 authors:
 - Ribose Inc.
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cnccs
@@ -24,75 +25,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.1
 - !ruby/object:Gem::Dependency
-  name: gb-agencies
+  name: csv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: mechanize
+  name: gb-agencies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
-  name: relaton-core
+  name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: '2.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: '2.10'
 - !ruby/object:Gem::Dependency
-  name: relaton-iso
+  name: relaton-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.0.pre.alpha.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.0.pre.alpha.1
 - !ruby/object:Gem::Dependency
-  name: csv
+  name: relaton-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 2.2.0.pre.alpha.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 2.2.0.pre.alpha.1
 description: 'Relaton::Gb: retrieve Chinese GB Standards for bibliographic use using
   the BibliographicItem model.'
 email:
@@ -106,7 +107,6 @@ files:
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
-- ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
 - README.adoc
@@ -114,11 +114,6 @@ files:
 - bin/console
 - bin/rspec
 - bin/setup
-- grammars/basicdoc.rng
-- grammars/biblio-standoc.rng
-- grammars/biblio.rng
-- grammars/relaton-gb-compile.rng
-- grammars/relaton-gb.rng
 - lib/relaton/gb.rb
 - lib/relaton/gb/bibdata.rb
 - lib/relaton/gb/bibitem.rb
@@ -144,11 +139,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
@@ -156,14 +152,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !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.'

data/.rubocop.yml

@@ -1,12 +0,0 @@
-# This project follows the Ribose OSS style guide.
-# https://github.com/riboseinc/oss-guides
-# All project-specific additions and overrides should be specified in this file.
-
-require: rubocop-rails
-
-inherit_from:
-  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
-AllCops:
-  TargetRubyVersion: 3.2
-Rails:
-  Enabled: false