adf_builder 1.2.2 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5c6497310cd559356bd6e358243d2dd2ed5d2a859330fe403ae959b32592b0b
-  data.tar.gz: 77e66f74d658adc2022d401d85a037549f8f92c91d984c265db337a33c05353c
+  metadata.gz: c0e75f097adeb0e0f73541ee79c693ae5de334a55b9330eb49130037fd6fbbe5
+  data.tar.gz: 78c32bb06e602c81270ce30b97ed526fb9449d9bc5aa6b6ddf19ac22593c8596
 SHA512:
-  metadata.gz: 8aba468994e77c3af346c7f6dccbdd4eed16fd858ccf6206226c90d97a5e1126d75bc5083440d40ce1ac3233d2b6f0395b899fcce70afc76ccba7691867e779f
-  data.tar.gz: 215970d63f001f71e21c55651368c9ebab28dafd9e5f26d19519dbff6c897ed4859443623f01d3a99a5c014743d00f8e74b351eda0b371d28e578edc744d5582
+  metadata.gz: c00a8c760bac13e7347f7a365e9598f6c2993ccf72c3adeaf1ef498e3092b6eab70bcd65b8c31e5bc0594014c012339b2653d4017b09716e20fc5364f174d587
+  data.tar.gz: 1c2a4588b945d2cc5275e1a583dea5da1fffc6fa7c6d9004c3466bf984d905bbc9bdfe49496073191a025f5c99efbc0ba503042ce587e2cf97380290336869bb

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [1.3.1] - 2026-01-19
+- **Validation Refinement**: `Address` now strictly enforces 1 to 5 `street` lines.
+
+## [1.3.0] - 2026-01-19
+- **Customer & Contact Validations**:
+  - `Contact`: Requires Name and at least one Phone or Email.
+  - `Address`: Validates Country against ISO 3166-1 alpha-2 codes.
+  - `Timeframe`: Validates ISO 8601 dates and requires earliest/latest date if present.
+  - `Phone/Email`: Enforces valid types and preference flags.
+
 ## [1.2.2] - 2026-01-19
 - **Strict Validations**: Added ISO 4217 currency validation for `Price`, `Amount`, and `Balance`.
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    adf_builder (1.2.1)
+    adf_builder (1.3.0)
       ox (~> 2.14)
 
 GEM

data/lib/adf_builder/nodes/customer.rb

@@ -39,20 +39,41 @@ module AdfBuilder
         @tag_name = :timeframe
       end
 
+      def validate!
+        super
+        # If timeframe is present, earliestdate or latestdate is required
+        return if @children.any? { |c| %i[earliestdate latestdate].include?(c.tag_name) }
+
+        raise AdfBuilder::Error, "Timeframe must have at least one of earliestdate or latestdate"
+      end
+
       def description(value)
         remove_children(:description)
         add_child(GenericNode.new(:description, {}, value))
       end
 
       def earliestdate(value)
+        validate_iso8601(value)
         remove_children(:earliestdate)
         add_child(GenericNode.new(:earliestdate, {}, value))
       end
 
       def latestdate(value)
+        validate_iso8601(value)
         remove_children(:latestdate)
         add_child(GenericNode.new(:latestdate, {}, value))
       end
+
+      private
+
+      def validate_iso8601(value)
+        # Simple ISO 8601 check (YYYY-MM-DDT...)
+        # Using a basic regex for now or standard library
+        require "date"
+        Date.iso8601(value.to_s)
+      rescue ArgumentError
+        raise AdfBuilder::Error, "Invalid ISO 8601 date: #{value}"
+      end
     end
   end
 end

data/lib/adf_builder/nodes/shared.rb

@@ -14,7 +14,14 @@ module AdfBuilder
       end
     end
 
+    # Common ISO 3166-1 alpha-2 codes
+    ISO_3166 = %w[US CA MX GB DE FR GR IT ES JP CN IN BR RU ZA AU NZ KR SE NO FI DK NL BE CH].freeze
+
     class Phone < Node
+      validates_inclusion_of :type, in: %i[phone fax cellphone pager]
+      validates_inclusion_of :time, in: %i[morning afternoon evening nopreference day]
+      validates_inclusion_of :preferredcontact, in: [0, 1, "0", "1"]
+
       def initialize(value, type: nil, time: nil, preferredcontact: nil)
         super()
         @tag_name = :phone
@@ -26,6 +33,8 @@ module AdfBuilder
     end
 
     class Email < Node
+      validates_inclusion_of :preferredcontact, in: [0, 1, "0", "1"]
+
       def initialize(value, preferredcontact: nil)
         super()
         @tag_name = :email
@@ -35,6 +44,9 @@ module AdfBuilder
     end
 
     class Name < Node
+      validates_inclusion_of :part, in: %i[first middle suffix last full]
+      validates_inclusion_of :type, in: %i[individual business]
+
       def initialize(value, part: nil, type: nil)
         super()
         @tag_name = :name
@@ -45,12 +57,24 @@ module AdfBuilder
     end
 
     class Address < Node
+      validates_inclusion_of :type, in: %i[work home delivery]
+      validates_inclusion_of :country, in: ISO_3166
+
       def initialize(type: nil)
         super()
         @tag_name = :address
         @attributes[:type] = type if type
       end
 
+      def validate!
+        super
+        streets = @children.select { |c| c.tag_name == :street }
+        raise AdfBuilder::Error, "Address must have at least one street line" if streets.empty?
+        return unless streets.size > 5
+
+        raise AdfBuilder::Error, "Address can have at most 5 street lines"
+      end
+
       def street(value, line: nil)
         node = GenericNode.new(:street, { line: line }.compact, value)
         add_child(node)
@@ -59,16 +83,33 @@ module AdfBuilder
       # Simple elements
       %i[apartment city regioncode postalcode country].each do |tag|
         define_method(tag) do |value|
+          if tag == :country && !ISO_3166.include?(value.to_s.upcase)
+            raise AdfBuilder::Error, "Invalid country code: #{value}"
+          end
+
           add_child(GenericNode.new(tag, {}, value))
         end
       end
     end
 
     class Contact < Node
-      def initialize(primary_contact: false)
+      validates_inclusion_of :primarycontact, in: [0, 1, "0", "1"]
+
+      def initialize(primary_contact: nil)
         super()
         @tag_name = :contact
-        # primary_contact might be useful for logic but not an attribute
+        @attributes[:primarycontact] = primary_contact if primary_contact
+      end
+
+      def validate!
+        super
+        # Custom Validation: Name is required
+        raise AdfBuilder::Error, "Contact must have a Name" unless @children.any? { |c| c.tag_name == :name }
+
+        # Custom Validation: At least one Phone OR Email
+        return if @children.any? { |c| %i[phone email].include?(c.tag_name) }
+
+        raise AdfBuilder::Error, "Contact must have at least one Phone or Email"
       end
 
       def name(value, part: nil, type: nil)

data/lib/adf_builder/validations.rb

@@ -31,7 +31,11 @@ module AdfBuilder
           next if value.nil?
 
           allowed = validation[:in]
-          unless allowed.include?(value)
+          # Normalize for comparison (allow string/symbol interchangeably)
+          value_s = value.to_s
+          allowed_s = allowed.map(&:to_s)
+
+          unless allowed_s.include?(value_s)
             raise AdfBuilder::Error,
                   "Invalid value for #{validation[:attribute]}: #{value}. Allowed: #{allowed.join(", ")}"
           end

data/lib/adf_builder/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AdfBuilder
-  VERSION = "1.2.2"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adf_builder
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.1
 platform: ruby
 authors:
 - marcus.salinas