pubid 2.0.0.pre.alpha.1 → 2.0.0.pre.alpha.3

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

@@ -30,51 +30,7 @@ module Pubid
         end
 
         def to_s(lang: :en, lang_single: false)
-          # Explanatory Supplement format:
-          # BS {number}-{part}:Explanatory Supplement:{year}
-          parts = []
-          parts << "BS"
-
-          # Number with part/subpart
-          if number
-            number_str = if number.is_a?(Components::Code)
-                           number.value.to_s
-                         else
-                           number.to_s
-                         end
-
-            # Part and subpart
-            if part
-              part_val = if part.is_a?(Components::Code)
-                           part.value
-                         else
-                           part
-                         end
-              number_str += "-#{part_val}"
-            end
-            if subpart
-              subpart_val = if supart.is_a?(Components::Code)
-                              subpart.value
-                            else
-                              subpart
-                            end
-              number_str += "-#{subpart_val}"
-            end
-
-            parts << number_str
-          end
-
-          result = parts.join(" ")
-
-          # Date
-          if date
-            year_val = date.is_a?(Components::Date) ? date.year : date.to_i
-            result += ":Explanatory Supplement:#{year_val}"
-            # Month if present
-            result += "-#{format('%02d', month)}" if month
-          end
-
-          result
+          render(format: :human, lang: lang, lang_single: lang_single)
         end
       end
     end

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

@@ -21,39 +21,7 @@ module Pubid
         end
 
         def to_s(lang: :en, lang_single: false)
-          parts = []
-
-          # Publisher is always "BSI Flex"
-          parts << "BSI Flex"
-
-          # Number with part/subpart
-          if number
-            number_str = number.is_a?(Components::Code) ? number.value.to_s : number.to_s
-            if part
-              part_val = part.is_a?(Components::Code) ? part.value : part
-              number_str += "-#{part_val}"
-            end
-            if subpart
-              subpart_val = subpart.is_a?(Components::Code) ? subpart.value : subpart
-              number_str += "-#{subpart_val}"
-            end
-            parts << number_str
-          end
-
-          result = parts.join(" ")
-
-          # Edition comes before date for Flex
-          result += " v#{edition}" if edition
-
-          # Date
-          if date
-            year_val = date.is_a?(Components::Date) ? date.year : date.to_i
-            result += ":#{year_val}"
-            # Month if present
-            result += "-#{format('%02d', month)}" if month
-          end
-
-          result
+          render(format: :human, lang: lang, lang_single: lang_single)
         end
       end
     end

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

@@ -5,7 +5,7 @@ module Pubid
     module Identifiers
       # BSI Handbook
       # Examples: "Handbook 17:1963", "HB 10146:1998"
-      class Handbook < Base
+      class Handbook < SingleIdentifier
         attribute :number, Bsi::Components::Code
         attribute :part, Bsi::Components::Code
         attribute :date, Bsi::Components::Date
@@ -20,18 +20,7 @@ module Pubid
         end
 
         def to_s(lang: :en, lang_single: false)
-          # Use preserved original abbreviation, default to "Handbook"
-          abbr = original_abbr || "Handbook"
-
-          number_str = number.is_a?(Components::Code) ? number.value.to_s : number.to_s
-          if part
-            part_val = part.is_a?(Components::Code) ? part.value : part
-            number_str += "-#{part_val.to_s.strip}"
-          end
-
-          result = "#{abbr} #{number_str}"
-          result += ":#{date.year}" if date
-          result
+          render(format: :human, lang: lang, lang_single: lang_single)
         end
       end
     end

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

@@ -25,36 +25,7 @@ module Pubid
         end
 
         def to_s(lang: :en, lang_single: false)
