relaton-iec 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16fcb1a2060563fce80d0a850bd513061a05c5753d84c0e6071a9e93e88ef25d
-  data.tar.gz: 5ef36c01fa0ceeaaabbc50d1a89ef62783fb1ea403727e6108076656ea8da0e9
+  metadata.gz: b7ec248ce4ccbda30b47e48cc530425476eb5b0b5d3e908614717d2c0f6cbb1b
+  data.tar.gz: 85f6a7b53e79549f1b5e4aba8521db64fd415336a6ef95c344244bdb4b1015af
 SHA512:
-  metadata.gz: 9d8861fcc6925f46b90f7735f505fbecd08ec50a3b145a8a5692510aaec7d7966b78b08f91fe93fd7891a4a3fc6bb0f2b8225d92dbe71aa167ac0abf29f90d9c
-  data.tar.gz: e15c69844eb15b02f076de2c14975102f12e30189decdf04586f437c3576b8bdb15d552ae18be4ec8534e318cf10a3aae00238687cd8df4f60676366446bf678
+  metadata.gz: c2453f2e4e3b1f912f738bf2abb32efc34eb261f9c9507215fe47822c6948d5cc3486cc721f9b2fb09164b497c61fd73aefd1344bc2334d08b4ec02efc89252f
+  data.tar.gz: 478e1f5a249c5811957bdd6f5af09cd13f94ba4482e9549ce5a83f0c247d9a9f891a305a845377a3dc6112d3a8e2a1ed5226617c66a45722e73c6c5b29c8e8c9

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/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-iec.
+- **VCR cassettes:** `spec/vcr_cassettes/` — index download requests are ignored by VCR (handled by fixture).

data/Gemfile

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

data/README.adoc

@@ -286,6 +286,8 @@ Relaton::Iec uses the relaton-logger gem for logging. By default, it logs to STD
 
 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-iec[relaton-data-iec] 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).
 
 

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 IEC index fixture from relaton-data-iec"
+  task :update_index do
+    require "net/http"
+    require "uri"
+
+    url = "https://raw.githubusercontent.com/relaton/relaton-data-iec/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/iec/hit.rb

@@ -4,7 +4,7 @@ module Relaton
   module Iec
     # Hit.
     class Hit < Core::Hit
-      GHURL = "https://raw.githubusercontent.com/relaton/relaton-data-iec/refs/heads/data-v2/"
+      GHURL = "https://raw.githubusercontent.com/relaton/relaton-data-iec/refs/heads/v2/"
 
       attr_writer :item
 

data/lib/relaton/iec/model/bibdata.rb

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

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

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

data/lib/relaton/iec/model/docidentifier.rb

@@ -1,74 +1,100 @@
 module Relaton
   module Iec
-    class Pubid < Lutaml::Model::Type::Value
-      class << self
-        def cast(value)
-          value.is_a?(String) ? ::Pubid::Iec::Identifier.parse(value) : value
-        rescue StandardError
-          Util.warn "Failed to parse Pubid: #{value}"
-          value
-        end
-      end
+    class Docidentifier < Bib::Docidentifier
+      attribute :content, :string
 
-      ::Lutaml::Model::Config::AVAILABLE_FORMATS.each do |format|
-        define_method(:"to_#{format}") { value.to_s }
+      attr_reader :pubid
+
+      def initialize(arg = nil, **kwargs)
+        arg.is_a?(Hash) ? super(arg) : super(**kwargs)
+        raw = arg.is_a?(Hash) ? (arg["content"] || arg[:content]) : kwargs[:content]
+        self.content = raw if raw
       end
 
-      def to_h = value.to_h
-      def urn = value.urn
-    end
+      alias_method :original_content=, :content=
+      alias_method :original_content, :content
 
-    class Docidentifier < Bib::Docidentifier
-      attribute :content, Pubid
+      def content=(value)
+        @pubid = nil
+        @raw_content = nil
 
-      def content_to_xml(model, parent, doc)
-        doc.add_xml_fragment parent, model.to_s
+        parsed =
+          case value
+          when ::Pubid::Iec::Base then value
+          when String
+            begin
+              ::Pubid::Iec::Identifier.parse(value)
+            rescue StandardError
+              Util.warn "Failed to parse Pubid: #{value}"
+              nil
+            end
+          end
+
+        if parsed
+          @pubid = parsed
+        elsif value.is_a?(String)
+          @raw_content = value
+        end
+
+        send(:original_content=, to_s)
       end
 
-      def content_to_key_value(model, doc)
-        doc["content"] = model.to_s
+      def content
+        return @raw_content if @raw_content
+        return render_pubid(@pubid) if @pubid
+
+        original_content
+      end
+
+      def to_s
+        content.to_s
       end
 
       def to_all_parts!
-        if content.is_a? String
-          Util.warn "Cannot convert String to all parts: #{content}"
-          return
-        end
+        return unless @pubid
 
         remove_part!
         remove_date!
         remove_stage!
-        content.all_parts = true if content.respond_to?(:all_parts=)
+        @pubid.all_parts = true if @pubid.respond_to?(:all_parts=)
+        refresh_content!
       end
 
       def remove_stage!
-        remove_attr! :stage
+        remove_attr!(:stage)
       end
 
       def remove_part!
-        remove_attr! :part
+        remove_attr!(:part)
       end
 
       def remove_date!
-        remove_attr! :year
+        remove_attr!(:year)
       end
 
-      def to_s
-        return content if content.is_a? String
+      private
 
+      def render_pubid(pubid)
         case type
-        when "URN" then content.urn
-        else content.to_s
+        when "URN" then pubid.urn
+        else pubid.to_s
         end
       end
 
