pubid 2.0.0.pre.alpha.8 → 2.0.0.pre.alpha.9

data/lib/pubid/adobe/urn_generator.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Pubid
+  module Adobe
+    # Generates URN strings for Adobe identifiers.
+    #
+    # Format:
+    #   urn:adobe:tech-note:<number>            e.g. urn:adobe:tech-note:5014
+    #   urn:adobe:publication:<slug>[:v<ver>]   e.g. urn:adobe:publication:adobe-glyph-list
+    #                                             urn:adobe:publication:adobe-japan1:v7
+    class UrnGenerator
+      attr_reader :identifier
+
+      def initialize(identifier)
+        @identifier = identifier
+      end
+
+      def generate
+        if identifier.is_a?(Identifiers::TechNote)
+          generate_tech_note
+        elsif identifier.is_a?(Identifiers::Publication)
+          generate_publication
+        else
+          raise ArgumentError,
+                "Unknown Adobe identifier class: #{identifier.class}"
+        end
+      end
+
+      private
+
+      def generate_tech_note
+        "urn:adobe:tech-note:#{identifier.number}"
+      end
+
+      def generate_publication
+        parts = ["urn:adobe:publication", identifier.slug]
+        parts << "v#{identifier.version}" if identifier.version
+        parts.join(":")
+      end
+    end
+  end
+end

data/lib/pubid/adobe/urn_parser.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Pubid
+  module Adobe
+    # Parses Adobe URNs back into identifiers.
+    #
+    # UrnGenerator emits:
+    #   urn:adobe:tech-note:<number>
+    #   urn:adobe:publication:<slug>[:v<version>]
+    #
+    # Examples:
+    #   urn:adobe:tech-note:5014                  → Adobe Technical Note #5014
+    #   urn:adobe:publication:adobe-glyph-list    → adobe-glyph-list
+    #   urn:adobe:publication:adobe-japan1:v7     → adobe-japan1-7
+    class UrnParser < Pubid::UrnParser::Base
+      PREFIX = "urn:adobe:".freeze
+
+      def parse_urn(urn)
+        body = strip_namespace(urn)
+        parts = split_parts(body)
+        namespace = parts.fetch(0)
+
+        case namespace
+        when "tech-note"
+          parse_tech_note(parts)
+        when "publication"
+          parse_publication(parts)
+        else
+          raise Pubid::UrnParser::Errors::ParseError,
+                "Unknown Adobe URN namespace: #{namespace.inspect} in #{urn.inspect}"
+        end
+      end
+
+      private
+
+      def strip_namespace(urn)
+        unless urn.downcase.start_with?(PREFIX)
+          raise Pubid::UrnParser::Errors::ParseError,
+                "Invalid Adobe URN: #{urn.inspect}"
+        end
+
+        urn[PREFIX.length..]
+      end
+
+      def parse_tech_note(parts)
+        number = parts.fetch(1)
+        flavor_parse("Adobe Technical Note ##{number}")
+      end
+
+      def parse_publication(parts)
+        slug = parts.fetch(1)
+        version_seg = parts[2]
+        if version_seg&.start_with?("v")
+          flavor_parse("#{slug}-#{version_seg.sub(/\Av/, "")}")
+        else
+          flavor_parse(slug)
+        end
+      end
+
+      def split_parts(body)
+        body.split(":")
+      end
+
+      def flavor_parse(text)
+        ::Pubid::Adobe.parse(text)
+      end
+    end
+  end
+end

