saucy 0.13.3 → 0.14.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.14.0
+
+* Accept user billing address.
+
 0.13.2
 
 * Follow-up to 0.13.1: Actually work irrespective of system TZ

data/app/controllers/billings_controller.rb

@@ -12,6 +12,13 @@ class BillingsController < ApplicationController
     @account.billing_email = @account.customer.email
     @account.expiration_month = @account.credit_card.expiration_month
     @account.expiration_year = @account.credit_card.expiration_year
+
+    @account.street_address = @account.billing_address.street_address
+    @account.extended_address = @account.billing_address.extended_address
+    @account.locality = @account.billing_address.locality
+    @account.region = @account.billing_address.region
+    @account.postal_code = @account.billing_address.postal_code
+    @account.country_name = @account.billing_address.country_name
   end
 
   def update

data/app/models/signup.rb

@@ -13,7 +13,13 @@ class Signup
       :expiration_month  => :expiration_month,
       :expiration_year   => :expiration_year,
       :verification_code => :verification_code,
-      :plan              => :plan
+      :plan              => :plan,
+      :street_address    => :street_address,
+      :extended_address  => :extended_address,
+      :locality          => :locality,
+      :region            => :region,
+      :postal_code       => :postal_code,
+      :country_name      => :country_name
     },
     :user => {
       :email    => :email,
@@ -22,7 +28,8 @@ class Signup
   }.freeze
 
   attr_accessor :billing_email, :password, :cardholder_name, :email,
-    :card_number, :expiration_month, :expiration_year, :plan, :verification_code, :coupon
+    :card_number, :expiration_month, :expiration_year, :plan, :verification_code, :coupon,
+    :street_address, :extended_address, :locality, :region, :postal_code, :country_name
 
   def initialize(attributes = {})
     if attributes

data/app/views/billings/_form.html.erb

@@ -1,8 +1,18 @@
 <%= form.inputs do %>
-  <%= form.input :cardholder_name, :required => true %>
-  <%= form.input :billing_email, :required => true, :hint => "We'll send receipts and billing issues to this address." %>
   <%= form.input :card_number, :required => true, :input_html => { :autocomplete => "off" } %>
   <%= form.input :verification_code, :required => true, :input_html => { :autocomplete => "off" } %>
   <%= form.input :expiration_month, :collection => [['January', '01'], ['February', '02'], ['March', '03'], ['April', '04'], ['May', '05'], ['June', '06'], ['July', '07'], ['August', '08'], ['September', '09'], ['October', '10'], ['November', '11'], ['December', '12']], :required => true %>
   <%= form.input :expiration_year, :collection => (Date.today.year..(Date.today.year+10)).to_a, :required => true %>
+  <%= form.input :cardholder_name, :required => true %>
+  <%= form.input :billing_email, :required => true, :hint => "We'll send receipts and billing issues to this address." %>
+
+  <%= form.input :street_address, :label => "Address Line 1", :required => true %>
+  <%= form.input :extended_address, :label => "Address Line 2", :required => true %>
+  <%= form.input :locality, :label => "City", :required => true %>
+  <%= form.input :region, :label => "State or Province", :required => true %>
+  <%= form.input :postal_code, :label => "ZIP or Postal Code", :required => true %>
+  <%= form.input :country_name, :label => "Country",
+                                :required => true,
+                                :collection => ["United States of America", "Canada", "---",
+                                                *Braintree::Address::CountryNames.map(&:first)] %>
 <% end -%>

data/features/run_features.feature

@@ -20,6 +20,7 @@ Feature: generate a saucy application and run rake
     gem "launchy"
     gem "timecop"
     gem "jquery-rails"
