active_fulfillment 3.0.0.pre8 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81e4d46fc9e29790dedd89eeab465416f9bc2b8e
-  data.tar.gz: f8b1cb46b86a27625bb50fc3a68e4c301eed1315
+  metadata.gz: edee633e1484a24673765631ab0a8a85cb114f4d
+  data.tar.gz: 1b3c6f2099542ca7f988a0a7ac9ee9f3309cc809
 SHA512:
-  metadata.gz: faff4e5e9c15dda5586ead4afcb10a973d78ddbf56f4bac42ae7403e7a90ff1f2558287ee23e0878c08dc0bea01259ad03d28a47ce12fcdc63a3c8a7b28285e5
-  data.tar.gz: 06bbeab03d5155dd553af4ffe72fae585aeb06764e904218f5310e75c6f04933e90b0adeb71a95da7289b7efd9953ef40ed0f10ee01f5bbb72c12488268e1393
+  metadata.gz: 21c48116701f5281c5a4deacc5a445126e12b6e407551fc097709d579231a31d74944e88eb404b476bc2667d073686717dbce7c79388608600f73445b10a2538
+  data.tar.gz: 90872e2cce274d7bc42593f93da678bf8a234fed5c4b12d3bf4e83d8ae665ab046cf22c7ded2e26fb8f1425aa0a108d256c61ca7060f3434268e1c713bc81b31

data/CHANGELOG.md

@@ -1,7 +1,13 @@
 # ActiveFulfillment changelog
 
-## Unreleased
+### Version 3.0.1 (January 2015)
 
+- Use Nokogiri for all xml handling.
+- Ruby 2.3.0 support.
+- Refactor Amazon MWS calls/parsing.
+- Freeze constants and hashes.
+
+### Version 2.1.8
 - Update dependencies
 - Remove old Amazon fulfillment service (use amazon_aws instead)
 - Add contributing guidelines

data/lib/active_fulfillment.rb

@@ -36,7 +36,7 @@ end
 require 'builder'
 require 'cgi'
 require 'net/https'
-require 'rexml/document'
+require 'nokogiri'
 require 'active_utils'
 
 require 'active_fulfillment/version'
@@ -44,3 +44,4 @@ require 'active_fulfillment/base'
 require 'active_fulfillment/response'
 require 'active_fulfillment/service'
 require 'active_fulfillment/services'
+require 'active_fulfillment/parsing'

data/lib/active_fulfillment/parsing.rb

@@ -0,0 +1,15 @@
+module ActiveFulfillment
+  module Parsing
+    module_function
+
+    def with_xml_document(xml, response = {})
+      begin
+        document = Nokogiri::XML(xml)
+      rescue Nokogiri::XML::SyntaxError
+        return response
+      end
+
+      yield document, response
+    end
+  end
+end

data/lib/active_fulfillment/services/amazon_mws.rb

@@ -6,15 +6,16 @@ require 'active_support/core_ext/hash/except'
 module ActiveFulfillment
   class AmazonMarketplaceWebService < Service
 
-    APPLICATION_IDENTIFIER = "active_merchant_mws/0.01 (Language=ruby)"
+    APPLICATION_IDENTIFIER = 'active_merchant_mws/0.01 (Language=ruby)'.freeze
 
-    REGISTRATION_URI = URI.parse("https://sellercentral.amazon.com/gp/mws/registration/register.html")
+    REGISTRATION_URI = URI.parse('https://sellercentral.amazon.com/gp/mws/registration/register.html').freeze
 
     SIGNATURE_VERSION = 2
-    SIGNATURE_METHOD  = "SHA256"
-    VERSION = "2010-10-01"
+    SIGNATURE_METHOD  = 'SHA256'.freeze
+    VERSION = '2010-10-01'.freeze
 
-    SUCCESS, FAILURE, ERROR = 'Accepted', 'Failure', 'Error'
+    SUCCESS, FAILURE, ERROR = 'Accepted'.freeze, 'Failure'.freeze, 'Error'.freeze
+    XML_FAILURE_RESPONSE = { :success => FAILURE }.freeze
 
     ENDPOINTS = {
       :ca => 'mws.amazonservices.ca',
@@ -26,7 +27,7 @@ module ActiveFulfillment
       :jp => 'mws.amazonservices.jp',
       :uk => 'mws-eu.amazonservices.ca',
       :us => 'mws.amazonservices.com'
-    }
+    }.freeze
 
     LOOKUPS = {
       :destination_address => {
@@ -53,18 +54,20 @@ module ActiveFulfillment
       :list_inventory => {
         :sku => "SellerSkus.member.%d"
       }
-    }
+    }.freeze
+
+    SHIPPING_METHODS = {
+      'Standard Shipping' => 'Standard',
+      'Expedited Shipping' => 'Expedited',
+      'Priority Shipping' => 'Priority'
+    }.freeze
 
     # The first is the label, and the last is the code
     # Standard:  3-5 business days
     # Expedited: 2 business days
     # Priority:  1 business day
     def self.shipping_methods