data/lib/pubid/adobe.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Pubid
+  module Adobe
+    extend Pubid::PrefixesSupport
+
+    # Leading identifier prefix tokens that an Adobe document id can start
+    # with. Tech notes appear as both `Adobe Technical Note #<n>` and the
+    # short alias `ATN<n>` in citations; both must route to this flavor.
+    # Named publications start with `Adobe` (e.g. `Adobe Glyph List`,
+    # `Adobe-Japan1-7`).
+    PREFIXES = ["Adobe", "ATN"].freeze
+
+    autoload :Builder,      "#{__dir__}/adobe/builder"
+    autoload :Identifier,   "#{__dir__}/adobe/identifier"
+    autoload :Identifiers,  "#{__dir__}/adobe/identifiers"
+    autoload :Parser,       "#{__dir__}/adobe/parser"
+    autoload :Renderer,     "#{__dir__}/adobe/renderer"
+    autoload :UrnGenerator, "#{__dir__}/adobe/urn_generator"
+    autoload :UrnParser,    "#{__dir__}/adobe/urn_parser"
+
+    # Parse an Adobe identifier string into an identifier object.
+    # @param identifier [String]
+    # @return [Pubid::Adobe::Identifier]
+    def self.parse(identifier)
+      Identifier.parse(identifier)
+    end
+
+    # Per-flavor format registry: inherits global formats, overrides :human
+    # with the Adobe-specific renderer.
+    Identifier.format_registry = FormatRegistry.new(parent: ::Pubid::Identifier.format_registry)
+    Identifier.format_registry.register(:human, renderer: Adobe::Renderer)
+
+    # Auto-discover identifier types from the Identifiers namespace.
+    # @return [Array<Class>]
+    def self.identifier_types
+      @identifier_types ||= Identifiers.constants
+        .filter_map { |c| begin; Identifiers.const_get(c); rescue NameError; nil; end }
+        .select { |c| c.is_a?(Class) && c < Pubid::Identifier }
+        .reject { |c| c == Identifier }
+    end
+
+    # Lookup: type key → identifier class
+    # @param code [String, Symbol]
+    # @return [Class, nil]
+    def self.locate_type(code)
+      identifier_types.find { |t| t.type[:key].to_s == code.to_s }
+    end
+
+    # Lookup: type short letter (e.g. "ATN") → identifier class
+    # @param short [String]
+    # @return [Class<Identifier>]
+    def self.identifier_klass_for_short(short)
+      @by_short ||= identifier_types.to_h { |klass| [klass.type[:short].to_s, klass] }
+      @by_short.fetch(short.to_s)
+    end
+  end
+end
+
+Pubid::Registry.register(:adobe, Pubid::Adobe)

data/lib/pubid/amca/builder.rb

@@ -7,7 +7,7 @@ module Pubid
     class Builder
       attr_reader :identifier_class
 
-      def initialize(identifier_class = Identifiers::Base)
+      def initialize(identifier_class = Identifier)
         @identifier_class = identifier_class
       end
 
@@ -46,7 +46,7 @@ module Pubid
 
       # Class method to build an identifier from parsed data
       # @param parsed [Hash, Array] the parsed identifier data
-      # @return [Identifiers::Base] the constructed identifier object
+      # @return [Identifier] the constructed identifier object
       def self.build(parsed)
         new.build(parsed)
       end

data/lib/pubid/amca/identifier.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
 
 # 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"
+# subclass); its body and `.parse` live in identifiers/base.rb. This file just ensures it is loaded.

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

@@ -3,7 +3,7 @@
 module Pubid
   module Amca
     # Base identifier class for AMCA identifiers. Canonical name
-    # Pubid::Amca::Identifier (Identifiers::Base is a back-compat alias); common
+    # Pubid::Amca::Identifier; common
     # functionality for all AMCA identifier types.
     class Identifier < ::Pubid::Identifier
       # @raise [Parslet::ParseFailed] If parsing fails
@@ -66,10 +66,5 @@ module Pubid
       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

@@ -8,7 +8,7 @@ module Pubid
       # - AMCA 99 JW Interp
       # - AMCA 204 – 1
       # - ANSI/AMCA 204 Interp
