relaton-iso 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0a58fc84ec9c809db2fc25e77930077b6a73ab11e133c4bdb2d652adf600594
-  data.tar.gz: 3691f0bd3e4eea35141266fbaceb40f3a1dd83fb56c40852db49a3f030f46a5c
+  metadata.gz: fd102580f9b62955c20c472e51fa4ef1ebf17da882ec6831d29b6c50736f45d1
+  data.tar.gz: 90539cae8ac8b65341a3a9e169095f509f83eebd511e2379355fd1492cfd443b
 SHA512:
-  metadata.gz: 8eaaf4e1dfb0216737f9344b2c4f43981411135f1c953f8536e1c58fdc4b56c5df3d0ef69d61c32a52647092db315c16305d07b4b76127b9b48f5a472d71b2db
-  data.tar.gz: b1e9d5b6aef1c7686187560a0c5e83c594c158ed0e9b0dc035f36b0aadb038770080e3bc99093dc78a2c3bd7e5cb8543bee72f5dd7b08ec11879e295db68d8e4
+  metadata.gz: e4b23ce25925854f5f3c17e94a2dd8a5021901e6ce5c01fd6b2cf5673b6db5697335ac171ccf56dadaedeefd95814aeb7909476e5c0347bfb515cfd3267ae13e
+  data.tar.gz: 5f170c2c73bfa5c533a0c21b3e3bd602313731c6b3f2a6641068383fc3a5bc9ac8098a4708dcb1d5191e089df3cf07c6aeb60e0739922f32f9562f369d3a3804

data/CLAUDE.md

@@ -29,5 +29,5 @@ Key dependency: `pubid-iso` gem handles ISO publication identifier parsing and c
 
 - **Framework:** RSpec with VCR cassettes and WebMock
 - **Network access:** fully blocked via `WebMock.disable_net_connect!`
-- **Index fixture:** `spec/fixtures/index-v1.zip` is served by WebMock stub (configured in `spec/support/webmock.rb`). Run `rake spec:update_index` to refresh when upstream data changes.
-- **VCR:** cassettes in `spec/vcr_cassettes/`, record mode `:once`, re-record interval 7 days. Index download requests are ignored by VCR (handled by WebMock stub instead).
+- **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-iso.
+- **VCR:** cassettes in `spec/vcr_cassettes/`, record mode `:once`, re-record interval 7 days. Index download requests are ignored by VCR (handled by fixture instead).

data/Gemfile

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

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/iso/data_fetcher.rb

@@ -194,7 +194,7 @@ module Relaton
 
       def write_file(file, doc, docid)
         @files << file
-        index.add_or_update docid.content.to_h, file
+        index.add_or_update docid.pubid.to_h, file
         File.write file, serialize(doc), encoding: "UTF-8"
       end
 

data/lib/relaton/iso/item_data.rb

@@ -23,10 +23,6 @@ module Relaton
         pubid = without_date ? content.exclude(:year) : content
         self.id = pubid.to_s(with_prf: true).gsub(/\W+/, "")
       end
-
-      def create_relation(**args)
-        Relation.new(**args)
-      end
     end
   end
 end

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

@@ -3,6 +3,7 @@ require_relative "ext"
 module Relaton
   module Iso
     class Bibdata < Item
+      model ItemData
       include Bib::BibdataShared
     end
   end

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

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

data/lib/relaton/iso/model/contributor.rb

@@ -1,7 +1,6 @@
 module Relaton
   module Iso
     class Contributor < Bib::Contributor
-      # attributes[:organization].type = :boolean
     end
   end
 end

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

@@ -1,133 +1,122 @@
 module Relaton
   module Iso
