pubid 2.0.0.pre.alpha.3 → 2.0.0.pre.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 296a51f39ef14271b7b66a8403042c4a35b214eb3e858c2a926ab9104e74acfa
-  data.tar.gz: 9dcdd6b5082ea2cc6b866078f7c749e687fd4f76ad767b94ed77347700f2a6c2
+  metadata.gz: fd077b48356a46dfb52d7b95e932c29e91e5fe1a7859c1128ddda22d768b4a96
+  data.tar.gz: 4e8059d20bed9297393f54bb894958a6c0ab8d92bef895fcb7528c291b3ff349
 SHA512:
-  metadata.gz: 974c5db378c9461c7636b47525054a7351fd136de2493710767abbb198e40fdadf7e21a9c9273d3bbe79707c301509e21aaea30eeae3d09931b11029e5cf69ae
-  data.tar.gz: 16d304dcd9a960da1386e46d692425e3c9a7153be96130187def4c02c9fc22e192bd4374956ee526678bbfe04add13ab50c71d625b860e0d6c65cd157ef12248
+  metadata.gz: 329f3776c53f4021bfd2d25bd8698fb9c01309a66f56e9334d815aee3fde8ce25b509637f97ffc4ef91f0dfb67d10768a33505a939109a305d34b2e917af8f6c
+  data.tar.gz: 79c43b4e3ca83fe379a588f20490850e6a88757e382f0f9b9fc88d9f31923aff8fd8a5d48670c33a0d0705747820c6b3548260334ebf4e63a09b60dab82ad4ec

data/lib/pubid/amca/identifier.rb

@@ -1,25 +1,6 @@
 # frozen_string_literal: true
 
-module Pubid
-  module Amca
-    # NOTE: this flavor intentionally does NOT `extend Pubid::IdentifierFacade`
-    # (nor include it in Identifiers::Base). The facade's identity check makes
-    # `is_a?(<Flavor>::Identifier)` true, which routes the object through a
-    # consumer's `to_hash` (e.g. relaton-index#save) — but AMCA's `to_hash`
-    # currently raises (publisher is stored as a String, not a Publisher
-    # component). Enabling the facade here would turn a non-crashing path into a
-    # crash. Re-enable once AMCA serialization round-trips cleanly.
-    module Identifier
-      # Parse an ACMA identifier string into an identifier object
-      # @param identifier [String] The ACMA identifier string to parse
-      # @return [Pubid::Amca::Identifier] The appropriate identifier object
-      # @raise [Parslet::ParseFailed] If parsing fails
-      def self.parse(identifier)
-        parsed = Parser.parse(identifier)
-        Builder.build(parsed)
-      rescue Parslet::ParseFailed => e
-        raise "Failed to parse ACMA identifier '#{identifier}': #{e.message}"
-      end
-    end
-  end
-end
+# Pubid::Amca::Identifier is the AMCA base class (a real Pubid::Identifier
+# subclass); its body, `.parse`, and the Identifiers::Base back-compat alias
+# live in identifiers/base.rb. This file just ensures it is loaded.
+require_relative "identifiers/base"

data/lib/pubid/amca/identifiers/base.rb

@@ -2,37 +2,74 @@
 
 module Pubid
   module Amca
