adf_builder 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efabe67ca191eb4a8d3cb985d6fa47869b2d719989337213d691734c07263cd0
-  data.tar.gz: 9b83a052a0198a37a8942bbdf39400681e0268a034ec05a0c5663d038ffbb378
+  metadata.gz: ded72167a643d102957459b6d439bbaae8f01833303a3eca082ce4a6f0e264dd
+  data.tar.gz: 64486e697bd4feefa5fdbc8c6cbe01d3d0492878225748ffdf3c8ed1650b8b09
 SHA512:
-  metadata.gz: 61da2f959f608ea29bbd29a0c3a63591ec3ef4d5a94dd0df50b8c7ea9f0eec4a254e696e05fe2f58d229d01081a837870a337852801afcb57a3090122036aefc
-  data.tar.gz: e219d9a2b74c562295a72464042cec57160e3f9ec8b99cc2b90f7bd4deb96fd956dad7c9632f74741470467443a10d2c4472e87468b299af2e50c381347a0087
+  metadata.gz: b868564c56972b958839382c2d5c5706ce1b7864ea13e2c7eb38dddccb82f6481a66bc471f679f79589533a8fa9fd29897a387d53d4426ee8bc5490242912b45
+  data.tar.gz: 0c25a32fec2c3015e402fdbe26e0c2af23a2a91ea64840097a7a86acd7c88c4e89a809362b1ea35b8eebaa112dc130534b82f1a3647173ab5f0d1f3aa2b19fa0

data/.gitignore

@@ -11,3 +11,4 @@
 .rspec_status
 
 deploy.txt
+*.gem

data/CHANGELOG.md

@@ -1,4 +1,20 @@
-## [Unreleased]
+## [1.1.0] - 2026-01-19
+- **Feature Complete**: Implemented all ADF 1.0 nodes and attributes including `Vendor`, `Provider`, and complex `Vehicle` tags (`Finance`, `Option`, `Odometer`, `ColorCombination`, `ImageTag`, `Price`).
+- **Singular Field logic**: Methods for singular fields (e.g. `vehicle.year`) now correctly replace existing values instead of appending.
+- **Removed Legacy Code**: Cleaned up deprecated legacy implementation directories.
+
+## [1.0.0] - 2026-01-19
+- **MAJOR OVERHAUL**: Complete rewrtie of the library architecture.
+- **New Block-based DSL**: Intuitive API for building ADF documents (`AdfBuilder.build { vehicle { ... } }`).
+- **Validation**: Strict enforcement of ADF enumerations and structure (e.g. `vehicle status: :new`).
+- **Editing**: New `AdfBuilder.tree` method for programmatic modifications after construction.
+- **Robustness**: Complete rewrite of XML generation using robust heuristics and strict `Ox` serialization.
+- **Compatibility**: Verified for Ruby 3.4.x.
+- **Features**:
+  - Support for multiple vehicles/customers.
+  - Support for singular vs multiple item logic.
+  - Dynamic support for arbitrary/custom tags (`method_missing`).
+  - Automatic handling of XML attributes vs simple elements.
 
 ## [0.4.0] - 2026-01-19
 - Modernized dependencies

data/Gemfile.lock

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

data/lib/adf_builder/nodes/customer.rb

@@ -3,56 +3,56 @@
 module AdfBuilder
   module Nodes
     class Customer < Node
+      def initialize
+        super
+        @tag_name = :customer
+      end
+
       def contact(&block)
+        remove_children(:contact)
         contact = Contact.new
         contact.instance_eval(&block) if block_given?
         add_child(contact)
       end
-    end
 
-    class Contact < Node
-      def name(value, part: nil, type: nil)
-        name_node = Name.new(value, part: part, type: type)
-        add_child(name_node)
+      def id(value, sequence: nil, source: nil)
+        # id* is multiple
+        add_child(Id.new(value, sequence: sequence, source: source))
       end
 
-      def email(value)
-        add_child(SimpleElement.new(:email, value))
+      def timeframe(&block)
+        remove_children(:timeframe)
+        tf = Timeframe.new
+        tf.instance_eval(&block) if block_given?
+        add_child(tf)
       end
 
-      def phone(value, type: nil)
-        phone_node = Phone.new(value, type: type)
-        add_child(phone_node)
+      def comments(value)
+        remove_children(:comments)
+        add_child(GenericNode.new(:comments, {}, value))
       end
     end
 
-    class Name < Node
-      def initialize(value, part: nil, type: nil)
-        super()
-        @value = value
-        @attributes[:part] = part if part
-        @attributes[:type] = type if type
+    class Timeframe < Node
+      def initialize
+        super
+        @tag_name = :timeframe
       end
-      attr_reader :value
-    end
 
-    class Phone < Node
-      def initialize(value, type: nil)
-        super()
-        @value = value
-        @attributes[:type] = type if type
+      def description(value)
+        remove_children(:description)
+        add_child(GenericNode.new(:description, {}, value))
+      end
+
+      def earliestdate(value)
+        remove_children(:earliestdate)
+        add_child(GenericNode.new(:earliestdate, {}, value))
       end
-      attr_reader :value
-    end
 
