omniship 0.1.0 → 0.3.2.2

data/README.markdown

@@ -1,5 +1,4 @@
-[![Code
-Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/Digi-Cazter/omniship)
+[![Gem Version](https://badge.fury.io/rb/omniship.png)](http://badge.fury.io/rb/omniship) [![Code Climate](https://codeclimate.com/github/Digi-Cazter/omniship.png)](https://codeclimate.com/github/Digi-Cazter/omniship) 
 
 # Omniship 
 

data/lib/omniship/address.rb

@@ -1,14 +1,14 @@
 module Omniship #:nodoc:
-  class Address 
+  class Address
     ADDRESS_TYPES = %w{residential commercial po_box}
-    
+
     attr_reader :options,
                 :country,
                 :postal_code,
                 :province,
                 :city,
                 :name,
-         	      :attention_name,
+                :attention_name,
                 :address1,
                 :address2,
                 :address3,
@@ -16,18 +16,18 @@ module Omniship #:nodoc:
                 :fax,
                 :address_type,
                 :company_name
-    
+
     alias_method :zip, :postal_code
     alias_method :postal, :postal_code
     alias_method :state, :province
     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)) ?
-                    options[:country] :
-                    ActiveMerchant::Country.find(options[:country])
+          options[:country] :
+          ActiveMerchant::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]
@@ -38,25 +38,27 @@ module Omniship #:nodoc:
       @phone = options[:phone]
       @fax = options[:fax]
       @company_name = options[:company_name] || options[:company]
+      @attention_name = options[:attention_name]
 
       self.address_type = options[:address_type]
     end
-    
+
     def self.from(object, options={})
       return object if object.is_a? Omniship::Address
       attr_mappings = {
-        :name => [:name],
-        :country => [:country_code, :country],
-        :postal_code => [:postal_code, :zip, :postal],
-        :province => [:province_code, :state_code, :territory_code, :region_code, :province, :state, :territory, :region],
-        :city => [:city, :town],
-        :address1 => [:address1, :address, :street],
-        :address2 => [:address2],
-        :address3 => [:address3],
-        :phone => [:phone, :phone_number],
-        :fax => [:fax, :fax_number],
-        :address_type => [:address_type],
-        :company_name => [:company, :company_name]
+          :name => [:name],
+          :attention_name => [:attention_name],
+          :country => [:country_code, :country],
+          :postal_code => [:postal_code, :zip, :postal],
+          :province => [:province_code, :state_code, :territory_code, :region_code, :province, :state, :territory, :region],
+          :city => [:city, :town],
+          :address1 => [:address1, :address, :street],
+          :address2 => [:address2],
+          :address3 => [:address3],
+          :phone => [:phone, :phone_number],
+          :fax => [:fax, :fax_number],
+          :address_type => [:address_type],
+          :company_name => [:company, :company_name]
       }
       attributes = {}
       hash_access = begin
@@ -76,11 +78,11 @@ module Omniship #:nodoc:
       attributes.delete(:address_type) unless ADDRESS_TYPES.include?(attributes[:address_type].to_s)
       self.new(attributes.update(options))
     end
-    
+
     def country_code(format = :alpha2)
       @country.nil? ? nil : @country.code(format).value
     end
-    
+
     def residential?; @address_type == 'residential' end
     def commercial?; @address_type == 'commercial' end
     def po_box?; @address_type == 'po_box' end
@@ -93,18 +95,19 @@ module Omniship #:nodoc:
 
     def to_hash
       {
-        :country => country_code,
-        :postal_code => postal_code,
-        :province => province,
-        :city => city,
-        :name => name,
-        :address1 => address1,
-        :address2 => address2,
-        :address3 => address3,
-        :phone => phone,
-        :fax => fax,
-        :address_type => address_type,
-        :company_name => company_name
+          :country => country_code,
+          :postal_code => postal_code,
+          :province => province,
+          :city => city,
+          :name => name,
+          :address1 => address1,
+          :address2 => address2,
+          :address3 => address3,
+          :phone => phone,
+          :fax => fax,
+          :address_type => address_type,
+          :company_name => company_name,
+          :attention_name => attention_name
       }
     end
 
@@ -116,15 +119,15 @@ module Omniship #:nodoc:
     def to_s
       prettyprint.gsub(/\n/, ' ')
     end
-    
+
     def prettyprint
       chunks = []
-      chunks << [@name, @address1,@address2,@address3].reject {|e| e.blank?}.join("\n")
+      chunks << [@name,@attention_name,@address1,@address2,@address3].reject {|e| e.blank?}.join("\n")
       chunks << [@city,@province,@postal_code].reject {|e| e.blank?}.join(', ')
       chunks << @country
       chunks.reject {|e| e.blank?}.join("\n")
     end
-    
+
     def inspect
       string = prettyprint
       string << "\nPhone: #{@phone}" unless @phone.blank?