-      [
-        [ 'Standard Shipping', 'Standard' ],
-        [ 'Expedited Shipping', 'Expedited' ],
-        [ 'Priority Shipping', 'Priority' ]
-      ].inject({}){|h, (k,v)| h[k] = v; h}
+      SHIPPING_METHODS
     end
 
     def initialize(options = {})
@@ -86,7 +89,7 @@ module ActiveFulfillment
       requires!(options, :order_date, :shipping_method)
       with_error_handling do
         data = commit :post, 'FulfillmentOutboundShipment', build_fulfillment_request(order_id, shipping_address, line_items, options)
-        parse_fulfillment_response(parse_document(data), 'Successfully submitted the order')
+        parse_fulfillment_response('Successfully submitted the order')
       end
     end
 
@@ -195,27 +198,28 @@ module ActiveFulfillment
 
     def parse_document(xml)
       begin
-        document = REXML::Document.new(xml)
-      rescue REXML::ParseException
-        return { :success => FAILURE }
+        document = Nokogiri::XML(xml)
+      rescue Nokogiri::XML::SyntaxError
+        return XML_FAILURE_RESPONSE
       end
     end
 
     def parse_tracking_response(document)
-      response = {}
-      response[:tracking_numbers] = {}
-      response[:tracking_companies] = {}
-      response[:tracking_urls] = {}
+      response = {
+        tracking_numbers: {},
+        tracking_companies: {},
+        tracking_urls: {}
+      }
 
-      tracking_numbers = REXML::XPath.match(document, "//FulfillmentShipmentPackage/member/TrackingNumber")
+      tracking_numbers = document.css('FulfillmentShipmentPackage > member > TrackingNumber'.freeze)
       if tracking_numbers.present?
-        order_id = REXML::XPath.first(document, "//FulfillmentOrder/SellerFulfillmentOrderId").text.strip
+        order_id = document.at_css('FulfillmentOrder > SellerFulfillmentOrderId'.freeze).text.strip
         response[:tracking_numbers][order_id] = tracking_numbers.map{ |t| t.text.strip }
       end
 
-      tracking_companies = REXML::XPath.match(document, "//FulfillmentShipmentPackage/member/CarrierCode")
+      tracking_companies = document.css('FulfillmentShipmentPackage > member > CarrierCode'.freeze)
       if tracking_companies.present?
-        order_id = REXML::XPath.first(document, "//FulfillmentOrder/SellerFulfillmentOrderId").text.strip
+        order_id = document.at_css('FulfillmentOrder > SellerFulfillmentOrderId'.freeze).text.strip
         response[:tracking_companies][order_id] = tracking_companies.map{ |t| t.text.strip }
       end
 
@@ -223,21 +227,20 @@ module ActiveFulfillment
       Response.new(success?(response), message_from(response), response)
     end
 
-    def parse_fulfillment_response(document, message)
+    def parse_fulfillment_response(message)
       Response.new(true, message, { :response_status => SUCCESS, :response_comment => message })
     end
 
     def parse_inventory_response(document)
-      response = {}
-      response[:stock_levels] = {}
+      response = { stock_levels: {} }
 
-      document.each_element('//InventorySupplyList/member') do |node|
+      document.css('InventorySupplyList > member'.freeze).each do |node|
         params = node.elements.to_a.each_with_object({}) { |elem, hash| hash[elem.name] = elem.text }
 
         response[:stock_levels][params['SellerSKU']] = params['InStockSupplyQuantity'].to_i
       end
 
-      next_token = REXML::XPath.first(document, '//NextToken')
+      next_token = document.at_css('NextToken'.freeze)
       response[:next_token] = next_token ? next_token.text : nil
 
       response[:response_status] = SUCCESS
@@ -245,15 +248,15 @@ module ActiveFulfillment
     end
 
     def parse_error(http_response)
-      response = {}
-      response[:http_code] = http_response.code
-      response[:http_message] = http_response.message
-
-      document = REXML::Document.new(http_response.body)
+      response = {
+        http_code: http_response.code,
+        http_message: http_response.message
+      }
 