-    # Simple Helper for tags like <email>foo</email>
-    class SimpleElement < Node
-      def initialize(tag_name, value)
-        super()
-        @tag_name = tag_name
-        @value = value
+      def latestdate(value)
+        remove_children(:latestdate)
+        add_child(GenericNode.new(:latestdate, {}, value))
       end
-      attr_reader :value, :tag_name
     end
   end
 end

data/lib/adf_builder/nodes/node.rb

@@ -5,17 +5,23 @@ module AdfBuilder
     class Node
       include AdfBuilder::Validations
 
-      attr_reader :children, :attributes
+      attr_reader :children, :attributes, :value, :tag_name
 
       def initialize
         @children = []
         @attributes = {}
+        @value = nil
+        @tag_name = nil
       end
 
       def add_child(node)
         @children << node
       end
 
+      def remove_children(tag_name)
+        @children.reject! { |c| c.tag_name == tag_name }
+      end
+
       def to_xml
         Serializer.to_xml(self)
       end
@@ -57,7 +63,6 @@ module AdfBuilder
         @attributes = attributes
         @value = value
       end
-      attr_reader :tag_name, :value
     end
 
     class Root < Node

data/lib/adf_builder/nodes/prospect.rb

@@ -19,6 +19,18 @@ module AdfBuilder
         add_child(customer)
       end
 
+      def vendor(&block)
+        vendor = Vendor.new
+        vendor.instance_eval(&block) if block_given?
+        add_child(vendor)
+      end
+
+      def provider(&block)
+        provider = Provider.new
+        provider.instance_eval(&block) if block_given?
+        add_child(provider)
+      end
+
       # Helpers for Editing
       def vehicles
         @children.select { |c| c.is_a?(Vehicle) }

data/lib/adf_builder/nodes/provider.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module AdfBuilder
+  module Nodes
+    class Provider < Node
+      def initialize
+        super
+        @tag_name = :provider
+      end
+
+      def id(value, sequence: nil, source: nil)
+        add_child(Id.new(value, sequence: sequence, source: source))
+      end
+
+      def name(value, part: nil, type: nil)
+        remove_children(:name)
+        add_child(Name.new(value, part: part, type: type))
+      end
+
+      def service(value)
+        remove_children(:service)
+        add_child(GenericNode.new(:service, {}, value))
+      end
+
+      def url(value)
+        remove_children(:url)
+        add_child(GenericNode.new(:url, {}, value))
+      end
+
+      def email(value, preferredcontact: nil)
+        remove_children(:email)
+        add_child(Email.new(value, preferredcontact: preferredcontact))
+      end
+
+      def phone(value, type: nil, time: nil, preferredcontact: nil)
+        remove_children(:phone)
+        add_child(Phone.new(value, type: type, time: time, preferredcontact: preferredcontact))
+      end
+
+      def contact(primary_contact: false, &block)
+        remove_children(:contact)
+        contact = Contact.new(primary_contact: primary_contact)
+        contact.instance_eval(&block) if block_given?
+        add_child(contact)
+      end
+    end
+  end
+end

data/lib/adf_builder/nodes/shared.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+module AdfBuilder
+  module Nodes
+    class Id < Node
+      def initialize(value, sequence: nil, source: nil)
+        super()
+        @tag_name = :id
+        @value = value
+        @attributes[:sequence] = sequence if sequence
+        @attributes[:source] = source if source
+      end
+    end
+
+    class Phone < Node
+      def initialize(value, type: nil, time: nil, preferredcontact: nil)
+        super()
+        @tag_name = :phone
+        @value = value
+        @attributes[:type] = type if type
+        @attributes[:time] = time if time
+        @attributes[:preferredcontact] = preferredcontact if preferredcontact
+      end
+    end
+
+    class Email < Node
+      def initialize(value, preferredcontact: nil)
+        super()
+        @tag_name = :email
+        @value = value
+        @attributes[:preferredcontact] = preferredcontact if preferredcontact
+      end
+    end
+
+    class Name < Node
+      def initialize(value, part: nil, type: nil)
+        super()
+        @tag_name = :name
+        @value = value
+        @attributes[:part] = part if part
+        @attributes[:type] = type if type
+      end
+    end
+
+    class Address < Node
+      def initialize(type: nil)
+        super()
+        @tag_name = :address
+        @attributes[:type] = type if type
+      end
+
+      def street(value, line: nil)
+        node = GenericNode.new(:street, { line: line }.compact, value)
+        add_child(node)
+      end
+
+      # Simple elements
+      %i[apartment city regioncode postalcode country].each do |tag|
+        define_method(tag) do |value|
+          add_child(GenericNode.new(tag, {}, value))
+        end
+      end
+    end
+
+    class Contact < Node
+      def initialize(primary_contact: false)
+        super()
+        @tag_name = :contact
+        # primary_contact might be useful for logic but not an attribute
+      end
+
+      def name(value, part: nil, type: nil)
+        add_child(Name.new(value, part: part, type: type))
+      end
+
+      def email(value, preferredcontact: nil)
+        add_child(Email.new(value, preferredcontact: preferredcontact))
+      end
+
+      def phone(value, type: nil, time: nil, preferredcontact: nil)
+        add_child(Phone.new(value, type: type, time: time, preferredcontact: preferredcontact))
+      end
+
+      def address(type: nil, &block)
+        addr = Address.new(type: type)
+        addr.instance_eval(&block) if block_given?
+        add_child(addr)
+      end
+    end
+  end
+end

