active_shipping 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a721187cba1984ab9a456dea8c660c81d2a1aa68
-  data.tar.gz: 4b6ba4b2a8bedd5434f611d81d2ba74df92fab5e
+  metadata.gz: 79c6b3362e5819936e2a22e145f561bef37dbd4f
+  data.tar.gz: 3e0b2fcd0aa37da3733796632bdf92864e538e52
 SHA512:
-  metadata.gz: 7fecbfa0feaf36671db206bb30fb3e981b5c079183d45ebd8a2c096a41ba4d66f516b69d443ed3e08b54c1af4fa070ce618fb9f3fc89ce48bf2e19fafcec0d2b
-  data.tar.gz: 80a224c59f08ba748989a2aacc4ddcacd529296c43c4d0caa370339a26d60d1d2c29d860ce4e0c1d5719e2f791aef2b05589b44055b45228400fd47fef24fae7
+  metadata.gz: 0dadab7eeb70c6123fdaaa4a0215755a5e9337a5e51c6bc82ba29ca357d9caa493a9bd64c070ca85c8e5e2500df47109beeb9c11c7e787c34973b3a8b9376f13
+  data.tar.gz: eeacbd47303bd524f268877a386477b67fe8ac2987cf7c4a722a90abc3535409de6ffcdb508072992b9c75e6d620c0d3c759edac1dc50229b05f2a4a63e998f1

data/.travis.yml

@@ -6,6 +6,7 @@ rvm:
 - "2.0"
 - "2.1"
 - "2.2"
+- "2.3.1"
 
 gemfile:
 - Gemfile.activesupport32

data/README.md

@@ -23,6 +23,7 @@ Active Shipping is currently being used and improved in a production environment
 * [Shipwire](http://www.shipwire.com)
 * [Stamps](http://www.stamps.com)
 * [Kunaki](http://www.kunaki.com)
+* [Australia Post](http://auspost.com.au/)
 
 ## Installation
 

data/dev.yml

@@ -1,9 +1,7 @@
 name: active_shipping
 
 up:
-  - ruby:
-      package: homebrew/version/ruby22
-      version: 2.2.5p319
+  - ruby: 2.3.1
   - bundler
 
 commands:

data/lib/active_shipping/carriers.rb

@@ -33,3 +33,4 @@ ActiveShipping::Carriers.register :NewZealandPost,   'active_shipping/carriers/n
 ActiveShipping::Carriers.register :CanadaPostPWS,    'active_shipping/carriers/canada_post_pws'
 ActiveShipping::Carriers.register :Stamps,           'active_shipping/carriers/stamps'
 ActiveShipping::Carriers.register :Correios,         'active_shipping/carriers/correios'
+ActiveShipping::Carriers.register :AustraliaPost,    'active_shipping/carriers/australia_post'

data/lib/active_shipping/carriers/australia_post.rb

@@ -0,0 +1,250 @@
+require 'active_support/core_ext/object/to_query'
+
+module ActiveShipping
+  class AustraliaPost < Carrier
+    cattr_reader :name
+    @@name = 'Australia Post'
+
+    HOST = 'digitalapi.auspost.com.au'
+
+    PARCEL_ENDPOINTS = {
+      service: {
+        domestic:      '/postage/parcel/domestic/service.json',
+        international: '/postage/parcel/international/service.json'
+      },
+      calculate: {
+        domestic:      '/postage/parcel/domestic/calculate.json',
+        international: '/postage/parcel/international/calculate.json'
+      }
+    }.freeze
+
+    def requirements
+      [:api_key]
+    end
+
+    def find_rates(origin, destination, packages, options = {})
+      packages = Array(packages)
+
+      service_requests = packages.map do |package|
+        service_request = ServiceRequest.new(origin, destination, package, options)
+
+        service_request.parse(commit(service_request.url))
+        service_request
+      end
+
+      combined_response = CombinedResponse.new(origin, destination, packages, service_requests)
+
+      RateResponse.new(true, 'success', combined_response.params, combined_response.options)
+    end
+
+    def calculate_rates(origin, destination, packages, service_code, options = {})
+      packages = Array(packages)
+
+      calculate_requests = packages.map do |package|
+        calculate_request = CalculateRequest.new(origin, destination, package, service_code, options)
+
+        calculate_request.parse(commit(calculate_request.url))
+        calculate_request
+      end
+
+      combined_response = CombinedResponse.new(origin, destination, packages, calculate_requests)
+
+      RateResponse.new(true, 'success', combined_response.params, combined_response.options)
+    end
+
+    private
+
+    def commit(request_url)
+      ssl_get(request_url, headers)
+
+    rescue ActiveUtils::ResponseError, ActiveShipping::ResponseError => e
+      data          = JSON.parse(e.response.body)
+      error_message = data['error'] && data['error']['errorMessage'] ? data['error']['errorMessage'] : 'unknown'
+
+      RateResponse.new(false, error_message, data)
+    end
+
+    def headers
+      {
+        'Content-type' => 'application/json',
+        'auth-key'     => @options[:api_key]
+      }
+    end
+
+    class CombinedResponse
+
+      def initialize(origin, destination, packages, requests)
+        @requests    = requests
+        @origin      = origin
+        @destination = destination
+        @packages    = packages
+      end
+
+      def options
+        {
+          rates:         rates,
+          raw_responses: @requests.map(&:raw_response),
+          request:       @requests.map(&:url)
+        }
+      end
+
+      def params
+        {
+          responses: @requests.map(&:response)
+        }
+      end
+
+      private
+
+      def rate_options(rates)
+        {
+          service_name:       rates.first[:service_name],
+          service_code:       rates.first[:service_code],
+          total_price:        rates.sum { |rate| rate[:total_price] },
+          currency:           'AUD',
+          delivery_time_text: rates.first[:delivery_time_text]
+        }
+      end
+
+      def rates
+        rates = @requests.map(&:rates).flatten
+
+        rates.group_by { |rate| rate[:service_name] }.map do |service_name, service_rates|
+          next unless service_rates.size == @packages.size
+
+          AustraliaPostRateEstimate.new(@origin, @destination, AustraliaPost.name, service_name, rate_options(service_rates))
+        end.compact
+      end
+
+    end
+
+    class AustraliaPostRequest
+      attr_reader :raw_response
+      attr_reader :response
+      attr_reader :rates
+
+      def initialize(origin, destination, package, options)
+        @origin      = Location.from(origin)
+        @destination = Location.from(destination)
+        @package     = package
+        @rates       = []
+        @options     = options
+      end
+
+      def url
+        endpoint = domestic_destination? ? @endpoints[:domestic] : @endpoints[:international]
+        params   = domestic_destination? ? domestic_params : international_params
+
+        URI::HTTPS.build(host: HOST, path: endpoint, query: params.to_query).to_s
+      end
+
+      def parse(data)
+        @raw_response = data
+        @response     = JSON.parse(data)
+      end
+
+      protected
+
+      def domestic_destination?
+        @destination.country_code == 'AU'
+      end
+
+      def domestic_params
+        {
+          length:        @package.cm(:length),
+          width:         @package.cm(:width),
+          height:        @package.cm(:height),
+          weight:        @package.weight.in_kg.to_f.round(2),
+          from_postcode: @origin.postal_code,
+          to_postcode:   @destination.postal_code
+        }
+      end
+
+      def international_params
+        {
+          weight:       @package.weight.in_kg.to_f.round(2),
+          country_code: @destination.country_code
+        }
+      end
+
+    end
+
+    class ServiceRequest < AustraliaPostRequest
+
+      def initialize(origin, destination, package, options)
+        super
+        @endpoints = PARCEL_ENDPOINTS[:service]
+      end
+
+      def parse(data)
+        super
+
+        @rates = response['services']['service'].map do |service|
+          {
+            service_name: service['name'],
+            service_code: service['code'],
+            total_price:  service['price'].to_f,
+            currency:     'AUD'
+          }
+        end
+      end
+
+    end
+
+    class CalculateRequest < AustraliaPostRequest
+      attr_reader :service_code
+
+      def initialize(origin, destination, package, service_code, options)
+        super(origin, destination, package, options)
+
+        @service_code = service_code
+        @endpoints    = PARCEL_ENDPOINTS[:calculate]
+      end
+
+      def parse(data)
+        super
+        postage_result = response['postage_result']
+
+        @rates = [{
+          service_name:       postage_result['service'],
+          service_code:       service_code,
+          total_price:        postage_result['total_cost'].to_f,
+          currency:           'AUD',
+          delivery_time_text: postage_result['delivery_time']
+        }]
+      end
+
+      private
+
+      def calculate_params
+        {
+          service_code:   @service_code,
+          option_code:    @options[:option_code],
+          suboption_code: @options[:suboption_code],
+          extra_cover:    @options[:extra_cover]
+        }.
+        # INFO: equivalent of .compact
+        select { |_, value| !value.nil? }
+      end
+
+      def domestic_params
+        super.merge(calculate_params)
+      end
+
+      def international_params
+        super.merge(calculate_params)
+      end
+
+    end
+
+    class AustraliaPostRateEstimate < RateEstimate
+      attr_reader :delivery_time_text
+
+      def initialize(origin, destination, carrier, service_name, options = {})
+        super
+        @delivery_time_text = options[:delivery_time_text]
+      end
+
+    end
+  end
+end

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "1.7.2"
+  VERSION = "1.7.3"
 end

data/test/credentials.yml

@@ -65,6 +65,9 @@ stamps:
   username: <%= ENV['ACTIVESHIPPING_STAMPS_USERNAME'] %>
   password: <%= ENV['ACTIVESHIPPING_STAMPS_PASSWORD'] %>
 
+australia_post:
+  api_key: <%= ENV['ACTIVESHIPPING_AUSTRALIA_POST_API_KEY'] %>
+
 # fedex_freight:
 #   account: FedExFreightAccountNumber
 #   shipping_address1: FedExShippingAddress1

data/test/fixtures/json/australia_post/calculate_domestic.json

@@ -0,0 +1,13 @@
+{
+  "postage_result": {
+    "service": "Express Post",
+    "delivery_time": "Guaranteed Next Business Day within the Express Post network (If posted on any business day Monday to Friday in accordance with the conditions set out on the item).",
+    "total_cost": "10.20",
+    "costs": {
+      "cost": {
+        "item": "Express Post",
+        "cost": "10.20"
+      }
+    }
+  }
+}

data/test/fixtures/json/australia_post/calculate_domestic_2.json

@@ -0,0 +1,19 @@
+{
+  "postage_result": {
+    "service": "Express Post",
+    "delivery_time": "Guaranteed Next Business Day within the Express Post network (If posted on any business day Monday to Friday in accordance with the conditions set out on the item).",
+    "total_cost": "14.70",
+    "costs": {
+      "cost": [{
+        "item": "Express Post",
+        "cost": "10.20"
+      }, {
+        "item": "Standard Service",
+        "cost": "0.00"
+      }, {
+        "item": "Extra Cover",
+        "cost": "4.50"
+      }]
+    }
+  }
+}

data/test/fixtures/json/australia_post/calculate_international.json

@@ -0,0 +1,12 @@
+{
+  "postage_result": {
+    "service": "Courier",
+    "total_cost": "87.36",
+    "costs": {
+      "cost": {
+        "item": "Courier",
+        "cost": "87.36"
+      }
+    }
+  }
+}

data/test/fixtures/json/australia_post/calculate_international_2.json

@@ -0,0 +1,15 @@
+{
+  "postage_result": {
+    "service": "Courier",
+    "total_cost": "87.36",
+    "costs": {
+      "cost": [{
+        "item": "Courier",
+        "cost": "87.36"
+      }, {
+        "item": "SMS track advice",
+        "cost": "0.00"
+      }]
+    }
+  }
+}

data/test/fixtures/json/australia_post/error_message.json

@@ -0,0 +1,5 @@
+{
+  "error": {
+    "errorMessage": "Please enter From postcode."
+  }
+}

data/test/fixtures/json/australia_post/service_domestic.json

@@ -0,0 +1,117 @@
+{
+  "services": {
+    "service": [{
+      "code": "AUS_PARCEL_EXPRESS",
+      "name": "Express Post",
+      "price": "28.55",
+      "max_extra_cover": 300,
+      "options": {
+        "option": [{
+          "code": "AUS_SERVICE_OPTION_STANDARD",
+          "name": "Standard Service",
+          "suboptions": {
+            "option": {
+              "code": "AUS_SERVICE_OPTION_EXTRA_COVER",
+              "name": "Extra Cover",
+              "max_extra_cover": 300
+            }
+          }
+        }, {
+          "code": "AUS_SERVICE_OPTION_SIGNATURE_ON_DELIVERY",
+          "name": "Signature on Delivery",
+          "suboptions": {
+            "option": {
+              "code": "AUS_SERVICE_OPTION_EXTRA_COVER",
+              "name": "Extra Cover",
+              "max_extra_cover": 5000
+            }
+          }
+        }]
+      }
+    }, {
+      "code": "AUS_PARCEL_EXPRESS_SATCHEL_3KG",
+      "name": "Express Post Medium (3Kg) Satchel",
+      "price": "14.80",
+      "max_extra_cover": 300,
+      "options": {
+        "option": [{
+          "code": "AUS_SERVICE_OPTION_STANDARD",
+          "name": "Standard Service",
+          "suboptions": {
+            "option": {
+              "code": "AUS_SERVICE_OPTION_EXTRA_COVER",
+              "name": "Extra Cover",
+              "max_extra_cover": 300
+            }
+          }
+        }, {
+          "code": "AUS_SERVICE_OPTION_SIGNATURE_ON_DELIVERY",
+          "name": "Signature on Delivery",
+          "suboptions": {
+            "option": {
+              "code": "AUS_SERVICE_OPTION_EXTRA_COVER",
+              "name": "Extra Cover",
+              "max_extra_cover": 5000
+            }
+          }
+        }]
+      }
+    }, {
+      "code": "AUS_PARCEL_REGULAR",
+      "name": "Parcel Post",
+      "price": "16.15",
+      "max_extra_cover": 300,
+      "options": {
+        "option": [{
+          "code": "AUS_SERVICE_OPTION_STANDARD",
+          "name": "Standard Service",
+          "suboptions": {
+            "option": {
+              "code": "AUS_SERVICE_OPTION_EXTRA_COVER",
+              "name": "Extra Cover",
+              "max_extra_cover": 300
+            }
+          }
+        }, {
+          "code": "AUS_SERVICE_OPTION_SIGNATURE_ON_DELIVERY",
+          "name": "Signature on Delivery",
+          "suboptions": {
+            "option": {
+              "code": "AUS_SERVICE_OPTION_EXTRA_COVER",
+              "name": "Extra Cover",
+              "max_extra_cover": 5000
+            }
+          }
+        }]
+      }
+    }, {
+      "code": "AUS_PARCEL_REGULAR_SATCHEL_3KG",
+      "name": "Parcel Post Medium Satchel",
+      "price": "13.40",
+      "max_extra_cover": 300,
+      "options": {
+        "option": [{
+          "code": "AUS_SERVICE_OPTION_STANDARD",
+          "name": "Standard Service",
+          "suboptions": {
+            "option": {
+              "code": "AUS_SERVICE_OPTION_EXTRA_COVER",
+              "name": "Extra Cover",
+              "max_extra_cover": 300
+            }
+          }
+        }, {
+          "code": "AUS_SERVICE_OPTION_SIGNATURE_ON_DELIVERY",
+          "name": "Signature on Delivery",
+          "suboptions": {
+            "option": {
+              "code": "AUS_SERVICE_OPTION_EXTRA_COVER",
+              "name": "Extra Cover",
+              "max_extra_cover": 5000
+            }
+          }
+        }]
+      }
+    }]
+  }
+}

data/test/fixtures/json/australia_post/service_domestic_2.json

@@ -0,0 +1,117 @@
+{
+  "services": {
+    "service": [{
+      "code": "AUS_PARCEL_EXPRESS",
+      "name": "Express Post",
+      "price": "10.20",
+      "max_extra_cover": 300,
+      "options": {
+        "option": [{
+          "code": "AUS_SERVICE_OPTION_STANDARD",
+          "name": "Standard Service",
+          "suboptions": {
+            "option": {
+              "code": "AUS_SERVICE_OPTION_EXTRA_COVER",
+              "name": "Extra Cover",
+              "max_extra_cover": 300
+            }
+          }
+        }, {
+          "code": "AUS_SERVICE_OPTION_SIGNATURE_ON_DELIVERY",
+          "name": "Signature on Delivery",
+          "suboptions": {
+            "option": {
+              "code": "AUS_SERVICE_OPTION_EXTRA_COVER",
+              "name": "Extra Cover",
+              "max_extra_cover": 5000
+            }
+          }
+        }]
+      }
+    }, {
+      "code": "AUS_PARCEL_EXPRESS_SATCHEL_500G",
+      "name": "Express Post Small Satchel",
+      "price": "10.55",
+      "max_extra_cover": 300,
+      "options": {
+        "option": [{
+          "code": "AUS_SERVICE_OPTION_STANDARD",
+          "name": "Standard Service",
+          "suboptions": {
+            "option": {
+              "code": "AUS_SERVICE_OPTION_EXTRA_COVER",
+              "name": "Extra Cover",
+              "max_extra_cover": 300
+            }
+          }
+        }, {
+          "code": "AUS_SERVICE_OPTION_SIGNATURE_ON_DELIVERY",
+          "name": "Signature on Delivery",
+          "suboptions": {
+            "option": {
+              "code": "AUS_SERVICE_OPTION_EXTRA_COVER",
+              "name": "Extra Cover",
+              "max_extra_cover": 5000
+            }
+          }
+        }]
+      }
+    }, {
+      "code": "AUS_PARCEL_REGULAR",
+      "name": "Parcel Post",
+      "price": "7.45",
+      "max_extra_cover": 300,
+      "options": {
+        "option": [{
+          "code": "AUS_SERVICE_OPTION_STANDARD",
+          "name": "Standard Service",
+          "suboptions": {
+            "option": {
+              "code": "AUS_SERVICE_OPTION_EXTRA_COVER",
+              "name": "Extra Cover",
+              "max_extra_cover": 300
+            }
+          }
+        }, {
+          "code": "AUS_SERVICE_OPTION_SIGNATURE_ON_DELIVERY",
+          "name": "Signature on Delivery",
+          "suboptions": {
+            "option": {
+              "code": "AUS_SERVICE_OPTION_EXTRA_COVER",
+              "name": "Extra Cover",
+              "max_extra_cover": 5000
+            }
+          }
+        }]
+      }
+    }, {
+      "code": "AUS_PARCEL_REGULAR_SATCHEL_500G",
+      "name": "Parcel Post Small Satchel",
+      "price": "8.25",
+      "max_extra_cover": 300,
+      "options": {
+        "option": [{
+          "code": "AUS_SERVICE_OPTION_STANDARD",
+          "name": "Standard Service",
+          "suboptions": {
+            "option": {
+              "code": "AUS_SERVICE_OPTION_EXTRA_COVER",
+              "name": "Extra Cover",
+              "max_extra_cover": 300
+            }
+          }
+        }, {
+          "code": "AUS_SERVICE_OPTION_SIGNATURE_ON_DELIVERY",
+          "name": "Signature on Delivery",
+          "suboptions": {
+            "option": {
+              "code": "AUS_SERVICE_OPTION_EXTRA_COVER",
+              "name": "Extra Cover",
+              "max_extra_cover": 5000
+            }
+          }
+        }]
+      }
+    }]
+  }
+}

data/test/fixtures/json/australia_post/service_international.json

@@ -0,0 +1,76 @@
+{
+  "services": {
+    "service": [{
+      "code": "INT_PARCEL_COR_OWN_PACKAGING",
+      "name": "Courier",
+      "price": "154.17",
+      "max_extra_cover": 5000,
+      "options": {
+        "option": [{
+          "code": "INT_TRACKING",
+          "name": "Tracking"
+        }, {
+          "code": "INT_SMS_TRACK_ADVICE",
+          "name": "SMS track advice"
+        }, {
+          "code": "INT_EXTRA_COVER",
+          "name": "Extra Cover"
+        }]
+      }
+    }, {
+      "code": "INT_PARCEL_EXP_OWN_PACKAGING",
+      "name": "Express",
+      "price": "89.17",
+      "max_extra_cover": 5000,
+      "options": {
+        "option": [{
+          "code": "INT_TRACKING",
+          "name": "Tracking"
+        }, {
+          "code": "INT_SIGNATURE_ON_DELIVERY",
+          "name": "Signature on delivery"
+        }, {
+          "code": "INT_SMS_TRACK_ADVICE",
+          "name": "SMS track advice"
+        }, {
+          "code": "INT_EXTRA_COVER",
+          "name": "Extra Cover"
+        }]
+      }
+    }, {
+      "code": "INT_PARCEL_STD_OWN_PACKAGING",
+      "name": "Standard",
+      "price": "84.17",
+      "max_extra_cover": 5000,
+      "options": {
+        "option": [{
+          "code": "INT_TRACKING",
+          "name": "Tracking"
+        }, {
+          "code": "INT_EXTRA_COVER",
+          "name": "Extra Cover"
+        }, {
+          "code": "INT_SIGNATURE_ON_DELIVERY",
+          "name": "Signature on delivery"
+        }, {
+          "code": "INT_SMS_TRACK_ADVICE",
+          "name": "SMS track advice"
+        }]
+      }
+    }, {
+      "code": "INT_PARCEL_SEA_OWN_PACKAGING",
+      "name": "Economy Sea",
+      "price": "46.80",
+      "max_extra_cover": 5000,
+      "options": {
+        "option": [{
+          "code": "INT_EXTRA_COVER",
+          "name": "Extra Cover"
+        }, {
+          "code": "INT_SIGNATURE_ON_DELIVERY",
+          "name": "Signature on delivery"
+        }]
+      }
+    }]
+  }
+}

data/test/fixtures/json/australia_post/service_international_2.json

@@ -0,0 +1,59 @@
+{
+  "services": {
+    "service": [{
+      "code": "INT_PARCEL_EXP_OWN_PACKAGING",
+      "name": "Express",
+      "price": "82.87",
+      "max_extra_cover": 5000,
+      "options": {
+        "option": [{
+          "code": "INT_TRACKING",
+          "name": "Tracking"
+        }, {
+          "code": "INT_SIGNATURE_ON_DELIVERY",
+          "name": "Signature on delivery"
+        }, {
+          "code": "INT_SMS_TRACK_ADVICE",
+          "name": "SMS track advice"
+        }, {
+          "code": "INT_EXTRA_COVER",
+          "name": "Extra Cover"
+        }]
+      }
+    }, {
+      "code": "INT_PARCEL_STD_OWN_PACKAGING",
+      "name": "Standard",
+      "price": "71.20",
+      "max_extra_cover": 5000,
+      "options": {
+        "option": [{
+          "code": "INT_TRACKING",
+          "name": "Tracking"
+        }, {
+          "code": "INT_EXTRA_COVER",
+          "name": "Extra Cover"
+        }, {
+          "code": "INT_SIGNATURE_ON_DELIVERY",
+          "name": "Signature on delivery"
+        }, {
+          "code": "INT_SMS_TRACK_ADVICE",
+          "name": "SMS track advice"
+        }]
+      }
+    }, {
+      "code": "INT_PARCEL_SEA_OWN_PACKAGING",
+      "name": "Economy Sea",
+      "price": "41.54",
+      "max_extra_cover": 5000,
+      "options": {
+        "option": [{
+          "code": "INT_EXTRA_COVER",
+          "name": "Extra Cover"
+        }, {
+          "code": "INT_SIGNATURE_ON_DELIVERY",
+          "name": "Signature on delivery"
+        }]
+      }
+    }]
+  }
+}

data/test/remote/australia_post_test.rb

@@ -0,0 +1,140 @@
+require 'test_helper'
+
+class RemoteAustraliaPostTest < Minitest::Test
+  include ActiveShipping::Test::Credentials
+  include ActiveShipping::Test::Fixtures
+
+  def setup
+    @carrier    = AustraliaPost.new(credentials(:australia_post))
+    @sydney     = location_fixtures[:sydney]
+    @melbourne  = location_fixtures[:melbourne]
+    @ottawa     = location_fixtures[:ottawa]
+  rescue NoCredentialsFound => e
+    skip(e.message)
+  end
+
+  def test_valid_credentials
+    assert @carrier.valid_credentials?
+  end
+
+  def test_service_domestic_simple_request
+    response = @carrier.find_rates(@sydney, @melbourne, package_fixtures[:wii])
+
+    assert response.is_a?(RateResponse)
+    assert response.success?
+    assert response.rates.any?
+    assert response.rates.first.is_a?(RateEstimate)
+    assert_equal 1, response.params["responses"].size
+    assert_equal 1, response.request.size
+  end
+
+  def test_service_domestic_combined_request
+    response = @carrier.find_rates(@sydney, @melbourne, package_fixtures.values_at(:book, :small_half_pound))
+
+    assert response.is_a?(RateResponse)
+    assert response.success?
+    assert response.rates.any?
+    assert response.rates.first.is_a?(RateEstimate)
+    assert_equal 2, response.params["responses"].size
+    assert_equal 2, response.request.size
+  end
+
+  def test_service_international_simple_request
+    response = @carrier.find_rates(@sydney, @ottawa, package_fixtures[:wii])
+
+    assert response.is_a?(RateResponse)
+    assert response.success?
+    assert response.rates.any?
+    assert response.rates.first.is_a?(RateEstimate)
+    assert_equal 1, response.params["responses"].size
+    assert_equal 1, response.request.size
+  end
+
+  def test_service_domestic_combined_request
+    response = @carrier.find_rates(@sydney, @ottawa, package_fixtures.values_at(:book, :small_half_pound))
+
+    assert response.is_a?(RateResponse)
+    assert response.success?
+    assert response.rates.any?
+    assert response.rates.first.is_a?(RateEstimate)
+    assert_equal 2, response.params["responses"].size
+    assert_equal 2, response.request.size
+  end
+
+  def test_service_domestic_response_error
+    error = assert_raises(ActiveShipping::ResponseError) do
+      @carrier.find_rates(@sydney, @melbourne, package_fixtures[:largest_gold_bar])
+    end
+
+    assert_equal 'The maximum weight of a parcel is 22 kg.', error.message
+  end
+
+  def test_service_international_response_error
+    error = assert_raises(ActiveShipping::ResponseError) do
+      @carrier.find_rates(@sydney, @ottawa, package_fixtures[:largest_gold_bar])
+    end
+
+    assert_equal 'The maximum weight of a parcel is 20 kg.', error.message
+  end
+
+  def test_calculate_domestic_simple_request
+    response = @carrier.calculate_rates(@sydney, @melbourne, package_fixtures[:wii], 'AUS_PARCEL_EXPRESS')
+
+    assert response.is_a?(RateResponse)
+    assert response.success?
+    assert response.rates.any?
+    assert response.rates.first.is_a?(RateEstimate)
+    assert_equal 1, response.params["responses"].size
+    assert_equal 1, response.request.size
+  end
+
+  def test_calculate_domestic_combined_request
+    response = @carrier.calculate_rates(@sydney, @melbourne, package_fixtures.values_at(:book, :small_half_pound), 'AUS_PARCEL_EXPRESS')
+
+    assert response.is_a?(RateResponse)
+    assert response.success?
+    assert response.rates.any?
+    assert response.rates.first.is_a?(RateEstimate)
+    assert_equal 2, response.params["responses"].size
+    assert_equal 2, response.request.size
+  end
+
+  def test_calculate_international_simple_request
+    response = @carrier.calculate_rates(@sydney, @ottawa, package_fixtures[:wii], 'INT_PARCEL_COR_OWN_PACKAGING')
+
+    assert response.is_a?(RateResponse)
+    assert response.success?
+    assert response.rates.any?
+    assert response.rates.first.is_a?(RateEstimate)
+    assert_equal 1, response.params["responses"].size
+    assert_equal 1, response.request.size
+  end
+
+  def test_calculate_domestic_combined_request
+    response = @carrier.calculate_rates(@sydney, @ottawa, package_fixtures.values_at(:book, :small_half_pound), 'INT_PARCEL_COR_OWN_PACKAGING')
+
+    assert response.is_a?(RateResponse)
+    assert response.success?
+    assert response.rates.any?
+    assert response.rates.first.is_a?(RateEstimate)
+    assert_equal 2, response.params["responses"].size
+    assert_equal 2, response.request.size
+  end
+
+  def test_calculate_domestic_response_error
+    error = assert_raises(ActiveShipping::ResponseError) do
+      @carrier.calculate_rates(@sydney, @melbourne, package_fixtures[:wii], 'INT_PARCEL_COR_OWN_PACKAGING')
+    end
+
+    assert_equal 'Please enter a valid Service code.', error.message
+  end
+
+  def test_calculate_international_response_error
+    error = assert_raises(ActiveShipping::ResponseError) do
+      @carrier.calculate_rates(@sydney, @ottawa, package_fixtures[:wii], 'AUS_PARCEL_EXPRESS')
+    end
+
+    assert_equal 'Please enter a valid Service code.', error.message
+  end
+
+end

data/test/test_helper.rb

@@ -245,7 +245,19 @@ module ActiveShipping::Test
                                       :city => 'Groningen',
                                       :address1 => 'Aquamarijnstraat 349',
                                       :postal_code => '9743 PJ',
-                                      :state => 'Groningen')
+                                      :state => 'Groningen'),
+        :sydney => Location.new(
+                                      :country => 'AUS',
+                                      :city => 'Sydney',
+                                      :state => 'NSW',
+                                      :address1 => '192 George Street',
+                                      :postal_code => '2000'),
+        :melbourne => Location.new(
+                                      :country => 'AUS',
+                                      :city => 'Melbourne',
+                                      :state => 'VIC',
+                                      :address1 => '192 George Street',
+                                      :postal_code => '3108')
       }
     end
 

data/test/unit/carriers/australia_post_test.rb

@@ -0,0 +1,181 @@
+require 'test_helper'
+
+class AustraliaPostTest < Minitest::Test
+  include ActiveShipping::Test::Fixtures
+
+  def setup
+    @carrier    = AustraliaPost.new(api_key: '4d9dc0f0-dda0-012e-066f-000c29b44ac0')
+    @sydney     = location_fixtures[:sydney]
+    @melbourne  = location_fixtures[:melbourne]
+    @ottawa     = location_fixtures[:ottawa]
+  end
+
+  def test_service_domestic_simple_request
+    url = 'https://digitalapi.auspost.com.au/postage/parcel/domestic/service.json?from_postcode=2000&height=2&length=19&to_postcode=3108&weight=0.25&width=14'
+    @carrier.expects(:commit).with(url).returns(json_fixture('australia_post/service_domestic'))
+    @carrier.find_rates(@sydney, @melbourne, package_fixtures[:book])
+  end
+
+  def test_service_domestic_combined_request
+    url_1 = 'https://digitalapi.auspost.com.au/postage/parcel/domestic/service.json?from_postcode=2000&height=2&length=19&to_postcode=3108&weight=0.25&width=14'
+    url_2 = 'https://digitalapi.auspost.com.au/postage/parcel/domestic/service.json?from_postcode=2000&height=2.54&length=2.54&to_postcode=3108&weight=0.23&width=2.54'
+    @carrier.expects(:commit).with(url_1).returns(json_fixture('australia_post/service_domestic'))
+    @carrier.expects(:commit).with(url_2).returns(json_fixture('australia_post/service_domestic_2'))
+    @carrier.find_rates(@sydney, @melbourne, package_fixtures.values_at(:book, :small_half_pound))
+  end
+
+  def test_service_domestic_simple_response
+    @carrier.expects(:commit).returns(json_fixture('australia_post/service_domestic'))
+    response = @carrier.find_rates(@sydney, @melbourne, package_fixtures[:book])
+    prices = [2855, 1480, 1615, 1340]
+    assert_equal prices, response.rates.map(&:price)
+    service_codes = ['AUS_PARCEL_EXPRESS', 'AUS_PARCEL_EXPRESS_SATCHEL_3KG', 'AUS_PARCEL_REGULAR', 'AUS_PARCEL_REGULAR_SATCHEL_3KG']
+    assert_equal service_codes, response.rates.map(&:service_code)
+    service_names = ['Express Post', 'Express Post Medium (3Kg) Satchel', 'Parcel Post', 'Parcel Post Medium Satchel']
+    assert_equal service_names, response.rates.map(&:service_name)
+  end
+
+  def test_service_domestic_combined_response
+    @carrier.expects(:commit).returns(json_fixture('australia_post/service_domestic'))
+    @carrier.expects(:commit).returns(json_fixture('australia_post/service_domestic_2'))
+    response = @carrier.find_rates(@sydney, @melbourne, package_fixtures.values_at(:book, :small_half_pound))
+    prices = [3875, 2360]
+    assert_equal prices, response.rates.map(&:price)
+    service_codes = ['AUS_PARCEL_EXPRESS', 'AUS_PARCEL_REGULAR']
+    assert_equal service_codes, response.rates.map(&:service_code)
+    service_names = ['Express Post', 'Parcel Post']
+    assert_equal service_names, response.rates.map(&:service_name)
+  end
+
+  def test_service_international_simple_request
+    url = 'https://digitalapi.auspost.com.au/postage/parcel/international/service.json?country_code=CA&weight=0.25'
+    @carrier.expects(:commit).with(url).returns(json_fixture('australia_post/service_international'))
+    @carrier.find_rates(@sydney, @ottawa, package_fixtures[:book])
+  end
+
+  def test_service_international_combined_request
+    url_1 = 'https://digitalapi.auspost.com.au/postage/parcel/international/service.json?country_code=CA&weight=0.25'
+    url_2 = 'https://digitalapi.auspost.com.au/postage/parcel/international/service.json?country_code=CA&weight=0.23'
+    @carrier.expects(:commit).with(url_1).returns(json_fixture('australia_post/service_international'))
+    @carrier.expects(:commit).with(url_2).returns(json_fixture('australia_post/service_international_2'))
+    @carrier.find_rates(@sydney, @ottawa, package_fixtures.values_at(:book, :small_half_pound))
+  end
+
+  def test_service_international_simple_response
+    @carrier.expects(:commit).returns(json_fixture('australia_post/service_international'))
+    response = @carrier.find_rates(@sydney, @ottawa, package_fixtures[:book])
+    prices = [15417, 8917, 8417, 4680]
+    assert_equal prices, response.rates.map(&:price)
+    service_codes = ['INT_PARCEL_COR_OWN_PACKAGING', 'INT_PARCEL_EXP_OWN_PACKAGING', 'INT_PARCEL_STD_OWN_PACKAGING', 'INT_PARCEL_SEA_OWN_PACKAGING']
+    assert_equal service_codes, response.rates.map(&:service_code)
+    service_names = ['Courier', 'Express', 'Standard', 'Economy Sea']
+    assert_equal service_names, response.rates.map(&:service_name)
+  end
+
+  def test_service_international_combined_response
+    @carrier.expects(:commit).returns(json_fixture('australia_post/service_international'))
+    @carrier.expects(:commit).returns(json_fixture('australia_post/service_international_2'))
+    response = @carrier.find_rates(@sydney, @melbourne, package_fixtures.values_at(:book, :small_half_pound))
+    prices = [17204, 15537, 8834]
+    assert_equal prices, response.rates.map(&:price)
+    service_codes = ['INT_PARCEL_EXP_OWN_PACKAGING', 'INT_PARCEL_STD_OWN_PACKAGING', 'INT_PARCEL_SEA_OWN_PACKAGING']
+    assert_equal service_codes, response.rates.map(&:service_code)
+    service_names = ['Express', 'Standard', 'Economy Sea']
+    assert_equal service_names, response.rates.map(&:service_name)
+  end
+
+  def test_service_response_error
+    error = assert_raises(ActiveShipping::ResponseError) do
+      raise_error = ActiveShipping::ResponseError.new
+      raise_error.expects(:response).returns(OpenStruct.new(body: json_fixture('australia_post/error_message')))
+      @carrier.expects(:ssl_get).raises raise_error
+      @carrier.find_rates(@sydney, @melbourne, package_fixtures[:book])
+    end
+    assert_equal 'Please enter From postcode.', error.response.message
+  end
+
+  def test_calculate_domestic_simple_request
+    url = 'https://digitalapi.auspost.com.au/postage/parcel/domestic/calculate.json?from_postcode=2000&height=2&length=19&service_code=AUS_PARCEL_EXPRESS&to_postcode=3108&weight=0.25&width=14'
+    @carrier.expects(:commit).with(url).returns(json_fixture('australia_post/calculate_domestic'))
+    @carrier.calculate_rates(@sydney, @melbourne, package_fixtures[:book], 'AUS_PARCEL_EXPRESS')
+  end
+
+  def test_calculate_domestic_combined_request
+    url_1 = 'https://digitalapi.auspost.com.au/postage/parcel/domestic/calculate.json?from_postcode=2000&height=2&length=19&service_code=AUS_PARCEL_EXPRESS&to_postcode=3108&weight=0.25&width=14'
+    url_2 = 'https://digitalapi.auspost.com.au/postage/parcel/domestic/calculate.json?from_postcode=2000&height=2.54&length=2.54&service_code=AUS_PARCEL_EXPRESS&to_postcode=3108&weight=0.23&width=2.54'
+    @carrier.expects(:commit).with(url_1).returns(json_fixture('australia_post/calculate_domestic'))
+    @carrier.expects(:commit).with(url_2).returns(json_fixture('australia_post/calculate_domestic_2'))
+    @carrier.calculate_rates(@sydney, @melbourne, package_fixtures.values_at(:book, :small_half_pound), 'AUS_PARCEL_EXPRESS')
+  end
+
+  def test_calculate_domestic_simple_response
+    @carrier.expects(:commit).returns(json_fixture('australia_post/calculate_domestic'))
+    response = @carrier.calculate_rates(@sydney, @melbourne, package_fixtures[:book], 'AUS_PARCEL_EXPRESS')
+    prices = [1020]
+    assert_equal prices, response.rates.map(&:price)
+    service_codes = ['AUS_PARCEL_EXPRESS']
+    assert_equal service_codes, response.rates.map(&:service_code)
+    service_names = ['Express Post']
+    assert_equal service_names, response.rates.map(&:service_name)
+  end
+
+  def test_calculate_domestic_combined_response
+    @carrier.expects(:commit).returns(json_fixture('australia_post/calculate_domestic'))
+    @carrier.expects(:commit).returns(json_fixture('australia_post/calculate_domestic_2'))
+    response = @carrier.calculate_rates(@sydney, @melbourne, package_fixtures.values_at(:book, :small_half_pound), 'AUS_PARCEL_EXPRESS')
+    prices = [2490]
+    assert_equal prices, response.rates.map(&:price)
+    service_codes = ['AUS_PARCEL_EXPRESS']
+    assert_equal service_codes, response.rates.map(&:service_code)
+    service_names = ['Express Post']
+    assert_equal service_names, response.rates.map(&:service_name)
+  end
+
+  def test_calculate_international_simple_request
+    url = 'https://digitalapi.auspost.com.au/postage/parcel/international/calculate.json?country_code=CA&service_code=INT_PARCEL_COR_OWN_PACKAGING&weight=0.25'
+    @carrier.expects(:commit).with(url).returns(json_fixture('australia_post/calculate_international'))
+    @carrier.calculate_rates(@sydney, @ottawa, package_fixtures[:book], 'INT_PARCEL_COR_OWN_PACKAGING')
+  end
+
+  def test_calculate_international_combined_request
+    url_1 = 'https://digitalapi.auspost.com.au/postage/parcel/international/calculate.json?country_code=CA&service_code=INT_PARCEL_COR_OWN_PACKAGING&weight=0.25'
+    url_2 = 'https://digitalapi.auspost.com.au/postage/parcel/international/calculate.json?country_code=CA&service_code=INT_PARCEL_COR_OWN_PACKAGING&weight=0.23'
+    @carrier.expects(:commit).with(url_1).returns(json_fixture('australia_post/calculate_international'))
+    @carrier.expects(:commit).with(url_2).returns(json_fixture('australia_post/calculate_international_2'))
+    @carrier.calculate_rates(@sydney, @ottawa, package_fixtures.values_at(:book, :small_half_pound), 'INT_PARCEL_COR_OWN_PACKAGING')
+  end
+
+  def test_calculate_international_simple_response
+    @carrier.expects(:commit).returns(json_fixture('australia_post/calculate_international'))
+    response = @carrier.calculate_rates(@sydney, @ottawa, package_fixtures[:book], 'INT_PARCEL_COR_OWN_PACKAGING')
+    prices = [8736]
+    assert_equal prices, response.rates.map(&:price)
+    service_codes = ['INT_PARCEL_COR_OWN_PACKAGING']
+    assert_equal service_codes, response.rates.map(&:service_code)
+    service_names = ['Courier']
+    assert_equal service_names, response.rates.map(&:service_name)
+  end
+
+  def test_calculate_international_combined_response
+    @carrier.expects(:commit).returns(json_fixture('australia_post/calculate_international'))
+    @carrier.expects(:commit).returns(json_fixture('australia_post/calculate_international_2'))
+    response = @carrier.calculate_rates(@sydney, @melbourne, package_fixtures.values_at(:book, :small_half_pound), 'INT_PARCEL_COR_OWN_PACKAGING')
+    prices = [17472]
+    assert_equal prices, response.rates.map(&:price)
+    service_codes = ['INT_PARCEL_COR_OWN_PACKAGING']
+    assert_equal service_codes, response.rates.map(&:service_code)
+    service_names = ['Courier']
+    assert_equal service_names, response.rates.map(&:service_name)
+  end
+
+  def test_calculate_response_error
+    error = assert_raises(ActiveShipping::ResponseError) do
+      raise_error = ActiveShipping::ResponseError.new
+      raise_error.expects(:response).returns(OpenStruct.new(body: json_fixture('australia_post/error_message')))
+      @carrier.expects(:ssl_get).raises raise_error
+      @carrier.calculate_rates(@sydney, @melbourne, package_fixtures[:book], 'AUS_PARCEL_EXPRESS')
+    end
+    assert_equal 'Please enter From postcode.', error.response.message
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - James MacAulay
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantified
@@ -185,6 +185,7 @@ files:
 - lib/active_shipping.rb
 - lib/active_shipping/carrier.rb
 - lib/active_shipping/carriers.rb
+- lib/active_shipping/carriers/australia_post.rb
 - lib/active_shipping/carriers/benchmark_carrier.rb
 - lib/active_shipping/carriers/bogus_carrier.rb
 - lib/active_shipping/carriers/canada_post.rb
@@ -222,6 +223,15 @@ files:
 - test/credentials.yml
 - test/fixtures/files/label1.pdf
 - test/fixtures/files/ups-shipping-label.gif
+- test/fixtures/json/australia_post/calculate_domestic.json
+- test/fixtures/json/australia_post/calculate_domestic_2.json
+- test/fixtures/json/australia_post/calculate_international.json
+- test/fixtures/json/australia_post/calculate_international_2.json
+- test/fixtures/json/australia_post/error_message.json
+- test/fixtures/json/australia_post/service_domestic.json
+- test/fixtures/json/australia_post/service_domestic_2.json
+- test/fixtures/json/australia_post/service_international.json
+- test/fixtures/json/australia_post/service_international_2.json
 - test/fixtures/json/newzealandpost/domestic_book.json
 - test/fixtures/json/newzealandpost/domestic_default.json
 - test/fixtures/json/newzealandpost/domestic_error.json
@@ -364,6 +374,7 @@ files:
 - test/fixtures/xml/usps/world_rate_request_without_value.xml
 - test/fixtures/xml/usps_returns/external_return_label_response.xml
 - test/fixtures/xml/usps_returns/external_return_label_response_failure.xml
+- test/remote/australia_post_test.rb
 - test/remote/canada_post_pws_platform_test.rb
 - test/remote/canada_post_pws_test.rb
 - test/remote/canada_post_test.rb
@@ -378,6 +389,7 @@ files:
 - test/remote/usps_returns_test.rb
 - test/remote/usps_test.rb
 - test/test_helper.rb
+- test/unit/carriers/australia_post_test.rb
 - test/unit/carriers/benchmark_test.rb
 - test/unit/carriers/canada_post_pws_rating_test.rb
 - test/unit/carriers/canada_post_pws_register_test.rb
@@ -431,6 +443,15 @@ test_files:
 - test/credentials.yml
 - test/fixtures/files/label1.pdf
 - test/fixtures/files/ups-shipping-label.gif
+- test/fixtures/json/australia_post/calculate_domestic.json
+- test/fixtures/json/australia_post/calculate_domestic_2.json
+- test/fixtures/json/australia_post/calculate_international.json
+- test/fixtures/json/australia_post/calculate_international_2.json
+- test/fixtures/json/australia_post/error_message.json
+- test/fixtures/json/australia_post/service_domestic.json
+- test/fixtures/json/australia_post/service_domestic_2.json
+- test/fixtures/json/australia_post/service_international.json
+- test/fixtures/json/australia_post/service_international_2.json
 - test/fixtures/json/newzealandpost/domestic_book.json
 - test/fixtures/json/newzealandpost/domestic_default.json
 - test/fixtures/json/newzealandpost/domestic_error.json
@@ -573,6 +594,7 @@ test_files:
 - test/fixtures/xml/usps/world_rate_request_without_value.xml
 - test/fixtures/xml/usps_returns/external_return_label_response.xml
 - test/fixtures/xml/usps_returns/external_return_label_response_failure.xml
+- test/remote/australia_post_test.rb
 - test/remote/canada_post_pws_platform_test.rb
 - test/remote/canada_post_pws_test.rb
 - test/remote/canada_post_test.rb
@@ -587,6 +609,7 @@ test_files:
 - test/remote/usps_returns_test.rb
 - test/remote/usps_test.rb
 - test/test_helper.rb
+- test/unit/carriers/australia_post_test.rb
 - test/unit/carriers/benchmark_test.rb
 - test/unit/carriers/canada_post_pws_rating_test.rb
 - test/unit/carriers/canada_post_pws_register_test.rb