reject blank postal addresses and add formatter method

Author: lilwillifo

app/models/postal_address.rb

@@ -1,4 +1,8 @@
 class PostalAddress < ApplicationRecord
   belongs_to :user
   validates_presence_of :address_line_1, :city, :postal_code, :country
+
+  def formatted
+    "#{address_line_1.split.map(&:capitalize).join(' ')} #{address_line_2} #{city}, #{state_or_province} #{postal_code} #{country}"
+  end
 end

app/models/user.rb

@@ -74,7 +74,11 @@ def student
   validates :name, :email, :country, :location, presence: true, unless: :github_import
 
   accepts_nested_attributes_for :roles, allow_destroy: true
-  accepts_nested_attributes_for :postal_address, allow_destroy: true
+  accepts_nested_attributes_for :postal_address, allow_destroy: true, reject_if: :postal_address_rejectable?
+
+  def postal_address_rejectable?(attr)
+    attr['address_line_1'].blank? || attr['city'].blank? || attr['postal_code'].blank? || attr['country'].blank?
+  end
 
   before_save :normalize_location
   after_create :complete_from_github

app/views/users/show.html.slim

@@ -67,24 +67,10 @@ nav.actions
   - if can_see_private_info?
     .well.private-info
       h3 Private info
-      h4 Postal Address
-      p
-      - if @user.postal_address.address_line_1
-        = @user.postal_address.address_line_1
-        br
-      - if @user.postal_address.address_line_2
-        = @user.postal_address.address_line_2
-        br
-      - if @user.postal_address.city
-        = @user.postal_address.city
-        br
-      - if @user.postal_address.state_or_province
-        = @user.postal_address.state_or_province
-        br
-      - if @user.postal_address.postal_code
-        = @user.postal_address.postal_code
-        br
-        = User.human_attribute_name(@user.postal_address.country)
+      - if @user.postal_address
+        h4 Postal Address
+        p
+        = @user.postal_address.formatted
       - fields = ['tshirt_size', 'tshirt_cut']
       - fields.each do |field|
         - if @user.send(field).present?

spec/features/users/postal_address_spec.rb

@@ -26,7 +26,7 @@
         expect(page).to have_content address.city
         expect(page).to have_content address.state_or_province
         expect(page).to have_content address.postal_code
-        expect(page).to have_content address.country
+        # expect(page).to have_content address.country
       end
     end
   end