-      node = REXML::XPath.first(document, '//Error')
-      error_code = REXML::XPath.first(node, '//Code')
-      error_message = REXML::XPath.first(node, '//Message')
+      document = Nokogiri::XML(http_response.body)
+      node = document.at_css('Error'.freeze)
+      error_code = node.at_css('Code'.freeze)
+      error_message = node.at_css('Message'.freeze)
 
       response[:status] = FAILURE
       response[:faultcode] = error_code ? error_code.text : ""
@@ -261,7 +264,7 @@ module ActiveFulfillment
       response[:response_message] = error_message ? error_message.text : ""
       response[:response_comment] = "#{response[:faultcode]}: #{response[:faultstring]}"
       response
-    rescue REXML::ParseException => e
+    rescue Nokogiri::XML::SyntaxError => e
     rescue NoMethodError => e
       response[:http_body] = http_response.body
       response[:response_status] = FAILURE

data/lib/active_fulfillment/services/james_and_james.rb

@@ -6,7 +6,7 @@ module ActiveFulfillment
     SERVICE_URLS = {
       fulfillment: 'https://%{subdomain}.sixworks.co.uk/api/1/',
       inventory: 'https://%{subdomain}.sixworks.co.uk/api/1/stock'
-    }
+    }.freeze
 
     def initialize(options = {})
       requires!(options, :subdomain, :key)

data/lib/active_fulfillment/services/shipwire.rb

@@ -6,17 +6,17 @@ module ActiveFulfillment
     SERVICE_URLS = { :fulfillment  => 'https://api.shipwire.com/exec/FulfillmentServices.php',
                      :inventory    => 'https://api.shipwire.com/exec/InventoryServices.php',
                      :tracking     => 'https://api.shipwire.com/exec/TrackingServices.php'
-                   }
+                   }.freeze
 
     SCHEMA_URLS = { :fulfillment => 'http://www.shipwire.com/exec/download/OrderList.dtd',
                     :inventory   => 'http://www.shipwire.com/exec/download/InventoryUpdate.dtd',
                     :tracking    => 'http://www.shipwire.com/exec/download/TrackingUpdate.dtd'
-                  }
+                  }.freeze
 
     POST_VARS = { :fulfillment => 'OrderListXML',
                   :inventory   => 'InventoryUpdateXML',
                   :tracking    => 'TrackingUpdateXML'
-                }
+                }.freeze
 
     WAREHOUSES = { 'CHI' => 'Chicago',
                    'LAX' => 'Los Angeles',
@@ -24,7 +24,15 @@ module ActiveFulfillment
                    'VAN' => 'Vancouver',
                    'TOR' => 'Toronto',
                    'UK'  => 'United Kingdom'
-                 }
+                 }.freeze
+
+    SHIPPING_METHODS = {
+      '1 Day Service' => '1D',
+      '2 Day Service' => '2D',
+      'Ground Service' => 'GD',
+      'Freight Service' => 'FT',
+      'International' => 'INTL'
+    }.freeze
 
     INVALID_LOGIN = /(Error with Valid Username\/EmailAddress and Password Required)|(Could not verify Username\/EmailAddress and Password combination)/
 
@@ -32,12 +40,7 @@ module ActiveFulfillment
 
     # The first is the label, and the last is the code
     def self.shipping_methods
-      [ ['1 Day Service',   '1D'],
-        ['2 Day Service',   '2D'],
-        ['Ground Service',  'GD'],
-        ['Freight Service', 'FT'],
-        ['International', 'INTL']
-      ].inject({}){|h, (k,v)| h[k] = v; h}
+      SHIPPING_METHODS
     end
 
     # Pass in the login and password for the shipwire account.
@@ -188,79 +191,91 @@ module ActiveFulfillment
     end
 
     def parse_fulfillment_response(xml)
-      response = {}
+      Parsing.with_xml_document(xml) do |document, response|
+        document.root.try do |root_document|
+          root_document.elements.each do |node|
+            response[node.name.underscore.to_sym] = node.text.strip
+          end
+        end
 
-      document = REXML::Document.new(xml)
-      document.root.elements.each do |node|
-        response[node.name.underscore.to_sym] = text_content(node)
+        response[:success] = response[:status] == '0'.freeze
+        response[:message] = response[:success] ? 'Successfully submitted the order'.freeze : message_from(response[:error_message])
+        response
       end
+    end
 
