pubid 2.0.0.alpha.10 → 2.0.0.pre.alpha.1

data/lib/pubid/ieee/nesc/builder.rb

@@ -20,18 +20,6 @@ module Pubid
       #   identifier = builder.build(parsed)
       #   # => #<Pubid::Ieee::Identifiers::Nesc::Handbook>
       class Builder
-        # The NESC's own designation (ANSI/IEEE C2). Used as the index code for
-        # the year-first forms, which print no code of their own.
-        #
-        # CAVEAT: this files the whole NESC family — including the Handbook and
-        # Redline, which are companions of the code rather than the code itself
-        # — under one `prefix "C"` + `number "2"` index key. That is deliberate:
-        # relaton narrows on `root.number` and then matches the full hash, so
-        # `_type` (and `variant`) keep the documents distinct; the alternative
-        # was an empty key, which silently defeats the binary search. Revisit if
-        # relaton ever treats `prefix + number` alone as an identity.
-        DEFAULT_CODE = "C2"
-
         # Build NESC identifier from parsed hash
         #
         # @param parsed_hash [Hash] Hash from parser
@@ -40,18 +28,22 @@ module Pubid
           # Determine identifier type based on parsed attributes
           identifier_class = determine_identifier_class(parsed_hash)
 
-          # The code travels through the base initializer as `code:` so it lands
-          # in `code_obj` and the CodeNumber mixin hoists the flat split columns
-          # relaton indexes on. Every NESC document is the C2-designated code
-          # (or a companion of it), so the year-first forms — which print no
-          # code — still key under "C2" rather than leaving `root.number` empty.
-          identifier = identifier_class.new(
-            code: parsed_hash[:code]&.to_s || DEFAULT_CODE,
-          )
+          identifier = identifier_class.new
+
+          # Set code if present (C2)
+          if parsed_hash[:code]
+            code_str = parsed_hash[:code].to_s
+            identifier.code = Pubid::Ieee::Components::Code.new(
+              prefix: code_str[0], # "C" from "C2"
+              number: code_str[1..], # "2" from "C2"
+            )
+          end
 
           # Set year (required for all NESC identifiers)
           if parsed_hash[:year]
-            identifier.year = parsed_hash[:year].to_s
+            identifier.year = Pubid::Components::Date.new(
+              year: parsed_hash[:year].to_s.to_i,
+            )
           end
 
           # Set variant (Handbook, Redline, etc.)
@@ -64,20 +56,16 @@ module Pubid
             identifier.edition = parsed_hash[:edition].to_s
           end
 
+          # Set draft flag
+          if parsed_hash[:draft]
+            identifier.draft = true
+          end
+
           # Set month (for drafts)
           if parsed_hash[:month]
             identifier.month = parsed_hash[:month].to_s
           end
 
-          # Registered-trademark "(R)" marks and the "(NESC(R))" abbreviation
-          # suffix (year-first forms) — see Identifiers::Nesc::Base#name_portion.
-          identifier.registered = true if parsed_hash[:name_registered] ||
-            parsed_hash[:abbr_registered]
-          if parsed_hash[:paren_abbr]
-            identifier.abbr_suffix = true
-            identifier.abbr_suffix_registered = true if parsed_hash[:paren_registered]
-          end
-
           identifier
         end
 
@@ -104,9 +92,8 @@ module Pubid
           # C2 code means standard NESC
           return Identifiers::Nesc::Standard if parsed_hash[:code]
 
-          # Plain year-first edition. Never the abstract Nesc::Base — only
-          # concrete leaves carry the CodeNumber `number` column.
-          Identifiers::Nesc::Edition
+          # Fallback to base class
+          Identifiers::Nesc::Base
         end
       end
     end

data/lib/pubid/ieee/nesc/parser.rb

@@ -20,7 +20,7 @@ module Pubid
       # @example Parse handbook
       #   parser = Parser.new
       #   result = parser.parse("2017 NESC Handbook, Premier Edition")
-      class Parser < ::Pubid::Parser::Grammar
+      class Parser < Parslet::Parser
         root(:nesc_identifier)
 
         rule(:space) { str(" ") }
@@ -34,15 +34,15 @@ module Pubid
           str("C2").as(:code)
         end
 
-        # NESC name variations (the "(R)" registered mark is captured
-        # separately by the `registered` rule so it can be round-tripped)
+        # NESC name variations
         rule(:nesc_full_name) do
-          str("National Electrical Safety Code") |
+          str("National Electrical Safety Code(R)") |
+            str("National Electrical Safety Code") |
             str("National Electric Safety Code") # Typo variation
         end
 
         rule(:nesc_abbr) do
-          str("NESC")
+          str("NESC(R)") | str("NESC")
         end
 
         rule(:nesc_name) do
@@ -51,7 +51,7 @@ module Pubid
 
         # Registered trademark notation
         rule(:registered) do
-          str("(R)")
+          str("(R)").maybe
         end
 
         # Edition notations
@@ -97,8 +97,8 @@ module Pubid
             dash >>
             year.as(:year) >>
             (comma.maybe >> space).maybe >>
-            nesc_full_name >> registered.maybe >>
-            (space >> str("(") >> nesc_abbr >> registered.maybe >> str(")")).maybe
+            nesc_full_name >>
+            (space >> str("(") >> nesc_abbr >> str(")")).maybe
         end
 
         # Pattern 2: YYYY NESC format (year-first)
@@ -109,12 +109,11 @@ module Pubid
           year.as(:year) >>
             space >>
             (
-              # Full name with optional (NESC) abbreviation suffix
-              (nesc_full_name.as(:full_name) >> registered.as(:name_registered).maybe >>
-               (space >> str("(") >> nesc_abbr.as(:paren_abbr) >>
-                registered.as(:paren_registered).maybe >> str(")")).maybe) |
-              # Just the NESC abbreviation (e.g. "2017 NESC(R) Handbook")
-              (nesc_abbr.as(:abbr) >> registered.as(:abbr_registered).maybe)
+              # Full name with optional (NESC) suffix
+              (nesc_full_name >> registered >>
+               (space >> str("(") >> nesc_abbr >> registered >> str(")")).maybe) |
+              # Just NESC abbreviation
+              (nesc_abbr >> registered)
             ) >>
             (space >> variant).maybe >>
             (comma >> space >> edition).maybe
@@ -124,7 +123,7 @@ module Pubid
         # Examples: "National Electrical Safety Code, C2-2012"
         #           "National Electrical Safety Code, C2-2012 - Redline"
         rule(:name_first) do
-          nesc_full_name >> registered.maybe >>
+          nesc_full_name >>
             comma >>
             space >>
             c2_code >>
@@ -139,7 +138,7 @@ module Pubid
         rule(:draft_nesc) do
           str("Draft").as(:draft) >>
             space >>
-            nesc_name >> registered.maybe >>
+            nesc_name >>
             comma >> space >>
             month >> space >> year.as(:year)
         end