-    class Pubid < Lutaml::Model::Type::Value
-      module Renderer
-      end
-
-      class << self
-        def cast(value)
-          value.is_a?(String) ? ::Pubid::Iso::Identifier.parse(value) : value
-        rescue StandardError
-          Util.warn "Failed to parse Pubid: #{value}"
-          value
-        end
-      end
-
-      ::Lutaml::Model::Config::AVAILABLE_FORMATS.each do |format|
-        define_method(:"to_#{format}") { value.to_s with_prf: true }
-      end
-
-      def to_h = value.to_h
-      def urn = value.urn
-    end
-
     class Docidentifier < Bib::Docidentifier
-      include Pubid::Renderer
+      attribute :content, :string
 
-      attribute :content, Pubid
+      attr_reader :pubid
 
-      # iso-tc identifiers are TC document numbers, not ISO standard
-      # identifiers — parsing them through Pubid adds a spurious
-      # "ISO" prefix (#178). Bypass Pubid casting for iso-tc content
-      # in both direct construction and XML deserialization paths.
       def initialize(arg = nil, **kwargs)
-        if arg.is_a?(Hash)
-          raw_content = arg["content"] if arg["type"] == "iso-tc"
-          super(arg)
-        else
-          raw_content = kwargs[:content] if kwargs[:type] == "iso-tc"
-          super(**kwargs)
-        end
-        @content = raw_content if raw_content.is_a?(String)
+        arg.is_a?(Hash) ? super(arg) : super(**kwargs)
+        # Content may have been set before type during lutaml init. Re-run
+        # the setter so type-dependent parsing (e.g. iso-tc bypass) applies.
+        raw = arg.is_a?(Hash) ? (arg["content"] || arg[:content]) : kwargs[:content]
+        self.content = raw if raw
       end
 
-      # Capture raw iso-tc content before Pubid casting (#178).
-      # The lutaml-model setter is defined via define_method, so we
-      # wrap it with alias_method instead of super.
       alias_method :original_content=, :content=
+      alias_method :original_content, :content
+
       def content=(value)
-        if value.is_a?(String) && type == "iso-tc"
-          @iso_tc_raw = value
+        @pubid = nil
+        @raw_content = nil
+
+        if type == "iso-tc" && value.is_a?(String)
+          @raw_content = value
+        else
+          parsed =
+            case value
+            when ::Pubid::Iso::Identifier::Base then value
+            when String
+              begin
+                ::Pubid::Iso::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
         end
-        send(:original_content=, value)
+
+        send(:original_content=, to_s)
       end
 
-      def content_to_xml(model, parent, doc)
-        doc.add_xml_fragment parent, model.to_s
+      def content
+        return @raw_content if @raw_content
+        return render_pubid(@pubid) if @pubid
+
+        original_content
       end
 
-      def content_to_key_value(model, doc)
-        doc["content"] = model.to_s
+      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
+        @pubid.all_parts = true
+        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 exclude_year
-        return content if content.is_a? String
-
-        pubid = content.exclude(:year)
-        current_pubid = pubid
-        while current_pubid.base
-          current_pubid.base = current_pubid.base.exclude(:year)
-          current_pubid = current_pubid.base
+        return @raw_content if @raw_content
+        return nil unless @pubid
+
+        pubid = @pubid.exclude(:year)
+        current = pubid
+        while current.base
+          current.base = current.base.exclude(:year)
+          current = current.base
         end
         pubid
       end
 
-      def to_s
-        return content if content.is_a? String
-        return @iso_tc_raw if @iso_tc_raw
+      private
 
+      def render_pubid(pubid)
         case type
-        when "URN" then content.urn
-        when "iso-reference", "iso-with-lang" then iso_reference
-        else content.to_s with_prf: true
+        when "URN" then pubid.urn
+        when "iso-reference", "iso-with-lang"
+          pubid.to_s(format: :ref_num_short, with_prf: true)
+        else
+          pubid.to_s(with_prf: true)
         end
       end
 
-      def iso_reference
-        content.to_s(format: :ref_num_short, with_prf: true)
-
-        # return content.to_s(format: :ref_num_short, with_prf: true) if content.language
-
-        # pubid_dup = content.dup
-        # pubid_dup.language = "en"
-        # pubid_dup.to_s(format: :ref_num_short, with_prf: true)
-      end
-
-      private
-
       def remove_attr!(attr)
-        return if content.is_a? String
+        return unless @pubid
 
-        content.send("#{attr}=", nil)
-        base = content.base
+        @pubid.send("#{attr}=", nil)
+        base = @pubid.base
         while base
           base.send("#{attr}=", nil)
           base = base.base
         end
+        refresh_content!
+      end
+
+      def refresh_content!
+        send(:original_content=, to_s)
       end
     end
   end

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

@@ -5,7 +5,6 @@ require_relative "structured_identifier"
 module Relaton
   module Iso
     class Ext < Bib::Ext
-      attribute :schema_version, method: :get_schema_version
       attribute :doctype, Doctype
       attribute :structuredidentifier, StructuredIdentifier
       attribute :horizontal, :boolean
@@ -14,18 +13,23 @@ module Relaton
       attribute :fast_track, :boolean
       attribute :price_code, :string
 
-      def get_schema_version
-        Relaton.schema_versions["relaton-model-iso"]
-      end
+      def get_schema_version = Relaton.schema_versions["relaton-model-iso"]
 
       xml do
-        root "ext"
         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
       end
+
+      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
+      end
     end
   end
 end

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

@@ -1,19 +1,22 @@
+require_relative "docidentifier"
+
 module Relaton
   module Iso
-    # The class is for relaton bibitem instances.
-    # The in relaton bibitem instances dosn't have schema-version & fetched attributes.
-    class ItemBase < Item
+    class ItemBase < Lutaml::Model::Serializable
+      include Bib::NamespaceHelper
+
+      attr_accessor :type
+
       model ItemData
 
-      # we don't need schema-version & fetched attributes in reation/bibitem
-      mappings[:xml].instance_variable_get(:@attributes).delete("id")
-      mappings[:xml].instance_variable_get(:@attributes).delete("schema-version")
-      mappings[:xml].instance_variable_get(:@elements).delete("fetched")
-      mappings[:xml].instance_variable_get(:@elements).delete("ext")
-      attributes.delete :id
-      attributes.delete :schema_version
-      attributes.delete :fetched
-      attributes.delete :ext
+      instance_exec(&Bib::ItemShared::ATTRIBUTES)
+      attribute :docidentifier, Docidentifier, collection: true, initialize_empty: true
+      attribute :relation, Relation, collection: true, initialize_empty: true
+
+      xml do
+        map_attribute "type", to: :type
+        instance_exec(&Bib::ItemShared::XML_BODY)
+      end
     end
   end
 end

data/lib/relaton/iso/version.rb

@@ -2,6 +2,6 @@
 
 module Relaton
   module Iso
-    VERSION = "2.0.0"
+    VERSION = "2.1.0"
   end
 end

data/{relaton_iso.gemspec → relaton-iso.gemspec}

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "isoics", "~> 0.1.6"
   spec.add_dependency "openssl", "~> 3.3.2" # 3.3.0 raised an error on Ruby 3.4.7
   spec.add_dependency "pubid-iso", "~> 1.15.8"
-  spec.add_dependency "relaton-bib", "~> 2.0.0"
+  spec.add_dependency "relaton-bib", "~> 2.1.0"
   spec.add_dependency "relaton-core", "~> 0.0.12"
   spec.add_dependency "relaton-index", "~> 0.2.12"
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  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: isoics
@@ -57,14 +58,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: relaton-core
   requirement: !ruby/object:Gem::Requirement
@@ -147,11 +148,12 @@ files:
 - lib/relaton/iso/scraper.rb
 - lib/relaton/iso/util.rb
 - lib/relaton/iso/version.rb
-- relaton_iso.gemspec
+- relaton-iso.gemspec
 homepage: https://github.com/relaton/relaton-iso
 licenses:
 - BSD-2-Clause
 metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -166,7 +168,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::Iso: retrieve ISO Standards for bibliographic use using the IsoBibliographicItem
   model'