ontrac-web-services 0.9.2 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 24a06b1c019fcaf0f2cbef819a1e49a08ae3816c
+  data.tar.gz: 171990d6bf720583f218d2a98357d08f783ee04a
+SHA512:
+  metadata.gz: 5628443f315087ab0867490564a284581288fcaacad9322341643addd542356341aad80d2cb561b3336c8e0756a109e0539ca208adb35d3298c0749d9d967f40
+  data.tar.gz: 817be89a68a55a9cea04402c06b6849b1894020c181df5ff45460dedcca9ba8a9ab3bb1f2d13b23443765bf743e75062bb57c9eb0870cd9d464059e7003978cc

data/README.md

@@ -1,48 +1,68 @@
 # ontrac-web-services
 ## Description
-This gem provides an interface to the OnTrac web services API.  It interfaces with its HTTP/POST API to generate labels (looking up shipping rates and tracking coming soon).
+This gem provides an interface to the OnTrac web services API.  It interfaces with its HTTP/POST API to generate labels.
 
 ## Examples
 ### Creating a shipment with multiple packages
 
 ```ruby
-  require 'ontrac'
+    require 'logger'
+    require 'ontrac'
 
-  include ::Ontrac::WebServices
-  include ::Ontrac::WebServices::Definitions
+    include ::Ontrac::WebServices
+    include ::Ontrac::WebServices::Definitions
 
-  credentials = Service::Credentials.new("ACCOUNT #", "PASSWORD", "production")
-  service = Service.new(credentials)
+    logger = Logger.new($stderr)
+    credentials = Service::Credentials.new("37", "testpass", "test")
+    service = Service.new(credentials, StringIO.new(debug_output = ""))
 
-  shipper = ShipperData.new
-  shipper.name    = "Fulfillment Circle"
-  shipper.address = "343 third street"
-  shipper.suite   = "suite 17"
-  shipper.city    = "sparks"
-  shipper.state   = "nv"
-  shipper.zip     = "89434"
-  shipper.phone   = "(415) 350-2608"
+    requests = [ 10.1, 22, 15 ].map do |package_weight|
+      ShipmentRequest.new.tap do |request|
+        request.shipper = Shipper.new.tap do |shipper|
+          shipper.Name    = "Fulfillment Circle"
+          shipper.Addr1   = "343 Third Street\nSuite 17"
+          shipper.City    = "sparks"
+          shipper.State   = "NV"
+          shipper.Zip     = "89434"
+          shipper.Contact = "John D."
+          shipper.Phone   = "(415) 350-2608"
+        end
+        request.consignee = Consignee.new.tap do |consignee|
+          consignee.Name    = "Joe Shmoe"
+          consignee.Addr1   = "123 4th St"
+          consignee.Addr2   = "Suite 315"
+          consignee.City    = "San Luis Obispo"
+          consignee.State   = "CA"
+          consignee.Zip     = "93401"
+          consignee.Phone   = "(805) 555-1234"
+        end
+        request.Service = SERVICE_TYPE_GROUND
+        request.SignatureRequired = false
+        request.Residential = true
+        request.SaturdayDel = false
+        request.Declared = 0
+        request.Weight = package_weight
+        request.LabelType = LABEL_TYPE_PDF
+        request.ShipDate = Time.new.strftime("%Y-%m-%d")
+      end
+    end
 
-  recipient = DeliveryData.new
-  recipient.name     = "Joe Shmoe"
-  recipient.address  = "123 4th St"
-  recipient.address2 = "Suite 315"
-  recipient.city     = "San Luis Obispo"
-  recipient.state    = "CA"
-  recipient.zip      = "93401"
-  recipient.phone    = "(805) 555-1234"
-
-  responses = service.request_shipment(SERVICE_TYPE_GROUND, shipper, recipient, LABEL_TYPE_PDF,
-      [ 22.0, 15, 10 ]) do |package_data, package_num|
-
-    package_data.package_detail.residential = false
-    package_data.package_detail.reference = "order #1234"
-  end
-
-  tracking_numbers = responses.map do |(tracking_number, label, charge)|
-    puts "tracking number: #{tracking_number}"
-    puts "charge: #{charge.to_f}"
-    File.open("#{tracking_number}.pdf", "w") { |f| f << label }
-    tracking_number
-  end
+    begin
+      service.post_shipments(requests).each do |(tracking_number, label, charge)|
+        File.open("#{tracking_number}.pdf", "w") { |f| f << label }
+        logger.info("label: ./#{tracking_number}.pdf, charge: #{charge}")
+      end
+    rescue ServiceException => err
+      logger.error("OnTrac Service Exception: #{err.message}")
+      logger.error("Root Error: #{err.root_error}") if (err.root_error && !err.root_error.empty?)
+      err.sub_errors.each do |uid, sub_error|
+        logger.error("Sub Error (#{uid}): #{sub_error}")
+      end
+      raise
+    ensure
+      if ($! && !debug_output.empty?)
+        logger.debug("OnTrac HTTP debug output")
+        debug_output.each_line.map(&:strip).each(&logger.method(:debug))
+      end
+    end
 ```

