saucy 0.2.10 → 0.2.11

data/app/controllers/plans_controller.rb

@@ -2,16 +2,16 @@ class PlansController < ApplicationController
   layout Saucy::Layouts.to_proc
 
   def index
-    @plans = Plan.all
+    @plans = Plan.ordered
   end
 
   def edit
-    @plans = Plan.all
+    @plans = Plan.ordered
     @account = current_account
   end
 
   def update
-    @plans = Plan.all
+    @plans = Plan.ordered
     @account = current_account
     if @account.save_braintree!(params[:account])
       redirect_to edit_account_path(@account), :notice => t('.update.notice', :default => "Plan changed successfully")

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

@@ -1,6 +1,7 @@
 <% if current_user.admin_of?(current_account) -%>
   <div class="current_credit_card">
-    We're currently charging the credit card ending in <%= current_account.credit_card.last_4 %>. <%= link_to "Change", edit_account_billing_path(current_account) %>
+    <h3>Billing Information</h3>
+    <p>We're currently charging the credit card ending in <%= current_account.credit_card.last_4 %>. <%= link_to "Change", edit_account_billing_path(current_account) %></p>
   </div>
   <div class="billing_history">
     <h3>Your Invoices</h3>
@@ -17,7 +18,7 @@
         <% end -%>
       </table>
     <% else -%>
-      There have been no invoices yet.
+      <p>There have been no invoices yet.</p>
     <% end -%>
   </div>
 <% end -%>

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

@@ -5,10 +5,11 @@ Feature: Sign up
 
   Background:
     Given a paid plan exists with a name of "Paid"
+    And a plan exists with a name of "Free"
 
   Scenario: User signs up for a paid plan with invalid data
     When I go to the sign up page for the "Paid" plan
-    And I should see "Paid"
+    Then I should see "Paid"
     And I should see "$1/month"
     And the "Card number" field should have autocomplete off
     And the "Verification code" field should have autocomplete off
@@ -21,7 +22,8 @@ Feature: Sign up
 
   Scenario: User signs up for a paid plan with valid data
     When I go to the list of plans page
-    And I follow "Paid"
+    Then I should see the "Paid" plan before the "Free" plan
+    When I follow "Paid"
     And I fill in "Email" with "email@person.com"
     And I fill in "Password" with "password"
     And I fill in "Confirm password" with "password"

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

@@ -7,3 +7,10 @@ Then /^the "([^"]*)" plan should be disabled$/ do |plan_name|
   input_id = page.find(:xpath, "//label/p[contains(text(),'#{plan_name}')]/../@for").node.value
   page.should have_css("##{input_id}[disabled='disabled']")
 end
+
+When /^I should see the "([^"]*)" plan before the "([^"]*)" plan$/ do |first_plan_name, second_plan_name|
+  first_expression  = Regexp.escape(first_plan_name)
+  second_expression = Regexp.escape(second_plan_name)
+  joint_expression  = /#{first_expression}.*#{second_expression}/m
+  page.body.should =~ joint_expression
+end

data/lib/saucy/plan.rb

@@ -7,6 +7,10 @@ module Saucy
       has_many :limits
 
       validates_presence_of :name
+
+      def self.ordered
+        order('price desc')
+      end
     end
 
     module InstanceMethods

data/spec/models/plan_spec.rb

@@ -52,3 +52,14 @@ describe Plan, "with limits" do
     subject.allows?(:lighthouse).should be
   end
 end
+
+
+describe Plan, "with prices" do
+  let!(:free) { Factory(:plan, :price => 0) }
+  let!(:least) { Factory(:plan, :price => 1) }
+  let!(:most) { Factory(:plan, :price => 2) }
+
+  it "gives them from most to least expensive when ordered" do
+    Plan.ordered.should == [most, least, free]
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 2
-  - 10
-  version: 0.2.10
+  - 11
+  version: 0.2.11
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -17,14 +17,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 -05:00
+date: 2011-01-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
   name: formtastic
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -34,12 +33,12 @@ dependencies:
         - 1
         - 2
         version: "1.2"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: railties
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -50,12 +49,12 @@ dependencies:
         - 0
         - 3
         version: 3.0.3
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: braintree
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -66,12 +65,12 @@ dependencies:
         - 6
         - 2
         version: 2.6.2
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: sham_rack
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -82,12 +81,12 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: sinatra
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -98,12 +97,12 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
-  requirement: *id005
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
   name: aruba
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -114,7 +113,8 @@ dependencies:
         - 2
         - 6
         version: 0.2.6
-  requirement: *id006
+  type: :development
+  version_requirements: *id006
 description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
 email: support@thoughtbot.com
 executables: []