fedex 0.0.1 → 0.1.0

data/Readme.md

@@ -33,9 +33,9 @@ Define the recipient:
                     :company => "Company", 
                     :phone_number => "555-555-5555", 
                     :address => "Main Street", 
-                    :city => "City", 
-                    :state => "ST", 
-                    :postal_code => "55555", 
+                    :city => "Franklin Park", 
+                    :state => "IL", 
+                    :postal_code => "60131", 
                     :country_code => "US", 
                     :residential => "false" }
 Define the packages(multiple packages in a single shipment are allowed):

data/fedex.gemspec

@@ -13,9 +13,9 @@ Gem::Specification.new do |s|
   s.description = %q{Ruby Library to use Fedex Web Services(version 10)}
 
   s.rubyforge_project = "fedex"
-  s.add_development_dependency "rspec"
-  s.add_dependency 'httparty'
-  s.add_dependency 'nokogiri'
+  s.add_development_dependency "rspec",   '~> 2.6.0'
+  s.add_dependency 'httparty',            '~> 0.8.0'
+  s.add_dependency 'nokogiri',            '~> 1.5.0'
   # s.add_runtime_dependency "rest-client"
 
   s.files         = `git ls-files`.split("\n")

data/lib/fedex/shipment.rb

@@ -64,7 +64,7 @@ module Fedex
         rate_details = [response[:rate_reply][:rate_reply_details][:rated_shipment_details]].flatten.first[:shipment_rate_detail]
         rate = Fedex::Rate.new(rate_details)
     else
-        error_message = (response[:rate_reply].nil? ? api_response["Fault"]["detail"]["fault"]["details"]["ValidationFailureDetail"]["message"] : response[:rate_reply][:notifications][:message]) rescue "Unexpected error has occurred..."
+        error_message = (response[:rate_reply].nil? ? api_response["Fault"]["detail"]["fault"]["details"]["ValidationFailureDetail"]["message"] : [response[:rate_reply][:notifications]].flatten.first[:message]) rescue "Unexpected error has occurred"
         raise RateError, error_message 
       end
     end
@@ -129,7 +129,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
         xml.PackagingType @shipping_options[:packaging_type] ||= "YOUR_PACKAGING"
         add_shipper(xml)
         add_recipient(xml)
@@ -276,5 +276,13 @@ module Fedex
       (!response[:rate_reply].nil? and %w{SUCCESS WARNING NOTE}.include? response[:rate_reply][:highest_severity])
     end
     
+    # Use GROUND_HOME_DELIVERY for shipments going to a residential address within the US.
+    def service_type
+      if @recipient[:residential].to_s =~ /true/i and @service_type =~ /GROUND/i and @recipient[:country_code] =~ /US/i
+        "GROUND_HOME_DELIVERY"
+      else
+        @service_type
+      end  
+    end
   end
 end

data/lib/fedex/version.rb

@@ -1,4 +1,4 @@
 #Sept-2011
 module Fedex
-  VERSION = "0.0.1" 
+  VERSION = "0.1.0" 
 end

data/spec/fedex_spec.rb

@@ -1,8 +1,13 @@
 require 'spec_helper'
 describe Fedex::Shipment do
   let(:test_keys) do
-    {:key => "RSkI5uThcfmtpm3I", :password => "RHhaZOG1MpDJ6QvSzxG0N06Ue", :account_number => "510087143", :meter => "118546765", :mode => "test"} 
+    {:key => "xxxx", :password => "xxxx", :account_number => "xxxx", :meter => "xxxx", :mode => "test"} 
   end  
+  
+  let(:production_keys) do
+    {:key => "xxxx", :password => "xxxx", :account_number => "xxxx", :meter => "xxxx", :mode => "production"} 
+  end  
+  
   context "missing required parameters" do
     it "should raise Fedex::Rate exception" do
       lambda{ Fedex::Shipment.new}.should raise_error(Fedex::RateError)
@@ -14,38 +19,80 @@ describe Fedex::Shipment do
     it "should create a valid instance" do
       subject.should be_an_instance_of(Fedex::Shipment)
     end
-   end
-  
-  before(:each) do
-    @fedex = Fedex::Shipment.new(test_keys)
-    @shipper = {:name => "Sender", :company => "Company", :phone_number => "555-555-5555", :address => "Main Street", :city => "Harrison", :state => "AR", :postal_code => "72601", :country_code => "US"}
-    @recipient = {:name => "Recipient", :company => "Company", :phone_number => "555-555-5555", :address => "Main Street", :city => "Franklin Park", :state => "IL", :postal_code => "60131", :country_code => "US", :residential => "false"}
-    @packages = []
-    @packages << { :weight => {:units => "LB", :value => 2}, 
-                   :dimensions => {:length => 10, :width => 5, :height => 4, :units => "IN" } }
-    @packages << { :weight => {:units => "LB", :value => 6}, 
-                   :dimensions => {:length => 5, :width => 5, :height => 4, :units => "IN" } }
-    @shipping_options = { :packaging_type => "YOUR_PACKAGING", :drop_off_type => "REGULAR_PICKUP" }               
   end
   