-      private
-
       def remove_attr!(attr)
-        return false if content.is_a? String
+        return unless @pubid
+
+        @pubid.send("#{attr}=", nil)
+        base = @pubid.base
+        while base
+          base.send("#{attr}=", nil)
+          base = base.base
+        end
+        refresh_content!
+      end
 
-        content.send(:"#{attr}=", nil)
-        true
+      def refresh_content!
+        send(:original_content=, to_s)
       end
     end
   end

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

@@ -3,11 +3,10 @@ require_relative "stage_name"
 
 module Relaton
   module Iec
-    class Ext < Lutaml::Model::Serializable
-      attribute :schema_version, method: :get_schema_version
+    class Ext < Bib::Ext
       attribute :doctype, Doctype
       attribute :subdoctype, :string, values: %w[specification method-of-test vocabulary code-of-practice]
-      attribute :flavor, :string
+      attribute :structuredidentifier, Iso::StructuredIdentifier
       attribute :horizontal, :boolean
       attribute :stagename, StageName
       attribute :updates_document_type, :string, values: Doctype::TYPES
@@ -18,15 +17,9 @@ module Relaton
       attribute :cen_processing, :boolean
       attribute :secretary, :string
       attribute :interest_to_committees, :string
-      attribute :ics, Bib::ICS, collection: true
-      attribute :structuredidentifier, Iso::StructuredIdentifier
       attribute :tc_sc_officers_note, :string, raw: true
 
       xml do
-        map_attribute "schema-version", to: :schema_version
-        map_element "doctype", to: :doctype
-        map_element "subdoctype", to: :subdoctype
-        map_element "flavor", to: :flavor
         map_element "horizontal", to: :horizontal
         map_element "stagename", to: :stagename
         map_element "updates-document-type", to: :updates_document_type
@@ -37,14 +30,24 @@ module Relaton
         map_element "cen-processing", to: :cen_processing
         map_element "secretary", to: :secretary
         map_element "interest-to-committees", to: :interest_to_committees
-        map_element "ics", to: :ics
-        map_element "structuredidentifier", to: :structuredidentifier
         map_element "tc-sc-officers-note", to: :tc_sc_officers_note
       end
 
-      def get_schema_version
-        Relaton.schema_versions["relaton-model-iec"]
+      key_value do
+        map_element "horizontal", to: :horizontal
+        map_element "stagename", to: :stagename
+        map_element "updates_document_type", to: :updates_document_type
+        map_element "fast_track", to: :fast_track
+        map_element "price_code", to: :price_code
+        map_element "function", to: :function
+        map_element "accessibility_color_inside", to: :accessibility_color_inside
+        map_element "cen_processing", to: :cen_processing
+        map_element "secretary", to: :secretary
+        map_element "interest_to_committees", to: :interest_to_committees
+        map_element "tc_sc_officers_note", to: :tc_sc_officers_note
       end
+
+      def get_schema_version = Relaton.schema_versions["relaton-model-iec"]
     end
   end
 end

data/lib/relaton/iec/model/item.rb

@@ -3,10 +3,14 @@ require_relative "ext"
 
 module Relaton
   module Iec
+    class Relation < Bib::Relation
+    end
+
     class Item < Iso::Item
       model ItemData
 
       attribute :docidentifier, Docidentifier, collection: true, initialize_empty: true
+      attribute :relation, Relation, collection: true, initialize_empty: true
       attribute :ext, Ext
     end
   end
@@ -14,11 +18,3 @@ end
 
 require_relative "item_base"
 require_relative "relation"
-
-module Relaton
-  module Iec
-    class Item
-      attribute :relation, Relation, collection: true, initialize_empty: true
-    end
-  end
-end

data/lib/relaton/iec/model/item_base.rb

@@ -1,9 +1,12 @@
+require_relative "docidentifier"
+
 module Relaton
   module Iec
-    class ItemBase < Item
+    class ItemBase < Iso::ItemBase
       model ItemData
 
-      include Bib::ItemBaseAttributes
+      attribute :docidentifier, Docidentifier, collection: true, initialize_empty: true
+      attribute :relation, Relation, collection: true, initialize_empty: true
     end
   end
 end

data/lib/relaton/iec/model/relation.rb

@@ -1,6 +1,6 @@
 module Relaton
   module Iec
-    class Relation < Bib::Relation
+    class Relation
       attribute :bibitem, ItemBase
     end
   end

data/lib/relaton/iec/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Iec
-    VERSION = "2.0.0".freeze
+    VERSION = "2.1.1".freeze
   end
 end

data/{relaton_iec.gemspec → relaton-iec.gemspec}

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "pubid-iec", "~> 1.15.11"
   spec.add_dependency "relaton-core", "~> 0.0.13"
   spec.add_dependency "relaton-index", "~> 0.2.20"
-  spec.add_dependency "relaton-iso", "~> 2.0.0"
+  spec.add_dependency "relaton-iso", "~> 2.1.0"
   spec.add_dependency "rubyzip"
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iec
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ribose Inc.
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -85,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +121,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- CLAUDE.md
 - Gemfile
 - LICENSE.txt
 - README.adoc
@@ -152,11 +154,12 @@ files:
 - lib/relaton/iec/statuses.yml
 - lib/relaton/iec/util.rb
 - lib/relaton/iec/version.rb
-- relaton_iec.gemspec
+- relaton-iec.gemspec
 homepage: https://github.com/relaton/relaton-iec
 licenses:
 - MIT
 metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -171,7 +174,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::Iec: retrieve IEC Standards for bibliographic use using the IecBibliographicItem
   model'