data/lib/ontrac/version.rb

@@ -1,3 +1,3 @@
 module Ontrac
-  VERSION = "0.9.2"
+  VERSION = "2.0.0"
 end

data/lib/ontrac/web_services/definitions.rb

@@ -1,24 +1,95 @@
-module Ontrac::WebServices
-  module Definitions
-    SERVICE_TYPE_SUNRISE = 'S'
-    SERVICE_TYPE_GOLD    = 'G'
-    SERVICE_TYPE_GROUND  = 'C'
-    SERVICE_TYPE_FREIGHT = 'H'
+module Ontrac
+  module WebServices
+    module Definitions
+      class DefinitionBase < Struct
+        def initialize(*)
+          super
+        end
 
-    LABEL_TYPE_PDF     = 1
-    LABEL_TYPE_JPG     = 2
-    LABEL_TYPE_BMP     = 3
-    LABEL_TYPE_GIF     = 4
-    LABEL_TYPE_EPL_4X3 = 5
-    LABEL_TYPE_EPL_4X5 = 6
-    LABEL_TYPE_ZPL_4X5 = 7
+        def to_xml(root_name = nil)
+          xml_builder = Nokogiri::XML::Builder.new
+          root_name ||= self.class.name.split("::").last
+
+          xml_builder.send(root_name) do |xml|
+            members.each do |field|
+              value = send(field)
+              if (DefinitionBase === value)
+                xml.doc.root << value.to_xml(field)
+              else
+                xml.send(field, value) unless (value.nil?)
+              end
+            end
+          end
+
+          xml_builder.doc.root
+        end
+      end
+
+      Shipper = DefinitionBase.new(
+        :Name,
+        :Addr1,
+        :City,
+        :State,
+        :Zip,
+        :Contact,
+        :Phone
+      )
+      Consignee = DefinitionBase.new(
+        :Name,
+        :Addr1,
+        :Addr2,
+        :Addr3,
+        :City,
+        :State,
+        :Zip,
+        :Contact,
+        :Phone
+      )
+      Dim = DefinitionBase.new(
+        :Length,
+        :Width,
+        :Height
+      )
+      ShipmentRequest = DefinitionBase.new(
+        :UID,
+        :shipper,
+        :consignee,
+        :Service,
+        :SignatureRequired,
+        :Residential,
+        :SaturdayDel,
+        :Declared,
+        :COD,
+        :CODType,
+        :Weight,
+        :Letter,
+        :BillTo,
+        :Instructions,
+        :Reference,
+        :Reference2,
+        :Reference3,
+        :Tracking,
+        :DIM,
+        :LabelType,
+        :ShipEmail,
+        :DelEmail,
+        :ShipDate,
+        :CargoType
+      )
+
+      SERVICE_TYPE_GROUND = "C"
+      SERVICE_TYPE_SUNRISE = "S"
+      SERVICE_TYPE_SUNRISE_GOLD = "G"
+      SERVICE_TYPE_PALLETIZED_FREIGHT = "H"
+
+      LABEL_TYPE_NONE = 0
+      LABEL_TYPE_PDF = 1
+      LABEL_TYPE_EPL_4_X_5 = 6
+      LABEL_TYPE_ZPL_4_X_5 = 7
+
+      COD_TYPE_NONE = "NONE"
+      COD_TYPE_UNSECURED = "UNSECURED "
+      COD_TYPE_SECURED = "SECURED"
+    end
   end
 end
