active_shipping 0.9.5 → 0.9.6

data/CHANGELOG

@@ -1,3 +1,5 @@
+* Include address name for rate requests to Shipwire if provided [dennis]
+* Add support for address name to Location [dennis]
 * Add fix for updated USPS API to strip any encoded html and trailing asterisks from rate names [dennis]
 * Add carrier CanadaPost [william]
 * Update FedEx rates and added ability to auto-generate rate name from code that gets returned by FedEx [dennis]

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

@@ -74,6 +74,7 @@ module ActiveMerchant
 
       def add_address(xml, destination)
         xml.tag! 'AddressInfo', :type => 'Ship' do
+          xml.tag! 'Name', destination.name unless destination.name.blank?
           xml.tag! 'Address1', destination.address1
           xml.tag! 'Address2', destination.address2 unless destination.address2.blank?
           xml.tag! 'Address3', destination.address3 unless destination.address3.blank?

data/lib/active_shipping/shipping/location.rb

@@ -7,6 +7,7 @@ module ActiveMerchant #:nodoc:
                   :postal_code,
                   :province,
                   :city,
+                  :name,
                   :address1,
                   :address2,
                   :address3,
@@ -27,6 +28,7 @@ module ActiveMerchant #:nodoc:
         @postal_code = options[:postal_code] || options[:postal] || options[:zip]
         @province = options[:province] || options[:state] || options[:territory] || options[:region]
         @city = options[:city]
+        @name = options[:name]
         @address1 = options[:address1]
         @address2 = options[:address2]
         @address3 = options[:address3]
@@ -39,6 +41,7 @@ module ActiveMerchant #:nodoc:
       def self.from(object, options={})
         return object if object.is_a? ActiveMerchant::Shipping::Location
         attr_mappings = {
+          :name => [:name],
           :country => [:country_code, :country],
           :postal_code => [:postal_code, :zip, :postal],
           :province => [:province_code, :state_code, :territory_code, :region_code, :province, :state, :territory, :region],
@@ -82,7 +85,7 @@ module ActiveMerchant #:nodoc:
       
       def prettyprint
         chunks = []
-        chunks << [@address1,@address2,@address3].reject {|e| e.blank?}.join("\n")
+        chunks << [@name, @address1,@address2,@address3].reject {|e| e.blank?}.join("\n")
         chunks << [@city,@province,@postal_code].reject {|e| e.blank?}.join(', ')
         chunks << @country
         chunks.reject {|e| e.blank?}.join("\n")

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_shipping
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - James MacAulay
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 +01:00
+date: 2011-01-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency