saucy 0.2.38 → 0.2.39

data/app/views/accounts/_account.html.erb

@@ -4,6 +4,6 @@
   </div>
 
   <%= render 'accounts/projects',
-             :projects => account.projects_visible_to(current_user),
-             :account  => account%>
+             :projects => projects,
+             :account  => account %>
 <% end -%>

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

@@ -5,8 +5,9 @@
 <%= render :partial => 'tab_bar' %>
 
 <div class="plan current">
-  <h3>Your Plan (<%= link_to "Upgrade", edit_account_plan_path(current_account), :id => "upgrade-account" %>)</h3>
+  <h3>Your Plan</h3>
   <%= render @account.plan %>
+  <%= link_to "Upgrade", edit_account_plan_path(current_account), :id => "upgrade-account" %>
 </div>
 
 <%= content_tag_for :div, @account do -%>

data/app/views/accounts/index.html.erb

@@ -2,4 +2,8 @@
   <h2>Accounts</h2>
 <% end -%>
 
-<%= render :partial => 'account', :collection => @accounts %>
+<% @accounts.each do |account| -%>
+  <%= render 'account', :account  => account,
+                        :projects => account.projects_visible_to(current_user) %>
+<% end -%>
+

data/app/views/accounts/new.html.erb

@@ -29,7 +29,7 @@
     <%= render :partial => 'billings/form', :locals => { :form => form } %>
   <% end -%>
 
-  <p>By clicking <strong>Sign up</strong> you agree to our <%= link_to "Terms of Service", "/pages/terms" %>.</p>
+  <p id="terms-text">By clicking <strong>Sign up</strong> you agree to our <%= link_to "Terms of Service", "/pages/terms" %>.</p>
 
   <%= form.buttons do %>
     <%= form.commit_button "Sign up" %>

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

@@ -14,7 +14,7 @@
       </li>
     <% end -%>
   </ul>
-  <%= link_to 'Add new account', plans_path, :class => 'new-account button' %>
+  <%= link_to 'Add new account', plans_path, :class => 'new-account' %>
 </div>
 
 

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

@@ -70,5 +70,5 @@ Feature: Trial plans
     And "admin@example.com" is an admin of the "Test" account
     And the "Test" account was created 7 days ago
     When the daily Saucy jobs are processed
-    Then an email with subject "A check in from App Name" should be sent to "admin@example.com"
+    Then an email with subject "A check in" should be sent to "admin@example.com"
 

data/spec/views/accounts/_account.html.erb_spec.rb

@@ -8,19 +8,14 @@ describe "/accounts/_account.html.erb" do
   before { view.stubs(:current_user => user) }
 
   def render_account
-    render :partial => "accounts/account", :locals => { :account => account }
+    render :partial => "accounts/account",
+           :locals  => { :account => account, :projects => projects }
   end
 
   context "with projects" do
     let(:project) { Factory.stub(:project, :name => 'Test Project') }
-    before do
-      account.stubs(:projects_visible_to => [project])
-      render_account
-    end
-
-    it "finds visible projects" do
-      account.should have_received(:projects_visible_to).with(user)
-    end
+    let(:projects) { [project] }
+    before { render_account }
 
     it "renders projects" do
       rendered.should include(project.name)
@@ -32,10 +27,8 @@ describe "/accounts/_account.html.erb" do
   end
 
   context "without projects" do
-    before do
-      account.stubs(:projects_visible_to => [])
-      render_account
-    end
+    let(:projects) { [] }
+    before { render_account }
 
     it "renders the blank slate" do
       rendered.should include("blank_slate")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 91
+  hash: 89
   prerelease: 
   segments: 
   - 0
   - 2
-  - 38
-  version: 0.2.38
+  - 39
+  version: 0.2.39
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-04 00:00:00 -05:00
+date: 2011-03-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,8 +33,8 @@ dependencies:
         - 1
         - 2
         version: "1.2"
-  name: formtastic
   version_requirements: *id001
+  name: formtastic
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -49,8 +49,8 @@ dependencies:
         - 0
         - 3
         version: 3.0.3
-  name: railties
   version_requirements: *id002
+  name: railties
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -65,8 +65,8 @@ dependencies:
         - 6
         - 2
         version: 2.6.2
-  name: braintree
   version_requirements: *id003
+  name: braintree
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -81,8 +81,8 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
-  name: sham_rack
   version_requirements: *id004
+  name: sham_rack
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -97,8 +97,8 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
-  name: sinatra
   version_requirements: *id005
+  name: sinatra
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -113,8 +113,8 @@ dependencies:
         - 2
         - 6
         version: 0.2.6
-  name: aruba
   version_requirements: *id006
+  name: aruba
   prerelease: false
 description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
 email: support@thoughtbot.com
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Clearance-based Rails engine for SaaS