-
-require 'ontrac/web_services/definitions/base'
-require 'ontrac/web_services/definitions/delivery_data'
-require 'ontrac/web_services/definitions/package'
-require 'ontrac/web_services/definitions/package_data'
-require 'ontrac/web_services/definitions/package_detail'
-require 'ontrac/web_services/definitions/shipment_request'
-require 'ontrac/web_services/definitions/shipper_data'

data/lib/ontrac/web_services/service.rb

@@ -1,121 +1,123 @@
 require 'net/https'
 require 'nokogiri'
 require 'base64'
+require 'cgi'
+require 'securerandom'
 
 module Ontrac::WebServices
-  class ServiceException < RuntimeError
-    attr_accessor :details
+  class ServiceException < Exception
+    attr_accessor :root_error, :sub_errors
   end
 
   class Service
-    Credentials = Struct.new(:account, :password, :environment)
+    class Credentials
+      attr_reader :account, :password, :environment
+
+      def initialize(account, password, environment)
+        @account = account or
+            raise ArgumentError.new("Missing OnTrac credential: account")
+        @password = password or
+            raise ArgumentError.new("Missing OnTrac credential: account")
+        @environment = environment or
+            raise ArgumentError.new("Missing OnTrac credential: environment")
+      end
+    end
+
+    attr_accessor :debug_output
 
-    def initialize(credentials)
+    def initialize(credentials, debug_output = nil)
       @credentials = credentials
+      self.debug_output = debug_output
     end
 
-    def service_url(request_name)
-      (@credentials.environment.to_sym == :production) ?
-          "https://www.shipontrac.net/OnTracAPI/#{request_name}.ashx" :
-          "https://www.shipontrac.net/OnTracAPItest/#{request_name}.ashx"
-    end
+    def service_url(service_name)
+      url_base = (@credentials.environment.to_sym == :production) ?
+          "https://www.shipontrac.net/OnTracWebServices/OnTracServices.svc/V2" :
+          "https://www.shipontrac.net/OnTracTestWebServices/OnTracServices.svc/V2"
 
-    def request_shipment(service, shipper_data, delivery_data,
-        label_type, package_weights, &process_contents)
-
-      label_base64_encoded =
-          label_type != Definitions::LABEL_TYPE_EPL_4X3 &&
-          label_type != Definitions::LABEL_TYPE_EPL_4X5
-
-      request = Definitions::ShipmentRequest.new
-      request.account = @credentials.account
-      request.password = @credentials.password
-
-      request.packages = package_weights.map.with_index do |weight, ndx|
-        Definitions::Package.new.tap do |package|
-          package.package_data = Definitions::PackageData.new.tap do |data|
-            data.shipper_data = shipper_data
-            data.delivery_data = delivery_data
-
-            data.package_detail = Definitions::PackageDetail.new.tap do |detail|
-              detail.service = service
-              detail.weight = weight
-              detail.ship_email = ""
-              detail.del_email = ""
-              detail.label_type = label_type
-            end
-          end
+      "%s/%s/%s?pw=%s" % [
+        url_base, @credentials.account, service_name, CGI.escape(@credentials.password)
+      ]
+    end
 
