fedex 3.1.0 → 3.3.0

data/lib/fedex/address.rb

@@ -2,8 +2,8 @@ module Fedex
   class Address
 
     attr_reader :changes, :score, :confirmed, :available, :status, :residential,
-                :business, :street_lines, :city, :state, :province_code,
-                :postal_code, :country_code
+                :business, :company, :street_lines, :city, :state, 
+                :province_code, :postal_code, :country_code
 
     def initialize(options)
       @changes   = options[:changes]
@@ -17,6 +17,7 @@ module Fedex
 
       address        = options[:address]
 
+      @company       = options[:company_name]
       @street_lines  = address[:street_lines]
       @city          = address[:city]
       @state         = address[:state_or_province_code]
@@ -27,4 +28,4 @@ module Fedex
       @options = options
     end
   end
-end
+end

data/lib/fedex/rate.rb

@@ -18,8 +18,9 @@ module Fedex
     #     @total_net_freight #The freight charge minus dicounts
     #     @total_surcharges #The total amount of all surcharges applied to this shipment
     #     @total_base_charge #The total base charge
-    attr_accessor :rate_type, :rate_zone, :total_bilint_weight, :total_freight_discounts, :total_net_charge, :total_taxes, :total_net_freight, :total_surcharges, :total_base_charge
+    attr_accessor :service_type, :rate_type, :rate_zone, :total_billing_weight, :total_freight_discounts, :total_net_charge, :total_taxes, :total_net_freight, :total_surcharges, :total_base_charge
     def initialize(options = {})
+      @service_type = options[:service_type]
       @rate_type = options[:rate_type]
       @rate_zone = options[:rate_zone]
       @total_billing_weight = "#{options[:total_billing_weight][:value]} #{options[:total_billing_weight][:units]}"
@@ -33,4 +34,4 @@ module Fedex
       @total_rebates = (options[:total_rebates]||{})[:amount]
     end
   end
-end
+end

data/lib/fedex/request/address.rb