-    module Identifiers
-      # Base identifier class for ACMA identifiers
-      # Single Responsibility: Common functionality for all ACMA identifier types
-      class Base < Pubid::Identifier
-        # Override base_hash to handle AMCA-specific copublisher format (string, not array)
-        def base_hash
-          hash = super
-          # AMCA's copublisher is a string, not an array, so remove it from copublishers
-          hash.delete(:copublishers) if hash[:copublishers]
-          hash
-        end
-
-        attribute :copublisher, :string
-        attribute :code, Components::Code
-        attribute :year, Components::Date
-        attribute :suffix, :string
-        attribute :reaffirmed, :string
-
-        # AMCA uses a fixed publisher string
-        def publisher
-          "AMCA"
-        end
-
-        def self.parse(string)
-          Amca::Identifier.parse(string)
-        end
-
-        def to_urn
-          UrnGenerator.new(self).generate
-        end
+    # Base identifier class for AMCA identifiers. Canonical name
+    # Pubid::Amca::Identifier (Identifiers::Base is a back-compat alias); common
+    # functionality for all AMCA identifier types.
+    class Identifier < ::Pubid::Identifier
+      # @raise [Parslet::ParseFailed] If parsing fails
+      def self.parse(identifier)
+        parsed = Parser.parse(identifier)
+        Builder.build(parsed)
+      rescue Parslet::ParseFailed => e
+        raise "Failed to parse ACMA identifier '#{identifier}': #{e.message}"
+      end
+
+      # Stored as a plain string (always "AMCA") so it round-trips through
+      # to_hash/from_hash. Was a `def publisher` method, which made lutaml
+      # serialize a String against the Components::Publisher attribute and raise.
+      attribute :publisher, :string, default: -> { "AMCA" }
+      attribute :copublisher, :string
+      attribute :code, Components::Code
+      attribute :year, Components::Date
+      attribute :suffix, :string
+      attribute :reaffirmed, :string
+
+      # Explicit key_value mapping: only these keys serialize (the inherited
+      # Pubid::Identifier attributes — including :type, which subclasses expose
+      # as a class-metadata Hash via `self.type` — are intentionally dropped).
+      # code/year are flattened to their scalar value and rebuilt on load, since
+      # the Builder may store them as either a String or a component.
+      key_value do
+        map "_type", to: :_type
+        map "publisher", to: :publisher
+        map "copublisher", to: :copublisher
+        map "code", with: { to: :code_to_kv, from: :code_from_kv }
+        map "year", with: { to: :year_to_kv, from: :year_from_kv }
+        map "suffix", to: :suffix
+        map "reaffirmed", to: :reaffirmed
+      end
+
+      def to_urn
+        UrnGenerator.new(self).generate
       end
+
+      def code_to_kv(model, doc)
+        v = model.code.is_a?(::Pubid::Components::Code) ? model.code.value : model.code
+        return if v.nil? || v.to_s.empty?
+
+        doc.add_child(Lutaml::KeyValue::DataModel::Element.new("code", v.to_s))
+      end
+
+      def code_from_kv(model, value)
+        model.code = ::Pubid::Components::Code.new(value: value.to_s)
+      end
+
+      def year_to_kv(model, doc)
+        y = model.year.is_a?(::Pubid::Components::Date) ? model.year.year : model.year
+        return if y.nil? || y.to_s.empty?
+
+        doc.add_child(Lutaml::KeyValue::DataModel::Element.new("year", y.to_s))
+      end
+
+      def year_from_kv(model, value)
+        model.year = ::Pubid::Components::Date.new(year: value.to_s)
+      end
+    end
+
+    module Identifiers
+      # Backward-compatible alias: AMCA's base class used to be
+      # Pubid::Amca::Identifiers::Base. It is now Pubid::Amca::Identifier.
+      Base = Pubid::Amca::Identifier
     end
   end
 end

data/lib/pubid/amca/identifiers/interpretation.rb

@@ -24,10 +24,6 @@ reaffirmed: nil, interpretation_code: nil)
         def self.type
           { key: :interpretation, title: "Interpretation", short: "Interp" }
         end
-
-        def type
-          Interpretation.type
-        end
       end
     end
   end

data/lib/pubid/amca/identifiers/publication.rb

@@ -24,10 +24,6 @@ reaffirmed: nil, revision: nil)
         def self.type
           { key: :publication, title: "Publication", short: nil }
         end
-
-        def type
-          Publication.type
-        end
       end
     end
   end

data/lib/pubid/amca/identifiers/standard.rb

@@ -12,10 +12,6 @@ module Pubid
         def self.type
           { key: :standard, title: "Standard", short: nil }
         end
-
-        def type
-          Standard.type
-        end
       end
     end
   end

data/lib/pubid/amca/renderer.rb

@@ -31,7 +31,7 @@ module Pubid
       def render_base(id)
         parts = []
         parts << id.copublisher if id.copublisher
-        t = id.class.attributes.key?(:type) ? id.type : nil
+        t = id.class.respond_to?(:type) ? id.class.type : nil
         if t.is_a?(Hash) && t[:title]
           parts << t[:title].to_s
         end

data/lib/pubid/amca/urn_generator.rb

@@ -28,7 +28,8 @@ module Pubid
       end
 
       def urn_type
-        identifier.type&.to_s&.downcase
+        (identifier.class.respond_to?(:type) ? identifier.class.type : nil)
+          &.to_s&.downcase
       end
 
       def generate

data/lib/pubid/api/builder.rb

@@ -26,6 +26,10 @@ module Pubid
 
       def cast(key, value)
         case key
+        # `:type` is consumed only by select_class for dispatch; it is not an
+        # identifier attribute (the concrete class is pinned by `_type`). Drop it
+        # so the raw Parslet::Slice never lands in the inherited :type attribute.
+        when :type then nil
         when :number then Components::Code.new(value: value.to_s)
         when :reaffirmation
           value.is_a?(Hash) ? (value[:year] || value).to_s : value.to_s

data/lib/pubid/api/identifier.rb

@@ -2,7 +2,11 @@
 
 module Pubid
   module Api
-    class Identifier
+    # Common base class for all API identifiers. SingleIdentifier and the
+    # concrete Identifiers::* types descend from it, so every API identifier is
+    # `is_a?(Pubid::Api::Identifier)` natively and gets the shared polymorphic
+    # `from_hash` (no facade needed).
+    class Identifier < ::Pubid::Identifier
       def self.parse(input)
         # Filter out comments
         return nil if input.start_with?("#")

data/lib/pubid/api/identifiers/base.rb

@@ -3,19 +3,9 @@
 module Pubid
   module Api
     module Identifiers
+      # Base class for all API identifiers.
+      # Inherits common attributes from SingleIdentifier.
       class Base < SingleIdentifier
-        # Base class for all API identifiers
-        # Inherits common attributes from SingleIdentifier
-
-        # Include type_string in serialization for round-trip compatibility
-        def base_hash
-          hash = super
-          if self.class.attributes.key?(:type_string) && type_string
-            hash[:type] =
-              type_string
-          end
-          hash
-        end
       end
     end
   end

data/lib/pubid/api/identifiers/mpms.rb

@@ -12,10 +12,6 @@ module Pubid
           "MPMS"
         end
 
-        def to_s
-          render(format: :human)
-        end
-
         private
 
         def code_portion

data/lib/pubid/api/identifiers/typeless_standard.rb

@@ -5,9 +5,6 @@ module Pubid
     module Identifiers
       class TypelessStandard < Base
         # No type_string method - renders without type
-        def to_s
-          render(format: :human)
-        end
       end
     end
   end

data/lib/pubid/api/single_identifier.rb

@@ -2,24 +2,21 @@
 
 module Pubid
   module Api
-    class SingleIdentifier < Pubid::Identifier
+    class SingleIdentifier < Identifier
       # Generate URN for this identifier
       #
       # @return [String] URN representation
 
-      def publisher
-        "API"
-      end
+      # Stored as a plain string (always "API") so it round-trips through
+      # to_hash/from_hash. Was a `def publisher` method, which made lutaml
+      # serialize a String against the Components::Publisher attribute.
+      attribute :publisher, :string, default: -> { "API" }
 
       attribute :code, Components::Code
       attribute :part, :string
       attribute :year, :string
       attribute :reaffirmation, :string
 
-      def to_s
-        render(format: :human)
-      end
-
       private
 
       def code_portion

data/lib/pubid/ashrae/identifier.rb

@@ -1,24 +1,9 @@
 # frozen_string_literal: true
 