-          process_contents.call(package.package_data, ndx) if (process_contents)
-        end
+    def post_shipments(shipment_requests)
+      shipment_requests.map do |shipment_request|
+        shipment_request.shipper.Contact ||= ""
+        shipment_request.shipper.Phone ||= ""
+
+        shipment_request.consignee.Addr2 ||= ""
+        shipment_request.consignee.Addr3 ||= ""
+        shipment_request.consignee.Contact ||= ""
+        shipment_request.consignee.Phone ||= ""
+
+        shipment_request.UID = SecureRandom.hex(16)
+        shipment_request.COD ||= 0
+        shipment_request.CODType ||= Definitions::COD_TYPE_NONE
+        shipment_request.BillTo ||= 0
+        shipment_request.Instructions ||= ""
+        shipment_request.Reference ||= ""
+        shipment_request.Reference2 ||= ""
+        shipment_request.Reference3 ||= ""
+        shipment_request.Tracking ||= ""
+        shipment_request.DIM ||= Definitions::Dim.new(0, 0, 0)
+        shipment_request.ShipEmail ||= ""
+        shipment_request.DelEmail ||= ""
       end
 
-      package_data_path = "/OnTracShipmentResponse/Package/PackageData"
-      num_packages = package_weights.size
-
-      request_xml = Nokogiri::XML::Document.new
-      request_xml << request.to_xml
-
-      issue_request("ShipmentRequest", request_xml) do |response_xml|
-        %w(Label Tracking Charges/TotalCharge).each do |node_name|
-          count = response_xml.xpath("count(#{package_data_path}/#{node_name})")
-          if (response_xml.xpath("count(#{package_data_path}/#{node_name})") != num_packages)
-            raise "Expected #{num_packages} #{node_name} response(s), received #{count}"
+      xml_builder = Nokogiri::XML::Builder.new
+      xml_builder.OnTracShipmentRequest do |xml|
+        xml.Shipments do |xml|
+          shipment_requests.each do |shipment_request|
+            xml.parent << shipment_request.to_xml("Shipment")
           end
         end
+      end
 
-        response_xml.xpath("/OnTracShipmentResponse/Package/PackageData").map do |xml|
-          label_img = xml.xpath("Label").text
-          label_img = Base64.decode64(label_img) if (label_base64_encoded)
-
-          [
-            xml.xpath("Tracking").text,
-            label_img,
-            Float(xml.xpath("Charges/TotalCharge").text),
-            xml
-          ]
-        end
+      response_xml = issue_request('shipments', xml_builder.doc)
+      shipment_requests.map do |request|
+        uid = request.UID
+        shipment_response = response_xml.xpath(
+          "/OnTracShipmentResponse/Shipments/Shipment[./UID = '#{uid}']"
+        ).first or raise ServiceException.new("Missing package response for #{uid}")
+
+        label = shipment_response.xpath("Label").text
+        label = Base64.decode64(label) if (request.LabelType == Definitions::LABEL_TYPE_PDF)
+        [
+          shipment_response.xpath("Tracking").text,
+          label,
+          Float(shipment_response.xpath("TotalChrg").text)
+        ]
       end
     end
 
     private
-      def issue_request(request_type, request_xml, &process_response)
-        uri = URI.parse(service_url(request_type))
+      def issue_request(service_name, request_xml)
+        uri = URI.parse(service_url(service_name))
         http = Net::HTTP.new(uri.host, uri.port)
+        http.set_debug_output(debug_output) if (debug_output)
         http.use_ssl = true
 
         response = http.request_post(uri.request_uri, request_xml.to_s)
         response_xml = Nokogiri::XML(response.body)
 
         check_response(response_xml)
-        process_response.call(response_xml)
-      rescue Timeout::Error, SocketError => root_exception
-        err = ServiceException.new("Network communication error")
-        err.set_backtrace([ "#{__FILE__}:#{__LINE__ + 1}", *root_exception.backtrace ])
-        raise err
-      rescue Exception => root_exception
-        err = ServiceException.new(root_exception.message)
-        err.details = { request: request_xml.to_s, response: response.body }
-        err.set_backtrace([ "#{__FILE__}:#{__LINE__ + 1}", *root_exception.backtrace ])
-        raise err
+        response_xml
       end
 
       def check_response(response_xml)
