saucy 0.1.12 → 0.1.13

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

@@ -5,8 +5,8 @@
 
   <h5 class="legend">Basic Information</h5>
   <%= form.inputs do %>
-    <%= form.input :account_name, :label => 'Company Name' %>
-    <%= form.input :keyword, :hint => "#{root_url}/accounts/<span>accounturl</span>" %>
+    <%= form.input :account_name, :label => 'Company Name', :hint => account_url(Account.new(:keyword => 'keyword')).html_safe %>
+    <%= form.input :keyword, :wrapper_html => { :style => 'display: none' } %>
   <% end %>
 
   <% unless signed_in? -%>
@@ -24,3 +24,4 @@
   <% end %>
 <% end %>
 
+<%= render :partial => "shared/saucy_javascript" %>

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

@@ -1,14 +1,16 @@
 <h2>Accept invitation to <%= @invitation.account_name %></h2>
 
 <%= semantic_form_for @invitation do |form| %>
-  <%= form.inputs 'I am a new user', :class => 'new_user' do -%>
+  <h5 class="legend">I am a new user</h5>
+  <%= form.inputs :class => 'new_user' do -%>
     <%= form.input :new_user_email, :label => 'Email' %>
     <%= form.input :new_user_name, :label => 'Name' %>
     <%= form.input :new_user_password, :label => 'Password' %>
     <%= form.input :new_user_password_confirmation, :label => 'Confirm password' %>
   <% end -%>
 
-  <%= form.inputs 'I am an existing user', :class => 'existing_user' do -%>
+  <h5 class="legend">I am an existing user</h5>
+  <%= form.inputs :class => 'existing_user' do -%>
     <%= form.input :existing_user_email, :label => 'Email' %>
     <%= form.input :existing_user_password, :label => 'Password' %>
   <% end -%>
@@ -17,4 +19,3 @@
     <%= form.commit_button "Accept Invitation" %>
   <% end %>
 <% end %>
-

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

@@ -1,5 +1,7 @@
 <%= form.inputs do %>
-  <%= form.input :name %>
-  <%= form.input :keyword %>
+  <%= form.input :name, :hint => project_url(Project.new(:account => current_account, :keyword => 'keyword')).html_safe %>
+  <%= form.input :keyword, :wrapper_html => { :style => 'display: none' } %>
   <%= form.input :users, :as => :check_boxes, :collection => users %>
 <% end %>
+
+<%= render :partial => "shared/saucy_javascript" %>

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

@@ -0,0 +1,15 @@
+<%= content_for :javascript do -%>
+  <%= javascript_tag do %>
+    $(function() {
+      $('#signup_account_name_input p.inline-hints, #project_name_input p.inline-hints').each(function(index) {
+        $(this).html($(this).text().replace("keyword", "<span>keyword</span>"))
+      });
+      $('#signup_account_name, #project_name').keyup(function(){
+        var mainPart = /^([\w\s]*)(\W*)/.exec($(this).val())[1];
+        mainPart = mainPart.replace(/ /g, "")
+        if(mainPart == "") mainPart = "keyword";
+        $(this).siblings('p.inline-hints').find('span').text(mainPart);
+      });
+    });
+  <% end %>
+<% end -%>

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

@@ -4,7 +4,9 @@ Feature: Manage Projects
   In order to have a project for each of my software applications
 
   Background:
-    Given an account exists with a name of "Test"
+    Given the following account exists:
+      | name | keyword |
+      | Test | test    |
     And I have signed in with "joe@example.com/test"
     And "joe@example.com" is an admin of the "Test" account
 
@@ -13,6 +15,7 @@ Feature: Manage Projects
     And I follow "New Project"
     And I fill in "Name" with "Project 1"
     And I fill in "Keyword" with "project1"
+    And I should see "http://www.example.com/accounts/test/projects/keyword"
     And I press "Create"
     And I go to the projects page for the "Test" account
     Then I should see "Project 1" within "ul.projects"

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

@@ -10,6 +10,7 @@ Feature: user adds a new account
     And I fill in "Password" with "test"
     And I fill in "Company Name" with "Robots"
     And I fill in "Keyword" with "robots"
+    And I should see "http://www.example.com/accounts/keyword"
     And I press "Sign up"
     Then I should see "created"
     But I should not see "Instructions for confirming"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 1
-  - 12
-  version: 0.1.12
+  - 13
+  version: 0.1.13
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 -05:00
+date: 2010-12-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,6 +109,7 @@ files:
 - app/views/projects/edit.html.erb
 - app/views/projects/index.html.erb
 - app/views/projects/new.html.erb
+- app/views/shared/_saucy_javascript.html.erb
 - lib/generators/saucy/base.rb
 - lib/generators/saucy/features/features_generator.rb
 - lib/generators/saucy/features/templates/factories.rb