-module Pubid
-  module Ashrae
-    # `extend Pubid::IdentifierFacade` adds polymorphic `from_hash` and pairs
-    # with `include Pubid::Ashrae::Identifier` in Identifiers::Base for identity
-    # (`is_a?`/`===`), so a consumer handed this module can deserialize and
-    # identity-check ASHRAE ids through it.
-    module Identifier
-      extend Pubid::IdentifierFacade
-
-      # Parse an ASHRAE identifier string into an identifier object
-      # @param identifier [String] The ASHRAE identifier string to parse
-      # @return [Identifiers::Base] The appropriate identifier object
-      # @raise [Parslet::ParseFailed] If parsing fails
-      def self.parse(identifier)
-        parsed = Parser.parse(identifier)
-        Builder.build(parsed)
-      rescue Parslet::ParseFailed => e
-        raise "Failed to parse ASHRAE identifier '#{identifier}': #{e.message}"
-      end
-    end
-  end
-end
+# The ASHRAE flavor base class is Pubid::Ashrae::Identifier — a real
+# Pubid::Identifier subclass that every concrete ASHRAE identifier descends
+# from, so `is_a?` identity and the shared polymorphic `from_hash` work natively
+# (no facade needed). Its body, `.parse`, and the Identifiers::Base back-compat
+# alias live in identifiers/base.rb; this file just ensures it is loaded when a
+# consumer references Pubid::Ashrae::Identifier directly.
+require_relative "identifiers/base"

data/lib/pubid/ashrae/identifiers/base.rb

@@ -2,25 +2,36 @@
 
 module Pubid
   module Ashrae
-    module Identifiers
-      # Base class for all ASHRAE identifiers
-      class Base < Pubid::Identifier
-        # Identity for the Pubid::Ashrae::Identifier facade (see its comment).
-        include Pubid::Ashrae::Identifier
+    # Base class for all ASHRAE identifiers. Canonical name
+    # Pubid::Ashrae::Identifier; every concrete ASHRAE identifier descends from
+    # it, and Identifiers::Base — aliased at the foot of this file — points back
+    # to it.
+    class Identifier < ::Pubid::Identifier
+      # Parse an ASHRAE identifier string into an identifier object
+      # @param identifier [String] The ASHRAE identifier string to parse
+      # @return [Pubid::Ashrae::Identifier] The appropriate identifier object
+      # @raise [Parslet::ParseFailed] If parsing fails
+      def self.parse(identifier)
+        parsed = Parser.parse(identifier)
+        Builder.build(parsed)
+      rescue Parslet::ParseFailed => e
+        raise "Failed to parse ASHRAE identifier '#{identifier}': #{e.message}"
+      end
 
-        attribute :publisher, :string, default: "ASHRAE"
-        attribute :code, :string
-        attribute :year, :string
-        attribute :type, :string
-        attribute :suffix, :string # R (revision), P (proposed), etc.
-        attribute :amendment, :string
-        attribute :reaffirmed, :string
-        attribute :copublisher, :string
+      attribute :publisher, :string, default: "ASHRAE"
+      attribute :code, :string
+      attribute :year, :string
+      attribute :type, :string
+      attribute :suffix, :string # R (revision), P (proposed), etc.
+      attribute :amendment, :string
+      attribute :reaffirmed, :string
+      attribute :copublisher, :string
+    end
 
-        def self.parse(string)
-          Ashrae::Identifier.parse(string)
-        end
-      end
+    module Identifiers
+      # Backward-compatible alias: ASHRAE's base class used to be
+      # Pubid::Ashrae::Identifiers::Base. It is now Pubid::Ashrae::Identifier.
+      Base = Pubid::Ashrae::Identifier
     end
   end
 end

data/lib/pubid/ashrae/parser.rb

@@ -650,6 +650,10 @@ module Pubid
       root(:identifier)
 
       def self.parse(string)
+        if string.length > Pubid::MAX_INPUT_LENGTH
+          raise ArgumentError, Pubid::INPUT_TOO_LONG_MESSAGE
+        end
+
         # Strip leading/trailing whitespace
         cleaned = string.strip
 

data/lib/pubid/ashrae.rb

@@ -13,6 +13,10 @@ module Pubid
     autoload :UrnParser, "#{__dir__}/ashrae/urn_parser"
 
     def self.parse(identifier)
+      if identifier.length > Pubid::MAX_INPUT_LENGTH
+        raise ArgumentError, Pubid::INPUT_TOO_LONG_MESSAGE
+      end
+
       Identifier.parse(identifier)
     end
 