-  context "Domestic Shipment" do 
-    describe "rate" do
-      it "should return rate" do
-        rate = @fedex.rate({:shipper=>@shipper, :recipient => @recipient, :packages => @packages, :service_type => "FEDEX_GROUND"})
-        rate.should be_an_instance_of(Fedex::Rate)
+  context "Published Rates(Development Mode)" do
+    before(:each) do
+      @fedex = Fedex::Shipment.new(test_keys)
+      @shipper = {:name => "Sender", :company => "Company", :phone_number => "555-555-5555", :address => "Main Street", :city => "Harrison", :state => "AR", :postal_code => "72601", :country_code => "US"}
+      @recipient = {:name => "Recipient", :company => "Company", :phone_number => "555-555-5555", :address => "Main Street", :city => "Frankin Park", :state => "IL", :postal_code => "60131", :country_code => "US", :residential => true }
+      @packages = []
+      @packages << { :weight => {:units => "LB", :value => 2}, 
+                     :dimensions => {:length => 10, :width => 5, :height => 4, :units => "IN" } }
+      @packages << { :weight => {:units => "LB", :value => 6}, 
+                     :dimensions => {:length => 5, :width => 5, :height => 4, :units => "IN" } }
+      @shipping_options = { :packaging_type => "YOUR_PACKAGING", :drop_off_type => "REGULAR_PICKUP" }               
+    end
+  
+    context "Domestic Shipment" do 
+      describe "rate" do
+        it "should return rate" do
+          rate = @fedex.rate({:shipper=>@shipper, :recipient => @recipient, :packages => @packages, :service_type => "FEDEX_GROUND"})
+          rate.should be_an_instance_of(Fedex::Rate)
+          puts rate.total_net_charge
+        
+        end
       end
     end
+  
+    context "Canadian Shipment" do
+      describe "rate" do
+        it "shoule return international fees" do
+          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 => recipient, :packages => @packages, :service_type => "FEDEX_GROUND", :shipping_options => @shipping_options })
+          rate.should be_an_instance_of(Fedex::Rate)
+          puts rate.total_net_charge
+        end
+      end
+    end  
   end
   
-  context "Canadian Shipment" do
-    describe "rate" do
-      it "shoule return international fees" do
-        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 => false }
-        rate = @fedex.rate({:shipper => @shipper, :recipient => recipient, :packages => @packages, :service_type => "FEDEX_GROUND", :shipping_options => @shipping_options })
-        rate.should be_an_instance_of(Fedex::Rate)
+  context "Discounted Rates(Production Mode)" do
+    before(:each) do
+      @fedex = Fedex::Shipment.new(production_keys)
+      @shipper = {:name => "Sender", :company => "Company", :phone_number => "555-555-5555", :address => "Main Street", :city => "Harrison", :state => "AR", :postal_code => "72601", :country_code => "US"}
+      @recipient = {:name => "Recipient", :company => "Company", :phone_number => "555-555-5555", :address => "Main Street", :city => "Frankin Park", :state => "IL", :postal_code => "60131", :country_code => "US", :residential => true }
+      @packages = []
+      @packages << { :weight => {:units => "LB", :value => 2}, 
+                     :dimensions => {:length => 10, :width => 5, :height => 4, :units => "IN" } }
+      @packages << { :weight => {:units => "LB", :value => 6}, 
+                     :dimensions => {:length => 5, :width => 5, :height => 4, :units => "IN" } }
+      @shipping_options = { :packaging_type => "YOUR_PACKAGING", :drop_off_type => "REGULAR_PICKUP" }               
+    end
+  
+    context "Domestic Shipment" do 
+      describe "rate" do
+        it "should return rate" do
+          rate = @fedex.rate({:shipper=>@shipper, :recipient => @recipient, :packages => @packages, :service_type => "FEDEX_GROUND"})
+          rate.should be_an_instance_of(Fedex::Rate)
+          puts rate.total_net_charge
+        
+        end
       end
     end
-  end  
   
+    context "Canadian Shipment" do
+      describe "rate" do
+        it "shoule return international fees" do
+          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 => recipient, :packages => @packages, :service_type => "FEDEX_GROUND", :shipping_options => @shipping_options })
+          rate.should be_an_instance_of(Fedex::Rate)
+          puts rate.total_net_charge
+        end
+      end
+    end  
+  end
+
 end

metadata

@@ -1,75 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fedex
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jazmin Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-29 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-03 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70151002532920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: httparty
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70151002532920
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: &70151002532420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70151002532420
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &70151002531960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70151002531960
 description: Ruby Library to use Fedex Web Services(version 10)
-email: 
+email:
 - jazminschroeder@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
@@ -82,40 +63,30 @@ files:
 - lib/fedex/version.rb
 - spec/fedex_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/jazminschroeder/fedex
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: fedex
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Fedex Rate Webservice
-test_files: 
+test_files:
 - spec/fedex_spec.rb
 - spec/spec_helper.rb