Merge pull request Shopify#199 from Shopify/remove_unnesessary_assign…

…ments

remove unnecessary assignments

lib/active_shipping.rb

@@ -25,7 +25,7 @@
 
 begin
   require 'active_support/all'
-rescue LoadError => e
+rescue LoadError
   require 'rubygems'
   gem "activesupport", ">= 2.3.5"
   require "active_support/all"

lib/active_shipping/shipping/carriers/canada_post.rb

@@ -104,7 +104,7 @@ def self.default_location
       protected
 
       def commit(request, origin, destination, options = {})
-        response = parse_rate_response(ssl_post(URL, request), origin, destination, options)
+        parse_rate_response(ssl_post(URL, request), origin, destination, options)
       end
 
       private

lib/active_shipping/shipping/carriers/canada_post_pws.rb

@@ -83,7 +83,7 @@ def find_tracking_info(pin, options = {})
         else
           CPPWSTrackingResponse.new(false, e.message, {}, :carrier => @@name)
         end
-      rescue InvalidPinFormatError => e
+      rescue InvalidPinFormatError
         CPPWSTrackingResponse.new(false, "Invalid Pin Format", {}, :carrier => @@name)
       end
 
@@ -94,18 +94,18 @@ def create_shipment(origin, destination, package, line_items = [], options = {})
         parse_shipment_response(response)
       rescue ActiveMerchant::ResponseError, ActiveMerchant::Shipping::ResponseError => e
         error_response(e.response.body, CPPWSShippingResponse)
-      rescue MissingCustomerNumberError => e
+      rescue MissingCustomerNumberError
         CPPWSShippingResponse.new(false, "Missing Customer Number", {}, :carrier => @@name)
       end
 
       def retrieve_shipment(shipping_id, options = {})
         response = ssl_post(shipment_url(shipping_id, options), nil, headers(options, SHIPMENT_MIMETYPE, SHIPMENT_MIMETYPE))
-        shipping_response = parse_shipment_response(response)
+        parse_shipment_response(response)
       end
 
       def find_shipment_receipt(shipping_id, options = {})
         response = ssl_get(shipment_receipt_url(shipping_id, options), headers(options, SHIPMENT_MIMETYPE, SHIPMENT_MIMETYPE))
-        shipping_response = parse_shipment_receipt_response(response)
+        parse_shipment_receipt_response(response)
       end
 
       def retrieve_shipping_label(shipping_response, options = {})

lib/active_shipping/shipping/carriers/fedex.rb

@@ -346,7 +346,6 @@ def build_location_node(name, location)
 
       def parse_rate_response(origin, destination, packages, response, options)
         rate_estimates = []
-        success, message = nil
 
         xml = build_document(response)
         root_node = xml.elements['RateReply']
@@ -422,14 +421,12 @@ def parse_tracking_response(response, options)
         message = response_message(xml)
 
         if success
-          tracking_number, shipper_address, origin, destination, status = nil
-          status_code, status_description, ship_time = nil
-          scheduled_delivery_time, actual_delivery_time, delivery_signature = nil
+          origin = nil
+          delivery_signature = nil
           shipment_events = []
 
           tracking_details = root_node.elements['TrackDetails']
           tracking_number = tracking_details.get_text('TrackingNumber').to_s
-
           status_code = tracking_details.get_text('StatusCode').to_s
           status_description = tracking_details.get_text('StatusDescription').to_s
           status = TRACKING_STATUS_CODES[status_code]

lib/active_shipping/shipping/carriers/stamps.rb

@@ -135,45 +135,42 @@ class Stamps < Carrier
 
       def account_info
         request = build_get_account_info_request
-        response = commit(:GetAccountInfo, request)
+        commit(:GetAccountInfo, request)
       end
 
       def purchase_postage(purchase_amount, control_total)
         request = build_purchase_postage_request(purchase_amount, control_total)
-        response = commit(:PurchasePostage, request)
+        commit(:PurchasePostage, request)
       end
 
       def purchase_status(transaction_id)
         request = build_get_purchase_status(transaction_id)
-        response = commit(:GetPurchaseStatus, request)
+        commit(:GetPurchaseStatus, request)
       end
 
       def validate_address(address, options = {})
         address = standardize_address(address)
-
         request = build_cleanse_address_request(address)
-        response = commit(:CleanseAddress, request)
+        commit(:CleanseAddress, request)
       end
 
       def find_rates(origin, destination, package, options = {})
         origin = standardize_address(origin)
         destination = standardize_address(destination)
-
         request = build_rate_request(origin, destination, package, options)
