active_shipping 0.10.0 → 0.10.1

data/CHANGELOG

@@ -1,3 +1,11 @@
+### v0.10.1
+ - Canada Post PWS: Makes wrapper act more consistently with the rest of the API [jnormore]
+ - UPS: Adds insurance charge to package object declarations [pbonnell]
+ - USPS: Improves how unavailable delivery information is handled [cyu]
+ - Shipment Packer: Prevents packing errors and consistently return an array when packing [christianblais]
+ - General: Improves tests such that they work with ruby 2.0 [Sirupsen]
+
+
 2011/04/21:
 * USPS updated to use new APIs [james]
 * new :gift boolean option for Package [james]

data/README.markdown

@@ -122,6 +122,16 @@ After you've pushed your well-tested changes to your github fork, make a pull re
 * Cody Fauser (<http://codyfauser.com>)
 * Jimmy Baker (<http://jimmyville.com/>)
 * William Lang (<http://williamlang.net/>)
+* Cameron Fowler
+* Christopher Saunders (<http://christophersaunders.ca>)
+* Denis Odorcic
+* Dennis O'Connor
+* Dennis Theisen
+* Edward Ocampo-Gooding
+* Isaac Kearse
+* John Duff
+* Nigel Ramsay
+* Philip Arndt
 
 ## Legal Mumbo Jumbo
 

data/lib/active_shipping.rb

@@ -49,3 +49,4 @@ require 'active_shipping/shipping/shipment_event'
 require 'active_shipping/shipping/shipment_packer'
 require 'active_shipping/shipping/carrier'
 require 'active_shipping/shipping/carriers'
+require 'active_shipping/shipping/errors'

data/lib/active_shipping/shipping/carriers/canada_post_pws.rb

@@ -237,6 +237,7 @@ module ActiveMerchant
       # rating
 
       def build_rates_request(origin, destination, line_items = [], options = {}, package = nil, services = [])
+        line_items = Array(line_items)
         xml =  XmlNode.new('mailing-scenario', :xmlns => "http://www.canadapost.ca/ws/ship/rate") do |node|
           node << customer_number_node(options)
           node << contract_id_node(options)
@@ -329,9 +330,9 @@ module ActiveMerchant
       # :show_postage_rate
       # :cod, :cod_amount, :insurance, :insurance_amount, :signature_required, :pa18, :pa19, :hfp, :dns, :lad
       # 
-      def build_shipment_request(origin_hash, destination_hash, package, line_items = [], options = {})
-        origin = Location.new(sanitize_zip(origin_hash))
-        destination = Location.new(sanitize_zip(destination_hash))
+      def build_shipment_request(origin, destination, package, line_items = [], options = {})
+        origin = sanitize_location(origin)
+        destination = sanitize_location(destination)
 
         xml = XmlNode.new('non-contract-shipment', :xmlns => "http://www.canadapost.ca/ws/ncshipment") do |root_node|
           root_node << XmlNode.new('delivery-spec') do |node|
@@ -652,13 +653,13 @@ module ActiveMerchant
         end
       end
 
-      def origin_node(location_hash)
-        origin = Location.new(sanitize_zip(location_hash))
+      def origin_node(location)
+        origin = sanitize_location(location)
         XmlNode.new("origin-postal-code", origin.zip)
       end
 
-      def destination_node(location_hash)
-        destination = Location.new(sanitize_zip(location_hash))
+      def destination_node(location)
+        destination = sanitize_location(location)
         case destination.country_code
           when 'CA'
             XmlNode.new('destination') do |node|
@@ -739,6 +740,12 @@ module ActiveMerchant
         DateTime.strptime((options[:shipping_date] || Time.now).to_s, "%Y-%m-%d")
       end
 
+      def sanitize_location(location)
+        location_hash = location.is_a?(Location) ? location.to_hash : location
+        location_hash = sanitize_zip(location_hash)
+        Location.new(location_hash)
+      end
+
       def sanitize_zip(hash)
         [:postal_code, :zip].each do |attr|
           hash[attr].gsub!(/\s+/,'') if hash[attr]

data/lib/active_shipping/shipping/carriers/fedex.rb

@@ -265,7 +265,7 @@ module ActiveMerchant
         rate_estimates = []
         success, message = nil
         
-        xml = REXML::Document.new(response)
+        xml = build_document(response)
         root_node = xml.elements['RateReply']
         
         success = response_success?(xml)
@@ -330,7 +330,7 @@ module ActiveMerchant
       end
 
       def parse_tracking_response(response, options)
-        xml = REXML::Document.new(response)
+        xml = build_document(response)
         root_node = xml.elements['TrackReply']
         
         success = response_success?(xml)
@@ -462,6 +462,12 @@ module ActiveMerchant
 
         Location.new(args)
       end
+
+      def build_document(xml)
+        REXML::Document.new(xml)
+      rescue REXML::ParseException => e
+        raise ActiveMerchant::Shipping::ResponseContentError.new(e, xml)
+      end
     end
   end
 end

data/lib/active_shipping/shipping/carriers/ups.rb

@@ -208,6 +208,9 @@ module ActiveMerchant
                   package_weight << XmlNode.new("UnitOfMeasurement") do |units|
                     units << XmlNode.new("Code", imperial ? 'LBS' : 'KGS')
                   end
+                if package.value.present? && package.currency.present?
+                  add_insured_node( package_node, currency:package.currency, value:(package.value.to_i/100) )
+                end
 
                   value = ((imperial ? package.lbs : package.kgs).to_f*1000).round/1000.0 # 3 decimals
                   package_weight << XmlNode.new("Weight", [value,0.1].max)
@@ -273,6 +276,21 @@ module ActiveMerchant
         end
       end
 
+      def add_insured_node(*args)
+        params, package_node = args.extract_options!, args[0]
+        currency, value = params[:currency], params[:value].to_i
+        package_node << XmlNode.new("PackageServiceOptions") do |package_service_options|
+          package_service_options << XmlNode.new("DeclaredValue") do |declared_value|
+            declared_value << XmlNode.new("CurrencyCode", currency)
+            declared_value << XmlNode.new("MonetaryValue", (value.to_i))
+          end
+          package_service_options << XmlNode.new("InsuredValue") do |declared_value|
+            declared_value << XmlNode.new("CurrencyCode", currency)
+            declared_value << XmlNode.new("MonetaryValue", (value.to_i))
+          end
+        end
+      end
+
       def parse_rate_response(origin, destination, packages, response, options={})
         rates = []
 
@@ -287,10 +305,10 @@ module ActiveMerchant
             service_code = rated_shipment.get_text('Service/Code').to_s
             days_to_delivery = rated_shipment.get_text('GuaranteedDaysToDelivery').to_s.to_i
             days_to_delivery = nil if days_to_delivery == 0
-
             rate_estimates << RateEstimate.new(origin, destination, @@name,
                                 service_name_for(origin, service_code),
                                 :total_price => rated_shipment.get_text('TotalCharges/MonetaryValue').to_s.to_f,
+                                :insurance_price => rated_shipment.get_text('ServiceOptionsCharges/MonetaryValue').to_s.to_f,
                                 :currency => rated_shipment.get_text('TotalCharges/CurrencyCode').to_s,
                                 :service_code => service_code,
                                 :packages => packages,

data/lib/active_shipping/shipping/carriers/usps.rb

@@ -125,6 +125,18 @@ module ActiveMerchant
         "WS" => "Western Samoa"
       }
 
+      STATUS_NODE_PATTERNS = %w(
+        */*/TrackSummary
+        Error/Description
+        */TrackInfo/Error/Description
+      )
+
+      RESPONSE_ERROR_MESSAGES = [
+        /There is no record of that mail item/,
+        /This Information has not been included in this Test Server\./,
+        /Delivery status information is not available/
+      ]
+
       def find_tracking_info(tracking_number, options={})
         options = @options.update(options)        
         tracking_request = build_tracking_request(tracking_number, options)
@@ -584,12 +596,16 @@ module ActiveMerchant
       end
             
       def response_status_node(document)
-        document.elements['*/*/TrackSummary'] || document.elements['Error/Description']
+        STATUS_NODE_PATTERNS.each do |pattern|
+          if node = document.elements[pattern]
+            return node
+          end
+        end
       end
       
       def response_success?(document)
         summary = response_status_node(document).get_text.to_s
-        !(summary =~ /There is no record of that mail item/ || summary =~ /This Information has not been included in this Test Server\./)
+        !RESPONSE_ERROR_MESSAGES.detect { |re| summary =~ re }
       end
       
       def response_message(document)

data/lib/active_shipping/shipping/errors.rb

@@ -0,0 +1,9 @@
+module ActiveMerchant
+  module Shipping
+    class ResponseContentError < StandardError
+      def initialize(exception, content_body)
+        super("#{exception.message} \n\n#{content_body}")
+      end
+    end
+  end
+end

data/lib/active_shipping/shipping/rate_estimate.rb

@@ -14,6 +14,7 @@ module ActiveMerchant #:nodoc:
       attr_reader :delivery_date  # Usually only available for express shipments
       attr_reader :delivery_range # Min and max delivery estimate in days
       attr_reader :negotiated_rate
+      attr_reader :insurance_price
 
       def initialize(origin, destination, carrier, service_name, options={})
         @origin, @destination, @carrier, @service_name = origin, destination, carrier, service_name
@@ -29,6 +30,7 @@ module ActiveMerchant #:nodoc:
         @delivery_range = options[:delivery_range] ? options[:delivery_range].map { |date| date_for(date) }.compact : []
         @shipping_date = date_for(options[:shipping_date])
         @delivery_date = @delivery_range.last
+        @insurance_price = Package.cents_from(options[:insurance_price])
       end
 
       def total_price

data/lib/active_shipping/shipping/shipment_packer.rb

@@ -10,8 +10,11 @@ module ActiveMerchant
       # maximum_weight  - maximum weight in grams
       # currency        - ISO currency code
       def self.pack(items, dimensions, maximum_weight, currency)
-        items = items.map(&:symbolize_keys).map { |item| [item] * item[:quantity].to_i }.flatten
         packages = []
+
+        return packages if items.empty?
+
+        items = items.map(&:symbolize_keys).map { |item| [item] * item[:quantity].to_i }.flatten
         state = :package_empty
 
         while state != :packing_finished

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/lib/vendor/quantified/Rakefile

@@ -1,6 +1,5 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -8,14 +7,7 @@ task :default => :test
 desc 'Test the plugin.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
+  t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
-
-desc 'Generate documentation for the calculations plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Quantified'
-  rdoc.options << '--line-numbers --inline-source'
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/vendor/quantified/lib/quantified/attribute.rb

@@ -38,6 +38,10 @@ module Quantified
     def system
       self.class.units_to_systems[unit]
     end
+
+    def coerce(other)
+      [other, self.amount]
+    end
     
     def method_missing(meth, *args)
       if args.size == 1 && self.class == (other = args.first).class

data/lib/vendor/quantified/test/length_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 require 'quantified/length'
 
 class LengthTest < Test::Unit::TestCase
@@ -40,17 +40,15 @@ class LengthTest < Test::Unit::TestCase
   end
   
   def test_convert_yards_to_millimetres
-    assert Length.new(914.4, :millimetres).eql?(Length.new(1, :yards).to_millimetres)
+    assert_in_epsilon Length.new(914.4, :millimetres).to_f, Length.new(1, :yards).to_millimetres.to_f
   end
   
   def test_convert_millimetres_to_yards
-    assert Length.new(1, :yards).eql?(Length.new(914.4, :millimetres).to_yards)
+    assert_in_epsilon Length.new(1, :yards).to_f, Length.new(914.4, :millimetres).to_yards.to_f
   end
   
   def test_convert_metres_to_inches
-    assert_equal 1.inches, (0.0254).metres.to_inches
-    assert 1.inches.eql?((0.0254).metres.to_inches)
-    assert 1.inches.eql?((0.0254).metres.in_inches)
+    assert_in_epsilon 1.inches.to_f, (0.0254).metres.to_inches.to_f
   end
   
   def test_comparison_with_numeric
@@ -89,4 +87,4 @@ class LengthTest < Test::Unit::TestCase
     assert_equal :metric, 2.centimetres.system
     assert_equal :imperial, 2.feet.system
   end
-end
+end

data/lib/vendor/quantified/test/mass_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 require 'quantified/mass'
 
 class MassTest < Test::Unit::TestCase
@@ -85,4 +85,12 @@ class MassTest < Test::Unit::TestCase
     assert_equal [:grams, :milligrams, :kilograms], Mass.units(:metric)
     assert_equal [:ounces, :pounds, :stones, :short_tons], Mass.units(:imperial)
   end
-end
+
+  def test_right_side_comparison_with_fixnum
+    assert Mass.new(14, :grams) < 20
+  end
+
+  def test_left_side_comparison_with_fixnum
+    assert 20 > Mass.new(14, :grams)
+  end
+end

data/lib/vendor/quantified/test/test_helper.rb

@@ -1,4 +1,5 @@
 require 'test/unit'
+
 begin
   require 'active_support/inflector'
 rescue LoadError => e
@@ -8,3 +9,12 @@ rescue LoadError => e
 end
 
 require File.dirname(__FILE__) + '/../lib/quantified'
+
+
+class Test::Unit::TestCase
+  EPSILON = 0.00001
+
+  def assert_in_epsilon(expected, actual, msg = nil)
+    assert_in_delta expected, actual, EPSILON, msg
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: active_shipping
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - James MacAulay
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -94,6 +94,22 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.5.1
     none: false
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  name: minitest
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.7.5
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.7.5
+    none: false
 - !ruby/object:Gem::Dependency
   prerelease: false
   name: rake
@@ -116,15 +132,15 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
     none: false
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -179,6 +195,7 @@ files:
 - lib/active_shipping/shipping/carriers/usps.rb
 - lib/active_shipping/shipping/carriers/usps.rb.orig
 - lib/active_shipping/shipping/carriers.rb
+- lib/active_shipping/shipping/errors.rb
 - lib/active_shipping/shipping/location.rb
 - lib/active_shipping/shipping/package.rb
 - lib/active_shipping/shipping/rate_estimate.rb
@@ -225,7 +242,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -3915278247980377542
+      hash: 4495588430750097686
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement