pubid 2.0.0 → 2.0.2

data/lib/pubid/api/parser.rb

@@ -1,144 +1,14 @@
 # frozen_string_literal: true
 
-require "parslet"
-
 module Pubid
   module Api
-    class Parser < ::Pubid::Parser::Grammar
-      # Basic building blocks
-      rule(:space) { str(" ") }
-      rule(:dash) { str("-") }
-      rule(:slash) { str("/") }
-      rule(:colon) { str(":") }
-      rule(:dot) { str(".") }
-      rule(:digit) { match("[0-9]") }
-      rule(:digits) { digit.repeat(1) }
-      rule(:letter) { match("[A-Z]") }
-      rule(:letters) { letter.repeat(1) }
-
-      # Publisher
-      rule(:publisher) { str("API") >> space }
-
-      # Document types (longest first for proper matching)
-      rule(:doc_type) do
-        (
-          str("MPMS") |
-          str("BULL") |
-          str("SPEC") |
-          str("STD") |
-          str("RP") |
-          str("TR") |
-          str("COS") |
-          str("PUBL")
-        ).as(:type)
-      end
-
-      # Chapter notation for MPMS (e.g., "CH 10")
-      rule(:chapter_notation) do
-        space >> str("CH") >> space >> digits.as(:chapter)
-      end
-
-      # Number with optional part (e.g., "579-2", "1104", "6D", "D16", "17TR7")
-      # Allow any mix of digits and letters
-      rule(:number_with_part) do
-        match("[0-9A-Z]").repeat(1).as(:number) >>
-          (dash >> match("[0-9A-Z]").repeat(1).as(:part)).maybe
-      end
-
-      # Digits with optional letter suffix (for MPMS sections: 6.4A, 3.1A)
-      rule(:digits_with_letter) do
-        digits >> letter.maybe
-      end
-
-      # Year (4-digit)
-      rule(:year) { digit.repeat(4, 4).as(:year) }
-
-      # Date with dash (e.g., "-2023")
-      rule(:date_dash) { dash >> year }
-
-      # Date with colon (e.g., ":2023")
-      rule(:date_colon) { colon >> year }
-
-      # Reaffirmation notation (e.g., "(R2020)")
-      rule(:reaffirmation) do
-        space >> str("(R") >> year >> str(")")
-      end
-
-      # Part notation (e.g., ", Part 2")
-      rule(:part_notation) do
-        str(", Part ") >> digits.as(:part_number)
-      end
-
-      # Edition notation (e.g., ", 4th edition")
-      rule(:edition_notation) do
-        str(", ") >>
-          digits.as(:edition_number) >>
-          (str("st") | str("nd") | str("rd") | str("th")) >>
-          str(" edition")
-      end
-
-      # MPMS identifier (special format with CH)
-      rule(:mpms_identifier) do
-        publisher >>
-          str("MPMS").as(:type) >>
-          chapter_notation >>
-          (dot >> digits_with_letter.as(:section)).maybe >>
-          (dot >> digits_with_letter.as(:subsection)).maybe >>
-          (date_dash | date_colon).maybe
-      end
-
-      # Standard identifier with type
-      rule(:typed_identifier) do
-        publisher >>
-          doc_type >> space >>
-          number_with_part >>
-          part_notation.maybe >>
-          (date_dash | date_colon).maybe >>
-          reaffirmation.maybe
-      end
-
-      # Typeless identifier (just API + number)
-      rule(:typeless_identifier) do
-        publisher >>
-          number_with_part >>
-          part_notation.maybe >>
-          (date_dash | date_colon).maybe >>
-          reaffirmation.maybe
-      end
-
-      # Second identifier in combined (no API prefix, just type + number)
-      rule(:second_identifier) do
-        doc_type >> space >>
-          number_with_part >>
-          part_notation.maybe >>
-          (date_dash | date_colon).maybe
-      end
-
-      # Combined identifier (two identifiers separated by slash)
-      rule(:combined_identifier) do
-        (mpms_identifier | typed_identifier | typeless_identifier).as(:first) >>
-          slash >>
-          second_identifier.as(:second) >>
-          edition_notation.maybe
-      end
-
-      # Main identifier (try combined first, then MPMS, then typed, then typeless)
-      rule(:identifier) do
-        combined_identifier | mpms_identifier | typed_identifier | typeless_identifier
-      end
-
-      root(:identifier)
-
+    class Parser
       # Pre-parse ingestion normalization (R2): every parse path feeds
       # the grammar the same normalized string.
       def self.normalize_input(input)
         # Normalize MPMP typo to MPMS
         input.gsub("API MPMP", "API MPMS")
       end
-
-      def parse(input)
-        super(self.class.normalize_input(input))
-      end
     end
   end
 end

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

@@ -19,7 +19,7 @@ module Pubid
           raise Pubid::Errors::InvalidInputError, Pubid::INPUT_TOO_LONG_MESSAGE
         end
 
-        parsed = Pubid::Parg::Backend.parse(:ashrae, Parser.normalize_input(identifier))
+        parsed = Pubid::Parg::Model.bound(:ashrae, Parser.normalize_input(identifier))
         Builder.build(parsed)
       end