-          # Build string representation - Index has special format
-          parts = []
-
-          # Publisher (BS)
-          parts << publisher.to_s if publisher
-
-          # Number
-          if number
-            number_str = number.is_a?(Components::Code) ? number.value.to_s : number.to_s
-            parts << number_str
-          end
-
-          result = parts.join(" ")
-
-          # Index suffix with colon or space format
-          result += if issue_number
-                      " Index Issue #{issue_number}"
-                    elsif index_format == "colon"
-                      ":Index"
-                    else
-                      " Index"
-                    end
-
-          # Date
-          if date
-            year_val = date.is_a?(Components::Date) ? date.year : date.to_i
-            result += ":#{year_val}"
-          end
-
-          result
+          render(format: :human, lang: lang, lang_single: lang_single)
         end
       end
     end

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

@@ -30,45 +30,7 @@ module Pubid
         end
 
         def to_s(lang: :en, lang_single: false)
-          # Build string representation - Method has three formats
-          parts = []
-
-          # Publisher (BS)
-          parts << publisher.to_s if publisher
-
-          # Number with part (e.g., "2782-1")
-          if number
-            number_str = number.is_a?(Components::Code) ? number.value.to_s : number.to_s
-            # Add part if present (e.g., "2782" + "-" + "1")
-            if part
-              part_val = part.is_a?(Components::Code) ? part.value : part
-              number_str += "-#{part_val}"
-            end
-            parts << number_str
-          end
-
-          result = parts.join(" ")
-
-          # Method suffix with appropriate format
-          if method_to
-            # Range format: ":Methods X to Y"
-            result += ":Methods #{method_code} to #{method_to}"
-          elsif method_and
-            # And format: ":Methods X and Y"
-            result += ":Methods #{method_code} and #{method_and}"
-          else
-            # Basic format: singular or plural
-            method_word = is_plural ? "Methods" : "Method"
-            result += ":#{method_word} #{method_code}"
-          end
-
-          # Date
-          if date
-            year_val = date.is_a?(Components::Date) ? date.year : date.to_i
-            result += ":#{year_val}"
-          end
-
-          result
+          render(format: :human, lang: lang, lang_single: lang_single)
         end
       end
     end

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

@@ -6,8 +6,8 @@ module Pubid
       # National Annex (NA) identifier
       # Can have own supplements: "NA+A1:2012 to BASE"
       class NationalAnnex < SingleIdentifier
-        attribute :na_supplements, Base, polymorphic: true, collection: true # Supplements on the NA itself
-        attribute :base_doc, Base, polymorphic: true # The identifier after "to"
+        attribute :na_supplements, ::Pubid::Identifier, polymorphic: true, collection: true # Supplements on the NA itself
+        attribute :base_doc, ::Pubid::Identifier, polymorphic: true # The identifier after "to"
 
         TYPED_STAGES = [
           Pubid::Components::TypedStage.new(
@@ -21,7 +21,8 @@ module Pubid
         ].freeze
 
         def self.type
-          { key: :na, title: "National Annex", short: "NA" }
+          { key: :na,
+            web: :national_annex, title: "National Annex", short: "NA" }
         end
 
         # Delegation methods to access wrapped base_doc attributes
@@ -42,30 +43,7 @@ module Pubid
         end
 
         def to_s(lang: :en, lang_single: false)
-          result = "NA"
-
-          # Add NA supplements if present
-          if na_supplements&.any?
-            na_supplements.each do |supp|
-              if supp.is_a?(Amendment)
-                result += "+A#{supp.amendment_number}:#{supp.amendment_year}"
-              elsif supp.is_a?(Corrigendum)
-                result += "+C#{supp.corrigendum_number}:#{supp.corrigendum_year}"
-              end
-            end
-          end
-
-          result += " to "
-
-          # Render the base identifier (what this NA is for)
-          result += if base_doc
-                      base_doc.to_s
-                    else
-                      # Fallback to parent rendering
-                      super
-                    end
-
-          result
+          render(format: :human, lang: lang, lang_single: lang_single)
         end
       end
     end

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

@@ -5,7 +5,7 @@ module Pubid
     module Identifiers
       # BSI Practice Guide (PP - Published Practice)
       # Examples: "PP 888:1982", "PP 7307:1986", "PP 7722:2006"
-      class PracticeGuide < Base
+      class PracticeGuide < SingleIdentifier
         attribute :number, Bsi::Components::Code
         attribute :date, Bsi::Components::Date
 
@@ -17,9 +17,7 @@ module Pubid
         end
 
         def to_s(lang: :en, lang_single: false)
-          result = "PP #{number}"
-          result += ":#{date.year}" if date
-          result
+          render(format: :human, lang: lang, lang_single: lang_single)
         end
       end
     end

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

@@ -17,61 +17,12 @@ module Pubid
         ].freeze
 
         def self.type