-      class Interpretation < Base
+      class Interpretation < Identifier
         attr_reader :interpretation_code
 
         def initialize(code:, year: nil, copublisher: nil, suffix: nil,

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

@@ -8,7 +8,7 @@ module Pubid
       # - AMCA Publication 211-22 (Rev. 01-23)
       # - AMCA Publication 311-16
       # - AMCA Publication 1011-03 (R2010)
-      class Publication < Base
+      class Publication < Identifier
         attr_reader :revision
 
         def initialize(code:, year:, copublisher: nil, suffix: nil,

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

@@ -8,7 +8,7 @@ module Pubid
       # - ANSI/AMCA 210-16
       # - ANSI/AMCA Standard 99-25
       # - AMCA Standard 803-02 (R2008)
-      class Standard < Base
+      class Standard < Identifier
         def self.type
           { key: :standard, title: "Standard", short: nil }
         end

data/lib/pubid/amca/identifiers.rb

@@ -3,7 +3,6 @@
 module Pubid
   module Amca
     module Identifiers
-      autoload :Base, "#{__dir__}/identifiers/base"
       autoload :Interpretation, "#{__dir__}/identifiers/interpretation"
       autoload :Publication, "#{__dir__}/identifiers/publication"
       autoload :Standard, "#{__dir__}/identifiers/standard"

data/lib/pubid/amca/single_identifier.rb

@@ -4,7 +4,7 @@ module Pubid
   module Amca
     # Base class for single (non-supplement) ACMA identifiers
     # Includes: Standard, Publication
-    class SingleIdentifier < Identifiers::Base
+    class SingleIdentifier < Identifier
     end
   end
 end

data/lib/pubid/amca.rb

@@ -8,7 +8,7 @@ module Pubid
     # Pubid::JOINT_PREFIXES.
     PREFIXES = ["AMCA"].freeze
 
-    autoload :Identifier, "#{__dir__}/amca/identifier"
+    autoload :Identifier, "#{__dir__}/amca/identifiers/base"
     autoload :Identifiers, "#{__dir__}/amca/identifiers"
     autoload :Builder, "#{__dir__}/amca/builder"
     autoload :Parser, "#{__dir__}/amca/parser"
@@ -26,8 +26,8 @@ module Pubid
     end
 
     # Per-flavor format registry: inherits global formats, overrides :human
-    Identifiers::Base.format_registry = FormatRegistry.new(parent: ::Pubid::Identifier.format_registry)
-    Identifiers::Base.format_registry.register(:human, renderer: Amca::Renderer)
+    Identifier.format_registry = FormatRegistry.new(parent: ::Pubid::Identifier.format_registry)
+    Identifier.format_registry.register(:human, renderer: Amca::Renderer)
 
     # Auto-discover all identifier types from the Identifiers namespace
     # @return [Array<Class>] identifier classes that define a self.type Hash

data/lib/pubid/ashrae/builder.rb

@@ -7,7 +7,7 @@ module Pubid
     class Builder
       attr_reader :identifier_class
 
-      def initialize(identifier_class = Identifiers::Base)
+      def initialize(identifier_class = Identifier)
         @identifier_class = identifier_class
       end
 
@@ -53,7 +53,7 @@ module Pubid
 
       # Class method to build an identifier from parsed data
       # @param parsed [Hash, Array] the parsed identifier data
-      # @return [Identifiers::Base] the constructed identifier object
+      # @return [Identifier] the constructed identifier object
       def self.build(parsed)
         new.build(parsed)
       end
@@ -158,12 +158,12 @@ module Pubid
       def build_errata(parsed)
         base_attrs = extract_base_attributes(parsed)
         base_class = determine_identifier_class(base_attrs)
-        base_identifier = base_class.new(**base_attrs)
+        base = base_class.new(**base_attrs)
 
         errata_date = extract_errata_date(parsed[:errata_date])
 
         Identifiers::Errata.new(
-          base_identifier: base_identifier,
+          base: base,
           errata_date: errata_date,
         )
       end
@@ -174,10 +174,10 @@ module Pubid
       def build_interpretation(parsed)
         base_attrs = extract_base_attributes(parsed)
         base_class = determine_identifier_class(base_attrs)
-        base_identifier = base_class.new(**base_attrs)
+        base = base_class.new(**base_attrs)
 
         Identifiers::Interpretation.new(
-          base_identifier: base_identifier,
+          base: base,
         )
       end
 
@@ -187,13 +187,13 @@ module Pubid
       def build_addendum_from_identifier(parsed)
         base_attrs = extract_base_attributes(parsed)
         base_class = determine_identifier_class(base_attrs)
-        base_identifier = base_class.new(**base_attrs)
+        base = base_class.new(**base_attrs)
 
         addendum_code = extract_value(parsed[:addendum_code])
         addendum_date = extract_addendum_date(parsed[:addendum_year])
 
         Identifiers::Addendum.new(
-          base_identifier: base_identifier,
+          base: base,
           addendum_code: addendum_code,
           addendum_date: addendum_date,
         )
@@ -209,13 +209,13 @@ module Pubid
           year: extract_value(parsed[:year]),
         }
         base_class = determine_identifier_class(base_attrs)
-        base_identifier = base_class.new(**base_attrs)
+        base = base_class.new(**base_attrs)
 
         addendum_code = extract_value(parsed[:addendum_code])
         addendum_date = extract_addendum_date(parsed[:addendum_year])
 
         Identifiers::Addendum.new(
-          base_identifier: base_identifier,
+          base: base,
           addendum_code: addendum_code,
           addendum_date: addendum_date,
         )
@@ -232,13 +232,13 @@ module Pubid
           year: extract_value(parsed[:year]),
         }
         base_class = determine_identifier_class(base_attrs)
-        base_identifier = base_class.new(**base_attrs)
+        base = base_class.new(**base_attrs)
 
         addendum_code = extract_value(parsed[:addendum_code])
         addendum_date = extract_addendum_date(parsed[:addendum_year])
 
         Identifiers::Addendum.new(
-          base_identifier: base_identifier,
+          base: base,
           addendum_code: addendum_code,
           addendum_date: addendum_date,
         )
@@ -270,13 +270,13 @@ module Pubid
         end
 
         base_class = determine_identifier_class(base_attrs)
-        base_identifier = base_class.new(**base_attrs)
+        base = base_class.new(**base_attrs)
 
         addendum_code = extract_value(parsed[:addendum_code])
         addendum_date = extract_addendum_date(parsed[:addendum_year])
 
         Identifiers::Addendum.new(
-          base_identifier: base_identifier,
+          base: base,
           addendum_code: addendum_code,
           addendum_date: addendum_date,
         )
@@ -308,13 +308,13 @@ module Pubid
         end
 
         base_class = determine_identifier_class(base_attrs)
-        base_identifier = base_class.new(**base_attrs)
+        base = base_class.new(**base_attrs)
 
         addendum_code = extract_value(parsed[:addendum_code])
         addendum_date = extract_addendum_date(parsed[:addendum_year])
 
         Identifiers::Addendum.new(
-          base_identifier: base_identifier,
+          base: base,
           addendum_code: addendum_code,
           addendum_date: addendum_date,
         )
@@ -326,13 +326,13 @@ module Pubid
       def build_standard_addendum(parsed)
         base_attrs = extract_base_attributes(parsed)
         base_class = determine_identifier_class(base_attrs)
-        base_identifier = base_class.new(**base_attrs)
+        base = base_class.new(**base_attrs)
 
         addendum_code = extract_value(parsed[:addendum_code])
         addendum_date = extract_addendum_date(parsed[:addendum_year])
 
         Identifiers::Addendum.new(
-          base_identifier: base_identifier,
+          base: base,
           addendum_code: addendum_code,
           addendum_date: addendum_date,
         )
@@ -372,7 +372,7 @@ module Pubid
         end
 
         base_class = determine_identifier_class(base_attrs)
-        base_identifier = base_class.new(**base_attrs)
+        base = base_class.new(**base_attrs)
 
         # Build the addendum_codes string from first code and additional codes
         first_code = extract_value(parsed[:addendum_code])
@@ -406,7 +406,7 @@ module Pubid
         end
 
         Identifiers::CombinedAddenda.new(
-          base_identifier: base_identifier,
+          base: base,
           addendum_codes: addendum_codes_str,
         )
       end
@@ -417,12 +417,12 @@ module Pubid
       def build_addenda_package(parsed)
         base_attrs = extract_base_attributes(parsed)
         base_class = determine_identifier_class(base_attrs)
-        base_identifier = base_class.new(**base_attrs)
+        base = base_class.new(**base_attrs)
 
         package_description = extract_value(parsed[:package_description])
 
         Identifiers::AddendaPackage.new(
-          base_identifier: base_identifier,
+          base: base,
           package_description: package_description,
         )
       end

data/lib/pubid/ashrae/identifier.rb

@@ -3,7 +3,6 @@
 # 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"
+# (no facade needed). Its body and `.parse` live in identifiers/base.rb; this
+# file just ensures it is loaded when a consumer references
+# Pubid::Ashrae::Identifier directly.

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

@@ -28,7 +28,7 @@ module Pubid
         end
 
         def copublisher
-          base_identifier&.copublisher
+          base&.copublisher
         end
       end
     end

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

@@ -28,7 +28,7 @@ module Pubid
         end
 
         def copublisher
-          base_identifier&.copublisher
+          base&.copublisher
         end
       end
     end

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

@@ -3,9 +3,7 @@
 module Pubid
   module Ashrae
     # 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.
+    # Pubid::Ashrae::Identifier; every concrete ASHRAE identifier descends from it.
     class Identifier < ::Pubid::Identifier
       # Parse an ASHRAE identifier string into an identifier object
       # @param identifier [String] The ASHRAE identifier string to parse
@@ -26,12 +24,20 @@ module Pubid
       attribute :amendment, :string
       attribute :reaffirmed, :string
       attribute :copublisher, :string