-      response[:success] = response[:status] == '0'
-      response[:message] = response[:success] ? "Successfully submitted the order" : message_from(response[:error_message])
-      response
+    def compute_stock_levels(document)
+      items = {}
+      products = document.xpath('//Product'.freeze)
+      products.each do |product|
+        qty = product.at_xpath('@quantity'.freeze).child.content.to_i
+        code = product.at_xpath('@code'.freeze).child.content
+        pending_qty = include_pending_stock? ? product.at_xpath('@pending'.freeze).child.content.to_i : 0
+        items[code] = qty + pending_qty
+      end
+      items
     end
 
     def parse_inventory_response(xml)
-      response = {}
-      response[:stock_levels] = {}
-
-      document = REXML::Document.new(xml)
-      document.root.elements.each do |node|
-        if node.name == 'Product'
-          to_check = ['quantity']
-          to_check << 'pending' if include_pending_stock?
-
-          amount = to_check.sum { |a| node.attributes[a].to_i }
-          response[:stock_levels][node.attributes['code']] = amount
-        else
-          response[node.name.underscore.to_sym] = text_content(node)
-        end
+      response = { stock_levels: {} }
+      Parsing.with_xml_document(xml, response) do |document|
+        status = document.at_xpath('//Status'.freeze).child.content
+        total_products = document.at_xpath('//TotalProducts'.freeze).child.content
+        success = test? ? status == 'Test'.freeze : status == '0'.freeze
+        message = success ? 'Successfully received the stock levels'.freeze : document.at_xpath('//ErrorMessage'.freeze).child.content
+
+        {
+          status: status,
+          total_products: total_products,
+          stock_levels: compute_stock_levels(document),
+          message: message,
+          success: success
+        }
       end
+    end
 
-      response[:success] = test? ? response[:status] == 'Test' : response[:status] == '0'
-      response[:message] = response[:success] ? "Successfully received the stock levels" : message_from(response[:error_message])
-
-      response
+    def shipped_order?(node)
+      node.name == 'Order'.freeze && node.attributes['shipped'.freeze].text == 'YES'.freeze
     end
 
     def parse_tracking_response(xml)
-      response = {}
-      response[:tracking_numbers] = {}
-      response[:tracking_companies] = {}
-      response[:tracking_urls] = {}
-
-      document = REXML::Document.new(xml)
-      document.root.elements.each do |node|
-        if node.name == 'Order'
-          if node.attributes["shipped"] == "YES" && node.elements['TrackingNumber']
-            tracking_number = node.elements['TrackingNumber'].text.strip
-            response[:tracking_numbers][node.attributes['id']] = [tracking_number]
-
-            tracking_company = node.elements['TrackingNumber'].attributes['carrier']
-            response[:tracking_companies][node.attributes['id']] = [tracking_company.strip] if tracking_company
-
-            tracking_url = node.elements['TrackingNumber'].attributes['href']
-            response[:tracking_urls][node.attributes['id']] = [tracking_url.strip] if tracking_url
+      response = {
+        tracking_numbers: {},
+        tracking_companies: {},
+        tracking_urls: {}
+      }
+
+      Parsing.with_xml_document(xml, response) do |document, response|
+        document.root.try do |root_document|
+          root_document.elements.each do |node|
+            if shipped_order?(node)
+              node_tracking = node.at_css('TrackingNumber'.freeze)
+              unless node_tracking.nil?
+                node_id = node.attributes['id'.freeze].text.strip
+                tracking_number = node_tracking.text.strip
+                response[:tracking_numbers][node_id] = [tracking_number]
+
+                tracking_company = node_tracking.attributes['carrier'.freeze].try { |item| item.text.strip }
+                response[:tracking_companies][node_id] = [tracking_company] if tracking_company
+
+                tracking_url = node_tracking.attributes['href'.freeze].try { |item| item.text.strip }
+                response[:tracking_urls][node_id] = [tracking_url] if tracking_url
+              end
+            else
+              response[node.name.underscore.to_sym] = node.text.strip
+            end
           end
-        else
-          response[node.name.underscore.to_sym] = text_content(node)
         end
       end
 
-      response[:success] = test? ? (response[:status] == '0' || response[:status] == 'Test') : response[:status] == '0'
-      response[:message] = response[:success] ? "Successfully received the tracking numbers" : message_from(response[:error_message])
+      response[:success] = test? ? (response[:status] == '0'.freeze || response[:status] == 'Test'.freeze) : response[:status] == '0'.freeze
+      response[:message] = response[:success] ? 'Successfully received the tracking numbers'.freeze : message_from(response[:error_message])
       response
     end
 
     def message_from(string)
       return if string.blank?