@@ -67,8 +67,11 @@ module Fedex
 
       def add_address_to_validate(xml)
         xml.AddressesToValidate{
+          xml.CompanyName           @address[:company] unless @address[:company].nil? or @address[:company].empty?
           xml.Address{
-            xml.StreetLines         @address[:street]
+            Array(@address[:street]).take(2).each do |address_line|
+              xml.StreetLines address_line
+            end
             xml.City                @address[:city]
             xml.StateOrProvinceCode @address[:state]
             xml.PostalCode          @address[:postal_code]

data/lib/fedex/request/base.rb

@@ -42,7 +42,7 @@ module Fedex
       #
       # return a Fedex::Request::Base object
       def initialize(credentials, options={})
-        requires!(options, :shipper, :recipient, :packages, :service_type)
+        requires!(options, :shipper, :recipient, :packages)
         @credentials = credentials
         @shipper, @recipient, @packages, @service_type, @customs_clearance, @debug = options[:shipper], options[:recipient], options[:packages], options[:service_type], options[:customs_clearance], options[:debug]
         @debug = ENV['DEBUG'] == 'true'

data/lib/fedex/request/rate.rb

@@ -9,8 +9,14 @@ module Fedex
         puts api_response if @debug
         response = parse_response(api_response)
         if success?(response)
-          rate_details = [response[:rate_reply][:rate_reply_details][:rated_shipment_details]].flatten.first[:shipment_rate_detail]
-          Fedex::Rate.new(rate_details)
+          rate_reply_details = response[:rate_reply][:rate_reply_details] || []
+          rate_reply_details = [rate_reply_details] if rate_reply_details.is_a?(Hash)
+
+          rate_reply_details.map do |rate_reply|
+            rate_details = [rate_reply[:rated_shipment_details]].flatten.first[:shipment_rate_detail]
+            rate_details.merge!(service_type: rate_reply[:service_type])
+            Fedex::Rate.new(rate_details)
+          end
         else
           error_message = if response[:rate_reply]
             [response[:rate_reply][:notifications]].flatten.first[:message]
@@ -27,7 +33,7 @@ module Fedex
       def add_requested_shipment(xml)
         xml.RequestedShipment{
           xml.DropoffType @shipping_options[:drop_off_type] ||= "REGULAR_PICKUP"
-          xml.ServiceType service_type
+          xml.ServiceType service_type if service_type
           xml.PackagingType @shipping_options[:packaging_type] ||= "YOUR_PACKAGING"
           add_shipper(xml)
           add_recipient(xml)

data/lib/fedex/request/shipment.rb

@@ -7,7 +7,7 @@ module Fedex
 
       def initialize(credentials, options={})
         super
-        requires! options
+        requires!(options, :service_type)
         # Label specification is required even if we're not using it.
         @label_specification = {
           :label_format_type => 'COMMON2D',

data/lib/fedex/version.rb

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

data/spec/lib/fedex/rate_spec.rb

@@ -41,16 +41,16 @@ module Fedex
 
       context "domestic shipment", :vcr do
         it "should return a rate" do
-          rate = fedex.rate({:shipper => shipper, :recipient => recipient, :packages => packages, :service_type => "FEDEX_GROUND"})
-          rate.should be_an_instance_of(Rate)
+          rates = fedex.rate({:shipper => shipper, :recipient => recipient, :packages => packages, :service_type => "FEDEX_GROUND"})
+          rates.first.should be_an_instance_of(Rate)
         end
       end
 
       context "canadian shipment", :vcr do
         it "should return a rate" do
           canadian_recipient = {:name => "Recipient", :company => "Company", :phone_number => "555-555-5555", :address=>"Address Line 1", :city => "Richmond", :state => "BC", :postal_code => "V7C4V4", :country_code => "CA", :residential => "true" }
-          rate = fedex.rate({:shipper => shipper, :recipient => canadian_recipient, :packages => packages, :service_type => "FEDEX_GROUND"})
-          rate.should be_an_instance_of(Rate)
+          rates = fedex.rate({:shipper => shipper, :recipient => canadian_recipient, :packages => packages, :service_type => "FEDEX_GROUND"})
+          rates.first.should be_an_instance_of(Rate)
         end
       end
 
@@ -140,10 +140,73 @@ module Fedex
           ]
 
           customs_clearance = { :broker => broker, :clearance_brokerage => clearance_brokerage, :importer_of_record => importer_of_record, :recipient_customs_id => recipient_customs_id, :duties_payment => duties_payment, :commodities => commodities }
-          rate = fedex.rate({:shipper => shipper, :recipient => canadian_recipient, :packages => packages, :service_type => "FEDEX_GROUND", :customs_clearance => customs_clearance})
-          rate.should be_an_instance_of(Rate)
+          rates = fedex.rate({:shipper => shipper, :recipient => canadian_recipient, :packages => packages, :service_type => "FEDEX_GROUND", :customs_clearance => customs_clearance})
+          rates.first.should be_an_instance_of(Rate)
         end
       end
+
+      context "with service type specified", :vcr do
+
+        let(:rates) {
+          fedex.rate({
+            :shipper => shipper,
+            :recipient => recipient,
+            :packages => packages,
+            :service_type => "FEDEX_GROUND"
+          })
+        }
+
+        it "returns a single rate" do
+          rates.count.should eq 1
+        end
+
+        it "has service_type attribute" do
+          rates.first.service_type == 'FEDEX_GROUND'
+        end
+
+      end
+
+      context "with no service type specified", :vcr do
+
+        let(:rates) {
+          fedex.rate({
+            :shipper => shipper,
+            :recipient => recipient,
+            :packages => packages
+          })
+        }
+
+        it "returns multiple rates" do
+          rates.count.should > 1
+        end
+
+        context "each rate" do
+
+          it 'has service type attribute' do
+            rates.first.should respond_to(:service_type)
+          end
+
+        end
+
+      end
+
+      context "when there are no valid services available", :vcr do
+
+        let(:bad_shipper) { shipper.merge(state: 'Anywhere') }
+        let(:rates) {
+          fedex.rate({
+            :shipper => bad_shipper,
+            :recipient => recipient,
+            :packages => packages
+          })
+        }
+
+        it 'returns empty array' do
+          rates.should eq []
+        end
+
+      end
+
     end
   end
-end
+end

data/spec/lib/fedex/shipment_spec.rb

@@ -22,11 +22,12 @@ describe Fedex::Request::Shipment do
       { :packaging_type => "YOUR_PACKAGING", :drop_off_type => "REGULAR_PICKUP" }
     end
 
+    let(:filename) {
+      require 'tmpdir'
+      File.join(Dir.tmpdir, "label#{rand(15000)}.pdf")
+    }
+
     context "domestic shipment", :vcr do
-      let(:filename) {
-        require 'tmpdir'
-        File.join(Dir.tmpdir, "label#{rand(15000)}.pdf")
-      }
       let(:options) do
         {:shipper => shipper, :recipient => recipient, :packages => packages, :service_type => "FEDEX_GROUND", :filename => filename}
       end
@@ -40,5 +41,18 @@ describe Fedex::Request::Shipment do
       end
     end
 
+    context 'without service_type specified', :vcr do
+      let(:options) do
+        {:shipper => shipper, :recipient => recipient, :packages => packages, :filename => filename}
+      end
+
+      it 'raises error' do
+        expect {
+          @shipment = fedex.ship(options)
+        }.to raise_error('Missing Required Parameter service_type')
+      end
+
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fedex
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-31 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70277283362620 !ruby/object:Gem::Requirement
+  requirement: &70096915868680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *70277283362620
+  version_requirements: *70096915868680
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70277283377800 !ruby/object:Gem::Requirement
+  requirement: &70096915867780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70277283377800
+  version_requirements: *70096915867780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70277283377140 !ruby/object:Gem::Requirement
+  requirement: &70096915867020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70277283377140
+  version_requirements: *70096915867020
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70277283376280 !ruby/object:Gem::Requirement
+  requirement: &70096915866260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70277283376280
+  version_requirements: *70096915866260
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70277283375680 !ruby/object:Gem::Requirement
+  requirement: &70096915865600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *70277283375680
+  version_requirements: *70096915865600
 description: Provides an interface to Fedex Web Services(version 10) - shipping rates,
   generate labels and address validation
 email: