active_shipping 0.1.2 → 0.1.3

data/Rakefile

@@ -49,7 +49,3 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README', 'CHANGELOG')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-task :install => [:package] do
-  `gem install pkg/#{PKG_FILE_NAME}.gem`
-end

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/active_shipping.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_shipping}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James MacAulay", "Tobias Luetke", "Cody Fauser", "Jimmy Baker"]
-  s.date = %q{2010-03-29}
+  s.date = %q{2010-03-30}
   s.description = %q{Shipping API extension for Active Merchant.}
   s.email = %q{jmacaulay@gmail.com}
   s.extra_rdoc_files = [
@@ -44,11 +44,13 @@ Gem::Specification.new do |s|
      "lib/active_shipping/shipping/contact.rb",
      "lib/active_shipping/shipping/label.rb",
      "lib/active_shipping/shipping/location.rb",
+     "lib/active_shipping/shipping/location_response.rb",
      "lib/active_shipping/shipping/package.rb",
      "lib/active_shipping/shipping/party.rb",
      "lib/active_shipping/shipping/rate_estimate.rb",
      "lib/active_shipping/shipping/rate_response.rb",
      "lib/active_shipping/shipping/response.rb",
+     "lib/active_shipping/shipping/return_label_response.rb",
      "lib/active_shipping/shipping/return_shipment.rb",
      "lib/active_shipping/shipping/shipment.rb",
      "lib/active_shipping/shipping/shipment_event.rb",

data/lib/active_shipping.rb

@@ -45,6 +45,8 @@ require 'active_shipping/shipping/tracking_response'
 require 'active_shipping/shipping/package'
 require 'active_shipping/shipping/location'
 require 'active_shipping/shipping/rate_estimate'
+require 'active_shipping/shipping/location_response'
+require 'active_shipping/shipping/return_label_response'
 
 require 'active_shipping/shipping/contact'
 require 'active_shipping/shipping/party'

data/lib/active_shipping/shipping/carriers/fedex.rb

@@ -119,7 +119,6 @@ module ActiveMerchant
         response = commit(save_request(req), (options[:test] || false)).gsub(/<(\/)?.*?\:(.*?)>/, '<\1\2>')
 
         parse_location_validation_request(response, location)
-        response
       end
 
       protected
@@ -159,6 +158,11 @@ module ActiveMerchant
           location.score = 0
           message
         end
+        LocationResponse.new(success, message, Hash.from_xml(response),
+          :xml => response,
+          :request => last_request,
+          :location => location
+        )
       end
 
       def parse_return_label_response(response, shipment)
@@ -173,9 +177,12 @@ module ActiveMerchant
           shipment.transit_time = parent.elements['//TransitTime'][0].to_s
           
           shipment
-        else
-          message
         end
+        ReturnLabelResponse.new(success, message, Hash.from_xml(response),
+          :xml => response,
+          :request => last_request,
+          :shipment => shipment
+        )
       end
 
       def build_return_label_request(shipment)

data/lib/active_shipping/shipping/location_response.rb

@@ -0,0 +1,14 @@
+module ActiveMerchant #:nodoc:
+  module Shipping
+    
+    class LocationResponse < Response
+      attr_reader :location
+      
+      def initialize(success, message, params = {}, options = {})
+        @location = options[:location]
+        super
+      end
+    end
+    
+  end
+end

data/lib/active_shipping/shipping/return_label_response.rb

@@ -0,0 +1,14 @@
+module ActiveMerchant #:nodoc:
+  module Shipping
+    
+    class ReturnLabelResponse < Response
+      attr_reader :shipment
+      
+      def initialize(success, message, params = {}, options = {})
+        @shipment = options[:shipment]
+        super
+      end
+    end
+    
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - James MacAulay
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 -04:00
+date: 2010-03-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,11 +69,13 @@ files:
 - lib/active_shipping/shipping/contact.rb
 - lib/active_shipping/shipping/label.rb
 - lib/active_shipping/shipping/location.rb
+- lib/active_shipping/shipping/location_response.rb
 - lib/active_shipping/shipping/package.rb
 - lib/active_shipping/shipping/party.rb
 - lib/active_shipping/shipping/rate_estimate.rb
 - lib/active_shipping/shipping/rate_response.rb
 - lib/active_shipping/shipping/response.rb
+- lib/active_shipping/shipping/return_label_response.rb
 - lib/active_shipping/shipping/return_shipment.rb
 - lib/active_shipping/shipping/shipment.rb
 - lib/active_shipping/shipping/shipment_event.rb