data/lib/adf_builder/nodes/vehicle.rb

@@ -4,22 +4,72 @@ module AdfBuilder
   module Nodes
     class Vehicle < Node
       validates_inclusion_of :status, in: %i[new used]
+      validates_inclusion_of :interest, in: %i[buy lease sell trade-in test-drive]
 
-      def year(value)
-        @attributes[:year] = value
+      def initialize
+        super
+        @tag_name = :vehicle
+        @attributes[:status] = :new
+        @attributes[:interest] = :buy
       end
 
-      def make(value)
-        @attributes[:make] = value
+      # Simple Text Elements (Singular)
+      %i[year make model vin stock trim doors bodystyle transmission condition pricecomments comments].each do |tag|
+        define_method(tag) do |value|
+          remove_children(tag)
+          add_child(GenericNode.new(tag, {}, value))
+        end
       end
 
-      def model(value)
-        @attributes[:model] = value
+      def interest(value)
+        @attributes[:interest] = value
       end
 
       def status(value)
         @attributes[:status] = value
       end
+
+      # Complex Elements
+      def id(value, sequence: nil, source: nil)
+        # id* is multiple, so just add
+        add_child(Id.new(value, sequence: sequence, source: source))
+      end
+
+      def odometer(value, status: nil, units: nil)
+        remove_children(:odometer)
+        add_child(Odometer.new(value, status: status, units: units))
+      end
+
+      def imagetag(value, width: nil, height: nil, alttext: nil)
+        remove_children(:imagetag)
+        add_child(ImageTag.new(value, width: width, height: height, alttext: alttext))
+      end
+
+      def price(value, **attrs)
+        remove_children(:price)
+        add_child(Price.new(value, **attrs))
+      end
+
+      def option(&block)
+        # option* is multiple
+        opt = Option.new
+        opt.instance_eval(&block) if block_given?
+        add_child(opt)
+      end
+
+      def finance(&block)
+        remove_children(:finance)
+        fin = Finance.new
+        fin.instance_eval(&block) if block_given?
+        add_child(fin)
+      end
+
+      def colorcombination(&block)
+        # colorcombination* is multiple
+        cc = ColorCombination.new
+        cc.instance_eval(&block) if block_given?
+        add_child(cc)
+      end
     end
   end
 end

data/lib/adf_builder/nodes/vehicle_nodes.rb

@@ -0,0 +1,137 @@
+# frozen_string_literal: true
+
+module AdfBuilder
+  module Nodes
+    class Odometer < Node
+      validates_inclusion_of :status, in: %i[unknown rolledover replaced original]
+      validates_inclusion_of :units, in: %i[km mi]
+
+      def initialize(value, status: nil, units: nil)
+        super()
+        @tag_name = :odometer
+        @value = value
+        @attributes[:status] = status if status
+        @attributes[:units] = units if units
+      end
+    end
+
+    class ImageTag < Node
+      def initialize(value, width: nil, height: nil, alttext: nil)
+        super()
+        @tag_name = :imagetag
+        @value = value
+        @attributes[:width] = width if width
+        @attributes[:height] = height if height
+        @attributes[:alttext] = alttext if alttext
+      end
+    end
+
+    class Price < Node
+      validates_inclusion_of :type, in: %i[quote offer msrp invoice call appraisal asking]
+      validates_inclusion_of :delta, in: %i[absolute relative percentage]
+      validates_inclusion_of :relativeto, in: %i[msrp invoice]
+
+      def initialize(value, type: :quote, currency: nil, delta: nil, relativeto: nil, source: nil)
+        super()
+        @tag_name = :price
+        @value = value
+        @attributes[:type] = type
+        @attributes[:currency] = currency if currency
+        @attributes[:delta] = delta if delta
+        @attributes[:relativeto] = relativeto if relativeto
+        @attributes[:source] = source if source
+      end
+    end
+
+    class Amount < Node
+      validates_inclusion_of :type, in: %i[downpayment monthly total]
+      validates_inclusion_of :limit, in: %i[maximum minimum exact]
+
+      def initialize(value, type: :total, limit: :maximum, currency: nil)
+        super()
+        @tag_name = :amount
+        @value = value
+        @attributes[:type] = type
+        @attributes[:limit] = limit
+        @attributes[:currency] = currency if currency
+      end
+    end
+
+    class Balance < Node
+      validates_inclusion_of :type, in: %i[finance residual]
+
+      def initialize(value, type: :finance, currency: nil)
+        super()
+        @tag_name = :balance
+        @value = value
+        @attributes[:type] = type
+        @attributes[:currency] = currency if currency
+      end
+    end
+
+    class Finance < Node
+      def initialize
+        super
+        @tag_name = :finance
+      end
+
+      def method(value)
+        add_child(GenericNode.new(:method, {}, value))
+      end
+
+      def amount(value, type: :total, limit: :maximum, currency: nil)
+        add_child(Amount.new(value, type: type, limit: limit, currency: currency))
+      end
+
+      def balance(value, type: :finance, currency: nil)
+        add_child(Balance.new(value, type: type, currency: currency))
+      end
+    end
+
+    class Option < Node
+      def initialize
+        super
+        @tag_name = :option
+      end
+
+      def optionname(value)
+        add_child(GenericNode.new(:optionname, {}, value))
+      end
+
+      def manufacturercode(value)
+        add_child(GenericNode.new(:manufacturercode, {}, value))
+      end
+
+      def stock(value)
+        add_child(GenericNode.new(:stock, {}, value))
+      end
+
+      def weighting(value)
+        add_child(GenericNode.new(:weighting, {}, value))
+      end
+
+      def price(value, **attrs)
+        add_child(Price.new(value, **attrs))
+      end
+    end
+
+    class ColorCombination < Node
+      def initialize
+        super
+        @tag_name = :colorcombination
+      end
+
+      def interiorcolor(value)
+        add_child(GenericNode.new(:interiorcolor, {}, value))
+      end
+
+      def exteriorcolor(value)
+        add_child(GenericNode.new(:exteriorcolor, {}, value))
+      end
+
+      def preference(value)
+        add_child(GenericNode.new(:preference, {}, value))
+      end
+    end
+  end
+end

