build using rails_apps_composer 2.2.30

DanielKehoe · DanielKehoe · commit 05687b8e1636 · 2013-01-22T16:40:57.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,7 @@
 # The original version of this file is found here:
 # https://github.com/RailsApps/rails-composer/blob/master/files/gitignore.txt
 #
-# Corrections? Improvements? Create a GitHub issue: 
+# Corrections? Improvements? Create a GitHub issue:
 # http://github.com/RailsApps/rails-composer/issues
 #----------------------------------------------------------------------------
 
@@ -74,4 +74,4 @@ pickle-email-*.html
 **.swp
 
 # Ignore application configuration
-/config/application.yml
+# /config/application.yml
diff --git a/Gemfile b/Gemfile
@@ -7,19 +7,19 @@ group :assets do
   gem 'uglifier', '>= 1.0.3'
 end
 gem 'jquery-rails'
-gem "rspec-rails", ">= 2.12.1", :group => [:development, :test]
+gem "rspec-rails", ">= 2.12.2", :group => [:development, :test]
 gem "database_cleaner", ">= 0.9.1", :group => :test
 gem "email_spec", ">= 1.4.0", :group => :test
 gem "cucumber-rails", ">= 1.3.0", :group => :test, :require => false
 gem "launchy", ">= 2.1.2", :group => :test
 gem "capybara", ">= 2.0.2", :group => :test
 gem "factory_girl_rails", ">= 4.1.0", :group => [:development, :test]
-gem "bootstrap-sass", ">= 2.1.1.0"
-gem "devise", ">= 2.2.0"
+gem "bootstrap-sass", ">= 2.2.2.0"
+gem "devise", ">= 2.2.2"
 gem "cancan", ">= 1.6.8"
 gem "rolify", ">= 3.2.0"
 gem "simple_form", ">= 2.0.4"
 gem "quiet_assets", ">= 1.0.1", :group => :development
-gem "figaro", ">= 0.5.2"
-gem "better_errors", ">= 0.2.0", :group => :development
-gem "binding_of_caller", ">= 0.6.8", :group => :development
+gem "figaro", ">= 0.5.3"
+gem "better_errors", ">= 0.3.2", :group => :development
+gem "binding_of_caller", ">= 0.6.8", :group => :development
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -97,9 +97,6 @@ GEM
     json (1.7.6)
     launchy (2.1.2)
       addressable (~> 2.3)
-    libwebsocket (0.1.7.1)
-      addressable
-      websocket
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -154,11 +151,11 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.27.2)
+    selenium-webdriver (2.29.0)
       childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
+      websocket (~> 1.0.4)
     simple_form (2.0.4)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
@@ -187,24 +184,24 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  better_errors (>= 0.2.0)
+  better_errors (>= 0.3.2)
   binding_of_caller (>= 0.6.8)
-  bootstrap-sass (>= 2.1.1.0)
+  bootstrap-sass (>= 2.2.2.0)
   cancan (>= 1.6.8)
   capybara (>= 2.0.2)
   coffee-rails (~> 3.2.1)
   cucumber-rails (>= 1.3.0)
   database_cleaner (>= 0.9.1)
-  devise (>= 2.2.0)
+  devise (>= 2.2.2)
   email_spec (>= 1.4.0)
   factory_girl_rails (>= 4.1.0)
-  figaro (>= 0.5.2)
+  figaro (>= 0.5.3)
   jquery-rails
   launchy (>= 2.1.2)
   quiet_assets (>= 1.0.1)
   rails (= 3.2.11)
   rolify (>= 3.2.0)
-  rspec-rails (>= 2.12.1)
+  rspec-rails (>= 2.12.2)
   sass-rails (~> 3.2.3)
   simple_form (>= 2.0.4)
   sqlite3
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -1,5 +1,5 @@
 module ApplicationHelper
-  
+
   def display_base_errors resource
     return '' if (resource.errors.empty?) or (resource.errors[:base].empty?)
     messages = resource.errors[:base].map { |msg| content_tag(:p, msg) }.join
@@ -11,5 +11,5 @@ def display_base_errors resource
     HTML
     html.html_safe
   end
-  
-end
+
+end
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
@@ -11,4 +11,4 @@
 <% end %>
 <h3>Cancel my account</h3>
 <p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %>.</p>
-<%= link_to "Back", :back %>
+<%= link_to "Back", :back %>
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
@@ -2,10 +2,10 @@
 <%= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => {:class => 'form-vertical' }) do |f| %>
   <%= f.error_notification %>
   <%= display_base_errors resource %>
-  <%= f.input :name, :autofocus => true %> 
+  <%= f.input :name, :autofocus => true %>
   <%= f.input :email, :required => true %>
   <%= f.input :password, :required => true %>
   <%= f.input :password_confirmation, :required => true %>
   <%= f.button :submit, 'Sign up', :class => 'btn-primary' %>
 <% end %>
-<%= render "devise/shared/links" %>
+<%= render "devise/shared/links" %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
@@ -5,4 +5,4 @@
   <%= f.input :remember_me, :as => :boolean if devise_mapping.rememberable? %>
   <%= f.button :submit, "Sign in", :class => 'btn-primary' %>
 <% end %>
-<%= render "devise/shared/links" %>
+<%= render "devise/shared/links" %>
diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb
@@ -22,4 +22,4 @@
   <%- resource_class.omniauth_providers.each do |provider| %>
     <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
   <% end -%>
-<% end -%>
+<% end -%>
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
@@ -1,4 +1,4 @@
 <h3>Home</h3>
 <% @users.each do |user| %>
   <p>User: <%=link_to user.name, user %></p>
-<% end %>
+<% end %>
diff --git a/app/views/layouts/_messages.html.erb b/app/views/layouts/_messages.html.erb
@@ -5,4 +5,4 @@
       <%= content_tag :div, msg, :id => "flash_#{name}" %>
     </div>
   <% end %>
-<% end %>
+<% end %>
diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb
@@ -2,11 +2,11 @@
 <ul class="nav">
   <% if user_signed_in? %>
     <li>
-    <%= link_to 'Logout', destroy_user_session_path, :method=>'delete' %>        
+    <%= link_to 'Logout', destroy_user_session_path, :method=>'delete' %>
     </li>
   <% else %>
     <li>
-    <%= link_to 'Login', new_user_session_path %>  
+    <%= link_to 'Login', new_user_session_path %>
     </li>
   <% end %>
   <% if user_signed_in? %>
@@ -23,4 +23,4 @@
     <%= link_to 'Sign up', new_user_registration_path %>
     </li>
   <% end %>
-</ul>
+</ul>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -32,4 +32,4 @@
       </div> <!--! end of .container -->
     </div> <!--! end of #main -->
   </body>
-</html>
+</html>
diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
@@ -12,4 +12,4 @@
       <a class="btn" data-dismiss="modal" href="#">Close</a>
     </div>
   <% end %>
-</div>
+</div>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
@@ -1,30 +1,30 @@
 <h3>Users</h3>
 <div class="span8">
 <table class="table table-condensed">
-	  <thead>
-      <tr>
-          <th>Username</th>
-          <th>Email</th>
-          <th>Registered</th>
-          <th>Role</th>
-          <th></th>
-          <th></th>                                      
-      </tr>
-  </thead>   
+  <thead>
+    <tr>
+      <th>Username</th>
+      <th>Email</th>
+      <th>Registered</th>
+      <th>Role</th>
+      <th></th>
+      <th></th>
+    </tr>
+  </thead>
   <tbody>
   <% @users.each do |user| %>
     <tr>
-        <td><%= link_to user.name, user %></td>
-        <td><%= user.email %></td>
-        <td><%= user.created_at.to_date %></td>
-        <td><%= user.roles.first.name.titleize unless user.roles.first.nil? %></td>
-        <td>
-          <a data-toggle="modal" href="#role-options-<%= user.id %>" class="btn btn-mini" type="button">Change role</a>
-          <%= render user %>
-        </td>
-        <td><%= link_to("Delete user", user_path(user), :data => { :confirm => "Are you sure?" }, :method => :delete, :class => 'btn btn-mini') unless user == current_user %></td>                                       
+      <td><%= link_to user.name, user %></td>
+      <td><%= user.email %></td>
+      <td><%= user.created_at.to_date %></td>
+      <td><%= user.roles.first.name.titleize unless user.roles.first.nil? %></td>
+      <td>
+        <a data-toggle="modal" href="#role-options-<%= user.id %>" class="btn btn-mini" type="button">Change role</a>
+        <%= render user %>
+      </td>
+      <td><%= link_to("Delete user", user_path(user), :data => { :confirm => "Are you sure?" }, :method => :delete, :class => 'btn btn-mini') unless user == current_user %></td>
     </tr>
   <% end %>
   </tbody>
 </table>
-</div>
+</div>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
@@ -1,3 +1,3 @@
 <h3>User</h3>
 <p>User: <%= @user.name %></p>
-<p>Email: <%= @user.email if @user.email %></p>
+<p>Email: <%= @user.email if @user.email %></p>
diff --git a/config/application.example.yml b/config/application.example.yml
@@ -11,5 +11,5 @@ GMAIL_USERNAME: Your_Username
 GMAIL_PASSWORD: Your_Password
 ADMIN_NAME: First User
 ADMIN_EMAIL: user@example.com
-ADMIN_PASSWORD: please
+ADMIN_PASSWORD: changeme
 ROLES: [admin, user, VIP]
diff --git a/config/application.yml b/config/application.yml
@@ -0,0 +1,15 @@
+# Add account credentials and API keys here.
+# See http://railsapps.github.com/rails-environment-variables.html
+# This file should be listed in .gitignore to keep your settings secret!
+# Each entry sets a local environment variable and overrides ENV variables in the Unix shell.
+# For example, setting:
+# GMAIL_USERNAME: Your_Gmail_Username
+# makes 'Your_Gmail_Username' available as ENV["GMAIL_USERNAME"]
+# Add application configuration variables here, as shown below.
+#
+GMAIL_USERNAME: Your_Username
+GMAIL_PASSWORD: Your_Password
+ADMIN_NAME: First User
+ADMIN_EMAIL: user@example.com
+ADMIN_PASSWORD: changeme
+ROLES: [admin, user, VIP]
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
@@ -92,6 +92,14 @@
   # the user cannot access the website without confirming his account.
   # config.allow_unconfirmed_access_for = 2.days
 
+  # A period that the user is allowed to confirm their account before their
+  # token becomes invalid. For example, if set to 3.days, the user can confirm
+  # their account within 3 days after the mail was sent, but on the fourth day
+  # their account can't be confirmed with the token any more.
+  # Default is nil, meaning there is no restriction on how long a user can take
+  # before confirming their account.
+  # config.confirm_within = 3.days
+
   # If true, requires any email changes to be confirmed (exactly the same way as
   # initial account confirmation) to be applied. Requires additional unconfirmed_email
   # db field (see migrations). Until confirmed new email is stored in
@@ -113,8 +121,8 @@
   # config.rememberable_options = {}
 
   # ==> Configuration for :validatable
-  # Range for password length. Default is 6..128.
-  # config.password_length = 6..128
+  # Range for password length. Default is 8..128.
+  config.password_length = 8..128
 
   # Email regex used to validate email formats. It simply asserts that
   # an one (and only one) @ exists in the given string. This is mainly
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
@@ -10,13 +10,15 @@ en:
       not_saved:
         one: "1 error prohibited this %{resource} from being saved:"
         other: "%{count} errors prohibited this %{resource} from being saved:"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
 
   devise:
     failure:
       already_authenticated: 'You are already signed in.'
       unauthenticated: 'You need to sign in or sign up before continuing.'
       unconfirmed: 'You have to confirm your account before continuing.'
       locked: 'Your account is locked.'
+      not_found_in_database: 'Invalid email or password.'
       invalid: 'Invalid email or password.'
       invalid_token: 'Invalid authentication token.'
       timeout: 'Your session expired, please sign in again to continue.'
diff --git a/features/step_definitions/user_steps.rb b/features/step_definitions/user_steps.rb
@@ -2,7 +2,7 @@
 
 def create_visitor
   @visitor ||= { :name => "Testy McUserton", :email => "example@example.com",
-    :password => "please", :password_confirmation => "please" }
+    :password => "changeme", :password_confirmation => "changeme" }
 end
 
 def find_user
@@ -103,7 +103,7 @@ def sign_in
 
 When /^I sign up with a mismatched password confirmation$/ do
   create_visitor
-  @visitor = @visitor.merge(:password_confirmation => "please123")
+  @visitor = @visitor.merge(:password_confirmation => "changeme123")
   sign_up
 end
 
diff --git a/public/humans.txt b/public/humans.txt
@@ -17,4 +17,4 @@
   Software: Ruby on Rails
 
 /* GENERATED BY */
-	RailsApps application template: http://railsapps.github.com/
+RailsApps application template: http://railsapps.github.com/
diff --git a/public/robots.txt b/public/robots.txt
@@ -1,5 +1,5 @@
 # See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
 #
 # To ban all spiders from the entire site uncomment the next two lines:
-User-Agent: *
-Disallow: /
+# User-Agent: *
+# Disallow: /
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
@@ -4,9 +4,9 @@
   factory :user do
     name 'Test User'
     email 'example@example.com'
-    password 'please'
-    password_confirmation 'please'
+    password 'changeme'
+    password_confirmation 'changeme'
     # required if the Devise Confirmable module is used
     # confirmed_at Time.now
   end
-end
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