-    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
+      # ASHRAE stores the publication year in a plain :string scalar, not a
+      # Components::Date, so the base #exclude's :year->:date remap cannot nil
+      # it. Reset the scalar directly (mirroring CSA/BIPM) so a year-less
+      # partial reference is a year wildcard under
+      # matches?(other, ignore: [:year]). super still recurses into the nested
+      # `base` of wrapper types (Errata/Addendum/…), which carry no year scalar.
+      def exclude(*args)
+        result = super
+        year_keys = args & %i[year date]
+        result.year = nil if !year_keys.empty? && result.respond_to?(:year=)
+        result
+      end
     end
+
   end
 end

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

@@ -28,7 +28,7 @@ module Pubid
         end
 
         def copublisher
-          base_identifier&.copublisher
+          base&.copublisher
         end
       end
     end

data/lib/pubid/ashrae/identifiers.rb

@@ -5,7 +5,6 @@ module Pubid
     module Identifiers
       autoload :AddendaPackage, "#{__dir__}/identifiers/addenda_package"
       autoload :Addendum, "#{__dir__}/identifiers/addendum"
-      autoload :Base, "#{__dir__}/identifiers/base"
       autoload :CombinedAddenda, "#{__dir__}/identifiers/combined_addenda"
       autoload :Errata, "#{__dir__}/identifiers/errata"
       autoload :Guideline, "#{__dir__}/identifiers/guideline"

data/lib/pubid/ashrae/parser.rb

@@ -166,7 +166,7 @@ module Pubid
           (space >> additional_copublisher).maybe >>
           suffix.maybe >>
           reaffirmed.maybe
-        ).as(:base_identifier) >>
+        ).as(:base) >>
           space >>
           str("Errata").as(:errata_keyword) >>
           (
@@ -188,7 +188,7 @@ module Pubid
             (space >> additional_copublisher).maybe >>
             suffix.maybe >>
             reaffirmed.maybe
-          ).as(:base_identifier) >>
+          ).as(:base) >>
             space >>
             str("Errata").as(:errata_keyword) >>
             (
@@ -207,7 +207,7 @@ module Pubid
             (space >> additional_copublisher).maybe >>
             suffix.maybe >>
             reaffirmed.maybe
-          ).as(:base_identifier) >>
+          ).as(:base) >>
             space >>
             str("Errata").as(:errata_keyword) >>
             errata_date.maybe >>
@@ -219,7 +219,7 @@ module Pubid
       rule(:interpretation_identifier) do
         str("Interpretations") >> space >>
           str("for") >> space >>
-          (type.as(:type) >> space >> code >> (dash >> year_digits.as(:year)).maybe).as(:base_identifier)
+          (type.as(:type) >> space >> code >> (dash >> year_digits.as(:year)).maybe).as(:base)
       end
 
       # Combined Addenda pattern (multiple addendums grouped together)
@@ -607,9 +607,12 @@ module Pubid
           year_first_addenda_package_identifier |
           addenda_package_identifier |
           addendum_identifier |
-          # Standalone copublisher pattern (ANSI/AMCA 210-99, AMCA 210-99)
-          (((str("ANSI") >> slash).maybe >> letter.repeat(2,
-                                                          10)).as(:copublisher) >>
+          # Standalone copublisher pattern (ANSI/AMCA 210-99, AMCA 210-99).
+          # The literal "ASHRAE" is excluded here so a bare "ASHRAE <code>-<year>"
+          # is not swallowed as a copublisher and instead falls through to the
+          # ASHRAE-publisher branch below.
+          (((str("ANSI") >> slash).maybe >> (str("ASHRAE").absent? >> letter).repeat(2,
+                                                                                     10)).as(:copublisher) >>
             space >>
             code_with_year >>
             optional_suffix.repeat(0, 2)) |
@@ -635,9 +638,11 @@ module Pubid
             suffix.maybe >>
             reaffirmed.maybe >>
             optional_suffix.repeat(0, 2)) |
-          # Standard ASHRAE pattern
+          # Standard ASHRAE pattern. The type keyword is optional so a bare
+          # partial reference "ASHRAE <code>" (no "Standard"/"Guideline") parses;
+          # the builder defaults the absent type to "Standard".
           (publisher.as(:publisher) >> space >>
-            type.as(:type) >> space >>
+            (type.as(:type) >> space).maybe >>
             code >>
             (space?.maybe >> dash >> year_digits.as(:year)).maybe >>
             (space >> additional_copublisher).maybe >>