fedex-web-services 1.1.6 → 1.1.42

data/lib/fedex.rb

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

data/lib/fedex/railtie.rb

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,21 @@
+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

data/lib/fedex/version.rb

@@ -1,3 +1,3 @@
 module Fedex
-  VERSION = "1.1.6"
+  VERSION = "1.1.42"
 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        = @service.service_version
+            o.major        = 10
             o.intermediate = 0
             o.minor        = 0
           end

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

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

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

@@ -58,9 +58,7 @@ module Fedex::WebServices
             o.shippingChargesPayment = Payment.new.tap do |o|
               o.paymentType = PaymentType::SENDER
               o.payor = Payor.new.tap do |o|
-                o.responsibleParty = @shipper.clone.tap do |o|
-                  o.accountNumber = @service.credentials.account_number
-                end
+                o.accountNumber = @service.credentials.account_number
               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 = Struct.new("Credentials",
         :account_number, :meter_number, :key, :password, :environment
       )
 
@@ -25,16 +25,6 @@ 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, from, to, weight, &process_contents)
+      def get_rates(service_type, rate_request_type, shipper, recipient, weight, &process_contents)
         request = GetRates.new(self,
           service_type,
           rate_request_type,
-          from,
-          to,
+          shipper,
+          recipient,
           weight
         )
 
@@ -21,10 +21,6 @@ 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"
@@ -37,7 +33,7 @@ module Fedex::WebServices
 
       protected
         def port
-          RatePortType.new(service_url)
+          RatePortType.new('https://wsbeta.fedex.com:443/web-services')
         end
     end
   end

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

@@ -9,10 +9,6 @@ module Fedex::WebServices
         :ship
       end
 
-      def service_version
-        12
-      end
-
       def process_shipment(service_type, shipper, recipient,
           label_specification, package_weights, &process_contents)
 
@@ -76,13 +72,11 @@ 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(service_url)
+          ShipPortType.new('https://wsbeta.fedex.com:443/web-services')
         end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fedex-web-services
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.42
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2012-04-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: soap4r-ruby19
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70234741411120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,12 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70234741411120
 description: Interfaces with the FedEx web services API to look up shipping rates,
   generate labels, and cancel shipments
 email:
@@ -35,6 +30,8 @@ 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
@@ -46,10 +43,8 @@ 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:
-- MIT
+licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -68,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fedex-web-services
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Provies an interface to the FedEx web services API (version 10)

data/lib/generators/fedex/generate_definitions_generator.rb

@@ -1,38 +0,0 @@
-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