data/lib/adf_builder/nodes/vendor.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module AdfBuilder
+  module Nodes
+    class Vendor < Node
+      def initialize
+        super
+        @tag_name = :vendor
+      end
+
+      def id(value, sequence: nil, source: nil)
+        add_child(Id.new(value, sequence: sequence, source: source))
+      end
+
+      def vendorname(value)
+        remove_children(:vendorname)
+        add_child(GenericNode.new(:vendorname, {}, value))
+      end
+
+      def url(value)
+        remove_children(:url)
+        add_child(GenericNode.new(:url, {}, value))
+      end
+
+      def contact(primary_contact: false, &block)
+        remove_children(:contact)
+        contact = Contact.new(primary_contact: primary_contact)
+        contact.instance_eval(&block) if block_given?
+        add_child(contact)
+      end
+    end
+  end
+end

data/lib/adf_builder/serializer.rb

@@ -41,7 +41,7 @@ module AdfBuilder
     def serialize_node(node, parent_element)
       # Determine element name using tag_name to avoid conflict with DSL methods like 'name'
       # Safest check: Does it have the instance variable set?
-      element_name = if node.instance_variable_defined?(:@tag_name)
+      element_name = if node.instance_variable_defined?(:@tag_name) && node.instance_variable_get(:@tag_name)
                        node.instance_variable_get(:@tag_name).to_s
                      else
                        node.class.name.split("::").last.downcase
@@ -75,7 +75,10 @@ module AdfBuilder
     end
 
     def attribute?(key)
-      %i[part type status sequence source id valid preferredcontact time].include?(key)
+      %i[
+        part type status sequence source id valid preferredcontact time
+        interest units width height alttext limit currency delta relativeto line
+      ].include?(key)
     end
   end
 end

data/lib/adf_builder/version.rb

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

data/lib/adf_builder.rb

@@ -4,164 +4,22 @@ require "ox"
 require "json"
 
 require_relative "adf_builder/version"
-
-# CUSTOMER
-require_relative "adf_builder/customer/customer"
-require_relative "adf_builder/customer/timeframe"
-
-# BASE
-require_relative "adf_builder/base/base"
-require_relative "adf_builder/base/prospect"
-require_relative "adf_builder/base/request_date"
-
-# PROVIDER
-require_relative "adf_builder/provider/provider"
-
-# SHARED
-require_relative "adf_builder/shared/id"
-require_relative "adf_builder/shared/contact"
-
-# VEHICLES
-require_relative "adf_builder/vehicles/vehicles"
-require_relative "adf_builder/vehicles/colorcombinations"
-require_relative "adf_builder/vehicles/price"
-
-# VENDOR
-require_relative "adf_builder/vendor/vendor"
-
-# v1.0 DSL
-# v1.0 DSL
 require_relative "adf_builder/validations"
+
+# Nodes
 require_relative "adf_builder/nodes/node"
 require_relative "adf_builder/nodes/prospect"
+require_relative "adf_builder/nodes/shared"
 require_relative "adf_builder/nodes/vehicle"
+require_relative "adf_builder/nodes/vehicle_nodes"
 require_relative "adf_builder/nodes/customer"
+require_relative "adf_builder/nodes/vendor"
+require_relative "adf_builder/nodes/provider"
+
+# Core
 require_relative "adf_builder/serializer"
 require_relative "adf_builder/dsl"
 
 module AdfBuilder
   class Error < StandardError; end