-      string.gsub("\n", '').squeeze(" ")
-    end
-
-    def text_content(xml_node)
-      text = xml_node.text
-      text = xml_node.cdatas.join if text.blank?
-      text
+      string.gsub("\n", ''.freeze).squeeze(' '.freeze)
     end
   end
 end

data/lib/active_fulfillment/services/shopify_api.rb

@@ -3,7 +3,7 @@ require 'active_support/core_ext/object/to_query'
 module ActiveFulfillment
   class ShopifyAPIService < Service
 
-    OrderIdCutoffDate = Date.iso8601("2015-03-01")
+    OrderIdCutoffDate = Date.iso8601('2015-03-01').freeze
 
     RESCUABLE_CONNECTION_ERRORS = [
       Net::ReadTimeout,
@@ -28,7 +28,7 @@ module ActiveFulfillment
       ActiveUtils::ConnectionError,
       ActiveUtils::ResponseError,
       ActiveUtils::InvalidResponseError
-    ]
+    ].freeze
 
     def initialize(options = {})
       @name = options[:name]
@@ -37,27 +37,27 @@ module ActiveFulfillment
     end
 
     def fulfill(order_id, shipping_address, line_items, options = {})
-      raise NotImplementedError.new("Shopify API Service must listen to fulfillment/create Webhooks")
+      raise NotImplementedError.new('Shopify API Service must listen to fulfillment/create Webhooks'.freeze)
     end
 
     def fetch_stock_levels(options = {})
-      response = send_app_request('fetch_stock', options.delete(:headers), options)
+      response = send_app_request('fetch_stock'.freeze, options.delete(:headers), options)
       if response
-        stock_levels = parse_response(response, 'StockLevels', 'Product', 'Sku', 'Quantity') { |p| p.to_i }
-        Response.new(true, "API stock levels", {:stock_levels => stock_levels})
+        stock_levels = parse_response(response, 'StockLevels'.freeze, 'Product'.freeze, 'Sku'.freeze, 'Quantity'.freeze) { |p| p.to_i }
+        Response.new(true, 'API stock levels'.freeze, {:stock_levels => stock_levels})
       else
-        Response.new(false, "Unable to fetch remote stock levels")
+        Response.new(false, 'Unable to fetch remote stock levels'.freeze)
       end
     end
 
     def fetch_tracking_data(order_numbers, options = {})
       options.merge!({:order_ids => order_numbers, :order_names => order_numbers})
-      response = send_app_request('fetch_tracking_numbers', options.delete(:headers), options)
+      response = send_app_request('fetch_tracking_numbers'.freeze, options.delete(:headers), options)
       if response
-        tracking_numbers = parse_response(response, 'TrackingNumbers', 'Order', 'ID', 'Tracking') { |o| o }
-        Response.new(true, "API tracking_numbers", {:tracking_numbers => tracking_numbers,
-                                                    :tracking_companies => {},
-                                                    :tracking_urls => {}})
+        tracking_numbers = parse_response(response, 'TrackingNumbers'.freeze, 'Order'.freeze, 'ID'.freeze, 'Tracking'.freeze) { |o| o }
+        Response.new(true, 'API tracking_numbers'.freeze, {:tracking_numbers => tracking_numbers,
+                                                           :tracking_companies => {},
+                                                           :tracking_urls => {}})
       else
         Response.new(false, "Unable to fetch remote tracking numbers #{order_numbers.inspect}")
       end
@@ -72,7 +72,7 @@ module ActiveFulfillment
     def send_app_request(action, headers, data)
       uri = request_uri(action, data)
 
-      logger.info "[" + @name.upcase + " APP] Post #{uri}"
+      logger.info "[#{@name.upcase} APP] Post #{uri}"
 
       response = nil
       realtime = Benchmark.realtime do
@@ -85,39 +85,46 @@ module ActiveFulfillment
         end
       end
 
-      line = "[" + @name.upcase + "APP] Response from #{uri} --> "
+      line = "[#{@name.upcase} APP] Response from #{uri} --> "
       line << "#{response} #{"%.4fs" % realtime}"
       logger.info line
 
       response
     end
 
