RubyGems - saucy - Versions diffs - 0.2.45 → 0.3.0 - Mend

saucy 0.2.45 → 0.3.0

Files changed (20) hide show

data/README.md +8 -3
data/app/controllers/billings_controller.rb +1 -0
data/app/views/accounts/{_tab_bar.html.erb → _subnav.html.erb} +3 -3
data/app/views/accounts/edit.html.erb +1 -1
data/app/views/billings/edit.html.erb +1 -1
data/app/views/billings/show.html.erb +1 -1
data/app/views/invitations/new.html.erb +1 -1
data/app/views/layouts/saucy.html.erb +24 -0
data/app/views/memberships/edit.html.erb +1 -1
data/app/views/memberships/index.html.erb +1 -1
data/app/views/projects/edit.html.erb +1 -1
data/app/views/projects/index.html.erb +1 -1
data/app/views/projects/new.html.erb +1 -1
data/features/step_definitions/saucy_steps.rb +0 -11
data/lib/generators/saucy/features/templates/features/edit_project_permissions.feature +1 -1
data/lib/generators/saucy/features/templates/features/manage_account.feature +1 -1
data/lib/generators/saucy/features/templates/features/manage_plan.feature +2 -2
data/lib/saucy/layouts.rb +1 -1
data/spec/layouts_spec.rb +3 -3
metadata +7 -6

data/README.md CHANGED Viewed

@@ -67,12 +67,17 @@ To use seed data in your Cucumber, add this to features/support/seed.rb:
 Customization
 -------------
-To change the layout for a controller inside of saucy, add a line like this to
-your config/application.rb:
+By default Saucy uses and provides a `saucy.html.erb` layout. To change the
+layout for a controller inside of saucy, add a line like this to your
+config/application.rb:
     config.saucy.layouts.accounts.index = "custom"
-Your layout should yield(:header) in order to get the headers from saucy views.
+In addition to just the normal yield, your layout should yield the following
+items in order to get everything from saucy views:
+* :header
+* :subnav
 To extend the ProjectsController:

data/app/controllers/billings_controller.rb CHANGED Viewed

@@ -1,5 +1,6 @@
 class BillingsController < ApplicationController
   before_filter :authorize_admin, :except => [:show]
+  layout Saucy::Layouts.to_proc
   def show
   end

data/app/views/accounts/{_tab_bar.html.erb → _subnav.html.erb} RENAMED Viewed

@@ -1,5 +1,5 @@
-<div class="tabs">
-  <ul>
+<% content_for :subnav do -%>
+  <ul class="subnav">
     <li class="accounts"><%= link_to "Account Info", edit_account_url(current_account) %></li>
     <li class="projects"><%= link_to "Projects", account_projects_url(current_account) %></li>
     <li class="users"><%= link_to "Users", account_memberships_url(current_account) %></li>
@@ -7,4 +7,4 @@
       <li class="billing"><%= link_to "Billing", account_billing_path(current_account) %></li>
     <% end -%>
   </ul>
-</div>
+<% end -%>

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

@@ -2,7 +2,7 @@
   <h2>Settings for <span><%= current_account.name %></span></h2>
 <% end -%>
-<%= render :partial => 'tab_bar' %>
+<%= render :partial => 'subnav' %>
 <div class="plan current">
   <h3>Your Plan</h3>

data/app/views/billings/edit.html.erb CHANGED Viewed

@@ -2,7 +2,7 @@
   <h2>Billing Information</h2>
 <% end -%>
-<%= render :partial => 'accounts/tab_bar' %>
+<%= render :partial => 'accounts/subnav' %>
 <%= semantic_form_for @account, :url => account_billing_path(@account) do |form| %>
   <%= render :partial => 'billings/form', :locals => { :form => form } %>

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

@@ -3,7 +3,7 @@
     <h2>Billing Information</h2>
   <% end -%>
-  <%= render :partial => 'accounts/tab_bar' %>
+  <%= render :partial => 'accounts/subnav' %>
   <div class="current_credit_card">
     <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>

data/app/views/invitations/new.html.erb CHANGED Viewed

@@ -2,7 +2,7 @@
   <h2>Invite a new User</h2>
 <% end -%>
-<%= render :partial => 'accounts/tab_bar' %>
+<%= render :partial => 'accounts/subnav' %>
 <%= semantic_form_for [current_account, @invitation] do |form| -%>
   <%= form.inputs do -%>

data/app/views/layouts/saucy.html.erb ADDED Viewed

@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+    <%= csrf_meta_tag %>
+  </head>
+  <body class="saucy">
+    <% flash.each do |key, value| -%>
+      <%= value %>
+    <% end -%>
+    <% if signed_in? -%>
+      <%= link_to 'Sign out', sign_out_path, :method => :delete %>
+    <% else -%>
+      <%= link_to 'Sign in', sign_in_path %>
+    <% end -%>
+    <%= yield(:subnav) %>
+    <%= yield(:header) %>
+    <%= yield %>
+  </body>
+</html>

data/app/views/memberships/edit.html.erb CHANGED Viewed

@@ -8,7 +8,7 @@
   <% end -%>
 </div>
-<%= render :partial => 'accounts/tab_bar' %>
+<%= render :partial => 'accounts/subnav' %>
 <%= semantic_form_for @membership do |form| -%>
   <%= form.inputs do -%>

data/app/views/memberships/index.html.erb CHANGED Viewed

@@ -2,7 +2,7 @@
   <h2>Users for <span><%= current_account.name %></span></h2>
 <% end -%>
-<%= render :partial => 'accounts/tab_bar' %>
+<%= render :partial => 'accounts/subnav' %>
 <ul class="users">
   <% @memberships.each do |membership| -%>

