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

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

@@ -10,9 +10,6 @@ module Pubid
             web: :electronic_book, title: "Electronic Publication", short: "EP" }
         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/expert_commentary.rb

@@ -14,10 +14,6 @@ module Pubid
         attribute :format, :string # "full", "abbr", "abbr_with_topic"
         attribute :topic, :string # e.g., "Fire"
 
-        def to_s
-          render(format: :human)
-        end
-
         def publisher
           base_identifier&.publisher
         end

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

@@ -29,9 +29,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/flex.rb

@@ -20,9 +20,6 @@ module Pubid
           { key: :flex, title: "BSI Flex", short: "BSI Flex" }
         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/handbook.rb

@@ -19,9 +19,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/index.rb

@@ -24,9 +24,6 @@ module Pubid
           { key: :index, title: "Index", short: "Index" }
         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/method.rb

@@ -29,9 +29,6 @@ module Pubid
           { key: :method, title: "Method", short: "Method" }
         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/national_annex.rb

@@ -42,9 +42,6 @@ module Pubid
           base_doc&.subpart || super
         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/practice_guide.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/publicly_available_specification.rb

@@ -21,9 +21,6 @@ module Pubid
             web: :publicly_available_specification, title: "Publicly Available Specification", short: "PAS" }
         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/published_document.rb

@@ -21,9 +21,6 @@ module Pubid
             web: :published_document, title: "Published Document", short: "PD" }
         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/section.rb

@@ -26,9 +26,6 @@ module Pubid
           { key: :section, title: "Section", short: "Section" }
         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/set.rb

@@ -13,13 +13,10 @@ module Pubid
       #   BS ISO 20400 + BS ISO 44001+BS ISO 44002
       #   BS ISO 9001+BS ISO 14001
       class Set < SingleIdentifier
-        attribute :identifiers, ::Pubid::Identifier, collection: true, polymorphic: true
+        attribute :identifiers, ::Pubid::Identifier, collection: true, 
+                                                     polymorphic: true
         attribute :separators, :string, collection: true # Should all be " + "
 
-        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?(Set)
 

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

@@ -25,9 +25,6 @@ module Pubid
           { key: :standalone_amendment, title: "Amendment", short: "AMD" }
         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/supplement_document.rb

@@ -20,10 +20,6 @@ module Pubid
           ":"
         } # Separator before Supplement (":" or " ")
 
-        def to_s
-          render(format: :human)
-        end
-
         def publisher
           base_identifier&.publisher
         end

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

@@ -29,9 +29,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/technical_specification.rb

@@ -28,9 +28,6 @@ module Pubid
             web: :technical_specification, title: "Technical Specification", short: "TS" }
         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/test_method.rb

@@ -29,9 +29,6 @@ module Pubid
           { key: :test_method, title: "Test Method", 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/value_added_publication.rb

@@ -15,10 +15,6 @@ module Pubid
         attribute :base_identifier, ::Pubid::Identifier, polymorphic: true
         attribute :format, :string, values: ["PDF", "TC", "BOOK"]
 
-        def to_s(lang: :en, lang_single: false)
-          render(format: :human, lang: lang, lang_single: lang_single)
-        end
-
         # Delegate common attributes to base_identifier
         def publisher
           base_identifier&.publisher

data/lib/pubid/bsi/single_identifier.rb

@@ -2,15 +2,34 @@
 
 module Pubid
   module Bsi
-    class SingleIdentifier < Pubid::Identifier
-      # Identity for the Pubid::Bsi::Identifier facade: SingleIdentifier is the
-      # common ancestor of every concrete BSI identifier, so including the
-      # facade module here makes them all `is_a?(Pubid::Bsi::Identifier)`.
-      include Pubid::Bsi::Identifier
+    # BSI base class. Canonical name Pubid::Bsi::Identifier; SingleIdentifier is a
+    # back-compat alias (BSI's common ancestor — there is no Identifiers::Base).
+    # Every concrete BSI identifier descends from it, so they are all
+    # `is_a?(Pubid::Bsi::Identifier)` natively and get the shared polymorphic
+    # `from_hash` (no facade needed).
+    class Identifier < ::Pubid::Identifier
+      def self.parse(string)
+        if string.length > Pubid::MAX_INPUT_LENGTH
+          raise ArgumentError, Pubid::INPUT_TOO_LONG_MESSAGE
+        end
+
+        # 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
 
-      # Generate URN for this identifier
-      #
-      # @return [String] URN representation
+        parsed = parser.parse(string)
+        Builder.build(parsed)
+      rescue Parslet::ParseFailed => e
+        raise StandardError, "Failed to parse '#{string}': #{e.message}"
+      end
 
       attribute :publisher, Bsi::Components::Publisher, default: -> {
         Bsi::Components::Publisher.new(body: "BS")
@@ -34,12 +53,8 @@ module Pubid
       attribute :explicit_publisher, :boolean, default: -> { false }
       attribute :space_separated_part, :boolean, default: -> { false }
 
-      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?(SingleIdentifier)
+        return nil unless other.is_a?(Pubid::Bsi::Identifier)
 
         # Compare by number first
         num_cmp = number.to_s <=> other.number.to_s
@@ -61,5 +76,9 @@ module Pubid
         end
       end
     end
+
+    # Backward-compatible alias: BSI's base class is Pubid::Bsi::Identifier.
+    # Concrete types declared as `< SingleIdentifier` continue to work.
+    SingleIdentifier = Identifier
   end
 end

data/lib/pubid/bsi.rb

@@ -12,7 +12,10 @@ module Pubid
     autoload :Builder, "#{__dir__}/bsi/builder"
     autoload :Identifier, "#{__dir__}/bsi/identifier"
     autoload :Identifiers, "#{__dir__}/bsi/identifiers"
-    autoload :Model, "#{__dir__}/bsi/model"
+    # NOTE: bsi/model.rb is legacy/unused (nothing references Pubid::Bsi::Model)
+    # and defines a conflicting `class Identifier < Lutaml::Model::Serializable`.
+    # It is intentionally NOT autoloaded so it can never clash with the real
+    # Pubid::Bsi::Identifier (single_identifier.rb).
     autoload :Parser, "#{__dir__}/bsi/parser"
     autoload :Renderer, "#{__dir__}/bsi/renderer"
     autoload :SingleIdentifier, "#{__dir__}/bsi/single_identifier"
@@ -203,6 +206,10 @@ module Pubid
     ].freeze
 
     def self.parse(string)
+      if string.length > Pubid::MAX_INPUT_LENGTH
+        raise ArgumentError, Pubid::INPUT_TOO_LONG_MESSAGE
+      end
+
       Identifier.parse(string)
     end
 

data/lib/pubid/ccsds/identifier.rb

@@ -62,20 +62,8 @@ module Pubid
         raise "Failed to parse CCSDS identifier '#{identifier}': #{e.message}"
       end
 
-      # Dispatch deserialization to the concrete class named by the stored
-      # `_type`, so `from_hash` rebuilds a Corrigendum rather than a bare root
-      # (lutaml resolves `_type` only for validation, not instantiation).
-      # Mirrors Pubid::Jis::Identifier.from_hash. The `klass == self` guard lets
-      # the matched subclass fall through to lutaml's inherited from_hash.
-      def self.from_hash(data, options = {})
-        type = data["_type"] || data[:_type]
-        klass_name = CCSDS_TYPE_MAP[type]
-        if klass_name
-          klass = Object.const_get(klass_name)
-          return klass.from_hash(data, options) unless klass == self
-        end
-        super
-      end
+      # from_hash is the shared polymorphic dispatch on Pubid::Identifier.
+      # CCSDS_TYPE_MAP remains as the key_value polymorphic_map.
     end
   end
 end

data/lib/pubid/cen_cenelec/identifier.rb

@@ -1,16 +1,18 @@
 # frozen_string_literal: true
 
-
 module Pubid
   module CenCenelec
-    # `extend Pubid::IdentifierFacade` adds polymorphic `from_hash` and pairs
-    # with `include Pubid::CenCenelec::Identifier` in Identifiers::Base for
-    # identity (`is_a?`/`===`), so a consumer handed this module can deserialize
-    # and identity-check CEN/CENELEC ids through it.
-    module Identifier
-      extend Pubid::IdentifierFacade
-
+    # Common base class for all CEN/CENELEC identifiers. CEN/CENELEC has a split
+    # hierarchy — some concrete types descend from Identifiers::Base, others from
+    # SingleIdentifier — so this class is the shared parent of BOTH, making every
+    # CEN/CENELEC identifier `is_a?(Pubid::CenCenelec::Identifier)` natively (and
+    # giving them the shared polymorphic `from_hash`). No facade needed.
+    class Identifier < ::Pubid::Identifier
       def self.parse(identifier)
+        if identifier.length > Pubid::MAX_INPUT_LENGTH
+          raise ArgumentError, Pubid::INPUT_TOO_LONG_MESSAGE
+        end
+
         parsed = Parser.parse(identifier)
         Builder.new.build(parsed)
       rescue Parslet::ParseFailed => e

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

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

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

@@ -10,10 +10,6 @@ module Pubid
         attribute :amendment_number, :string
         attribute :amendment_year, :integer
 
-        def to_s(**opts)
-          render(format: :human, **opts)
-        end
-
         def publisher
           base_identifier&.publisher
         end

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

@@ -3,12 +3,9 @@
 module Pubid
   module CenCenelec
     module Identifiers
-      # Base CEN identifier
+      # Base CEN identifier (one of two roots; see Pubid::CenCenelec::Identifier).
       # Format: {PUBLISHER} NUMBER[-PART]:YEAR
-      class Base < Pubid::Identifier
-        # Identity for the Pubid::CenCenelec::Identifier facade (see its comment).
-        include Pubid::CenCenelec::Identifier
-
+      class Base < Pubid::CenCenelec::Identifier
         # Generate URN for this identifier
         #
         # @return [String] URN representation
@@ -23,10 +20,6 @@ module Pubid
         attribute :adopted_identifier, Base, polymorphic: true # Nested identifier object (ISO, IEC, etc.)
         attribute :edition, :string # Edition number
 
-        def to_s(**opts)
-          render(format: :human, **opts)
-        end
-
         def ==(other)
           return false unless other.is_a?(Base)
 

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

@@ -8,10 +8,6 @@ module Pubid
       class ConsolidatedIdentifier < Base
         attribute :identifiers, Base, polymorphic: true, collection: true
 
-        def to_s(**opts)
-          render(format: :human, **opts)
-        end
-
         # Delegate to first identifier (base document)
         def publisher
           identifiers&.first&.publisher

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

@@ -11,10 +11,6 @@ module Pubid
         attribute :corrigendum_year, :integer
         attribute :corrigendum_month, :string
 
-        def to_s(**opts)
-          render(format: :human, **opts)
-        end
-
         def publisher
           base_identifier&.publisher
         end

data/lib/pubid/cen_cenelec/identifiers/european_prestandard.rb

@@ -25,9 +25,6 @@ module Pubid
             web: :european_prestandard, title: "European Prestandard", short: "ENV" }
         end
 