data/lib/pubid/asme/single_identifier.rb

@@ -2,7 +2,9 @@
 
 module Pubid
   module Asme
-    class SingleIdentifier < Pubid::Identifier
+    # Descends from Pubid::Asme::Identifier (the flavor base) so every concrete
+    # ASME identifier is `is_a?(Pubid::Asme::Identifier)`.
+    class SingleIdentifier < Identifier
       # Generate URN for this identifier
       #
       # @return [String] URN representation

data/lib/pubid/astm/single_identifier.rb

@@ -2,7 +2,9 @@
 
 module Pubid
   module Astm
-    class SingleIdentifier < Pubid::Identifier
+    # Descends from Pubid::Astm::Identifier (the flavor base) so every concrete
+    # ASTM identifier is `is_a?(Pubid::Astm::Identifier)`.
+    class SingleIdentifier < Identifier
       # Generate URN for this identifier
       #
       # @return [String] URN representation

data/lib/pubid/bsi/identifier.rb

@@ -1,33 +1,7 @@
 # frozen_string_literal: true
 
-module Pubid
-  module Bsi
-    # `extend Pubid::IdentifierFacade` adds polymorphic `from_hash` and pairs
-    # with `include Pubid::Bsi::Identifier` in SingleIdentifier (BSI's common
-    # ancestor — there is no Identifiers::Base) for identity (`is_a?`/`===`), so
-    # a consumer handed this module can deserialize and identity-check BSI ids
-    # through it.
-    module Identifier
-      extend Pubid::IdentifierFacade
-
-      def self.parse(string)
-        # Delegate to IEC for bare IEC identifiers
-        # This handles IEC-specific features like VAP suffixes (CSV, RLV, etc.)
-        # and consolidated supplements (+AMD1:2001)
-        if string.match?(/\bIEC\b/) &&
-            (string.match?(/\s+(CSV|CMV|RLV|SER|EXV|PAC|PRV)\b/) ||
-             string.match?(/\+AMD\d+:/) ||
-             string.match?(/\+COR\d+:/))
-          return Pubid::Iec.parse(string)
-        end
-
-        parser = Parser.new
-
-        parsed = parser.parse(string)
-        Builder.build(parsed)
-      rescue Parslet::ParseFailed => e
-        raise StandardError, "Failed to parse '#{string}': #{e.message}"
-      end
-    end
-  end
-end
+# Pubid::Bsi::Identifier is the BSI base class (a real Pubid::Identifier
+# subclass); its body, `.parse` (including the IEC-delegation logic), and the
+# SingleIdentifier back-compat alias live in single_identifier.rb. This file
+# just ensures it is loaded when a consumer references Pubid::Bsi::Identifier.
+require_relative "single_identifier"

data/lib/pubid/bsi/identifiers/addendum_document.rb

@@ -21,10 +21,6 @@ module Pubid
           ":"
         } # Separator before Addendum (":" or " ")
 
-        def to_s(lang: :en, lang_single: false)
-          render(format: :human, lang: lang, lang_single: lang_single)
-        end
-
         def publisher
           base_identifier&.publisher
         end

data/lib/pubid/bsi/identifiers/adopted_european_norm.rb

@@ -25,10 +25,6 @@ module Pubid
           nil
         end
 
-        def to_s(lang: :en, lang_single: false)
-          render(format: :human, lang: lang, lang_single: lang_single)
-        end
-
         # Delegate common methods to adopted identifier
         def number
           adopted_identifier&.number

data/lib/pubid/bsi/identifiers/adopted_international_standard.rb

@@ -25,10 +25,6 @@ module Pubid
           nil
         end
 
-        def to_s
-          render(format: :human)
-        end
-
         # Delegate common methods to adopted identifier
         def number
           adopted_identifier&.number

data/lib/pubid/bsi/identifiers/aerospace_standard.rb

@@ -59,9 +59,6 @@ module Pubid
             short: "BS" }
         end
 