-
-  class Builder
-    def initialize
-      @doc = init_doc
-      @base = Base.new(@doc)
-    end
-
-    def prospect
-      @base.prospect
-    end
-
-    # output the XML
-    def to_xml
-      Ox.dump(@doc, {})
-    end
-
-    # def an example of minimal XML taken from ADF spec file http://adfxml.info/adf_spec.pdf
-    def minimal_lead
-      prospect = Ox::Element.new("prospect")
-
-      request_date = Ox::Element.new("requestdate")
-      request_date << "2000-03-30T15:30:20-08:00"
-
-      vehicle = Ox::Element.new("vehicle")
-      year = Ox::Element.new("year")
-      year << "1999"
-
-      make = Ox::Element.new("make")
-      make << "Chevrolet"
-
-      model = Ox::Element.new("model")
-      model << "Blazer"
-
-      vehicle << year << make << model
-
-      customer = Ox::Element.new("customer")
-
-      contact = Ox::Element.new("contact")
-
-      name = Ox::Element.new("name")
-      name[:part] = "full"
-      name << "John Doe"
-
-      phone = Ox::Element.new("phone")
-      phone << "393-999-3922"
-
-      contact << name << phone
-      customer << contact
-
-      vendor = Ox::Element.new("vendor")
-
-      contact = Ox::Element.new("contact")
-      name = Ox::Element.new("name")
-      name[:part] = "full"
-      name << "Acura of Bellevue"
-
-      contact << name
-      vendor << contact
-
-      prospect << request_date << vehicle << customer << vendor
-      @doc.remove_children_by_path("adf/prospect")
-      @doc.adf << prospect
-      Ox.dump(@doc, {})
-    end
-
-    # go back to the initial structure
-    def reset_doc
-      @doc.adf.prospect.remove_children_by_path("*")
-    end
-
-    # all the files will start with this same header
-    def init_doc
-      doc = Ox::Document.new
-      instruct = Ox::Instruct.new(:xml)
-      instruct[:version] = "1.0"
-      doc << instruct
-      doc << Ox::Raw.new("")
-      instruct = Ox::Instruct.new("ADF")
-      instruct[:version] = "1.0"
-      doc << instruct
-      adf = Ox::Element.new("adf")
-      doc << adf
-      doc
-    end
-
-    # we will either create a new node with the value or replace the one if it is available
-    def self.update_node(parent_node, key, value, params = {})
-      key = key.to_s
-      value = value.to_s
-      if parent_node.locate(key).size.positive?
-        node = parent_node.locate(key).first
-        node.replace_text(value)
-      else
-        node = (Ox::Element.new(key) << value)
-        parent_node << node
-      end
-
-      AdfBuilder::Builder.update_params(node, key, params)
-    end
-
-    # update the params by first checking if they are valid params and then checking if the values are valid if necessary
-    def self.update_params(node, key, params)
-      return true if params.empty?
-
-      key = key.to_sym
-      valid_values = params[:valid_values]
-      valid_parameters = params[:valid_parameters]
-      _params = AdfBuilder::Builder.whitelabel_params(params, valid_parameters, key)
-      _params.each do |k, v|
-        node[k] = v if (valid_values[key][k] == true) || valid_values[key][k].include?(v.to_s)
-      end
-    end
-
-    # clear out the opts that don't match valid keys
-    def self.whitelabel_params(opts, valid_parameters, key)
-      opts.slice(*valid_parameters[key])
-    end
-
-    def self.valid_child?(parent, tag_name, index)
-      child = parent.locate(tag_name)[index]
-      [!child.nil?, child]
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adf_builder
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - marcus.salinas
@@ -100,26 +100,18 @@ files:
 - bin/console
 - bin/setup
 - lib/adf_builder.rb
-- lib/adf_builder/base/base.rb
-- lib/adf_builder/base/prospect.rb
-- lib/adf_builder/base/request_date.rb
-- lib/adf_builder/customer/customer.rb
-- lib/adf_builder/customer/timeframe.rb
 - lib/adf_builder/data/iso-4217-currency-codes.json
 - lib/adf_builder/dsl.rb
 - lib/adf_builder/nodes/customer.rb
 - lib/adf_builder/nodes/node.rb
 - lib/adf_builder/nodes/prospect.rb
+- lib/adf_builder/nodes/provider.rb
+- lib/adf_builder/nodes/shared.rb
 - lib/adf_builder/nodes/vehicle.rb
-- lib/adf_builder/provider/provider.rb
+- lib/adf_builder/nodes/vehicle_nodes.rb
+- lib/adf_builder/nodes/vendor.rb
 - lib/adf_builder/serializer.rb
-- lib/adf_builder/shared/contact.rb
-- lib/adf_builder/shared/id.rb
 - lib/adf_builder/validations.rb
-- lib/adf_builder/vehicles/colorcombinations.rb
-- lib/adf_builder/vehicles/price.rb
-- lib/adf_builder/vehicles/vehicles.rb
-- lib/adf_builder/vendor/vendor.rb
 - lib/adf_builder/version.rb
 homepage: https://github.com/jippylong12/adf_builder
 licenses:

data/lib/adf_builder/base/base.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module AdfBuilder
-  class Base
-    # initialize the prospect, id, and requestdate node
-    def initialize(doc)
-      @doc = doc
-      @prospect = Prospect.new(@doc)
-    end
-
-    attr_reader :prospect
-  end
-end

data/lib/adf_builder/base/prospect.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module AdfBuilder
-  class Prospect
-    STATUSES = {
-      new: :new,
-      resend: :resend
-    }.freeze
-
-    def initialize(doc)
-      @doc = doc
-      @doc.adf << Ox::Element.new("prospect")
-      @prospect = @doc.adf.prospect
-      @prospect[:status] = STATUSES[:new]
-
-      @request_date = RequestDate.new(@prospect)
-      @vehicles = Vehicles.new(@prospect)
-      @customer = Customer.new(@prospect)
-      @vendor = Vendor.new(@prospect)
-      @provider = Provider.new(@prospect)
-    end
-
-    attr_reader :request_date, :vehicles, :customer, :vendor, :provider
-
-    # set status to renew
-    def set_renew
-      @prospect[:status] = STATUSES[:resend]
-    end
-
-    def add_id(value, source = nil, sequence = 1)
-      Id.new.add(@prospect, value, source, sequence)
-    end
-  end
-end