-          { key: :pas, title: "Publicly Available Specification", short: "PAS" }
+          { key: :pas,
+            web: :publicly_available_specification, title: "Publicly Available Specification", short: "PAS" }
         end
 
         def to_s(lang: :en, lang_single: false)
-          # Build string representation - PAS uses type abbreviation as prefix
-          parts = []
-
-          # Use type abbreviation (PAS) instead of publisher (BS)
-          type_abbr = type&.abbr || "PAS"
-          parts << type_abbr
-
-          # Number with part and subpart
-          if number
-            number_str = number.is_a?(Components::Code) ? number.value.to_s : number.to_s
-
-            # Collection (second number with slash, e.g., PAS 2035/2030)
-            if second_number
-              second_val = second_number.is_a?(Components::Code) ? second_number.value : second_number
-              number_str += "/#{second_val}"
-            end
-
-            # Part and subpart
-            if part
-              part_val = part.is_a?(Components::Code) ? part.value : part
-              number_str += "-#{part_val.to_s.strip}"
-            end
-            if subpart
-              subpart_val = subpart.is_a?(Components::Code) ? subpart.value : subpart
-              number_str += "-#{subpart_val.to_s.strip}"
-            end
-
-            parts << number_str
-          end
-
-          result = parts.join(" ")
-
-          # Date
-          if date
-            year_val = date.is_a?(Components::Date) ? date.year : date.to_i
-            result += ":#{year_val}"
-            # Month if present
-            result += "-#{format('%02d', month)}" if month
-          end
-
-          # Edition
-          result += " v#{edition}" if edition
-
-          # Translation
-          if translation_lang
-            result += " (#{translation_lang})"
-          elsif translation_upper
-            result += " (#{translation_upper})"
-          end
-
-          result
+          render(format: :human, lang: lang, lang_single: lang_single)
         end
       end
     end

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

@@ -17,61 +17,12 @@ module Pubid
         ].freeze
 
         def self.type
-          { key: :pd, title: "Published Document", short: "PD" }
+          { key: :pd,
+            web: :published_document, title: "Published Document", short: "PD" }
         end
 
         def to_s(lang: :en, lang_single: false)
-          # Build string representation - PD uses type abbreviation as prefix
-          parts = []
-
-          # Use type abbreviation (PD) instead of publisher (BS)
-          type_abbr = type&.abbr || "PD"
-          parts << type_abbr
-
-          # Number with part and subpart
-          if number
-            number_str = number.is_a?(Components::Code) ? number.value.to_s : number.to_s
-
-            # Collection (second number with slash, e.g., PD 6430/1)
-            if second_number
-              second_val = second_number.is_a?(Components::Code) ? second_number.value : second_number
-              number_str += "/#{second_val}"
-            end
-
-            # Part and subpart
-            if part
-              part_val = part.is_a?(Components::Code) ? part.value : part
-              number_str += "-#{part_val.to_s.strip}"
-            end
-            if subpart
-              subpart_val = subpart.is_a?(Components::Code) ? subpart.value : subpart
-              number_str += "-#{subpart_val.to_s.strip}"
-            end
-
-            parts << number_str
-          end
-
-          result = parts.join(" ")
-
-          # Date
-          if date
-            year_val = date.is_a?(Components::Date) ? date.year : date.to_i
-            result += ":#{year_val}"
-            # Month if present
-            result += "-#{format('%02d', month)}" if month
-          end
-
-          # Edition
-          result += " v#{edition}" if edition
-
-          # Translation
-          if translation_lang
-            result += " (#{translation_lang})"
-          elsif translation_upper
-            result += " (#{translation_upper})"
-          end
-
-          result
+          render(format: :human, lang: lang, lang_single: lang_single)
         end
       end
     end

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

