relaton-calconnect 2.0.0.pre.alpha.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8eeb2fd8506663291f0232e8b37d85a01205c3a31a6b71a1eb1bd46d51a86697
-  data.tar.gz: aa119791dda6060581b2c43dd4bfafcd9cc1c288d61e2275196ab5568b150884
+  metadata.gz: 67e7ef0d03aee629fefa14e00cd047e595dfa2fdf108a65498597a7d3f304728
+  data.tar.gz: 0c4339378b9e115fabd5ba7ac886079f77b05ca11ed5b6bf24a387b8bb1f94d4
 SHA512:
-  metadata.gz: 969a15f38d16893c511cdf9bdc341af97026c0e788ed99d6e53e2cb942a37e86a948ef367fa1a47661bbcd45a1c4b2c33f7657c86a0e4addaca5b165a5f99a9e
-  data.tar.gz: c2296648220ea1828e6393e6c57a971a52ce99c278a7f9663b02f66d6f77e329e596ac7e4a21e0338122e364dd406fd8867059f8a508b0f47981900208c2fbe4
+  metadata.gz: 54db14fc4d30c8e9b326702ee504b5d6808fadefbcb6865f67568af02d24f742e5c7e687a42e8c0eebeb66186946b9d58d87c4f20f260bedcd30971575b70ddf
+  data.tar.gz: 110aa774e87a5c8b225bde02303894162f2e895d884e2ed5926ee31bee5f6f098a62594d98e05b943a107c04dd69024cd982d137204758ea7b39be88b27ed993

data/CLAUDE.md

@@ -0,0 +1,13 @@
+# CLAUDE.md
+
+## Development
+
+- `bundle install` — install dependencies
+- `bundle exec rake spec` — run tests
+- `bundle exec rubocop` — lint
+
+## Testing
+
+- **Framework:** RSpec with VCR cassettes and WebMock
+- **Index fixture:** `spec/fixtures/index-v1.zip` is pre-loaded into `Relaton::Index` pool in `before(:suite)` (configured in `spec/support/webmock.rb`). Run `rake spec:update_index` to refresh from relaton-data-calconnect.
+- **VCR cassettes:** `spec/vcr_cassettes/` — index download requests are ignored by VCR (handled by fixture).

data/Gemfile

@@ -3,6 +3,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in relaton_calconnect.gemspec
 gemspec
 
+
 gem "equivalent-xml", "~> 0.6"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"

data/README.adoc

@@ -138,6 +138,8 @@ RelatonCalconnect uses the relaton-logger gem for logging. By default, it logs t
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
+To update the index test fixture (used by tests), run `rake spec:update_index`. This downloads the latest `index-v1.zip` from the https://github.com/relaton/relaton-data-calconnect[relaton-data-calconnect] repository.
+
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 == Contributing

data/Rakefile

@@ -4,3 +4,25 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+namespace :spec do
+  desc "Download latest CALCONNECT index fixture from relaton-data-calconnect"
+  task :update_index do
+    require "net/http"
+    require "uri"
+
+    url = "https://raw.githubusercontent.com/relaton/relaton-data-calconnect/data-v2/index-v1.zip"
+    dest = File.join(__dir__, "spec", "fixtures", "index-v1.zip")
+
+    puts "Downloading \#{url} ..."
+    uri = URI.parse(url)
+    response = Net::HTTP.get_response(uri)
+
+    if response.is_a?(Net::HTTPSuccess)
+      File.binwrite(dest, response.body)
+      puts "Updated \#{dest} (\#{response.body.bytesize} bytes)"
+    else
+      abort "Failed to download: HTTP \#{response.code}"
+    end
+  end
+end

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/calconnect/model/bibdata.rb

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

data/lib/relaton/calconnect/model/bibitem.rb

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

data/lib/relaton/calconnect/model/ext.rb

@@ -3,14 +3,9 @@ require_relative "doctype"
 module Relaton
   module Calconnect
     class Ext < Bib::Ext
-      attribute :schema_version, method: :get_schema_version
       attribute :doctype, Doctype
-      attribute :subdoctype, :string
-      attribute :flavor, :string
 
-      def get_schema_version
-        Relaton.schema_versions["relaton-model-cc"]
-      end
+      def get_schema_version = Relaton.schema_versions["relaton-model-cc"]
     end
   end
 end

data/lib/relaton/calconnect/scraper.rb

@@ -252,13 +252,19 @@ module Relaton
         @errors[:editorialgroup] &&= eg.nil?
         return unless eg
 
-        # Handle old format: { technical_committee: { name: "X" } }
-        eg = eg[:technical_committee] if eg[:technical_committee]
+        # Normalize: editorialgroup can be a single hash or an array of hashes
+        groups = array(eg).map do |g|
+          g = g[:technical_committee] if g.is_a?(Hash) && g[:technical_committee]
+          g
+        end
+
+        subdivisions = groups.map do |g|
+          subdiv_name = Bib::TypedLocalizedString.new content: g[:name]
+          Bib::Subdivision.new(type: "technical-committee", name: [subdiv_name])
+        end
 
-        subdiv_name = Bib::TypedLocalizedString.new content: eg[:name]
-        subdivision = Bib::Subdivision.new(type: "technical-committee", name: [subdiv_name])
         org_name = Bib::TypedLocalizedString.new content: "CalConnect"
-        org = Bib::Organization.new name: [org_name], subdivision: [subdivision]
+        org = Bib::Organization.new name: [org_name], subdivision: subdivisions
         description = Bib::LocalizedMarkedUpString.new content: "committee"
         role = Bib::Contributor::Role.new type: "author", description: [description]
         hash[:contributor] ||= []

data/lib/relaton/calconnect/version.rb

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

data/{relaton_calconnect.gemspec → relaton-calconnect.gemspec}

@@ -27,7 +27,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
 
   spec.add_dependency "faraday", "~> 2.7.0"
-  spec.add_dependency "relaton-bib", "~> 2.0.0-alpha.7"
+  spec.add_dependency "relaton-bib", "~> 2.1.0"
   spec.add_dependency "relaton-core", "~> 0.0.12"
+  spec.add_dependency "addressable", "~> 2.8"
   spec.add_dependency "relaton-index", "~> 0.2.0"
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-calconnect
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.3
+  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: faraday
@@ -29,14 +30,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: relaton-core
   requirement: !ruby/object:Gem::Requirement
@@ -51,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.12
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +93,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- CLAUDE.md
 - Gemfile
 - LICENSE.txt
 - README.adoc
@@ -105,11 +121,12 @@ files:
 - lib/relaton/calconnect/scraper.rb
 - lib/relaton/calconnect/util.rb
 - lib/relaton/calconnect/version.rb
-- relaton_calconnect.gemspec
+- relaton-calconnect.gemspec
 homepage: https://github.com/relaton/relaton-calconnect
 licenses:
 - BSD-2-Clause
 metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,7 +141,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::Calconnect: retrieve CC Standards for bibliographic use using the
   BibliographicItem model'