-        response = commit(:GetRates, request)
+        commit(:GetRates, request)
       end
 
       def create_shipment(origin, destination, package, line_items = [], options = {})
         origin = standardize_address(origin)
         destination = standardize_address(destination)
-
         request = build_create_indicium_request(origin, destination, package, line_items, options)
-        response = commit(:CreateIndicium, request)
+        commit(:CreateIndicium, request)
       end
 
       def find_tracking_info(shipment_id, options = {})
         request = build_track_shipment_request(shipment_id, options)
-        response = commit(:TrackShipment, request)
+        commit(:TrackShipment, request)
       end
 
       def namespace
@@ -226,7 +223,7 @@ def renew_authenticator(request)
 
       def get_authenticator
         request = build_authenticate_user_request
-        response = commit(:AuthenticateUser, request)
+        commit(:AuthenticateUser, request)
       end
 
       def build_header

lib/active_shipping/shipping/carriers/ups.rb

@@ -361,7 +361,7 @@ def build_location_node(name, location, options = {})
         #                   * Shipment/(ShipTo|ShipFrom)/CompanyName element
         #                   * Shipment/(Shipper|ShipTo|ShipFrom)/AttentionName element
         #                   * Shipment/(Shipper|ShipTo|ShipFrom)/TaxIdentificationNumber element
-        location_node = XmlNode.new(name) do |location_node|
+        XmlNode.new(name) do |location_node|
           # You must specify the shipper name when creating labels.
           if shipper_name = (options[:origin_name] || @options[:origin_name])
             location_node << XmlNode.new('Name', shipper_name)
@@ -447,8 +447,6 @@ def build_package_node(package, options = {})
       end
 
       def parse_rate_response(origin, destination, packages, response, options = {})
-        rates = []
-
         xml = REXML::Document.new(response)
         success = response_success?(xml)
         message = response_message(xml)
@@ -480,11 +478,10 @@ def parse_tracking_response(response, options = {})
         message = response_message(xml)
 
         if success
-          tracking_number, origin, destination, status_code, status_description, delivery_signature = nil
+          delivery_signature = nil
           exception_event, scheduled_delivery_date, actual_delivery_date = nil
           delivered, exception = false
           shipment_events = []
-          status = {}
 
           first_shipment = xml.elements['/*/Shipment']
           first_package = first_shipment.elements['Package']
@@ -614,7 +611,7 @@ def response_digest(xml)
       end
 
       def parse_ship_confirm(response)
-        xml = REXML::Document.new(response)
+        REXML::Document.new(response)
       end
 
       def parse_ship_accept(response)
@@ -646,7 +643,7 @@ def service_name_for(origin, code)
         end
 
         name ||= OTHER_NON_US_ORIGIN_SERVICES[code] unless name == 'US'
-        name ||= DEFAULT_SERVICES[code]
+        name || DEFAULT_SERVICES[code]
       end
     end
   end

lib/active_shipping/shipping/carriers/usps.rb

@@ -217,12 +217,8 @@ def find_rates(origin, destination, packages, options = {})
         destination = Location.from(destination)
         packages = Array(packages)
 
-        # raise ArgumentError.new("USPS packages must originate in the U.S.") unless ['US',nil].include?(origin.country_code(:alpha2))
-
-        # domestic or international?
-
         domestic_codes = US_POSSESSIONS + ['US', nil]
-        response = if domestic_codes.include?(destination.country_code(:alpha2))
+        if domestic_codes.include?(destination.country_code(:alpha2))
           us_rates(origin, destination, packages, options)
         else
           world_rates(origin, destination, packages, options)
@@ -249,7 +245,7 @@ def extract_event_details(message)
         time = Time.parse(timestamp)
         zoneless_time = Time.utc(time.year, time.month, time.mday, time.hour, time.min, time.sec)
         location = Location.new(city: city, state: state, postal_code: zip_code, country: 'USA')
-        EventDetails.new($1.upcase, time, zoneless_time, location)
+        EventDetails.new(description, time, zoneless_time, location)
       end
 
       protected
@@ -538,7 +534,7 @@ def parse_tracking_response(response, options)
         message = response_message(xml)
 
         if success
-          tracking_number, origin, destination = nil
+          destination = nil
           shipment_events = []
           tracking_details = xml.elements.collect('*/*/TrackDetail') { |e| e }
 

lib/vendor/quantified/test/test_helper.rb

@@ -2,7 +2,7 @@
 
 begin
   require 'active_support/inflector'
-rescue LoadError => e
+rescue LoadError
   require 'rubygems'
   gem "activesupport", ">= 2.3.5"
   require 'active_support/inflector'

test/remote/canada_post_pws_platform_test.rb