@@ -27,34 +27,7 @@ module Pubid
         end
 
         def to_s(lang: :en, lang_single: false)
-          # Build string representation - Section has two formats
-          parts = []
-
-          # Publisher (DD, BS, etc.)
-          parts << publisher.to_s if publisher
-
-          # Number
-          if number
-            number_str = number.is_a?(Components::Code) ? number.value.to_s : number.to_s
-            parts << number_str
-          end
-
-          result = parts.join(" ")
-
-          # Section suffix with colon or space format
-          result += if section_format == "colon"
-                      ":Section #{section_id}"
-                    else
-                      " Section #{section_id}"
-                    end
-
-          # Date
-          if date
-            year_val = date.is_a?(Components::Date) ? date.year : date.to_i
-            result += ":#{year_val}"
-          end
-
-          result
+          render(format: :human, lang: lang, lang_single: lang_single)
         end
       end
     end

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

@@ -12,26 +12,12 @@ module Pubid
       # Examples:
       #   BS ISO 20400 + BS ISO 44001+BS ISO 44002
       #   BS ISO 9001+BS ISO 14001
-      class Set < Base
-        attribute :identifiers, Base, collection: true, polymorphic: true
+      class Set < SingleIdentifier
+        attribute :identifiers, ::Pubid::Identifier, collection: true, polymorphic: true
         attribute :separators, :string, collection: true # Should all be " + "
 
         def to_s(lang: :en, lang_single: false)
-          return "" if identifiers.nil? || identifiers.empty?
-
-          parts = []
-
-          identifiers.each_with_index do |id, i|
-            # Render each identifier
-            parts << id.to_s
-
-            # Add separator (always " + " between identifiers)
-            if i < identifiers.length - 1
-              parts << " + "
-            end
-          end
-
-          parts.join
+          render(format: :human, lang: lang, lang_single: lang_single)
         end
 
         def <=>(other)

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

@@ -26,13 +26,7 @@ module Pubid
         end
 
         def to_s(lang: :en, lang_single: false)
-          base = if corrigendum
-                   "AMD Corrigendum #{amendment_number}"
-                 else
-                   "AMD #{amendment_number}"
-                 end
-
-          parenthesized ? "(#{base})" : base
+          render(format: :human, lang: lang, lang_single: lang_single)
         end
       end
     end

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

@@ -8,8 +8,8 @@ module Pubid
       # Supports both forward and reverse formats:
       # Forward: "BS 1000:Supplement No. 1:1972", "BS 1722-1 Supplement No. 1:1974"
       # Reverse: "Supplement No. 1 (1970) to BS 1831:1969"
-      class SupplementDocument < Base
-        attribute :base_identifier, Base, polymorphic: true
+      class SupplementDocument < SingleIdentifier
+        attribute :base_identifier, ::Pubid::Identifier, polymorphic: true
         attribute :supplement_number, :string
         attribute :supplement_year, :integer
         attribute :supplement_type, :string, default: -> {
@@ -21,25 +21,7 @@ module Pubid
         } # Separator before Supplement (":" or " ")
 
         def to_s
-          base_str = base_identifier.to_s
-
-          if reverse_format
-            # Reverse format: "Supplement No. 1 (1970) to BS 1831:1969"
-            supplement_str = if supplement_type == "No."
-                               "Supplement No. #{supplement_number} (#{supplement_year})"
-                             else
-                               "Supplement #{supplement_number} (#{supplement_year})"
-                             end
-            "#{supplement_str} to #{base_str}"
-          else
-            # Forward format: "BS 1000:Supplement No. 1:1972" or "BS 1722-1 Supplement No. 1:1974"
-            supplement_str = if supplement_type == "No."
-                               "#{separator}Supplement No. #{supplement_number}:#{supplement_year}"
-                             else
-                               "#{separator}Supplement #{supplement_number}:#{supplement_year}"
-                             end
-            "#{base_str}#{supplement_str}"
-          end
+          render(format: :human)
         end
 
         def publisher

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

