@@ -108,7 +108,7 @@ module ActiveMerchant #:nodoc: def attribute_from_metric_or_imperial(obj, klass, metric_unit, imperial_unit) if obj.is_a?(klass) - return value + return obj else return klass.new(obj, (@unit_system == :imperial ? imperial_unit : metric_unit)) end lib/active_shipping/shipping/package.rb @@ -62,4 +62,12 @@ class PackageTest < Test::Unit::TestCase assert_equal 'GBP', wii.currency assert_equal 26999, wii.value end + + def test_package_with_mass_object + package = Package.new(Quantified::Mass.new(10, :pounds), []) + assert_equal 10, package.pounds + + package = Package.new(Quantified::Mass.new(850, :grams), []) + assert_equal 850, package.grams + end end \ No newline at end of file test/unit/package_test.rb dfcd5d32750f0316c4523d4bcada229cdbbaf5fa Sam Pohlenz sam@sampohlenz.com http://github.com/spohlenz/active_shipping/commit/057d28ccadc464be12e5834b9d8990fbf8e23732 057d28ccadc464be12e5834b9d8990fbf8e23732 2009-10-29T21:52:11-07:00 2009-10-29T21:52:11-07:00 Fixed Package bug when Mass object given da8bcbfb550153795c357d038274f921d4aa3e87 Sam Pohlenz sam@sampohlenz.com