fedex-web-services 1.0.42 → 1.1.6

data/lib/fedex.rb

@@ -1,6 +1,2 @@
 require "fedex/version"
 require "fedex/web_services"
-
-module Fedex
-  require 'fedex/railtie' if defined?(Rails)
-end

data/lib/fedex/version.rb

@@ -1,3 +1,3 @@
 module Fedex
-  VERSION = "1.0.42"
+  VERSION = "1.1.6"
 end

data/lib/fedex/web_services/request/base.rb

@@ -33,7 +33,7 @@ module Fedex::WebServices
         def version
           VersionId.new.tap do |o|
             o.serviceId    = @service.service_id
-            o.major        = 10
+            o.major        = @service.service_version
             o.intermediate = 0
             o.minor        = 0
           end

data/lib/fedex/web_services/request/get_rates.rb

@@ -2,13 +2,13 @@ module Fedex::WebServices
   module Request
     class GetRates < Base
 
-      def initialize(service, service_type, rate_request_type, shipper, recipient, weight)
+      def initialize(service, service_type, rate_request_type, from_address, to_address, weight)
 
         super(service)
 
         @service_type = service_type
-        @shipper = shipper
-        @recipient = recipient
+        @from_address = from_address
+        @to_address = to_address
         @rate_request_type = rate_request_type
         @requested_package_line_items = [
           RequestedPackageLineItem.new.tap do |o|
@@ -31,16 +31,23 @@ module Fedex::WebServices
 
           o.requestedShipment = RequestedShipment.new.tap do |o|
             o.shipTimestamp = Time.now.iso8601
-            o.serviceType   = @service_type
+            o.serviceType = @service_type
             o.packagingType = PackagingType::YOUR_PACKAGING
 
-            o.shipper   = @shipper
-            o.recipient = @recipient
+            o.shipper = Party.new.tap do |o|
+              o.address = @from_address
+            end
+
+            o.recipient = Party.new.tap do |o|
+              o.address = @to_address
+            end
 
             o.shippingChargesPayment = Payment.new.tap do |o|
               o.paymentType = PaymentType::SENDER
               o.payor = Payor.new.tap do |o|
-                o.accountNumber = @service.credentials.account_number
+                o.responsibleParty = Party.new.tap do |o|
+                  o.accountNumber = @service.credentials.account_number
+                end
               end
             end
 

data/lib/fedex/web_services/request/process_shipment.rb

@@ -58,7 +58,9 @@ module Fedex::WebServices
             o.shippingChargesPayment = Payment.new.tap do |o|
               o.paymentType = PaymentType::SENDER
               o.payor = Payor.new.tap do |o|
-                o.accountNumber = @service.credentials.account_number
+                o.responsibleParty = @shipper.clone.tap do |o|
+                  o.accountNumber = @service.credentials.account_number
+                end
               end
             end
 

data/lib/fedex/web_services/service/base.rb

@@ -10,7 +10,7 @@ module Fedex::WebServices
       include Fedex::WebServices::Definitions
       include Fedex::WebServices::Request
 
-      Credentials = Struct.new("Credentials",
+      Credentials = Struct.new(
         :account_number, :meter_number, :key, :password, :environment
       )
 
@@ -25,6 +25,16 @@ module Fedex::WebServices
         raise "service_id must be implemented by subclasses of Service"
       end
 
+      def service_version
+        raise "service_version must be implemented by subclasses of Service"
+      end
+
+      def service_url
+        (@credentials.environment.to_sym == :production) ?
+            'https://ws.fedex.com:443/web-services' :
+            'https://wsbeta.fedex.com:443/web-services'
+      end
+
       protected
         def port
           raise "port must be implemented by subclasses of Service"

data/lib/fedex/web_services/service/rate.rb

@@ -4,12 +4,12 @@ module Fedex::WebServices
   module Service
     class Rate < Base
 
-      def get_rates(service_type, rate_request_type, shipper, recipient, weight, &process_contents)
+      def get_rates(service_type, rate_request_type, from, to, weight, &process_contents)
         request = GetRates.new(self,
           service_type,
           rate_request_type,
-          shipper,
-          recipient,
+          from,
+          to,
           weight
         )
 
@@ -21,6 +21,10 @@ module Fedex::WebServices
         :crs
       end
 
+      def service_version
+        13
+      end
+
       def self.rate_for(response, rate_request_type)
         details = response.rateReplyDetails.first.ratedShipmentDetails.select do |detail|
           detail.shipmentRateDetail.rateType == "PAYOR_#{rate_request_type}_PACKAGE"
@@ -33,7 +37,7 @@ module Fedex::WebServices
 
       protected
         def port
-          RatePortType.new('https://wsbeta.fedex.com:443/web-services')
+          RatePortType.new(service_url)
         end
     end
   end

data/lib/fedex/web_services/service/ship.rb

@@ -9,6 +9,10 @@ module Fedex::WebServices
         :ship
       end
 
+      def service_version
+        12
+      end
+
       def process_shipment(service_type, shipper, recipient,
           label_specification, package_weights, &process_contents)
 
@@ -72,11 +76,13 @@ module Fedex::WebServices
                   acc + BigDecimal.new(rate.netCharge.amount) :
                   acc
             end
+      rescue
+        raise "Unable to extract rate information from response"
       end
 
       protected
         def port
-          ShipPortType.new('https://wsbeta.fedex.com:443/web-services')
+          ShipPortType.new(service_url)
         end
     end
   end

data/lib/generators/fedex/generate_definitions_generator.rb

@@ -0,0 +1,38 @@
+module Fedex
+  module Generators
+    class GenerateDefinitionsGenerator < ::Rails::Generators::Base
+      FEDEX_INITIALIZER_FILE = File.join(Rails.root, 'config', 'initializers', 'fedex.rb')
+
+      class_option :wsdl_dir,
+          default: File.join(%w(lib fedex web_services wsdl)),
+          type:    :string,
+          desc:    "directory where the fedex wsld files are stored"
+
+
+      class_option :skip_initializer,
+          default: false,
+          type:    :boolean,
+          desc:    "install a rails initializer to load the wsdl definitions"
+
+      desc "Generate the FedEx WebServices class definitions and create an initializer to load them"
+
+      def install
+        wsdl_dir = options[:wsdl_dir]
+        wsdl_files = Dir.glob(File.join(wsdl_dir, '*.wsdl'))
+        target_lib_dir = File.join(Rails.root, 'lib')
+
+        if (wsdl_files.empty?)
+          say("Could not find any wsdl files in #{wsdl_dir}", :red)
+        else
+          Fedex::WebServices::Definitions.generate_definitions(target_lib_dir, *wsdl_files)
+          say("Added #{File.join(target_lib_dir, Fedex::WebServices::Definitions::MODULE_PATH)}", :green)
+
+          unless (options[:skip_initializer])
+            create_file(FEDEX_INITIALIZER_FILE,
+                "Fedex::WebServices::Definitions.load_definitions('lib')")
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fedex-web-services
 version: !ruby/object:Gem::Version
-  version: 1.0.42
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000Z
-dependencies: []
+date: 2012-11-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: soap4r-ruby19
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Interfaces with the FedEx web services API to look up shipping rates,
   generate labels, and cancel shipments
 email:
@@ -19,8 +35,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/fedex/railtie.rb
-- lib/fedex/tasks/fedex.rake
 - lib/fedex/version.rb
 - lib/fedex/web_services/definitions.rb
 - lib/fedex/web_services/request/base.rb
@@ -32,8 +46,10 @@ files:
 - lib/fedex/web_services/service/ship.rb
 - lib/fedex/web_services.rb
 - lib/fedex.rb
+- lib/generators/fedex/generate_definitions_generator.rb
 homepage: https://github.com/brewski/fedex-web-services
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -43,7 +59,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -52,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fedex-web-services
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Provies an interface to the FedEx web services API (version 10)

data/lib/fedex/railtie.rb

@@ -1,9 +0,0 @@
-module Fedex
-  class Railtie < Rails::Railtie
-    railtie_name :fedex
-
-    rake_tasks do
-      load "fedex/tasks/fedex.rake"
-    end
-  end
-end

data/lib/fedex/tasks/fedex.rake

@@ -1,21 +0,0 @@
-namespace :fedex do
-  desc "Generate the ruby definition files from the FedEx wsdl files"
-  task :generate_definitions do
-    wsdl_dir = ENV['WSDL_DIR']
-    if (!Dir.exist?(wsdl_dir || ""))
-      puts "Set the WSDL_DIR environment variable to location of the Fedex wsdl files"
-    else
-      Fedex::WebServices::Definitions.generate_definitions(
-        File.join(Rails.root, 'lib'),
-        *Dir.glob(File.join(ENV['WSDL_DIR'], '*.wsdl'))
-      )
-
-      File.open(File.join(Rails.root, 'config', 'initializers', 'fedex.rb'), "w") do |file|
-        file.puts "Fedex::WebServices::Definitions.load_definitions('lib')"
-      end
-
-      puts "Added lib/fedex/web_services/definitions/"
-      puts "Added config/initializers/fedex.rb"
-    end
-  end
-end