-        def to_s(lang: :en, lang_single: false, **opts)
-          render(format: :human, lang: lang, lang_single: lang_single, **opts)
-        end
       end
     end
   end

data/lib/pubid/cen_cenelec/identifiers/fragment.rb

@@ -9,10 +9,6 @@ module Pubid
         attribute :base_identifier, Amendment
         attribute :fragment_number, :string
 
-        def to_s(**opts)
-          render(format: :human, **opts)
-        end
-
         def publisher
           base_identifier&.base_identifier&.publisher
         end

data/lib/pubid/cen_cenelec/single_identifier.rb

@@ -2,13 +2,10 @@
 
 module Pubid
   module CenCenelec
-    class SingleIdentifier < Pubid::Identifier
-      # Identity for the Pubid::CenCenelec::Identifier facade. CEN/CENELEC
-      # identifiers split between two roots (Identifiers::Base and this
-      # SingleIdentifier), both direct subclasses of Pubid::Identifier, so the
-      # facade module is included into each to cover every concrete type.
-      include Pubid::CenCenelec::Identifier
-
+    # The second of CEN/CENELEC's two identifier roots (the other is
+    # Identifiers::Base); both descend from Pubid::CenCenelec::Identifier so every
+    # concrete type is `is_a?` it.
+    class SingleIdentifier < Pubid::CenCenelec::Identifier
       attribute :publisher, Components::Publisher, default: -> {
         Components::Publisher.new(body: "EN")
       }

data/lib/pubid/cen_cenelec.rb

@@ -141,6 +141,10 @@ module Pubid
     ).freeze
 
     def self.parse(identifier)
+      if identifier.length > Pubid::MAX_INPUT_LENGTH
+        raise ArgumentError, Pubid::INPUT_TOO_LONG_MESSAGE
+      end
+
       CenCenelec::Identifier.parse(identifier)
     end
 

data/lib/pubid/cie/identifier.rb

@@ -11,6 +11,10 @@ module Pubid
       attribute :style, :string # "legacy" or "current"
 
       def self.parse(input)
+        if input.length > Pubid::MAX_INPUT_LENGTH
+          raise ArgumentError, Pubid::INPUT_TOO_LONG_MESSAGE
+        end
+
         parsed = Parser.parse(input)
         builder = Builder.new
         builder.build(parsed, original_string: input)

data/lib/pubid/cie/single_identifier.rb

@@ -18,10 +18,10 @@ module Pubid
     # - Identical (identical to ISO publications)
     # - TutorialBundle (tutorial bundles)
     class SingleIdentifier < Identifier
-      # CIE uses a fixed publisher string
-      def publisher
-        "CIE"
-      end
+      # Stored as a plain string (always "CIE") 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: -> { "CIE" }
 
       attribute :year, :string
       attribute :date_separator, :string # "dash" or "colon"

data/lib/pubid/cie.rb

@@ -19,6 +19,10 @@ module Pubid
     # Main entry point for CIE identifiers
     # Delegates to Identifier.parse
     def self.parse(input)
+      if input.length > Pubid::MAX_INPUT_LENGTH
+        raise ArgumentError, Pubid::INPUT_TOO_LONG_MESSAGE
+      end
+
       Identifier.parse(input)
     end
 

data/lib/pubid/csa/identifier.rb

@@ -2,8 +2,17 @@
 
 module Pubid
   module Csa
-    class Identifier
+    # Common base class for all CSA identifiers. SingleIdentifier (and the
+    # concrete Identifiers::* types through it) descends from it, so every CSA
+    # identifier is `is_a?(Pubid::Csa::Identifier)` natively and gets the shared
+    # polymorphic `from_hash`. (The Wrapper/Composite container models are
+    # separate Lutaml::Model types, not identifiers.)
+    class Identifier < ::Pubid::Identifier
       def self.parse(input)
+        if input.length > Pubid::MAX_INPUT_LENGTH
+          raise ArgumentError, Pubid::INPUT_TOO_LONG_MESSAGE
+        end
+
         # Filter out comments
         return nil if input.start_with?("#")
 

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

@@ -4,9 +4,6 @@ module Pubid
   module Csa
     module Identifiers
       class Base < SingleIdentifier
-        def to_s(**opts)
-          render(format: :human, **opts)
-        end
       end
     end
   end

data/lib/pubid/csa/identifiers/cec.rb

@@ -20,10 +20,6 @@ module Pubid
 
           @code ||= Components::Code.new(value: "#{cec_part.value}-#{no_number.value}")
         end
-
-        def to_s(**opts)
-          render(format: :human, **opts)
-        end
       end
     end
   end

data/lib/pubid/csa/identifiers/series.rb

@@ -17,10 +17,6 @@ module Pubid
       class Series < Base
         # Series prefix (MH, RV, etc.) - optional
         attribute :series_prefix, :string
-
-        def to_s(**opts)
-          render(format: :human, **opts)
-        end
       end
     end
   end

data/lib/pubid/csa/single_identifier.rb

@@ -2,7 +2,7 @@
 
 module Pubid
   module Csa
-    class SingleIdentifier < Pubid::Identifier
+    class SingleIdentifier < Identifier
       # Generate URN for this identifier
       #
       # @return [String] URN representation

data/lib/pubid/csa.rb

@@ -15,6 +15,10 @@ module Pubid
     autoload :Components, "#{__dir__}/csa/components"
 
     def self.parse(identifier_string)
+      if identifier_string.length > Pubid::MAX_INPUT_LENGTH
+        raise ArgumentError, Pubid::INPUT_TOO_LONG_MESSAGE
+      end
+
       Identifier.parse(identifier_string)
     end
 

data/lib/pubid/etsi/components/code.rb

@@ -16,13 +16,7 @@ module Pubid
       class Code < Lutaml::Model::Serializable
         attribute :number, :string # Main number
         attribute :minor, :string # Optional minor part
-        attribute :parts, :string, collection: true # Parts array
-
-        def initialize(number:, minor: nil, parts: nil)
-          @number = number
-          @minor = minor
-          @parts = parts || []
-        end
+        attribute :parts, :string, collection: true, default: [] # Parts array
 
         # Render code with space for minor and dash-separated parts
         def to_s

data/lib/pubid/etsi/components/version.rb

@@ -13,11 +13,6 @@ module Pubid
           false
         } # true for ed.N format
 
-        def initialize(version:, is_edition: false)
-          @version = version
-          @is_edition = is_edition
-        end
-
         def to_s
           if is_edition
             "ed.#{version}"