data/app/views/projects/edit.html.erb CHANGED Viewed

@@ -9,7 +9,7 @@
 </div>
-<%= render :partial => 'accounts/tab_bar' %>
+<%= render :partial => 'accounts/subnav' %>
 <%= semantic_form_for @project do |form| %>
   <%= render 'form', :form       => form,

data/app/views/projects/index.html.erb CHANGED Viewed

@@ -2,7 +2,7 @@
   <h2>Projects for <%= current_account.name %></h2>
 <% end -%>
-<%= render :partial => 'accounts/tab_bar' %>
+<%= render :partial => 'accounts/subnav' %>
 <ul class="projects">
   <% @projects.each do |project| -%>

data/app/views/projects/new.html.erb CHANGED Viewed

@@ -2,7 +2,7 @@
   <h2>Create a new project</h2>
 <% end -%>
-<%= render :partial => 'accounts/tab_bar' %>
+<%= render :partial => 'accounts/subnav' %>
 <%= semantic_form_for(@project, :url => account_projects_url(current_account)) do |form| %>
   <%= render 'form', :form       => form,

data/features/step_definitions/saucy_steps.rb CHANGED Viewed

@@ -1,15 +1,4 @@
 When /^I bootstrap the application for saucy$/ do
-  steps %{
-    And I add a header to the layout
-  }
-end
-When /^I add a header to the layout$/ do
-  header = "<%= yield(:header) %>"
-  replace_in_file "app/views/layouts/application.html.erb",
-                  /(<body>)/,
-                  "\\1\n#{header}"
 end
 When /^I copy the locked Gemfile from this project$/ do

data/lib/generators/saucy/features/templates/features/edit_project_permissions.feature CHANGED Viewed

@@ -19,7 +19,7 @@ Feature: edit permissions for a project
     And "jane@example.com" is a member of the "thoughtbot" account
     And "hank@example.com" is an admin of the "Stocknames" project
     When I go to the settings page for the "thoughtbot" account
-    And I follow "Projects" within ".tabs"
+    And I follow "Projects" within ".subnav"
     And I follow "Stocknames" within "ul.projects"
     Then "Bill" should be listed as a member
     And "Hank" should be listed as an admin

data/lib/generators/saucy/features/templates/features/manage_account.feature CHANGED Viewed

@@ -20,7 +20,7 @@ Feature: Manage account
     And a project named "Projection" exists under the "Test" account
     And the user "captain@awesome.com" exists under the "Test" account
     When I go to the settings page for the "Test" account
-    And I follow "Projects" within ".tabs"
+    And I follow "Projects" within ".subnav"
     Then I should see "Projection"
     When I follow "Users"
     Then I should see "captain@awesome.com"

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

@@ -31,7 +31,7 @@ Feature: Manage Plan
     And I have signed in with "joe@example.com/test"
     And "joe@example.com" is an admin of the "Test" account
     When I go to the settings page for the "Test" account
-    Then I should not see "Billing" within ".tabs"
+    Then I should not see "Billing" within ".subnav"
     Then I should see "Your Plan"
     And I follow "Upgrade"
     Then I should see "Upgrade Your Plan"
@@ -59,7 +59,7 @@ Feature: Manage Plan
     And I have signed in with "joe@example.com/test"
     And "joe@example.com" is an admin of the "Test" account
     When I go to the settings page for the "Test" account
-    Then I should not see "Billing" within ".tabs"
+    Then I should not see "Billing" within ".subnav"
     Then I should see "Your Plan"
     And I follow "Upgrade"
     When I choose the "Basic" plan

data/lib/saucy/layouts.rb CHANGED Viewed

@@ -28,7 +28,7 @@ module Saucy
         if action_name.sub!(/=$/, '')
           @actions[action_name] = args.first
         else
-          @actions[action_name] ||= "application"
+          @actions[action_name] ||= "saucy"
         end
       end
     end

data/spec/layouts_spec.rb CHANGED Viewed

@@ -6,8 +6,8 @@ describe Saucy::Layouts do
     subject.accounts.index.should == "custom"
   end
-  it "defaults to the application layout" do
-    subject.accounts.index.should == "application"
+  it "defaults to the saucy layout" do
+    subject.accounts.index.should == "saucy"
   end
   it "selects a layout for a controller" do
@@ -15,7 +15,7 @@ describe Saucy::Layouts do
     controller.stubs(:action_name => 'index')
     block = subject.class.to_proc
-    block.call(controller).should == 'application'
+    block.call(controller).should == 'saucy'
   end
 end

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: saucy
 version: !ruby/object:Gem::Version
-  hash: 77
+  hash: 19
   prerelease: false
   segments:
   - 0
-  - 2
-  - 45
-  version: 0.2.45
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors:
 - thoughtbot, inc.
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-03-18 00:00:00 -04:00
+date: 2011-03-21 00:00:00 -04:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -147,7 +147,7 @@ files:
 - app/views/accounts/_account.html.erb
 - app/views/accounts/_blank_slate.html.erb
 - app/views/accounts/_projects.html.erb
-- app/views/accounts/_tab_bar.html.erb
+- app/views/accounts/_subnav.html.erb
 - app/views/accounts/edit.html.erb
 - app/views/accounts/index.html.erb
 - app/views/accounts/new.html.erb
@@ -163,6 +163,7 @@ files:
 - app/views/invitation_mailer/invitation.text.erb
 - app/views/invitations/new.html.erb
 - app/views/invitations/show.html.erb
+- app/views/layouts/saucy.html.erb
 - app/views/memberships/edit.html.erb
 - app/views/memberships/index.html.erb
 - app/views/plans/_plan.html.erb