-    def parse_response(response, root, type, key, value)
-      case @format
-      when 'json'
-        response_data = ActiveSupport::JSON.decode(response)
-        return {} unless response_data.is_a?(Hash)
-        response_data[root.underscore] || response_data
-      when 'xml'
-        response_data = {}
-        document = REXML::Document.new(response)
-        document.elements[root].each do |node|
-          if node.name == type
-            response_data[node.elements[key].text] = node.elements[value].text
-          end
+    def parse_json(json_data, root)
+      response_data = ActiveSupport::JSON.decode(json_data)
+      return {} unless response_data.is_a?(Hash)
+      response_data[root.underscore] || response_data
+      rescue ActiveSupport::JSON.parse_error
+        {}
+    end
+
+
+    def parse_xml(xml_data, type, key, value)
+      Parsing.with_xml_document(xml_data) do |document, response|
+        # Extract All elements of type and map them!
+        root_element = document.xpath("//#{type}")
+        root_element.each do |type_item|
+          key_item = type_item.at_css(key).child.content
+          value_item = type_item.at_css(value).child.content
+          response[key_item] = value_item
         end
-        response_data
+        response
       end
+    end
 
-    rescue ActiveSupport::JSON.parse_error, REXML::ParseException
+    def parse_response(response, root, type, key, value)
+      return parse_json(response, root) if @format == 'json'.freeze
+      return parse_xml(response, type, key, value) if @format == 'xml'.freeze
       {}
     end
 
     def encode_payload(payload, root)
       case @format
-      when 'json'
+      when 'json'.freeze
         {root => payload}.to_json
-      when 'xml'
+      when 'xml'.freeze
         payload.to_xml(:root => root)
       end
     end

data/lib/active_fulfillment/services/webgistix.rb

@@ -1,24 +1,63 @@
 module ActiveFulfillment
   class WebgistixService < Service
+  
     SERVICE_URLS = {
       :fulfillment => 'https://www.webgistix.com/XML/CreateOrder.asp',
       :inventory   => 'https://www.webgistix.com/XML/GetInventory.asp',
       :tracking    => 'https://www.webgistix.com/XML/GetTracking.asp'
-    }
-    TEST_URLS = SERVICE_URLS.merge({
+    }.freeze
+    
+    TEST_URLS = SERVICE_URLS.dup.merge({
       :fulfillment => 'https://www.webgistix.com/XML/CreateOrderTest.asp'
-    })
-
-    SUCCESS, DUPLICATE, FAILURE = 'True', 'Duplicate', 'False'
-
-    SUCCESS_MESSAGE = 'Successfully submitted the order'
-    FAILURE_MESSAGE = 'Failed to submit the order'
-    DUPLICATE_MESSAGE = 'This order has already been successfully submitted'
-
-    INVALID_LOGIN = 'Invalid Credentials'
-    NOT_SHIPPED = 'Not Shipped'
-
-    TRACKING_COMPANIES = %w(UPS FedEx USPS)
+    }).freeze
+
+    SUCCESS, DUPLICATE, FAILURE = 'True'.freeze, 'Duplicate'.freeze, 'False'.freeze
+
+    SUCCESS_MESSAGE = 'Successfully submitted the order'.freeze
+    FAILURE_MESSAGE = 'Failed to submit the order'.freeze
+    DUPLICATE_MESSAGE = 'This order has already been successfully submitted'.freeze
+
+    INVALID_LOGIN = 'Invalid Credentials'.freeze
+    NOT_SHIPPED = 'Not Shipped'.freeze
+
+    TRACKING_COMPANIES = %w(UPS FedEx USPS).freeze
+    
+    SHIPPING_PROVIDERS = {
+        'UPS Ground Shipping' => 'Ground',
+        'UPS Ground' => 'Ground',
+        'UPS Standard Shipping (Canada Only)' => 'Standard',
+        'UPS Standard Shipping (CA & MX Only)' => 'Standard',
+        'UPS 3-Business Day' => '3-Day Select',
+        'UPS 2-Business Day' => '2nd Day Air',
+        'UPS 2-Business Day AM' => '2nd Day Air AM',
+        'UPS Next Day' => 'Next Day Air',
+        'UPS Next Day Saver' => 'Next Day Air Saver',
+        'UPS Next Day Early AM' => 'Next Day Air Early AM',
+        'UPS Worldwide Express (Next Day)' => 'Worldwide Express',
+        'UPS Worldwide Expedited (2nd Day)' => 'Worldwide Expedited',
+        'UPS Worldwide Express Saver' => 'Worldwide Express Saver',
+        'FedEx Priority Overnight' => 'FedEx Priority Overnight',
+        'FedEx Standard Overnight' => 'FedEx Standard Overnight',
+        'FedEx First Overnight' => 'FedEx First Overnight',
+        'FedEx 2nd Day' => 'FedEx 2nd Day',
+        'FedEx Express Saver' => 'FedEx Express Saver',
+        'FedEx International Priority' => 'FedEx International Priority',
+        'FedEx International Economy' => 'FedEx International Economy',
+        'FedEx International First' => 'FedEx International First',
+        'FedEx Ground' => 'FedEx Ground',
+        'USPS Priority Mail' => 'Priority Mail',
+        'USPS Priority Mail International' => 'Priority Mail International',
+        'USPS Priority Mail Small Flat Rate Box' => 'Priority Mail Small Flat Rate Box',
+        'USPS Priority Mail Medium Flat Rate Box' => 'Priority Mail Medium Flat Rate Box',
+        'USPS Priority Mail Large Flat Rate Box' => "Priority Mail Large Flat Rate Box",
+        'USPS Priority Mail Flat Rate Envelope' => 'Priority Mail Flat Rate Envelope',
+        'USPS First Class Mail' => 'First Class',
+        'USPS First Class International' => 'First Class International',
+        'USPS Express Mail' => 'Express',
+        'USPS Express Mail International' => 'Express Mail International',
+        'USPS Parcel Post' => 'Parcel',
+        'USPS Media Mail' => 'Media Mail'
+    }.freeze
 
     # If a request is detected as a duplicate only the original data will be
     # used by Webgistix, and the subsequent responses will have a
