fedex 3.3.0 → 3.3.1

data/Readme.md

@@ -68,10 +68,10 @@ packages << {
 ```
 
 By default packaging type is "YOUR PACKAGING" and the drop off type is "REGULAR PICKUP".
-If you need something different you can pass an extra hash for shipping details
+If you need something different you can pass an extra hash for shipping options
 
 ```ruby
-shipping_details = {
+shipping_options = {
   :packaging_type => "YOUR_PACKAGING",
   :drop_off_type => "REGULAR_PICKUP"
 }
@@ -98,7 +98,7 @@ rate = fedex.rate(:shipper=>shipper,
                   :recipient => recipient,
                   :packages => packages,
                   :service_type => "FEDEX_GROUND",
-                  :shipping_details => shipping_details)
+                  :shipping_options => shipping_options)
 ```
 
 Fedex provides multiple total values; `total_net_charge` is the final amount you are looking for.
@@ -123,7 +123,7 @@ ship = fedex.ship(:shipper=>shipper,
                   :recipient => recipient,
                   :packages => packages,
                   :service_type => "FEDEX_GROUND",
-                  :shipping_details => shipping_details)
+                  :shipping_options => shipping_options)
 puts ship[:completed_shipment_detail][:operational_detail] [:transit_time]
 ```
 Above code will give you the transit time.
@@ -138,7 +138,7 @@ label = fedex.label(:filename => "my_dir/example.pdf",
                     :recipient => recipient,
                     :packages => packages,
                     :service_type => "FEDEX_GROUND",
-                    :shipping_details => shipping_details)
+                    :shipping_options => shipping_options)
 ```
 
 ### ** Generate a shipping label in any available format **
@@ -156,7 +156,7 @@ label = fedex.label(:filename => "my_dir/example_epl2.pcx",
                     :recipient => recipient,
                     :packages => packages,
                     :service_type => "FEDEX_GROUND",
-                    :shipping_details => shipping_details,
+                    :shipping_options => shipping_options,
                     :label_specification => example_spec)
 ```
 ### ** Storing a label on Amazon S3 with Paperclip **
@@ -169,7 +169,7 @@ label = fedex.label(:filename => "tmp/example_label.pdf",
                     :recipient => recipient,
                     :packages => packages,
                     :service_type => "FEDEX_GROUND",
-                    :shipping_details => shipping_details,
+                    :shipping_options => shipping_options,
                     :label_specification => example_spec)
 ```
 
@@ -240,16 +240,18 @@ Fedex::Shipment::DROP_OFF_TYPES
 ````
 
 # Contributors:
-- [jazminschroeder](http://github.com/jazminschroeder) (Jazmin Schroeder)
-- [parndt](https://github.com/parndt) (Philip Arndt)
-- [mmell](https://github.com/mmell) (Michael Mell)
-- [jordanbyron](https://github.com/jordanbyron) (Jordan Byron)
-- [geermc4](https://github.com/geermc4) (German Garcia)
+- [jazminschroeder] (http://github.com/jazminschroeder) (Jazmin Schroeder)
+- [parndt] (https://github.com/parndt) (Philip Arndt)
+- [mmell] (https://github.com/mmell) (Michael Mell)
+- [jordanbyron] (https://github.com/jordanbyron) (Jordan Byron)
+- [geermc4] (https://github.com/geermc4) (German Garcia)
 - [janders223] (https://github.com/janders223) (Jim Anders)
 - [jlambert121] (https://github.com/jlambert121) (Justin Lambert)
 - [sborsje] (https://github.com/sborsje) (Stefan Borsje)
 - [bradediger] (https://github.com/bradediger) (Brad Ediger)
 - [yevgenko] (https://github.com/yevgenko) (Yevgeniy Viktorov)
+- [smartacus] (https://github.com/smartacus) (Michael Lippold)
+- [jonathandean] (https://github.com/jonathandean) (Jonathan Dean)
 
 # Copyright/License:
 Copyright 2011 [Jazmin Schroeder](http://jazminschroeder.com)

data/fedex.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "fedex"
 
+  s.license = 'MIT'
+
   s.add_dependency 'httparty',            '~> 0.11.0'
   s.add_dependency 'nokogiri',            '~> 1.5.0'
 

data/lib/fedex/request/address.rb

@@ -17,7 +17,7 @@ module Fedex
         response = parse_response(api_response)
         if success?(response)
           options = response[:address_validation_reply][:address_results][:proposed_address_details]
-
+          options = Array(options).first
           Fedex::Address.new(options)
         else
           error_message = if response[:address_validation_reply]

data/lib/fedex/request/base.rb

@@ -177,6 +177,12 @@ module Fedex
         @packages.each do |package|
           xml.RequestedPackageLineItems{
             xml.GroupPackageCount 1
+            if package[:insured_value]
+              xml.InsuredValue{
+                xml.Currency package[:insured_value][:currency]
+                xml.Amount package[:insured_value][:amount]
+              }
+            end
             xml.Weight{
               xml.Units package[:weight][:units]
               xml.Value package[:weight][:value]

data/lib/fedex/request/shipment.rb

@@ -37,7 +37,7 @@ module Fedex
       # Add information for shipments
       def add_requested_shipment(xml)
         xml.RequestedShipment{
-          xml.ShipTimestamp Time.now.utc.iso8601(2)
+          xml.ShipTimestamp @shipping_options[:ship_timestamp] ||= Time.now.utc.iso8601(2)
           xml.DropoffType @shipping_options[:drop_off_type] ||= "REGULAR_PICKUP"
           xml.ServiceType service_type
           xml.PackagingType @shipping_options[:packaging_type] ||= "YOUR_PACKAGING"

data/lib/fedex/version.rb

@@ -1,3 +1,3 @@
 module Fedex
-  VERSION = "3.3.0"
+  VERSION = "3.3.1"
 end

data/spec/lib/fedex/address_spec.rb

@@ -34,6 +34,26 @@ module Fedex
         end
       end
 
+      context "multiple address validation results", :vcr do
+        let(:address) do
+          {
+            :street      => "301 Las Colinas Blvd",
+            :city        => "Irving",
+            :state       => "TX",
+            :postal_code => "75039",
+            :country     => "USA"
+          }
+        end
+
+        let(:options) do
+          { :address => address }
+        end
+
+        it "validates the address" do
+          expect{ fedex.validate_address(options) }.to_not raise_error
+        end
+      end
+
     end
   end
 end

data/spec/lib/fedex/track_spec.rb

@@ -44,7 +44,7 @@ module Fedex
       it "reports the status of the package" do
         tracking_info = fedex.track(options.merge(:uuid => uuid)).first
 
-        tracking_info.status.should == "Shipment cancelled by sender"
+        tracking_info.status.should_not be_nil
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fedex
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70096915868680 !ruby/object:Gem::Requirement
+  requirement: &70294995885800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *70096915868680
+  version_requirements: *70294995885800
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70096915867780 !ruby/object:Gem::Requirement
+  requirement: &70294995885280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70096915867780
+  version_requirements: *70294995885280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70096915867020 !ruby/object:Gem::Requirement
+  requirement: &70294995884680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70096915867020
+  version_requirements: *70294995884680
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70096915866260 !ruby/object:Gem::Requirement
+  requirement: &70294995884140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70096915866260
+  version_requirements: *70294995884140
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70096915865600 !ruby/object:Gem::Requirement
+  requirement: &70294995883540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *70096915865600
+  version_requirements: *70294995883540
 description: Provides an interface to Fedex Web Services(version 10) - shipping rates,
   generate labels and address validation
 email:
@@ -109,7 +109,8 @@ files:
 - spec/support/credentials.rb
 - spec/support/vcr.rb
 homepage: https://github.com/jazminschroeder/fedex
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: