ingram_micro 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ced56ce6b64dcb31798c34be03efc8e9637738b8
-  data.tar.gz: bef3a1e41d54ebcbc42ca13a90b61c19d64ca433
+  metadata.gz: ae29cf578fd9c5601075983aae88cbb12ba141bd
+  data.tar.gz: a2db6217061f0febba1a4ff9c60117a18bf92532
 SHA512:
-  metadata.gz: 3591785159a554ca1837e4af5cc0e73541d3220e3d18bfbee23303d9c44763609c02ef1b5b6484f00453a0092b78e9ad54ef0c4d24999cb2fc5ce07e806c684e
-  data.tar.gz: a097e58b06d3ad2cde84e3feb02d79d4b739bf749340327d084e22dbbf31e4d5e1dfe2b8b93da64e94161054eaa917fe16485f728ddeb0cc07021b585dcc29bd
+  metadata.gz: c50b9315c2ffbe9bc8d0fbd82a883e64a8a942c8af3d070d79a2e9a2ec0762f002917ce94bd79597d727c7df5574ee15df0a3ed9452cc6325736f7a2ed40b367
+  data.tar.gz: db68618513f87dce397a6d65bc8f8b822b099d66e8f333354a81396bea34ba353a4448cb45d2921c8d70ce5874f004bf7495e3a902d3e49556ce261f4c1ada55

data/lib/ingram_micro/elements/sales_order_submission.rb

@@ -4,7 +4,7 @@ class IngramMicro::SalesOrderSubmission < IngramMicro::BaseElement
     customer: nil,
     sales_order_shipment_information: nil,
     credit_card_information: nil,
-    order_header: nil,
+    sales_order_header: nil,
     detail: nil,
     line_items: [],
     customer_id: nil,
@@ -21,7 +21,7 @@ class IngramMicro::SalesOrderSubmission < IngramMicro::BaseElement
     @element[:customer] ||= IngramMicro::Customer.new
     @element[:sales_order_shipment_information] ||= IngramMicro::SalesOrderShipmentInformation.new
     @element[:credit_card_information] ||= IngramMicro::CreditCardInformation.new
-    @element[:order_header] ||= IngramMicro::SalesOrderHeader.new
+    @element[:sales_order_header] ||= IngramMicro::SalesOrderHeader.new
     check_line_items
     @element[:detail] ||= IngramMicro::Detail.new({line_items: @element[:line_items]})
   end
@@ -41,7 +41,7 @@ class IngramMicro::SalesOrderSubmission < IngramMicro::BaseElement
         @element[:credit_card_information].build(builder)
       end
       builder.send('order-header') do
-        @element[:order_header].build(builder)
+        @element[:sales_order_header].build(builder)
       end
     end
     builder.send('detail') do

data/lib/ingram_micro/transmission.rb

@@ -21,7 +21,7 @@ class IngramMicro::Transmission
     xsd = Nokogiri::XML::Schema(File.read("#{IngramMicro::GEM_DIR}/xsd/" +
       XSD[self.transaction_name]))
     valid = true
-    xsd.validate(self.order_builder.doc).each do |error|
+    xsd.validate(self.xml_builder.doc).each do |error|
       errors << error.message
       valid = false
     end
@@ -30,7 +30,12 @@ class IngramMicro::Transmission
   end
 
   def order_builder
-    raise Exception('order_builder needs to be implemented in subclass')
+    warn '[DEPRECATION] `order_builder` is deprecated.  Please use `xml_builder` instead.'
+    xml_builder
+  end
+
+  def xml_builder
+    raise Exception('xml_builder needs to be implemented in subclass')
   end
 
   def add_transaction_info(builder)
@@ -45,6 +50,6 @@ class IngramMicro::Transmission
 
   def send_request
     client = IngramMicro::Client.new
-    client.post(self.order_builder.to_xml)
+    client.post(self.xml_builder.to_xml)
   end
 end

data/lib/ingram_micro/transmissions/check_shipment_status.rb

@@ -10,7 +10,7 @@ class IngramMicro::CheckShipmentStatus < IngramMicro::Transmission
     @line_items = options[:line_items]
   end
 
-  def order_builder
+  def xml_builder
     @builder ||= Nokogiri::XML::Builder.new do |builder|
       builder.message do
         add_message_header(builder)

data/lib/ingram_micro/transmissions/return_authorization.rb

@@ -13,7 +13,7 @@ class IngramMicro::ReturnAuthorization < IngramMicro::Transmission
     @purchase_order_information = options[:purchase_order_information]
   end
 
-  def order_builder
+  def xml_builder
     @builder ||= Nokogiri::XML::Builder.new do |builder|
       builder.send('message') do
         add_message_header(builder)

data/lib/ingram_micro/transmissions/sales_order.rb

@@ -1,5 +1,5 @@
 class IngramMicro::SalesOrder < IngramMicro::Transmission
-  attr_accessor :customer, :credit_card_information, :order_header,
+  attr_accessor :customer, :credit_card_information, :sales_order_header,
   :sales_order_shipment_information, :detail, :carrier_name, :business_name,
   :customer_id
 
@@ -9,14 +9,15 @@ class IngramMicro::SalesOrder < IngramMicro::Transmission
     @customer = options[:customer]
     @sales_order_shipment_information = options[:sales_order_shipment_information]
     @credit_card_information = options[:credit_card_information]
-    @order_header = options[:order_header]
+    @sales_order_header = options[:sales_order_header]
     @detail = options[:detail]
     @business_name = options[:business_name]
     @customer_id = options[:customer_id]
     @carrier_name = options[:carrier_name]
+    validate_options(options)
   end
 
-  def order_builder
+  def xml_builder
     @builder ||= Nokogiri::XML::Builder.new do |builder|
       builder.message do
         add_message_header(builder)
@@ -44,7 +45,7 @@ class IngramMicro::SalesOrder < IngramMicro::Transmission
       carrier_name: @carrier_name,
       customer: customer,
       sales_order_shipment_information: sales_order_shipment_information,
-      order_header: order_header,
+      sales_order_header: sales_order_header,
       credit_card_information: credit_card_information
     }
     sos = IngramMicro::SalesOrderSubmission.new(sos_options)
@@ -53,4 +54,9 @@ class IngramMicro::SalesOrder < IngramMicro::Transmission
     end
     sos.valid?
   end
+
+  def validate_options(options)
+    raise "use sales_order_shipment_information (IngramMicro::SalesOrderShipmentInformation" if options[:shipment_information]
+    raise "use sales_order_header (IngramMicro::SalesOrderHeader" if options[:order_header]
+  end
 end

data/lib/ingram_micro/transmissions/standard_response.rb

@@ -12,7 +12,7 @@ class IngramMicro::StandardResponse < IngramMicro::Transmission
     @filename = options[:filename]
   end
 
-  def order_builder
+  def xml_builder
     @builder ||= Nokogiri::XML::Builder.new do |builder|
       builder.message do
         add_message_header(builder)

data/lib/ingram_micro/version.rb

@@ -1,3 +1,3 @@
 module IngramMicro
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ingram_micro
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ben Christel