@@ -27,42 +66,7 @@ module ActiveFulfillment
 
     # The first is the label, and the last is the code
     def self.shipping_methods
-      [
-        ["UPS Ground Shipping", "Ground"],
-        ["UPS Ground", "Ground"],
-        ["UPS Standard Shipping (Canada Only)", "Standard"],
-        ["UPS Standard Shipping (CA & MX Only)", "Standard"],
-        ["UPS 3-Business Day", "3-Day Select"],
-        ["UPS 2-Business Day", "2nd Day Air"],
-        ["UPS 2-Business Day AM", "2nd Day Air AM"],
-        ["UPS Next Day", "Next Day Air"],
-        ["UPS Next Day Saver", "Next Day Air Saver"],
-        ["UPS Next Day Early AM", "Next Day Air Early AM"],
-        ["UPS Worldwide Express (Next Day)", "Worldwide Express"],
-        ["UPS Worldwide Expedited (2nd Day)", "Worldwide Expedited"],
-        ["UPS Worldwide Express Saver", "Worldwide Express Saver"],
-        ["FedEx Priority Overnight", "FedEx Priority Overnight"],
-        ["FedEx Standard Overnight", "FedEx Standard Overnight"],
-        ["FedEx First Overnight", "FedEx First Overnight"],
-        ["FedEx 2nd Day", "FedEx 2nd Day"],
-        ["FedEx Express Saver", "FedEx Express Saver"],
-        ["FedEx International Priority", "FedEx International Priority"],
-        ["FedEx International Economy", "FedEx International Economy"],
-        ["FedEx International First", "FedEx International First"],
-        ["FedEx Ground", "FedEx Ground"],
-        ["USPS Priority Mail", "Priority Mail"],
-        ["USPS Priority Mail International", "Priority Mail International"],
-        ["USPS Priority Mail Small Flat Rate Box", "Priority Mail Small Flat Rate Box"],
-        ["USPS Priority Mail Medium Flat Rate Box", "Priority Mail Medium Flat Rate Box"],
-        ["USPS Priority Mail Large Flat Rate Box", "Priority Mail Large Flat Rate Box"],
-        ["USPS Priority Mail Flat Rate Envelope", "Priority Mail Flat Rate Envelope"],
-        ["USPS First Class Mail", "First Class"],
-        ["USPS First Class International", "First Class International"],
-        ["USPS Express Mail", "Express"],
-        ["USPS Express Mail International", "Express Mail International"],
-        ["USPS Parcel Post", "Parcel"],
-        ["USPS Media Mail", "Media Mail"]
-      ].inject({}){|h, (k,v)| h[k] = v; h}
+      SHIPPING_PROVIDERS
     end
 
     # Pass in the login and password for the shipwire account.
@@ -245,8 +249,8 @@ module ActiveFulfillment
 
     def parse_response(action, xml)
       begin
-        document = REXML::Document.new("<response>#{xml}</response>")
-      rescue REXML::ParseException
+        document = Nokogiri::XML("<response>#{xml}</response>")
+      rescue Nokogiri::XML::SyntaxError
         return {:success => FAILURE}
       end
 
@@ -266,7 +270,7 @@ module ActiveFulfillment
       response = parse_errors(document)
 
       # Check if completed
-      if completed = REXML::XPath.first(document, '//Completed')
+      if completed = document.at_xpath('//Completed'.freeze)
         completed.elements.each do |e|
           response[e.name.underscore.to_sym] = e.text
         end
