fedex-web-services 1.1.42 → 1.1.44

data/lib/fedex.rb

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

data/lib/fedex/railtie.rb

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

data/lib/fedex/version.rb

@@ -1,3 +1,3 @@
 module Fedex
-  VERSION = "1.1.42"
+  VERSION = "1.1.44"
 end

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

@@ -25,6 +25,12 @@ module Fedex::WebServices
         raise "service_id 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
         )
 
@@ -33,7 +33,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

@@ -76,7 +76,7 @@ module Fedex::WebServices
 
       protected
         def port
-          ShipPortType.new('https://wsbeta.fedex.com:443/web-services')
+          ShipPortType.new(service_url)
         end
     end
   end

metadata

@@ -1,37 +1,48 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: fedex-web-services
-version: !ruby/object:Gem::Version
-  version: 1.1.42
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 75
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 44
+  version: 1.1.44
 platform: ruby
-authors:
+authors: 
 - Brian Abreu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-04-18 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: soap4r-ruby19
-  requirement: &70234741411120 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70234741411120
-description: Interfaces with the FedEx web services API to look up shipping rates,
-  generate labels, and cancel shipments
-email:
+  version_requirements: *id001
+description: Interfaces with the FedEx web services API to look up shipping rates, generate labels, and cancel shipments
+email: 
 - brian@nut.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-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
@@ -43,28 +54,41 @@ files:
 - lib/fedex/web_services/service/ship.rb
 - lib/fedex/web_services.rb
 - lib/fedex.rb
+has_rdoc: true
 homepage: https://github.com/brewski/fedex-web-services
 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
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 51
+      segments: 
+      - 1
+      - 9
+      - 0
       version: 1.9.0
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: fedex-web-services
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Provies an interface to the FedEx web services API (version 10)
 test_files: []
+

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