saucy 0.2.6.1 → 0.2.7

data/app/views/plans/edit.html.erb

@@ -7,17 +7,21 @@
     <% @plans.each do |plan| -%>
       <%= content_tag_for :li, plan, :class => "#{plan.name.parameterize} #{'disabled' if !@account.can_change_plan_to?(plan)}" do %>
         <%= form.label :plan_id, render(plan), :value => plan.id %>
-        <%= form.radio_button :plan_id, plan.id, :disabled => !@account.can_change_plan_to?(plan) %>
+        <%= form.radio_button :plan_id, plan.id, :disabled => !@account.can_change_plan_to?(plan), "data-free" => plan.free? %>
       <% end %>
     <% end -%>
   <% end %>
 
   <% if !@account.credit_card -%>
-    <h5 class="legend">Billing Information</h5>
-    <%= render :partial => 'billings/form', :locals => { :form => form } %>
+    <div class="billing_information" style="<%= 'display: none' if @account.plan.free? %>">
+      <h5 class="legend">Billing Information</h5>
+      <%= render :partial => 'billings/form', :locals => { :form => form } %>
+    </div>
   <% end -%>
 
   <%= form.buttons do %>
     <%= form.commit_button "Upgrade" %>
   <% end %>
 <% end %>
+
+<%= render :partial => "shared/saucy_javascript" %>

data/app/views/shared/_saucy_javascript.html.erb

@@ -11,6 +11,23 @@
         $(this).siblings('p.inline-hints').find('span').text(mainPart);
         $('#signup_keyword, #project_keyword').val(mainPart);
       });
+
+      $.fn.updateSelectedPlan = function() {
+        $(".plans-edit input:radio:not(checked)").each(function() {
+          $("label[for=" + $(this).attr("id") + "]").removeClass('selected');
+        });
+        $("label[for=" + $(this).attr("id") + "]").addClass('selected');
+        if($(this).attr("data-free") == "true") {
+          $(".billing_information").hide();
+        } else {
+          $(".billing_information").show();
+        }
+      };
+
+      $(".plans-edit input:radio").click(function() {
+        $(this).updateSelectedPlan();
+      });
+      $(".plans-edit input:radio:checked").updateSelectedPlan();
     });
   <% end %>
 <% end -%>

data/lib/saucy/account.rb

@@ -82,21 +82,12 @@ module Saucy
 
       def save_braintree!(attributes)
         successful = true
-        self.plan = ::Plan.find(attributes[:plan_id]) if attributes[:plan_id].present?
-        if CUSTOMER_ATTRIBUTES.keys.any? { |attribute| attributes[attribute].present? }
-          CUSTOMER_ATTRIBUTES.keys.each do |attribute|
-            send("#{attribute}=", attributes[attribute]) if attributes[attribute].present?
-          end
-          result = Braintree::Customer.update(customer_token, customer_attributes)
-          successful = result.success?
-          handle_customer_result(result)
+        self.plan = ::Plan.find(attributes[:plan_id]) if changing_plan?(attributes)
+        if changing_braintree_attributes?(attributes)
+          successful = update_braintree_customer(attributes)
         end
-        if successful && attributes[:plan_id].present?
-          if subscription 
-            Braintree::Subscription.update(subscription_token, :plan_id => attributes[:plan_id])
-          else
-            create_subscription
-          end
+        if successful && changing_plan?(attributes)
+          save_subscription
           flush_cache :subscription
         end
         successful && save
@@ -114,6 +105,35 @@ module Saucy
 
       private
 
+      def changing_plan?(attributes)
+        attributes[:plan_id].present?
+      end
+
+      def changing_braintree_attributes?(attributes)
+        CUSTOMER_ATTRIBUTES.keys.any? { |attribute| attributes[attribute].present? }
+      end
+
+      def set_braintree_attributes(attributes)
+        CUSTOMER_ATTRIBUTES.keys.each do |attribute|
+          send("#{attribute}=", attributes[attribute]) if attributes[attribute].present?
+        end
+      end
+
+      def update_braintree_customer(attributes)
+        set_braintree_attributes(attributes)
+        result = Braintree::Customer.update(customer_token, customer_attributes)
+        handle_customer_result(result)
+        result.success?
+      end
+
+      def save_subscription
+        if subscription 
+          Braintree::Subscription.update(subscription_token, :plan_id => plan_id)
+        elsif plan.billed?
+          create_subscription
+        end
+      end
+
       def customer_attributes
         {
           :email => billing_email,
@@ -139,7 +159,7 @@ module Saucy
 
       def credit_card_options
         if customer && customer.credit_cards.any?
-          { :update_existing_token => customer.credit_cards[0].token }
+          { :update_existing_token => credit_card.token }
         else
           {}
         end

data/spec/models/account_spec.rb

@@ -216,7 +216,7 @@ 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 and billing info is supplied" do
+  it "creates a credit card, and subscription 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_braintree!(:plan_id => new_plan.id,
                             :cardholder_name => "Ralph Robot", 
@@ -232,6 +232,14 @@ describe Account, "with a free plan" do
     subject.credit_card.should_not be_nil
     subject.subscription.should_not be_nil
   end
+
+  it "doesn't create a credit card, and subscription when the plan is changed to a different free plan" do
+    new_plan = Factory(:plan, :name => "New Plan")
+    subject.save_braintree!(:plan_id => new_plan.id)
+
+    subject.credit_card.should be_nil
+    subject.subscription.should be_nil
+  end
 end
 
 describe Account, "with a plan and limits, and other plans" do

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 69
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 2
-  - 6
-  - 1
-  version: 0.2.6.1
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -18,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-15 00:00:00 -05:00
+date: 2011-01-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency