fedex 3.10.1 → 3.10.11

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 71f42b0e4670b52d75f45239d4c079a48a04e765
+  data.tar.gz: cbb86921e68cca947eca61a7de136782ca8218e1
+SHA512:
+  metadata.gz: 3e8fb6f4b18b80ae1cc47bad9ea971a731c35707d6816cbcb97720ea60bbdb5feaae76303ca448b7ac8b1726c067d9fd6756a9575d93573021e5b7f9fe98b568
+  data.tar.gz: 4ffb159aa7bdf4cb49055dcab91d82ff7eb47b0c91ab8aa82f4903625c7a8ab87f7db4f5637a1c9040cc8ab6eb125cb389841376df1924f085563c8a90022a98

data/Readme.md

@@ -1,3 +1,6 @@
+# IMPORTANT!!
+I plan a major refactor to this gem. Sorry but at this moment I am not merging PR's. I appreciate your effort but need some time to catch up. Thanks!! 
+
 # Fedex Rate Web Service
 ## Fedex API Shipment Version: 13
 
@@ -353,7 +356,8 @@ To request a pickup:
 pickup = fedex.pickup(:carrier_code => 'FDXE',
                       :packages => {:weight => {:units => "LB", :value => 10}, :count => 2},
                       :ready_timestamp => Date.today.to_datetime + 1.375,
-                      :close_time => Date.today.to_time + 60 * 60 * 17)
+                      :close_time => Date.today.to_time + 60 * 60 * 17,
+                      :country_relationship => "DOMESTIC")
 puts pickup[:pickup_confirmation_number]
 ```
 

data/fedex.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |s|
 
   s.license = 'MIT'
 
-  s.add_dependency 'httparty',            '>= 0.8.3'
+  s.add_dependency 'httparty',            '>= 0.14.0'
   s.add_dependency 'nokogiri',            '>= 1.5.6'
 
-  s.add_development_dependency "rspec",   '~> 3.0.0'
-  s.add_development_dependency 'vcr',     '~> 2.0.0'
+  s.add_development_dependency "rspec",   '~> 3.1'
+  s.add_development_dependency 'vcr',     '~> 2.0'
   s.add_development_dependency 'webmock', '~> 1.8.0'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'

data/lib/fedex/request/base.rb

@@ -51,6 +51,7 @@ module Fedex
         requires!(options, :shipper, :recipient, :packages)
         @credentials = credentials
         @shipper, @recipient, @packages, @service_type, @customs_clearance_detail, @debug = options[:shipper], options[:recipient], options[:packages], options[:service_type], options[:customs_clearance_detail], options[:debug]
+        @origin = options[:origin]
         @debug = ENV['DEBUG'] == 'true'
         @shipping_options =  options[:shipping_options] ||={}
         @payment_options = options[:payment_options] ||={}
@@ -142,6 +143,26 @@ module Fedex
         }
       end
 
+      # Add shipper to xml request
+      def add_origin(xml)
+        xml.Origin{
+          xml.Contact{
+            xml.PersonName @origin[:name]
+            xml.CompanyName @origin[:company]
+            xml.PhoneNumber @origin[:phone_number]
+          }
+          xml.Address {
+            Array(@origin[:address]).take(2).each do |address_line|
+              xml.StreetLines address_line
+            end
+            xml.City @origin[:city]
+            xml.StateOrProvinceCode @origin[:state]
+            xml.PostalCode @origin[:postal_code]
+            xml.CountryCode @origin[:country_code]
+          }
+        }
+      end
+
       # Add recipient to xml request
       def add_recipient(xml)
         xml.Recipient{
@@ -351,7 +372,7 @@ module Fedex
 
       # Parse response, convert keys to underscore symbols
       def parse_response(response)
-        response = sanitize_response_keys(response)
+        response = sanitize_response_keys(response.parsed_response)
       end
 
       # Recursively sanitizes the response object by cleaning up any hash keys.

data/lib/fedex/request/shipment.rb

@@ -44,6 +44,7 @@ module Fedex
           xml.PackagingType @shipping_options[:packaging_type] ||= "YOUR_PACKAGING"
           add_total_weight(xml) if @mps.has_key? :total_weight
           add_shipper(xml)
+          add_origin(xml) if @origin
           add_recipient(xml)
           add_shipping_charges_payment(xml)
           add_special_services(xml) if @shipping_options[:return_reason] || @shipping_options[:cod] || @shipping_options[:saturday_delivery]

data/lib/fedex/version.rb

@@ -1,5 +1,5 @@
 module Fedex
-  VERSION = "3.10.1"
+  VERSION = "3.10.11"
   API_VERSION = "13"
   PICKUP_API_VERSION = "9"
   SERVICE_AVAILABILITY_API_VERSION = "5"

metadata

@@ -1,126 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: fedex
 version: !ruby/object:Gem::Version
-  version: 3.10.1
-  prerelease: 
+  version: 3.10.11
 platform: ruby
 authors:
 - Jazmin Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Provides an interface to Fedex Web Services
@@ -130,8 +115,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - Rakefile
 - Readme.md
@@ -178,27 +163,26 @@ files:
 homepage: https://github.com/jazminschroeder/fedex
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: fedex
-rubygems_version: 1.8.23.2
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Fedex Web Services
 test_files:
 - spec/config/fedex_credentials.example.yml