data/lib/adf_builder/base/request_date.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module AdfBuilder
-  class RequestDate
-    WITH_SYMBOLS = "%FT%T%:z"
-    WITHOUT_SYMBOLS = "%Y%m%dT%H%M%S%z"
-
-    def initialize(prospect_node)
-      @request_date_node = Ox::Element.new("requestdate")
-      @request_date_node << DateTime.now.strftime("%FT%T%:z")
-      prospect_node << @request_date_node
-    end
-
-    def update_val(datetime_value, format = 1)
-      if format == 1
-        @request_date_node.replace_text(datetime_value.strftime(WITH_SYMBOLS))
-      elsif format == 2
-        @request_date_node.replace_text(datetime_value.strftime(WITHOUT_SYMBOLS))
-      end
-    end
-  end
-end

data/lib/adf_builder/customer/customer.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-module AdfBuilder
-  class Customer
-    def initialize(prospect)
-      @customer = Ox::Element.new("customer")
-      @contact = nil
-      @timeframe = nil
-
-      prospect << @customer
-    end
-
-    attr_reader :contact, :timeframe
-
-    def add(name, opts = {})
-      @contact = Contact.new(@customer, name, opts)
-    end
-
-    def add_id(index, value, source = nil, sequence = 1)
-      if @prospect.locate("customer").empty?
-        false
-      else
-        Id.new.add(@prospect.customer(index), value, source, sequence)
-      end
-    end
-
-    # @param descriptin [String] - Description of customer’s timing intention.
-    # @param earliest_date [DateTime] - Earliest date customer is interested in. If timeframe tag
-    # is present, it is required to specify earliestdate and/or
-    # latestdate
-    # @param latest_date [DateTime] - Latest date customer is interested in. If timeframe tag
-    # is present, it is required to specify earliestdate and/or
-    # latestdate
-    def add_timeframe(description, earliest_date = nil, latest_date = nil)
-      return false if earliest_date.nil? && latest_date.nil?
-
-      return false if earliest_date && (earliest_date.class != DateTime)
-
-      return false if latest_date && (latest_date.class != DateTime)
-
-      @timeframe = Timeframe.new(@customer, description, earliest_date, latest_date) if @timeframe.nil?
-    end
-
-    def update_comments(comments)
-      return false if comments.class != String
-
-      AdfBuilder::Builder.update_node(@customer, :comments, comments)
-    end
-  end
-end

data/lib/adf_builder/customer/timeframe.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module AdfBuilder
-  class Timeframe
-    def initialize(customer, description, earliest_date, latest_date)
-      begin
-        earliest_date = earliest_date.strftime("%FT%T%:z") if earliest_date
-        latest_date = latest_date.strftime("%FT%T%:z") if latest_date
-      rescue StandardError
-        return nil
-      end
-
-      @timeframe = Ox::Element.new("timeframe")
-
-      @timeframe << (Ox::Element.new("description") << description)
-      @timeframe << (Ox::Element.new("earliestdate") << earliest_date) if earliest_date
-      @timeframe << (Ox::Element.new("latestdate") << latest_date) if latest_date
-      customer << @timeframe
-    end
-
-    def update_description(description)
-      AdfBuilder::Builder.update_node(@timeframe, :description, description)
-    end
-
-    def update_earliest_date(date)
-      begin
-        date = date.strftime("%FT%T%:z")
-      rescue StandardError
-        return false
-      end
-      AdfBuilder::Builder.update_node(@timeframe, :earliestdate, date)
-    end
-
-    def update_latest_date(date)
-      begin
-        date = date.strftime("%FT%T%:z")
-      rescue StandardError
-        return false
-      end
-
-      AdfBuilder::Builder.update_node(@timeframe, :latestdate, date)
-    end
-  end
-end

data/lib/adf_builder/provider/provider.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module AdfBuilder
-  class Provider
-    FREE_TEXT_OPTIONAL_TAGS = %i[service url].freeze
-
-    def initialize(prospect)
-      @prospect = prospect
-      @provider = nil
-      @contact = nil
-    end
-
-    attr_reader :contact
-
-    def add(name, params = {})
-      @provider = Ox::Element.new("provider")
-      params.merge!({ valid_values: AdfBuilder::Contact::VALID_VALUES,
-                      valid_parameters: AdfBuilder::Contact::VALID_PARAMETERS })
-      AdfBuilder::Builder.update_node(@provider, :name, name, params)
-      @prospect << @provider
-    end
-
-    def add_contact(name, opts = {})
-      @contact = Contact.new(@provider, name, opts)
-    end
-
-    def add_phone(phone, params = {})
-      params.merge!({ valid_values: AdfBuilder::Contact::VALID_VALUES,
-                      valid_parameters: AdfBuilder::Contact::VALID_PARAMETERS })
-      AdfBuilder::Builder.update_node(@provider, :phone, phone, params)
-    end
-
-    def add_email(email, params = {})
-      params.merge!({ valid_values: AdfBuilder::Contact::VALID_VALUES,
-                      valid_parameters: AdfBuilder::Contact::VALID_PARAMETERS })
-      AdfBuilder::Builder.update_node(@provider, :email, email, params)
-    end
-
-    def update_tags_with_free_text(tags)
-      tags.each do |key, value|
-        AdfBuilder::Builder.update_node(@provider, key, value) if FREE_TEXT_OPTIONAL_TAGS.include? key.to_sym
-      end
-    end
-
-    def add_id(index, value, source = nil, sequence = 1)
-      if @prospect.locate("provider").empty?
-        false
-      else
-        Id.new.add(@prospect.provider(index), value, source, sequence)
-      end
-    end
-  end
-end

data/lib/adf_builder/shared/contact.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module AdfBuilder
-  class Contact
-    VALID_PARAMETERS = {
-      name: %i[part type primarycontact],
-      email: [:preferredcontact],
-      phone: %i[type time preferredcontact]
-    }.freeze
-
-    VALID_VALUES = {
-      name: {
-        part: %w[first middle suffix last full],
-        type: %w[individual business],
-        primarycontact: %w[0 1]
-      },
-      email: {
-        preferredcontact: %w[0 1]
-      },
-      phone: {
-        preferredcontact: %w[0 1],
-        type: %w[phone fax cellphone pager],
-        time: %w[morning afternoon evening nopreference day]
-      }
-    }.freeze
-
-    def initialize(parent_node, name, params = {})
-      @contact = Ox::Element.new("contact")
-      params.merge!({ valid_values: VALID_VALUES, valid_parameters: VALID_PARAMETERS })
-      AdfBuilder::Builder.update_node(@contact, :name, name, params)
-      parent_node << @contact
-    end
-
-    def add_phone(phone, params = {})
-      params.merge!({ valid_values: VALID_VALUES, valid_parameters: VALID_PARAMETERS })
-      AdfBuilder::Builder.update_node(@contact, :phone, phone, params)
-    end
-
-    def add_email(email, params = {})
-      params.merge!({ valid_values: VALID_VALUES, valid_parameters: VALID_PARAMETERS })
-      AdfBuilder::Builder.update_node(@contact, :email, email, params)
-    end
-  end
-end

data/lib/adf_builder/shared/id.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module AdfBuilder
-  class Id
-    def initialize; end
-
-    # add id tag to the form
-    def add(parent_node, value, source = nil, sequence = 1)
-      id_node = Ox::Element.new("id")
-      id_node << value
-      id_node[:sequence] = sequence
-
-      id_node[:source] = source if source
-
-      parent_node.prepend_child(id_node)
-    end
-  end
-end

data/lib/adf_builder/vehicles/colorcombinations.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module AdfBuilder
-  class ColorCombinations
-    FREE_TEXT_OPTIONAL_TAGS = %i[interiorcolor exteriorcolor preference].freeze
-
-    def initialize(vehicle)
-      @vehicle = vehicle
-      @color_combination = nil
-    end
-
-    def add(interior_color, exterior_color, preference)
-      @color_combination = Ox::Element.new("colorcombination")
-      @color_combination <<
-        (Ox::Element.new("interiorcolor") << interior_color) <<
-        (Ox::Element.new("exteriorcolor") << exterior_color) <<
-        (Ox::Element.new("preference") << preference.to_s)
-      @vehicle << @color_combination
-    end
-
-    def update_tags(index, tags)
-      valid, vehicle = AdfBuilder::Builder.valid_child?(@vehicle, "colorcombination", index)
-      return unless valid
-
-      tags.each do |key, value|
-        AdfBuilder::Builder.update_node(vehicle, key, value) if FREE_TEXT_OPTIONAL_TAGS.include? key.to_sym
-      end
-    end
-  end
-end

data/lib/adf_builder/vehicles/price.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module AdfBuilder
-  class Price
-    VALID_PARAMETERS = {
-      price: %i[type currency delta relativeto source]
-    }.freeze
-
-    VALID_VALUES = {
-      price: {
-        type: %w[quote offer msrp invoice call appraisal asking],
-        currency: true,
-        delta: %w[absolute relative percentage],
-        relativeto: %w[msrp invoice],
-        source: true
-      }
-    }.freeze
-
-    def initialize(parent_node, value, params = {})
-      @parent_node = parent_node
-      params.merge!({ valid_values: VALID_VALUES, valid_parameters: VALID_PARAMETERS })
-      validate_currency(params)
-      AdfBuilder::Builder.update_node(@parent_node, :price, value, params)
-      @price = @parent_node.price
-    end
-
-    def update(value, params = {})
-      params.merge!({ valid_values: VALID_VALUES, valid_parameters: VALID_PARAMETERS })
-      AdfBuilder::Builder.update_node(@parent_node, :price, value, params)
-    end
-
-    def validate_currency(params)
-      code = params[:currency]
-      return unless code
-
-      json = JSON.parse(File.read("./lib/adf_builder/data/iso-4217-currency-codes.json"))
-      codes = json.map { |j| j["Alphabetic_Code"] }.reject(&:nil?)
-      return if codes.include? code
-
-      params.delete(:currency)
-    end
-  end
-end

data/lib/adf_builder/vehicles/vehicles.rb

@@ -1,123 +0,0 @@
-# frozen_string_literal: true
-
-module AdfBuilder
-  class Vehicles
-    VALID_PARAMETERS = {
-      vehicle: %i[interest status],
-      odometer: %i[status units],
-      imagetag: %i[width height alttext]
-    }.freeze
-
-    VALID_VALUES = {
-      vehicle: {
-        interest: %w[buy lease sell trade-in test-drive],
-        status: %w[new used]
-      },
-      odometer: {
-        status: %w[unknown rolledover replaced original],
-        units: %w[km mi]
-      },
-      imagetag: {
-        width: true,
-        height: true,
-        alttext: true
-      }
-    }.freeze
-
-    FREE_TEXT_OPTIONAL_TAGS = %i[year make model vin stock
-                                 trim doors bodystyle transmission pricecomments comments].freeze
-
-    CONDITIONS = %w[excellent good fair poor unknown].freeze
-
-    def initialize(prospect)
-      @prospect = prospect
-      @color_combinations = []
-      @prices = []
-    end
-
-    def add_color_combination(v_index, interior_color, exterior_color, preference)
-      valid, vehicle = AdfBuilder::Builder.valid_child?(@prospect, "vehicle", v_index)
-      return unless valid
-
-      cc = ColorCombinations.new(vehicle)
-      cc.add(interior_color, exterior_color, preference)
-      @color_combinations.push(cc)
-    end
-
-    def color_combination(index)
-      @color_combinations[index]
-    end
-
-    def price(index)
-      @prices[index]
-    end
-
-    def add(year, make, model, params = {})
-      vehicle = Ox::Element.new("vehicle")
-
-      params.merge!({ valid_values: VALID_VALUES, valid_parameters: VALID_PARAMETERS })
-      AdfBuilder::Builder.update_params(vehicle, :vehicle, params)
-
-      vehicle << (Ox::Element.new("year") << year.to_s)
-      vehicle << (Ox::Element.new("make") << make)
-      vehicle << (Ox::Element.new("model") << model)
-
-      @prospect << vehicle
-    end
-
-    def update_odometer(index, value, params = {})
-      valid, vehicle = AdfBuilder::Builder.valid_child?(@prospect, "vehicle", index)
-      return unless valid
-
-      params.merge!({ valid_values: VALID_VALUES, valid_parameters: VALID_PARAMETERS })
-      AdfBuilder::Builder.update_node(vehicle, "odometer", value, params)
-    end
-
-    def update_condition(index, value)
-      valid, vehicle = AdfBuilder::Builder.valid_child?(@prospect, "vehicle", index)
-      return unless valid && CONDITIONS.include?(value)
-
-      AdfBuilder::Builder.update_node(vehicle, "condition", value)
-    end
-
-    def update_imagetag(index, value, params = {})
-      valid, vehicle = AdfBuilder::Builder.valid_child?(@prospect, "vehicle", index)
-      return unless valid
-
-      params.merge!({ valid_values: VALID_VALUES, valid_parameters: VALID_PARAMETERS })
-      AdfBuilder::Builder.update_node(vehicle, "imagetag", value, params)
-    end
-
-    def update_tags_with_free_text(index, tags)
-      valid, vehicle = AdfBuilder::Builder.valid_child?(@prospect, "vehicle", index)
-      return unless valid
-
-      tags.each do |key, value|
-        AdfBuilder::Builder.update_node(vehicle, key, value) if FREE_TEXT_OPTIONAL_TAGS.include? key.to_sym
-      end
-    end
-
-    def add_id(index, value, source = nil, sequence = 1)
-      if @prospect.locate("vehicle").empty? || @prospect.vehicle(index).nil?
-        false
-      else
-        Id.new.add(@prospect.vehicle(index), value, source, sequence)
-      end
-    end
-
-    def add_price(index, value, params = {})
-      valid, vehicle = AdfBuilder::Builder.valid_child?(@prospect, "vehicle", index)
-      return unless valid
-
-      price = Price.new(vehicle, value, params)
-      @prices.push(price)
-    end
-
-    def add_comments(index, value)
-      valid, vehicle = AdfBuilder::Builder.valid_child?(@prospect, "vehicle", index)
-      return unless valid
-
-      AdfBuilder::Builder.update_node(vehicle, "comments", value)
-    end
-  end
-end

data/lib/adf_builder/vendor/vendor.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module AdfBuilder
-  class Vendor
-    def initialize(prospect)
-      @vendor = Ox::Element.new("vendor")
-      @contact = nil
-      prospect << @vendor
-    end
-
-    attr_reader :contact
-
-    def add(name, contact_name, opts = {})
-      @vendor << (Ox::Element.new("vendorname") << name)
-      @contact = Contact.new(@vendor, contact_name, opts)
-    end
-
-    def add_url(url)
-      @vendor.remove_children(@vendor.url) if @vendor.locate("url").size.positive?
-      @vendor << (Ox::Element.new("url") << url)
-    end
-
-    def add_id(index, value, source = nil, sequence = 1)
-      if @prospect.locate("vendor").empty?
-        false
-      else
-        Id.new.add(@prospect.vendor(index), value, source, sequence)
-      end
-    end
-  end
-end