@@ -30,50 +30,7 @@ module Pubid
         end
 
         def to_s(lang: :en, lang_single: false)
-          # Supplementary Index format: BS {number} Supplementary Index:{year}
-          parts = []
-          parts << "BS"
-
-          # Number with part/subpart
-          if number
-            number_str = if number.is_a?(Components::Code)
-                           number.value.to_s
-                         else
-                           number.to_s
-                         end
-
-            # Part and subpart
-            if part
-              part_val = if part.is_a?(Components::Code)
-                           part.value
-                         else
-                           part
-                         end
-              number_str += "-#{part_val}"
-            end
-            if subpart
-              subpart_val = if supart.is_a?(Components::Code)
-                              subpart.value
-                            else
-                              subpart
-                            end
-              number_str += "-#{subpart_val}"
-            end
-
-            parts << number_str
-          end
-
-          result = parts.join(" ")
-
-          # Date
-          if date
-            year_val = date.is_a?(Components::Date) ? date.year : date.to_i
-            result += " Supplementary Index:#{year_val}"
-            # Month if present
-            result += "-#{format('%02d', month)}" if month
-          end
-
-          result
+          render(format: :human, lang: lang, lang_single: lang_single)
         end
       end
     end

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

@@ -24,54 +24,12 @@ module Pubid
         ].freeze
 
         def self.type
-          { key: :ts, title: "Technical Specification", short: "TS" }
+          { key: :ts,
+            web: :technical_specification, title: "Technical Specification", short: "TS" }
         end
 
         def to_s(lang: :en, lang_single: false)
-          # Technical specifications use a simple format: TS {number}:{year}
-          parts = []
-          parts << "TS"
-
-          # Number with part/subpart
-          if number
-            number_str = if number.is_a?(Components::Code)
-                           number.value.to_s
-                         else
-                           number.to_s
-                         end
-
-            # Part and subpart
-            if part
-              part_val = if part.is_a?(Components::Code)
-                           part.value
-                         else
-                           part
-                         end
-              number_str += "-#{part_val}"
-            end
-            if subpart
-              subpart_val = if supart.is_a?(Components::Code)
-                              subpart.value
-                            else
-                              subpart
-                            end
-              number_str += "-#{subpart_val}"
-            end
-
-            parts << number_str
-          end
-
-          result = parts.join(" ")
-
-          # Date
-          if date
-            year_val = date.is_a?(Components::Date) ? date.year : date.to_i
-            result += ":#{year_val}"
-            # Month if present
-            result += "-#{format('%02d', month)}" if month
-          end
-
-          result
+          render(format: :human, lang: lang, lang_single: lang_single)
         end
       end
     end

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

@@ -30,36 +30,7 @@ module Pubid
         end
 
         def to_s(lang: :en, lang_single: false)
-          # Test Method format: BS {number}:{test_series}:{test_id}:{year}
-          parts = []
-
-          # Publisher (BS)
-          parts << "BS"
-
-          # Number
-          if number
-            number_str = if number.is_a?(Components::Code)
-                           number.value.to_s
-                         else
-                           number.to_s
-                         end
-            parts << number_str
-          end
-
-          result = parts.join(" ")
-
-          # Test series and test ID suffixes
-          if test_series && test_id
-            result += ":#{test_series}:#{test_id}"
-          end
-
-          # Date
-          if date
-            year_val = date.is_a?(Components::Date) ? date.year : date.to_i
-            result += ":#{year_val}"
-          end
-
-          result
+          render(format: :human, lang: lang, lang_single: lang_single)
         end
       end
     end