-        def to_s(lang: :en, lang_single: false)
-          render(format: :human, lang: lang, lang_single: lang_single)
-        end
       end
     end
   end

data/lib/pubid/bsi/identifiers/amendment.rb

@@ -11,10 +11,6 @@ module Pubid
         attribute :amendment_year, :integer
         attribute :separator, :string, default: -> { "+" }
 
-        def to_s
-          render(format: :human)
-        end
-
         def publisher
           base_identifier&.publisher
         end

data/lib/pubid/bsi/identifiers/british_industrial_practice.rb

@@ -16,9 +16,6 @@ module Pubid
           }
         end
 
-        def to_s(lang: :en, lang_single: false)
-          render(format: :human, lang: lang, lang_single: lang_single)
-        end
       end
     end
   end

data/lib/pubid/bsi/identifiers/bundled_identifier.rb

@@ -12,15 +12,12 @@ module Pubid
       #   BS SP 13; 14; 15 and 16:1949
       #   BS 4048:Parts 1 and 2:1966
       class BundledIdentifier < SingleIdentifier
-        attribute :identifiers, ::Pubid::Identifier, collection: true, polymorphic: true
+        attribute :identifiers, ::Pubid::Identifier, collection: true, 
+                                                     polymorphic: true
         attribute :separators, :string, collection: true # Separators between identifiers
         attribute :common_year, Bsi::Components::Date # Year applied to all if present
         attribute :bundle_type, :string # "Parts", "Sections", or nil for regular bundles
 
-        def to_s(lang: :en, lang_single: false)
-          render(format: :human, lang: lang, lang_single: lang_single)
-        end
-
         def <=>(other)
           return nil unless other.is_a?(BundledIdentifier)
 

data/lib/pubid/bsi/identifiers/committee_document.rb

@@ -29,9 +29,6 @@ module Pubid
           { key: :committee_document, title: "Committee Document", short: "DC" }
         end
 
-        def to_s(lang: :en, lang_single: false)
-          render(format: :human, lang: lang, lang_single: lang_single)
-        end
       end
     end
   end

data/lib/pubid/bsi/identifiers/consolidated_identifier.rb

@@ -6,11 +6,8 @@ module Pubid
       # Consolidated Identifier - contains base document plus supplements
       # Example: "BS 4592-0:2006+A1:2012" = [BS 4592-0:2006, Amendment 1:2012]
       class ConsolidatedIdentifier < SingleIdentifier
-        attribute :identifiers, ::Pubid::Identifier, polymorphic: true, collection: true
-
-        def to_s(lang: :en, lang_single: false)
-          render(format: :human, lang: lang, lang_single: lang_single)
-        end
+        attribute :identifiers, ::Pubid::Identifier, polymorphic: true, 
+                                                     collection: true
 
         def to_urn
           base = identifiers&.first

data/lib/pubid/bsi/identifiers/corrigendum.rb

@@ -11,10 +11,6 @@ module Pubid
         attribute :corrigendum_year, :integer
         attribute :separator, :string, default: -> { "+" }
 
-        def to_s
-          render(format: :human)
-        end
-
         def publisher
           base_identifier&.publisher
         end

data/lib/pubid/bsi/identifiers/detailed_specification.rb

@@ -27,9 +27,6 @@ module Pubid
           }
         end
 
-        def to_s(lang: :en, lang_single: false)
-          render(format: :human, lang: lang, lang_single: lang_single)
-        end
       end
     end
   end

data/lib/pubid/bsi/identifiers/disc.rb

@@ -21,9 +21,6 @@ module Pubid
           { key: :disc, title: "DISC", short: "DISC" }
         end
 
-        def to_s(lang: :en, lang_single: false)
-          render(format: :human, lang: lang, lang_single: lang_single)
-        end
       end
     end
   end

data/lib/pubid/bsi/identifiers/draft_document.rb

@@ -21,9 +21,6 @@ module Pubid
             web: :draft_document, title: "Draft Document", short: "DD" }
         end
 
-        def to_s(lang: :en, lang_single: false)
-          render(format: :human, lang: lang, lang_single: lang_single)
-        end
       end
     end
   end