+    gem "minitest", "~> 2.6.1", :platforms => :ruby_19
     """
     When I add the "saucy" gem from this project as a dependency
     And I successfully run `bundle install`

data/lib/generators/saucy/features/templates/factories.rb

@@ -25,6 +25,11 @@ Factory.define :paid_account, :parent => :account do |f|
   f.verification_code { "123"               }
   f.expiration_month  { 5                   }
   f.expiration_year   { 2012                }
+  f.street_address    { "1 Robo Lane"       }
+  f.locality          { "Boston"            }
+  f.region            { "MA"                }
+  f.postal_code       { "02108"             }
+  f.country_name      { "United States of America" }
   f.association :plan, :factory => :paid_plan
 end
 

data/lib/generators/saucy/features/templates/features/manage_billing.feature

@@ -3,12 +3,14 @@ Feature: Manage Billing
   I want to be able to manage my billing information
   So that my account can stay up to date and in good standing
 
-  Scenario: Update the billing information on an account with a paid plan
+  Background:
     Given a paid plan exists with a name of "Paid"
     And the following account exists:
-      | name | keyword | plan       | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
-      | Test | test    | name: Paid | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
-    And I have signed in with "joe@example.com"
+      | name | keyword | plan       | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year | street_address | extended_address | locality      | region | postal_code | country_name             |
+      | Test | test    | name: Paid | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            | 1 Robo Lane    | Suite 333        | Beverly Hills | CA     | 90210       | United States of America |
+
+  Scenario: Update the billing information on an account with a paid plan
+    Given I have signed in with "joe@example.com"
     And "joe@example.com" is an admin of the "Test" account
     When I go to the billing page for the "Test" account
     Then I should see "card ending in 5555"
@@ -21,23 +23,39 @@ Feature: Manage Billing
     And the "Verification code" field should have nothing in it
     And the "Expiration month" field should contain "01"
     And the "Expiration year" field should contain "2015"
+    And the "Address Line 1" field should contain "1 Robo Lane"
+    And the "Address Line 2" field should contain "Suite 333"
+    And the "City" field should contain "Beverly Hills"
+    And the "State or Province" field should contain "CA"
+    And the "ZIP or Postal Code" field should contain "90210"
+    And the "Country" field should contain "United States of America"
 
-    And I fill in "Cardholder name" with "Ralph Robot"
+    When I fill in "Cardholder name" with "Ralph Robot"
     And I fill in "Billing email" with "accounting@example.com"
     And I fill in "Card number" with "4111111111111111"
     And I fill in "Verification code" with "123"
     And I select "March" from "Expiration month"
     And I select "2020" from "Expiration year"
+    And I fill in "Address Line 1" with "41 Winter St"
+    And I fill in "Address Line 2" with "Floor 7"
+    And I fill in "City" with "Boston"
+    And I fill in "State or Province" with "MA"
+    And I fill in "ZIP or Postal Code" with "02108"
+    And I select "Uganda" from "Country"
     And I press "Update"
     Then I should see "updated successfully"
-    Then I should see "card ending in 1111"
+    And I should see "card ending in 1111"
+
+    When I follow "Change"
+    Then the "Address Line 1" field should contain "41 Winter St"
+    And the "Address Line 2" field should contain "Floor 7"
+    And the "City" field should contain "Boston"
+    And the "State or Province" field should contain "MA"
+    And the "ZIP or Postal Code" field should contain "02108"
+    And the "Country" field should contain "Uganda"
 
   Scenario: Be forced to update the billing information on an account with a paid plan that is past due
-    Given a paid plan exists with a name of "Paid"
-    And the following account exists:
-      | name | keyword | plan       | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
-      | Test | test    | name: Paid | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
-    And the "Test" account is past due
+    Given the "Test" account is past due
     And I have signed in with "joe@example.com"
     And "joe@example.com" is an admin of the "Test" account
     When I go to the settings page for the "Test" account
@@ -45,11 +63,7 @@ Feature: Manage Billing
     And I should see "There was an issue processing the credit card you have on file. Please update your credit card information."
 
   Scenario: Be told to have an admin update the billing information on an account with a paid plan that is past due
-    Given a paid plan exists with a name of "Paid"
-    And the following account exists:
-      | name | keyword | plan       | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
-      | Test | test    | name: Paid | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
-    And the "Test" account is past due
+    Given the "Test" account is past due
     And the following projects exist:
       | name     | account    |
       | Project  | name: Test |
@@ -64,11 +78,7 @@ Feature: Manage Billing
     Then I should be on the billing page for the "Test" account
 
   Scenario: View past credit card charges
-    Given a paid plan exists with a name of "Paid"
-    And the following account exists:
-      | name | keyword | plan       | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
-      | Test | test    | name: Paid | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
-    And the following transaction exist for the "Test" account:
+    Given the following transaction exist for the "Test" account:
       | status  | amount | created_at        |
       | Settled | 20.00  | July 1, 2010      |
       | Settled | 5.00   | August 1, 2010    |
@@ -80,14 +90,19 @@ Feature: Manage Billing
     And I should see "08/01/10 $5"
 
   Scenario: Navigate back to the main settings page
-    Given a paid plan exists with a name of "Paid"
-    And the following account exists:
-      | name | keyword | plan       | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
-      | Test | test    | name: Paid | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
-    And I have signed in with "joe@example.com"
+    Given I have signed in with "joe@example.com"
     And "joe@example.com" is an admin of the "Test" account
     When I go to the billing page for the "Test" account
     And I follow "Change"
     And I follow "Billing"
     And I follow "Account Info"
     Then I should be on the settings page for the "Test" account
+
+  Scenario: Billing countries
+    Given I have signed in with "joe@example.com"
+    And "joe@example.com" is an admin of the "Test" account
+    When I go to the billing page for the "Test" account
+    And I follow "Change"
+    Then I should see all the Braintree countries in the country select with the following at the top:
+      | United States of America |
+      | Canada                   |

data/lib/generators/saucy/features/templates/features/manage_plan.feature

@@ -6,7 +6,7 @@ Feature: Manage Plan
   Scenario: Change the plan to another paid plan on an account with a paid plan
     Given a paid plan exists with a name of "Basic"
     And a paid plan exists with a name of "Premium"
-    And the following account exists:
+    And the following paid account exists:
       | name | keyword | plan        | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
       | Test | test    | name: Basic | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
     And I have signed in with "joe@example.com"
@@ -37,13 +37,18 @@ Feature: Manage Plan
     Then I should see "Upgrade Your Plan"
     When I choose the "Basic" plan
     Then I should see "Billing Information"
-    And I should not see "No thanks, just delete my account"
     And I fill in "Cardholder name" with "Ralph Robot"
     And I fill in "Billing email" with "accounting@example.com"
     And I fill in "Card number" with "4111111111111111"
     And I fill in "Verification code" with "123"
     And I select "March" from "Expiration month"
     And I select "2020" from "Expiration year"
+    And I fill in "Address Line 1" with "41 Winter St"
+    And I fill in "Address Line 2" with "Floor 7"
+    And I fill in "City" with "Boston"
+    And I fill in "State or Province" with "MA"
+    And I fill in "ZIP or Postal Code" with "02108"
+    And I select "United States of America" from "Country"
     When I press "Upgrade"
     Then I should see "Plan changed successfully"
     And I should see "Basic"
@@ -71,6 +76,12 @@ Feature: Manage Plan
     And I fill in "Verification code" with "123"
     And I select "March" from "Expiration month"
     And I select "2020" from "Expiration year"
+    And I fill in "Address Line 1" with "41 Winter St"
+    And I fill in "Address Line 2" with "Floor 7"
+    And I fill in "City" with "Boston"
+    And I fill in "State or Province" with "MA"
+    And I fill in "ZIP or Postal Code" with "02108"
+    And I select "United States of America" from "Country"
     When I press "Upgrade"
     Then I should not see "Plan changed successfully"
     And "Card number" should have the error "is invalid"
@@ -78,7 +89,7 @@ Feature: Manage Plan
   Scenario: Change the plan to a free on an account with a paid plan
     Given a paid plan exists with a name of "Basic"
     And a plan exists with a name of "Free"
-    And the following account exists:
+    And the following paid account exists:
       | name | keyword | plan        | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
       | Test | test    | name: Basic | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
     And I have signed in with "joe@example.com"
@@ -97,7 +108,7 @@ Feature: Manage Plan
   Scenario: Attempting to downgrade when beyond the limits
     Given a paid plan exists with a name of "Basic"
     And a plan exists with a name of "Free"
-    And the following account exists:
+    And the following paid account exists:
       | name | keyword | plan        | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
       | Test | test    | name: Basic | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
     And the following limits exist:
@@ -127,7 +138,7 @@ Feature: Manage Plan
 
   Scenario: Viewing current usage
     Given a paid plan exists with a name of "Basic"
-    And the following account exists:
+    And the following paid account exists:
       | name | keyword | plan        | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
       | Test | test    | name: Basic | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
     And the following limits exist:

data/lib/generators/saucy/features/templates/features/sign_up_paid.feature

@@ -31,6 +31,12 @@ Feature: Sign up
     And I fill in "Verification code" with "123"
     And I select "March" from "Expiration month"
     And I select "2020" from "Expiration year"
+    And I fill in "Address Line 1" with "123 Robo Lane"
+    And I fill in "Address Line 2" with "Suite 5"
+    And I fill in "City" with "Boston"
+    And I fill in "State or Province" with "MA"
+    And I fill in "ZIP or Postal Code" with "02110"
+    And I select "United States of America" from "Country"
     And I press "Sign up"
     Then I should see "created"
 
@@ -46,6 +52,12 @@ Feature: Sign up
     And I fill in "Verification code" with "123"
     And I select "March" from "Expiration month"
     And I select "2020" from "Expiration year"
+    And I fill in "Address Line 1" with "123 Robo Lane"
+    And I fill in "Address Line 2" with "Suite 5"
+    And I fill in "City" with "Boston"
+    And I fill in "State or Province" with "MA"
+    And I fill in "ZIP or Postal Code" with "02110"
+    And I select "United States of America" from "Country"
     And I press "Sign up"
     Then "Card number" should have the error "is invalid"
 
@@ -61,5 +73,11 @@ Feature: Sign up
     And I fill in "Verification code" with "123"
     And I select "March" from "Expiration month"
     And I select "2020" from "Expiration year"
+    And I fill in "Address Line 1" with "123 Robo Lane"
+    And I fill in "Address Line 2" with "Suite 5"
+    And I fill in "City" with "Boston"
+    And I fill in "State or Province" with "MA"
+    And I fill in "ZIP or Postal Code" with "02110"
+    And I select "United States of America" from "Country"
     And I press "Sign up"
     Then "Card number" should have the error "Do Not Honor"

data/lib/generators/saucy/features/templates/features/trial_plans.feature

@@ -37,15 +37,6 @@ Feature: Trial plans
     And I should see "expired"
     And the "Temp" plan should be disabled
 
-  Scenario: Delete an account with an expired plan
-    Given a "Temp" account exists with a name of "Test" created 30 days ago
-    And I am signed in as an admin of the "Test" account
-    When I go to the projects page for the "Test" account
-    Then I should be on the upgrade plan page for the "Test" account
-    And I should see "expired"
-    When I follow "No thanks, just delete my account"
-    Then I should see "Your account has been deleted"
-
   Scenario: Sign up for a non-trial plan
     When I go to the list of plans page
     And I follow "Eternal"

data/lib/generators/saucy/features/templates/step_definitions/country_steps.rb

@@ -0,0 +1,8 @@
+Then /^I should see all the Braintree countries in the country select with the following at the top:$/ do |table|
+  divider = "---"
+  top_country_names = table.raw.flatten
+  all_country_names = Braintree::Address::CountryNames.map(&:first)
+
+  expected_country_names = [top_country_names, divider, all_country_names].flatten
+  page.should have_select("Country", :options => expected_country_names)
+end

data/lib/saucy/subscription.rb

@@ -10,16 +10,28 @@ module Saucy
 
       extend ActiveSupport::Memoizable
 
-      CUSTOMER_ATTRIBUTES = { :cardholder_name => :cardholder_name, 
-                              :billing_email => :email, 
-                              :card_number => :number, 
-                              :expiration_month => :expiration_month, 
-                              :expiration_year => :expiration_year, 
-                              :verification_code => :cvv }
-
-      attr_accessor *CUSTOMER_ATTRIBUTES.keys
-
-      CUSTOMER_ATTRIBUTES.keys.each do |attribute|
+      CUSTOMER_ATTRIBUTES = [ :cardholder_name,
+                              :billing_email,
+                              :card_number,
+                              :expiration_month,
+                              :expiration_year,
+                              :verification_code,
+                              :street_address,
+                              :extended_address,
+                              :locality,
+                              :region,
+                              :postal_code,
+                              :country_name
+      ]
+
+      OPTIONAL_CUSTOMER_ATTRIBUTES = [:extended_address]
+
+      REQUIRED_CUSTOMER_ATTRIBUTES =
+        CUSTOMER_ATTRIBUTES - OPTIONAL_CUSTOMER_ATTRIBUTES
+
+      attr_accessor *CUSTOMER_ATTRIBUTES
+
+      REQUIRED_CUSTOMER_ATTRIBUTES.each do |attribute|
         validates_presence_of attribute, :if => :switching_to_billed?
       end
       before_create :create_customer
@@ -39,6 +51,10 @@ module Saucy
         customer.credit_cards[0] if customer && customer.credit_cards.any?
       end
 
+      def billing_address
+        credit_card.billing_address if credit_card
+      end
+
       def subscription
         Braintree::Subscription.find(subscription_token) if subscription_token
       end
@@ -103,11 +119,11 @@ module Saucy
       end
 
       def changing_customer_attributes?(attributes)
-        CUSTOMER_ATTRIBUTES.keys.any? { |attribute| attributes[attribute].present? }
+        CUSTOMER_ATTRIBUTES.any? { |attribute| attributes[attribute].present? }
       end
 
       def set_customer_attributes(attributes)
-        CUSTOMER_ATTRIBUTES.keys.each do |attribute|
+        CUSTOMER_ATTRIBUTES.each do |attribute|
           send("#{attribute}=", attributes[attribute]) if attributes[attribute].present?
         end
       end
@@ -144,7 +160,16 @@ module Saucy
                               :number => card_number,
                               :expiration_month => expiration_month,
                               :expiration_year => expiration_year,
-                              :cvv => verification_code }
+                              :cvv => verification_code,
+                              :billing_address => {
+                                :street_address => street_address,
+                                :extended_address => extended_address,
+                                :locality => locality,
+                                :region => region,
+                                :postal_code => postal_code,
+                                :country_name => country_name
+                              }
+                            }
           if credit_card
             card_attributes.merge!(:options => credit_card_options)
           end

data/spec/models/subscription_spec.rb

@@ -1,17 +1,22 @@
 require 'spec_helper'
 
+describe Account, "factories" do
+  it "has a valid factory" do
+    Factory(:account).should be_valid
+  end
+
+  it "has a valid paid factory" do
+    Factory(:paid_account).should be_valid
+  end
+end
+
 describe Account do
   subject { Factory(:account) }
 
   it "manifests braintree processor_declined errors as errors on number and doesn't save" do
     FakeBraintree.failures["4111111111111112"] = { "message" => "Do Not Honor", "code" => "2000", "status" => "processor_declined" }
-    account = Factory.build(:account, 
-                            :cardholder_name => "Ralph Robot", 
-                            :billing_email => "ralph@example.com", 
+    account = Factory.build(:paid_account,
                             :card_number => "4111111111111112", 
-                            :verification_code => "100",
-                            :expiration_month => 5, 
-                            :expiration_year => 2012,
                             :plan => Factory(:paid_plan))
     account.save.should_not be
     FakeBraintree.customers.should be_empty
@@ -21,13 +26,8 @@ describe Account do
 
   it "manifests braintree gateway_rejected errors as errors on number and doesn't save" do
     FakeBraintree.failures["4111111111111112"] = { "message" => "Gateway Rejected: cvv", "code" => "N", "status" => "gateway_rejected" }
-    account = Factory.build(:account, 
-                            :cardholder_name => "Ralph Robot", 
-                            :billing_email => "ralph@example.com", 
+    account = Factory.build(:paid_account,
                             :card_number => "4111111111111112", 
-                            :expiration_month => 5, 
-                            :expiration_year => 2012,
-                            :verification_code => 200,
                             :plan => Factory(:paid_plan))
     account.save.should_not be
     FakeBraintree.customers.should be_empty
@@ -36,14 +36,9 @@ describe Account do
    end
 
   it "manifests braintree gateway_rejected errors as errors on number and doesn't save" do
-    FakeBraintree.failures["4111111111111111"] = { "message" => "Credit card number is invalid.", "errors" => { "customer" => { "errors" => [], "credit-card" => { "errors" => [{ "message" => "Credit card number is invalid.", "code" => 81715, "attribute" => :number }] }}}}
-    account = Factory.build(:account, 
-                            :cardholder_name => "Ralph Robot", 
-                            :billing_email => "ralph@example.com", 
-                            :card_number => "4111111111111111", 
-                            :expiration_month => 5, 
-                            :expiration_year => 2012,
-                            :verification_code => 123,
+    FakeBraintree.failures["4111111111111112"] = { "message" => "Credit card number is invalid.", "errors" => { "customer" => { "errors" => [], "credit-card" => { "errors" => [{ "message" => "Credit card number is invalid.", "code" => 81715, "attribute" => :number }] }}}}
+    account = Factory.build(:paid_account,
+                            :card_number => "4111111111111112", 
                             :plan => Factory(:paid_plan))
     account.save.should_not be
     FakeBraintree.customers.should be_empty
@@ -64,7 +59,7 @@ describe Account, "given free and paid plans" do
 
     result.should be_false
     account.reload.plan.should == free
-    Saucy::Subscription::CUSTOMER_ATTRIBUTES.keys.each do |attribute|
+    Saucy::Subscription::REQUIRED_CUSTOMER_ATTRIBUTES.each do |attribute|
       account.errors[attribute].should_not be_blank
     end
     FakeBraintree.customers[account.customer_token].should_not be_nil
@@ -92,14 +87,7 @@ end
 
 describe Account, "with a paid plan" do
   subject do
-    Factory(:account, 
-            :cardholder_name => "Ralph Robot", 
-            :billing_email => "ralph@example.com", 
-            :card_number => "4111111111111111", 
-            :verification_code => "123",
-            :expiration_month => 5, 
-            :expiration_year => 2012,
-            :plan => Factory(:paid_plan))
+    Factory(:paid_account, :plan => Factory(:paid_plan))
   end
 
   it "has a customer_token" do
@@ -148,15 +136,76 @@ describe Account, "with a paid plan" do
     FakeBraintree.subscriptions[subject.subscription_token]["price"].should == "5"
   end
 
-  it "updates the customer and credit card information when changed" do
-    subject.save_customer_and_subscription!(:billing_email => "jrobot@example.com",
-                                            :cardholder_name => "Jim Robot", 
-                                            :card_number => "4111111111111115",
-                                            :verification_code => "123",
-                                            :expiration_month => 5, 
-                                            :expiration_year => 2013)
-    subject.customer.email.should == "jrobot@example.com"
-    subject.credit_card.cardholder_name.should == "Jim Robot"
+  context "updating customer credit card information when changed" do
+    before do
+      subject.save_customer_and_subscription!(:billing_email => "jrobot@example.com",
+                                              :cardholder_name => "Jim Robot", 
+                                              :card_number => "4111111111111115",
+                                              :verification_code => "123",
+                                              :expiration_month => 5, 
+                                              :expiration_year => 2013)
+    end
+
+    it "updates the billing email" do
+      subject.customer.email.should == "jrobot@example.com"
+    end
+
+    it "updates the cardholder name" do
+      subject.credit_card.cardholder_name.should == "Jim Robot"
+    end
+
+    it "updates the card number" do
+      subject.credit_card.last_4.should == "1115"
+    end
+
+    it "updates the expiration year" do
+      subject.credit_card.expiration_year.should == 2013
+    end
+
+    it "updates the expiration month" do
+      subject.credit_card.expiration_month.should == 5
+    end
+  end
+
+  context "updating customer credit card billing address information when changed" do
+    before do
+      subject.save_customer_and_subscription!(:billing_email => "jrobot@example.com",
+                                              :cardholder_name => "Jim Robot", 
+                                              :card_number => "4111111111111115",
+                                              :verification_code => "123",
+                                              :expiration_month => 5, 
+                                              :expiration_year => 2013,
+                                              :street_address => "1 E Main St",
+                                              :extended_address => "Suite 3",
+                                              :locality => "Chicago",
+                                              :region => "Illinois",
+                                              :postal_code => "60622",
+                                              :country_name => "United States of America")
+    end
+
+    it "updates the street address" do
+      subject.billing_address.street_address.should == "1 E Main St"
+    end
+
+    it "updates the extended address" do
+      subject.billing_address.extended_address.should == "Suite 3"
+    end
+
+    it "updates the locality" do
+      subject.billing_address.locality.should == "Chicago"
+    end
+
+    it "updates the region" do
+      subject.billing_address.region.should == "Illinois"
+    end
+
+    it "updates the postal code" do
+      subject.billing_address.postal_code.should == "60622"
+    end
+
+    it "updates the country name" do
+      subject.billing_address.country_name.should == "United States of America"
+    end
   end
 
   it "deletes the customer when deleted" do
@@ -190,6 +239,10 @@ describe Account, "with a free plan" do
     subject.subscription.should be_nil
   end
 
+  it "doesn't have a billing address" do
+    subject.billing_address.should be_nil
+  end
+
   it "creates a braintree customer" do
     FakeBraintree.customers[subject.customer_token].should_not be_nil
   end
@@ -199,34 +252,23 @@ describe Account, "with a free plan" do
     FakeBraintree.subscriptions[subject.subscription_token].should be_nil
   end
 
-  it "creates a credit card, and subscription when the plan is changed to a paid plan and the billing info is supplied" do
+  it "creates a credit card, subscription, and billing address when the plan is changed to a paid plan and the billing info is supplied" do
     new_plan = Factory(:paid_plan, :name => "New Plan")
-    subject.save_customer_and_subscription!(:plan_id => new_plan.id,
-                                            :cardholder_name => "Ralph Robot", 
-                                            :billing_email => "ralph@example.com", 
-                                            :card_number => "4111111111111111", 
-                                            :verification_code => "123",
-                                            :expiration_month => 5, 
-                                            :expiration_year => 2012)
+    subject.save_customer_and_subscription!(Factory.attributes_for(:paid_account, :plan_id => new_plan.id))
 
     FakeBraintree.customers[subject.customer_token]["credit_cards"].first.should_not be_nil
     FakeBraintree.subscriptions[subject.subscription_token].should_not be_nil
     FakeBraintree.subscriptions[subject.subscription_token]["plan_id"].should == new_plan.id
     subject.credit_card.should_not be_nil
     subject.subscription.should_not be_nil
+    subject.billing_address.should_not be_nil
   end
 
   it "passes up the merchant_account_id on the subscription when it's configured" do
     begin
       Saucy::Configuration.merchant_account_id = 'test'
       new_plan = Factory(:paid_plan, :name => "New Plan")
-      subject.save_customer_and_subscription!(:plan_id => new_plan.id,
-                                              :cardholder_name => "Ralph Robot", 
-                                              :billing_email => "ralph@example.com", 
-                                              :card_number => "4111111111111111", 
-                                              :verification_code => "123",
-                                              :expiration_month => 5, 
-                                              :expiration_year => 2012)
+      subject.save_customer_and_subscription!(Factory.attributes_for(:paid_account, :plan_id => new_plan.id))
 
       FakeBraintree.subscriptions[subject.subscription_token]["merchant_account_id"].should == 'test'
     ensure
@@ -237,23 +279,18 @@ describe Account, "with a free plan" do
   it "doesn't pass up the merchant_account_id on the subscription when it's not configured" do
     Saucy::Configuration.merchant_account_id = nil
     new_plan = Factory(:paid_plan, :name => "New Plan")
-    subject.save_customer_and_subscription!(:plan_id => new_plan.id,
-                                            :cardholder_name => "Ralph Robot", 
-                                            :billing_email => "ralph@example.com", 
-                                            :card_number => "4111111111111111", 
-                                            :verification_code => "123",
-                                            :expiration_month => 5, 
-                                            :expiration_year => 2012)
+    subject.save_customer_and_subscription!(Factory.attributes_for(:paid_account, :plan_id => new_plan.id))
 
     FakeBraintree.subscriptions[subject.subscription_token].keys.should_not include("merchant_account_id")
   end
 
-  it "doesn't create a credit card, and subscription when the plan is changed to a different free plan" do
+  it "doesn't create a credit card, subscription, and billing address when the plan is changed to a different free plan" do
     new_plan = Factory(:plan, :name => "New Plan")
     subject.save_customer_and_subscription!(:plan_id => new_plan.id)
 
     subject.credit_card.should be_nil
     subject.subscription.should be_nil
+    subject.billing_address.should be_nil
   end
 end
 
@@ -285,16 +322,12 @@ end
 
 describe Account, "with a paid subscription" do
   subject do
-    Factory(:account, 
-            :cardholder_name => "Ralph Robot", 
-            :billing_email => "ralph@example.com", 
-            :card_number => "4111111111111111", 
-            :verification_code => "123",
-            :expiration_month => 5, 
-            :expiration_year => 2012,
+    Factory(:paid_account, 
             :plan => Factory(:paid_plan))
   end
 
+  let(:merchant_time_zone) { ActiveSupport::TimeZone[Saucy::Configuration.merchant_account_time_zone] }
+
   it "gets marked as past due and updates its next_billing_date when subscriptions are updated and it has been rejected by the gateway" do
     next_billing_date_string = 2.months.from_now.to_s(:braintree_date)
     subscription = FakeBraintree.subscriptions[subject.subscription_token]
@@ -304,8 +337,7 @@ describe Account, "with a paid subscription" do
     Timecop.travel(subject.next_billing_date + 1.day) do
       Account.update_subscriptions!
       subject.reload.subscription_status.should == Braintree::Subscription::Status::PastDue
-      subject.next_billing_date.should == Time.parse(next_billing_date_string).in_time_zone(
-        Saucy::Configuration.merchant_account_time_zone)
+      subject.next_billing_date.should == merchant_time_zone.parse(next_billing_date_string)
       subject.past_due?.should be
     end
   end
@@ -326,13 +358,7 @@ describe Account, "with a paid subscription" do
     end
 
     it "delivers the rest of the emails even if one fails" do
-      Factory(:account, 
-              :cardholder_name => "Ralph Robot", 
-              :billing_email => "ralph@example.com", 
-              :card_number => "4111111111111111", 
-              :verification_code => "123",
-              :expiration_month => 5, 
-              :expiration_year => 2012,
+      Factory(:paid_account, 
               :plan => Factory(:paid_plan))
       Timecop.travel(subject.next_billing_date + 1.day) do
         Account.update_subscriptions!
@@ -519,13 +545,7 @@ end
 
 describe Account, "with a paid subscription that is past due" do
   subject do
-    Factory(:account, 
-            :cardholder_name => "Ralph Robot", 
-            :billing_email => "ralph@example.com", 
-            :card_number => "4111111111111111", 
-            :verification_code => "123",
-            :expiration_month => 5, 
-            :expiration_year => 2012,
+    Factory(:paid_account, 
             :plan => Factory(:paid_plan))
   end
 
@@ -622,13 +642,7 @@ end
 
 describe Account, "that is activated" do
   subject do
-    Factory(:account,
-            :cardholder_name => "Ralph Robot",
-            :billing_email => "ralph@example.com",
-            :card_number => "4111111111111111",
-            :verification_code => "123",
-            :expiration_month => 5,
-            :expiration_year => 2012,
+    Factory(:paid_account,
             :plan => Factory(:paid_plan))
   end
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 45
   prerelease: 
-  segments: 
-  - 0
-  - 13
-  - 3
-  version: 0.13.3
+  version: 0.14.0
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -20,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-18 00:00:00 Z
+date: 2011-10-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: clearance
@@ -30,11 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 11
-        - 2
         version: 0.11.2
   type: :runtime
   version_requirements: *id001
@@ -46,10 +36,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
         version: "1.2"
   type: :runtime
   version_requirements: *id002
@@ -61,11 +47,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 0
-        - 3
         version: 3.0.3
   type: :runtime
   version_requirements: *id003
@@ -77,11 +58,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 6
-        - 2
         version: 2.6.2
   type: :runtime
   version_requirements: *id004
@@ -93,11 +69,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
         version: 1.3.3
   type: :runtime
   version_requirements: *id005
@@ -109,11 +80,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 1
-        - 2
         version: 1.1.2
   type: :runtime
   version_requirements: *id006
@@ -125,11 +91,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 3
-        - 0
-        - 4
         version: 3.0.4
   type: :runtime
   version_requirements: *id007
@@ -141,11 +102,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 2
-        - 6
         version: 0.2.6
   type: :development
   version_requirements: *id008
@@ -238,6 +194,7 @@ files:
 - lib/generators/saucy/features/templates/factories.rb
 - lib/generators/saucy/features/templates/step_definitions/account_steps.rb
 - lib/generators/saucy/features/templates/step_definitions/braintree_steps.rb
+- lib/generators/saucy/features/templates/step_definitions/country_steps.rb
 - lib/generators/saucy/features/templates/step_definitions/cron_steps.rb
 - lib/generators/saucy/features/templates/step_definitions/email_steps.rb
 - lib/generators/saucy/features/templates/step_definitions/factory_girl_steps.rb
@@ -345,23 +302,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Clearance-based Rails engine for SaaS