effective_addresses 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6c73a756a6065b2ae5b115a0af75bd6b0b21883
-  data.tar.gz: cc0c0668a7c5d76f194b4aaaea23b15f7c3a5b12
+  metadata.gz: 7ee055f205c393e2696760339044b2a22fb528de
+  data.tar.gz: d54ee12d55465e5e744bcc11809211b86ad2bcc8
 SHA512:
-  metadata.gz: 062cbb1cd37d50edcfd9544685dffde9126109411a2a3bc9102349615f7578ede85ee46f345ea34366f2a97afd29b0e55ff245b4cc5f57a90aa93869d9fce8b8
-  data.tar.gz: 675e4cfc5b51c2231ea32c1e7fc327ae3880b508ffdcaf0ae4c535d6644d4def0a63bd13a706bf120062f205e0f526df0165b25aa33186b8f9a0d8ff418ce5fb
+  metadata.gz: c1db155e4237759d00a1b2eba93f8a994e1f8fcdfa5984730c91237e765995e6648f0385092985bd9ea971232f4020dea6957acf2e26d6bbcdad125c5aca4346
+  data.tar.gz: 205466113aace3c3ffbe2cec7d5665f6f82cc70a6cf400fa9d7b6f4e6b2d60dbe552b53ee8b1edde053b513637db0b4d935dd5cfb28b17532f9bd633ab61cc6a

data/app/models/effective/address.rb

@@ -123,17 +123,17 @@ module Effective
 
     def to_s
       output = ''
-      output += "#{full_name}\n" if full_name.present?
-      output += "#{address1}\n" if address1.present?
-      output += "#{address2}\n" if address2.present?
-      output += [city.presence, state.presence].compact.join(', ')
-      output += '\n' if city.present? || state.present?
-      output += [country.presence, postal_code.presence].compact.join(', ')
+      output += "#{full_name.upcase}\n" if full_name.present?
+      output += "#{address1.upcase}\n" if address1.present?
+      output += "#{address2.upcase}\n" if address2.present?
+      output += [city.try(:upcase).presence, state_code.try(:upcase).presence, ' ' + postal_code.presence].compact.join(' ')
+      output += "\n"
+      output += country.try(:upcase).to_s
       output
     end
 
     def to_html
-      to_s.gsub(/\n/, '<br>').html_safe
+      to_s.gsub(/\n/, '<br>').gsub('  ', '&nbsp;&nbsp;').html_safe
     end
   end
 end

data/app/views/effective/addresses/_address.html.haml

@@ -1,11 +1,11 @@
 - if address.full_name.present?
-  = address.full_name
+  = address.full_name.upcase
   %br
-= address.address1
+= address.address1.upcase
 %br
 - if address.address2.present?
-  = address.address2
+  = address.address2.upcase
   %br
-= [address.city.presence, address.state.presence].compact.join(', ')
+= [address.city.try(:upcase).presence, address.state_code.try(:upcase).presence, ' ' + address.postal_code.presence].compact.join(' ').html_safe
 %br
-= [address.country.presence, address.postal_code.presence].compact.join(', ')
+= address.country.try(:upcase).to_s

data/lib/effective_addresses/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAddresses
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_addresses
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails