lib/omniship/address.rb in omniship-0.4.0 vs lib/omniship/address.rb in omniship-0.4.1

- old
+ new

@@ -23,12 +23,12 @@ alias_method :territory, :province alias_method :region, :province alias_method :company, :company_name def initialize(options = {}) - @country = (options[:country].nil? or options[:country].is_a?(ActiveMerchant::Country)) ? + @country = (options[:country].nil? or options[:country].is_a?(ActiveUtils::Country)) ? options[:country] : - ActiveMerchant::Country.find(options[:country]) + ActiveUtils::Country.find(options[:country]) @postal_code = options[:postal_code] || options[:postal] || options[:zip] @province = options[:province] || options[:state] || options[:territory] || options[:region] @city = options[:city] @name = options[:name] @address1 = options[:address1]