-        status = response_xml.xpath("/OnTracShipmentResponse/Status").text
-        message = response_xml.xpath("/OnTracShipmentResponse/Message").text
-        package_messages = response_xml.xpath("//PackageData/Message")
-
-        if (status.empty? || status != "1" || response_xml.xpath("//PackageData/Status != 1"))
-          if (status.empty? && message.empty?)
-            msg = "OnTrac's label system returned an invalid response"
-          else
-            msg = "No status information was returned for the request"    if (status.empty?)
-            msg = message || "The request returned a status of #{status}" if (status != "1")
-            msg << " -- " + [ *package_messages.to_a ] * " ; " if (!package_messages.empty?)
-          end
+        root_error = response_xml.xpath("/OnTracShipmentResponse/Error").text
+        erred_shipments = response_xml.xpath("//Shipment[./Error != '']")
 
-          raise msg
-        end
+        return if (root_error.empty? && erred_shipments.empty?)
+
+        err = ServiceException.new("OnTrac responded with an error")
+        err.root_error = root_error
+        err.sub_errors = Hash[
+          erred_shipments.map do |shipment_response|
+            [ shipment_response.xpath("./UID").text, shipment_response.xpath("./Error").text ]
+          end
+        ]
+        raise err
       end
   end
 end

data/ontrac-web-services.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Provides an interface to the OnTrac web services API}
   gem.summary       = %q{Interfaces with the OnTrac web services API to look up shipping rates, generate labels, and track shipments}
   gem.homepage      = "https://github.com/brewski/ontrac-web-services"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -16,6 +17,5 @@ Gem::Specification.new do |gem|
   gem.version       = Ontrac::VERSION
 
   gem.required_ruby_version = '>= 1.9.0'
-  gem.add_dependency("activesupport")
-  gem.add_dependency("nokogiri")
+  gem.add_dependency("nokogiri", "~> 1.0")
 end

metadata

@@ -1,48 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ontrac-web-services
 version: !ruby/object:Gem::Version
-  version: 0.9.2
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Abreu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2015-08-15 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: Provides an interface to the OnTrac web services API
 email:
 - brian@nuts.com
@@ -50,7 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -59,38 +40,31 @@ files:
 - lib/ontrac/version.rb
 - lib/ontrac/web_services.rb
 - lib/ontrac/web_services/definitions.rb
-- lib/ontrac/web_services/definitions/base.rb
-- lib/ontrac/web_services/definitions/delivery_data.rb
-- lib/ontrac/web_services/definitions/package.rb
-- lib/ontrac/web_services/definitions/package_data.rb
-- lib/ontrac/web_services/definitions/package_detail.rb
-- lib/ontrac/web_services/definitions/shipment_request.rb
-- lib/ontrac/web_services/definitions/shipper_data.rb
 - lib/ontrac/web_services/service.rb
 - ontrac-web-services.gemspec
 homepage: https://github.com/brewski/ontrac-web-services
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Interfaces with the OnTrac web services API to look up shipping rates, generate
   labels, and track shipments
 test_files: []

data/lib/ontrac/web_services/definitions/base.rb

@@ -1,43 +0,0 @@
-require 'active_support'
-require 'nokogiri'
-
-module Ontrac::WebServices::Definitions
-  class Base
-    include Nokogiri
-
-    def self.attr_accessor(*args)
-      (@attributes ||= []).concat(args)
-      super
-    end
-
-    def self.attributes
-      return (@attributes ||= [])
-    end
-
-    def self.basename
-      ActiveSupport::Inflector.camelize(self.name.gsub(/^.*::/, ''))
-    end
-
-    def to_xml
-      xml_builder = Nokogiri::XML::Builder.new
-
-      xml_builder.send(self.class.basename) do |xml|
-        self.class.attributes.each do |attribute_name|
-          (values = *self.send(attribute_name)).each do |attribute_value|
-            xml_attr_name = respond_to?("#{attribute_name}_to_xml_name") ?
-                send("#{attribute_name}_to_xml_name") :
-                ActiveSupport::Inflector.camelize(attribute_name, false)
-
-            if (attribute_value.is_a?(Base))
-              xml.doc.root << attribute_value.to_xml
-            else
-              xml.send(xml_attr_name, attribute_value)
-            end
-          end
-        end
-      end
-
-      xml_builder.doc.root
-    end
-  end
-end

data/lib/ontrac/web_services/definitions/delivery_data.rb

@@ -1,32 +0,0 @@
-module Ontrac
-  module WebServices
-    module Definitions
-      class DeliveryData < Base
-        attr_accessor :name
-        attr_accessor :address
-        attr_accessor :address2
-        attr_accessor :address3
-        attr_accessor :city
-        attr_accessor :state
-        attr_accessor :zip
-        attr_accessor :phone
-        attr_accessor :contact
-      end
-    end
-  end
-end
-
-# [ DeliveryData, Package, PackageData, PackageDetail, ShipmentRequest, ShipperData ].map do |cls|
-#   accessors = cls.attributes.map { |a| "        attr_accessor :#{a.to_s.underscore}" }
-# <<-CLSDEF
-# module Ontrac
-#   module WebServices
-#     module Definitions
-#       class #{cls.name.split("::").last} < Base
-# #{accessors * "\n"}
-#       end
-#     end
-#   end
-# end
-# CLSDEF
-# end

data/lib/ontrac/web_services/definitions/package.rb

@@ -1,9 +0,0 @@
-module Ontrac
-  module WebServices
-    module Definitions
-      class Package < Base
-        attr_accessor :package_data
-      end
-    end
-  end
-end

data/lib/ontrac/web_services/definitions/package_data.rb

@@ -1,16 +0,0 @@
-module Ontrac
-  module WebServices
-    module Definitions
-      class PackageData < Base
-        attr_accessor :uid
-        attr_accessor :shipper_data
-        attr_accessor :delivery_data
-        attr_accessor :package_detail
-
-        def uid_to_xml_name
-          "UID"
-        end
-      end
-    end
-  end
-end

data/lib/ontrac/web_services/definitions/package_detail.rb

@@ -1,29 +0,0 @@
-module Ontrac
-  module WebServices
-    module Definitions
-      class PackageDetail < Base
-        attr_accessor :ship_date
-        attr_accessor :reference
-        attr_accessor :tracking
-        attr_accessor :service
-        attr_accessor :declared
-        attr_accessor :cod
-        attr_accessor :cod_type
-        attr_accessor :saturday_delivery
-        attr_accessor :signature_rqd
-        attr_accessor :type
-        attr_accessor :weight
-        attr_accessor :bill_to
-        attr_accessor :instructions
-        attr_accessor :ship_email
-        attr_accessor :del_email
-        attr_accessor :label_type
-        attr_accessor :residential
-
-        def cod_type_to_xml_name
-          "cod_Type"
-        end
-      end
-    end
-  end
-end

data/lib/ontrac/web_services/definitions/shipment_request.rb

@@ -1,16 +0,0 @@
-module Ontrac
-  module WebServices
-    module Definitions
-      class ShipmentRequest < Base
-        attr_accessor :account
-        attr_accessor :password
-        attr_accessor :request_reference
-        attr_accessor :packages
-
-        def self.basename
-          "OntracShipmentRequest"
-        end
-      end
-    end
-  end
-end

data/lib/ontrac/web_services/definitions/shipper_data.rb

@@ -1,16 +0,0 @@
-module Ontrac
-  module WebServices
-    module Definitions
-      class ShipperData < Base
-        attr_accessor :name
-        attr_accessor :address
-        attr_accessor :suite
-        attr_accessor :city
-        attr_accessor :state
-        attr_accessor :zip
-        attr_accessor :phone
-        attr_accessor :contact
-      end
-    end
-  end
-end