@@ -140,7 +140,7 @@ def test_tracking
   def test_tracking_invalid_pin_raises_exception
     pin = "000000000000000"
     exception = assert_raise ResponseError do
-      response = @cp.find_tracking_info(pin, build_options)
+      @cp.find_tracking_info(pin, build_options)
     end
     assert_equal "No Pin History", exception.message
   end
@@ -178,7 +178,7 @@ def test_find_services_country_JP
 
   def test_find_services_invalid_country
     exception = assert_raise ResponseError do
-      response = @cp.find_services('XX', build_options)
+      @cp.find_services('XX', build_options)
     end
     assert_equal "A valid destination country must be supplied.", exception.message
   end

test/remote/fedex_test.rb

@@ -93,22 +93,22 @@ def test_rates_for_locations_with_only_zip_and_country
   end
 
   def test_rates_for_location_with_only_country_code
-    response = @carrier.find_rates(
-                 @locations[:bare_beverly_hills],
-                 Location.new(:country => 'CA'),
-                 @packages.values_at(:wii)
-               )
+    @carrier.find_rates(
+      @locations[:bare_beverly_hills],
+      Location.new(:country => 'CA'),
+      @packages.values_at(:wii)
+    )
   rescue ResponseError => e
     assert_match /postal code/i, e.message
     assert_match /(missing|invalid)/i, e.message
   end
 
   def test_invalid_recipient_country
-    response = @carrier.find_rates(
-                 @locations[:bare_beverly_hills],
-                 Location.new(:country => 'JP', :zip => '108-8361'),
-                 @packages.values_at(:wii)
-               )
+    @carrier.find_rates(
+      @locations[:bare_beverly_hills],
+      Location.new(:country => 'JP', :zip => '108-8361'),
+      @packages.values_at(:wii)
+    )
   rescue ResponseError => e
     assert_match /postal code/i, e.message
     assert_match /(missing|invalid)/i, e.message
@@ -202,7 +202,7 @@ def test_tracking
 
   def test_tracking_with_bad_number
     assert_raises ResponseError do
-      response = @carrier.find_tracking_info('12345')
+      @carrier.find_tracking_info('12345')
     end
   end
 

test/remote/kunaki_test.rb

@@ -26,12 +26,12 @@ def test_successful_rates_request
   def test_send_no_items
     assert_raise(ActiveMerchant::ResponseError) do
       begin
-        response = @carrier.find_rates(
-                     @locations[:ottawa],
-                     @locations[:beverly_hills],
-                     @packages.values_at(:book, :wii),
-                     :items => []
-                   )
+        @carrier.find_rates(
+          @locations[:ottawa],
+          @locations[:beverly_hills],
+          @packages.values_at(:book, :wii),
+          :items => []
+        )
       rescue ActiveMerchant::ResponseError => e
         assert_equal 500, e.response.code.to_i
         raise

test/remote/shipwire_test.rb

@@ -57,7 +57,7 @@ def test_invalid_xml_raises_response_content_error
     @carrier.expects(:ssl_post).returns("")
 
     assert_raises ActiveMerchant::Shipping::ResponseContentError do
-      rate_estimates = @carrier.find_rates(
+      @carrier.find_rates(
         @locations[:ottawa],
         @locations[:london],
         @packages.values_at(:book, :wii),

test/remote/stamps_test.rb

@@ -24,7 +24,7 @@ def test_purchase_postage
     purchase_amount = 10.62 # Based on the amount used in the track shipment tests
     assert_nothing_raised do
       account = @carrier.account_info
-      purchase = @carrier.purchase_postage(purchase_amount, account.control_total)
+      @carrier.purchase_postage(purchase_amount, account.control_total)
     end
   end
 
@@ -392,7 +392,6 @@ def test_us_to_us_possession
   end
 
   def test_bare_packages_domestic
-    response = nil
     response = begin
       @carrier.find_rates(
         @locations[:beverly_hills], # imperial (U.S. origin)
@@ -407,7 +406,6 @@ def test_bare_packages_domestic
   end
 
   def test_bare_packages_international
-    response = nil
     response = begin
       @carrier.find_rates(
         @locations[:beverly_hills], # imperial (U.S. origin)
@@ -422,7 +420,6 @@ def test_bare_packages_international
   end
 
   def test_first_class_packages_with_mail_type
-    response = nil
     response = begin
       @carrier.find_rates(
         @locations[:beverly_hills], # imperial (U.S. origin)
@@ -441,7 +438,6 @@ def test_first_class_packages_with_mail_type
   end
 
   def test_first_class_packages_with_invalid_mail_type
-    response = nil
     assert_raise ResponseError do
       @carrier.find_rates(
         @locations[:beverly_hills], # imperial (U.S. origin)