@@ -1,3 +1,4 @@ +* Remove ftools for Rails 1.9 compatibility and remove xml logging, as logging is now included in the connection [cody] * Update connection code from ActiveMerchant [cody] * Fix space-ridden USPS usernames when validating credentials [james] * Remove extra slash from USPS URLs [james] CHANGELOG @@ -23,11 +23,8 @@ $:.unshift File.dirname(__FILE__) - - require 'rubygems' require 'active_support' -require 'ftools' require 'vendor/xml_node/lib/xml_node' require 'vendor/quantified/lib/quantified' lib/active_shipping.rb @@ -186,7 +186,7 @@ module ActiveMerchant message = "No shipping rates could be found for the destination address" if message.blank? end - RateResponse.new(success, message, Hash.from_xml(response), :rates => rate_estimates, :xml => response, :request => last_request, :log_xml => options[:log_xml]) + RateResponse.new(success, message, Hash.from_xml(response), :rates => rate_estimates, :xml => response, :request => last_request) end def parse_tracking_response(response, options) lib/active_shipping/shipping/carriers/fedex.rb @@ -101,8 +101,7 @@ module ActiveMerchant RateResponse.new(response["success"], response["message"], response, :xml => response, :rates => build_rate_estimates(response, origin, destination), - :request => last_request, - :log_xml => options[:log_xml] + :request => last_request ) end lib/active_shipping/shipping/carriers/shipwire.rb @@ -259,7 +259,7 @@ module ActiveMerchant :packages => packages) end end - RateResponse.new(success, message, Hash.from_xml(response).values.first, :rates => rate_estimates, :xml => response, :request => last_request, :log_xml => options[:log_xml]) + RateResponse.new(success, message, Hash.from_xml(response).values.first, :rates => rate_estimates, :xml => response, :request => last_request) end def parse_tracking_response(response, options={}) lib/active_shipping/shipping/carriers/ups.rb @@ -297,7 +297,7 @@ module ActiveMerchant rate_estimates.reject! {|e| e.package_count != packages.length} rate_estimates = rate_estimates.sort_by(&:total_price) - RateResponse.new(success, message, Hash.from_xml(response), :rates => rate_estimates, :xml => response, :request => last_request, :log_xml => options[:log_xml]) + RateResponse.new(success, message, Hash.from_xml(response), :rates => rate_estimates, :xml => response, :request => last_request) end def rates_from_response_node(response_node, packages) lib/active_shipping/shipping/carriers/usps.rb @@ -34,10 +34,6 @@ module ActiveMerchant #:nodoc: @test = options[:test] || false @xml = options[:xml] @request = options[:request] - if options[:log_xml] - log_options = (options[:log_xml].is_a?(Hash) ? options[:log_xml] : {}) - log_xml(log_options) - end raise ResponseError.new(self) unless success end @@ -48,34 +44,6 @@ module ActiveMerchant #:nodoc: def test? @test ? true : false end - - # options[:name] -- A name to give the log file. Defaults to a timestamp. The full filenames end up - # being "#{name}_request.xml" and "#{name}_request.xml" - # options[:path] -- The path to save the files. Defaults to - # "~/.active_merchant/shipping/logs/#{carrier_name}". Directories will be - # created if they don't exist already. - def log_xml(options={}) - name = options[:name] || Time.new.strftime('%Y%m%d%H%M%S') - carrier_name = begin - self.rates.first.carrier - rescue NoMethodError - '' - end - path = options[:path] || File.join(ENV['HOME'], '.active_merchant', 'shipping', 'logs', carrier_name) - File.makedirs(path) - methods = {'request' => 'request', 'response' => 'xml'} - methods.each do |suffix, method| - file = File.join(path, ([name,suffix].join('_') + '.xml')) - i = 0 - while File.exist?(file) do - file = File.join(path, ([name + (i += 1).to_s,suffix].join('_') + '.xml')) - end - File.open(file, 'w+') do |file| - file.puts self.send(method) - end - end - end - end end end lib/active_shipping/shipping/response.rb @@ -1,20 +1,9 @@ #!/usr/bin/env ruby $:.unshift(File.dirname(__FILE__) + '/../lib') - require 'test/unit' require 'active_shipping' - -begin - require 'mocha' -rescue LoadError - require 'rubygems' - require 'mocha' -end - -require 'ruby-debug' - - +require 'mocha' module Test module Unit test/test_helper.rb @@ -73,19 +73,6 @@ class UPSTest < Test::Unit::TestCase assert_equal [992, 2191, 3007, 5509, 9401, 6124], response.rates.map(&:price) end - def test_xml_logging_to_file - mock_response = xml_fixture('ups/test_real_home_as_residential_destination_response') - @carrier.expects(:commit).times(2).returns(mock_response) - RateResponse.any_instance.expects(:log_xml).with({:name => 'test', :path => '/tmp/logs'}).times(1).returns(true) - response = @carrier.find_rates( @locations[:beverly_hills], - @locations[:real_home_as_residential], - @packages.values_at(:chocolate_stuff), - :log_xml => {:name => 'test', :path => '/tmp/logs'}) - response = @carrier.find_rates( @locations[:beverly_hills], - @locations[:real_home_as_residential], - @packages.values_at(:chocolate_stuff)) - end - def test_maximum_weight assert Package.new(150 * 16, [5,5,5], :units => :imperial).mass == @carrier.maximum_weight assert Package.new((150 * 16) + 0.01, [5,5,5], :units => :imperial).mass > @carrier.maximum_weight test/unit/carriers/ups_test.rb @@ -116,13 +116,11 @@ class USPSTest < Test::Unit::TestCase def test_xml_logging_to_file mock_response = @international_rate_responses[:vanilla] @carrier.expects(:commit).times(2).returns(mock_response) - RateResponse.any_instance.expects(:log_xml).times(1).with({:name => 'test', :path => '/tmp/logs'}).returns(true) @carrier.find_rates( @locations[:beverly_hills], @locations[:ottawa], @packages[:book], - :test => true, - :log_xml => {:name => 'test', :path => '/tmp/logs'} + :test => true ) @carrier.find_rates( @locations[:beverly_hills], test/unit/carriers/usps_test.rb cbc633113acfbd9acca454a8d401bc970bd277e3 Cody Fauser codyfauser@gmail.com http://github.com/Shopify/active_shipping/commit/e8b0fb1bee76b1b61f9a4835f9fc026c9e375c3f e8b0fb1bee76b1b61f9a4835f9fc026c9e375c3f 2009-06-08T10:04:12-07:00 2009-06-08T10:04:12-07:00 Remove ftools for Rails 1.9 compatibility and remove xml logging, as logging is now included in the connection ec17cb79152019edd516c1884f6c6e7c028eed93 Cody Fauser codyfauser@gmail.com