@@ -283,11 +287,11 @@ module ActiveFulfillment
       response = parse_errors(document)
       response[:stock_levels] = {}
 
-      document.root.each_element('//Item') do |node|
+      document.root.xpath('//Item'.freeze).each do |node|
         # {ItemID => 'SOME-ID', ItemQty => '101'}
         params = node.elements.to_a.each_with_object({}) {|elem, hash| hash[elem.name] = elem.text}
 
-        response[:stock_levels][params['ItemID']] = params['ItemQty'].to_i
+        response[:stock_levels][params['ItemID'.freeze]] = params['ItemQty'.freeze].to_i
       end
 
       response
@@ -295,25 +299,23 @@ module ActiveFulfillment
 
     def parse_tracking_response(document)
       response = parse_errors(document)
-      response[:tracking_numbers] = {}
-      response[:tracking_companies] = {}
-      response[:tracking_urls] = {}
+      response = response.merge(tracking_numbers: {}, tracking_companies: {}, tracking_urls: {})
 
-      document.root.each_element('//Shipment') do |node|
+      document.root.xpath('//Shipment'.freeze).each do |node|
         # {InvoiceNumber => 'SOME-ID', ShipmentTrackingNumber => 'SOME-TRACKING-NUMBER'}
         params = node.elements.to_a.each_with_object({}) {|elem, hash| hash[elem.name] = elem.text}
 
-        tracking = params['ShipmentTrackingNumber']
+        tracking = params['ShipmentTrackingNumber'.freeze]
 
         unless tracking == NOT_SHIPPED
-          response[:tracking_numbers][params['InvoiceNumber']] ||= []
-          response[:tracking_numbers][params['InvoiceNumber']] << tracking
+          response[:tracking_numbers][params['InvoiceNumber'.freeze]] ||= []
+          response[:tracking_numbers][params['InvoiceNumber'.freeze]] << tracking
         end
 
-        company = params['Method'].split[0] if params['Method']
+        company = params['Method'.freeze].split[0] if params['Method'.freeze]
         if TRACKING_COMPANIES.include? company
-          response[:tracking_companies][params['InvoiceNumber']] ||= []
-          response[:tracking_companies][params['InvoiceNumber']] << company
+          response[:tracking_companies][params['InvoiceNumber'.freeze]] ||= []
+          response[:tracking_companies][params['InvoiceNumber'.freeze]] << company
         end
       end
 
@@ -323,7 +325,7 @@ module ActiveFulfillment
     def parse_errors(document)
       response = {}
 
-      REXML::XPath.match(document, "//Errors/Error").to_a.each_with_index do |e, i|
+      document.xpath('//Errors/Error'.freeze).each_with_index do |e, i|
         response["error_#{i}".to_sym] = e.text
       end
 

data/lib/active_fulfillment/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module ActiveFulfillment
-  VERSION = "3.0.0.pre8"
+  VERSION = "3.0.1"
 end

data/test/test_helper.rb

@@ -5,6 +5,7 @@ require 'active_fulfillment'
 require 'minitest/autorun'
 require 'mocha/setup'
 require 'timecop'
+require 'rexml/document'
 
 require 'logger'
 ActiveFulfillment::Service.logger = Logger.new(nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_fulfillment
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre8
+  version: 3.0.1
 platform: ruby
 authors:
 - Cody Fauser
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,6 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +132,7 @@ files:
 - CHANGELOG.md
 - lib/active_fulfillment.rb
 - lib/active_fulfillment/base.rb
+- lib/active_fulfillment/parsing.rb
 - lib/active_fulfillment/response.rb
 - lib/active_fulfillment/service.rb
 - lib/active_fulfillment/services.rb
@@ -164,13 +179,13 @@ summary: Framework and tools for dealing with shipping, tracking and order fulfi
   services.
 test_files:
 - test/test_helper.rb
-- test/remote/webgistix_test.rb
-- test/remote/shipwire_test.rb
-- test/remote/james_and_james_test.rb
 - test/remote/amazon_mws_test.rb
+- test/remote/james_and_james_test.rb
+- test/remote/shipwire_test.rb
+- test/remote/webgistix_test.rb
+- test/unit/services/amazon_mws_test.rb
+- test/unit/services/james_and_james_test.rb
 - test/unit/services/shopify_api_test.rb
-- test/unit/services/webgistix_test.rb
 - test/unit/services/shipwire_test.rb
-- test/unit/services/james_and_james_test.rb
-- test/unit/services/amazon_mws_test.rb
+- test/unit/services/webgistix_test.rb
 - test/unit/base_test.rb