Permalink
Browse files

build using rails_apps_composer 2.2.30

  • Loading branch information...
1 parent a07b8ac commit 216a85b8cd55de9326a0573149f8522c0311d5de @DanielKehoe DanielKehoe committed Jan 21, 2013
View
@@ -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
#----------------------------------------------------------------------------
View
@@ -6,14 +6,17 @@ group :assets do
gem 'uglifier', '>= 1.0.3'
end
gem 'jquery-rails'
-gem "mongoid", ">= 3.0.16"
-gem "rspec-rails", ">= 2.12.1", :group => [:development, :test]
+gem "mongoid", ">= 3.0.18"
+gem "rspec-rails", ">= 2.12.2", :group => [:development, :test]
gem "database_cleaner", ">= 0.9.1", :group => :test
-gem "mongoid-rspec", ">= 1.5.5", :group => :test
+gem "mongoid-rspec", ">= 1.5.6", :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 "devise", ">= 2.2.0"
+gem "devise", ">= 2.2.2"
gem "quiet_assets", ">= 1.0.1", :group => :development
+gem "figaro", ">= 0.5.3"
+gem "better_errors", ">= 0.3.2", :group => :development
+gem "binding_of_caller", ">= 0.6.8", :group => :development
View
@@ -31,6 +31,10 @@ GEM
addressable (2.3.2)
arel (3.0.2)
bcrypt-ruby (3.0.1)
+ better_errors (0.3.2)
+ coderay (>= 1.0.0)
+ erubis (>= 2.7.0)
+ binding_of_caller (0.6.8)
builder (3.0.4)
capybara (2.0.2)
mime-types (>= 1.16)
@@ -41,6 +45,7 @@ GEM
xpath (~> 1.0.0)
childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
+ coderay (1.0.8)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
@@ -58,7 +63,7 @@ GEM
cucumber (>= 1.1.8)
nokogiri (>= 1.5.0)
database_cleaner (0.9.1)
- devise (2.2.0)
+ devise (2.2.2)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (~> 3.1)
@@ -75,13 +80,15 @@ GEM
factory_girl_rails (4.1.0)
factory_girl (~> 4.1.0)
railties (>= 3.0.0)
- ffi (1.3.0)
+ ffi (1.3.1)
+ figaro (0.5.3)
+ rails (~> 3.0)
gherkin (2.11.5)
json (>= 1.4.6)
hike (1.2.1)
i18n (0.6.1)
journey (1.0.4)
- jquery-rails (2.1.4)
+ jquery-rails (2.2.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.7.6)
@@ -95,12 +102,12 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
- mongoid (3.0.16)
+ mongoid (3.0.18)
activemodel (~> 3.1)
- moped (~> 1.1)
+ moped (~> 1.2)
origin (~> 1.0)
tzinfo (~> 0.3.22)
- mongoid-rspec (1.5.5)
+ mongoid-rspec (1.5.6)
mongoid (>= 3.0.1)
rake
rspec (>= 2.9)
@@ -112,7 +119,7 @@ GEM
polyglot (0.3.3)
quiet_assets (1.0.1)
railties (~> 3.1)
- rack (1.4.3)
+ rack (1.4.4)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
@@ -145,7 +152,7 @@ GEM
rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
rspec-mocks (2.12.1)
- rspec-rails (2.12.1)
+ rspec-rails (2.12.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
@@ -154,7 +161,7 @@ GEM
rspec-mocks (~> 2.12.0)
rubyzip (0.9.9)
sass (3.2.5)
- sass-rails (3.2.5)
+ sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
@@ -187,19 +194,22 @@ PLATFORMS
ruby
DEPENDENCIES
+ better_errors (>= 0.3.2)
+ binding_of_caller (>= 0.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.3)
jquery-rails
launchy (>= 2.1.2)
- mongoid (>= 3.0.16)
- mongoid-rspec (>= 1.5.5)
+ mongoid (>= 3.0.18)
+ mongoid-rspec (>= 1.5.6)
quiet_assets (>= 1.0.1)
rails (= 3.2.11)
- rspec-rails (>= 2.12.1)
+ rspec-rails (>= 2.12.2)
sass-rails (~> 3.2.3)
uglifier (>= 1.0.3)
@@ -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 -%>
@@ -1,4 +1,4 @@
<h3>Home</h3>
<% @users.each do |user| %>
<p>User: <%=link_to user.name, user %></p>
-<% end %>
+<% end %>
@@ -2,4 +2,4 @@
<% if msg.is_a?(String) %>
<%= content_tag :div, msg, :id => "flash_#{name}" %>
<% end %>
-<% end %>
+<% end %>
@@ -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? %>
@@ -18,4 +18,4 @@
<%= link_to 'Sign up', new_user_registration_path %>
</li>
<% end %>
-</ul>
+</ul>
@@ -5,4 +5,4 @@
<%= link_to user.name, user %> signed up <%= user.created_at.to_date %>
</li>
<% end %>
-</ul>
+</ul>
@@ -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>
@@ -0,0 +1,14 @@
+# 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
@@ -0,0 +1,14 @@
+# 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
@@ -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
@@ -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.'
View
@@ -5,8 +5,8 @@
#
# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
# Mayor.create(name: 'Emanuel', city: cities.first)
-puts 'SETTING UP DEFAULT USER LOGIN'
-user = User.create! :name => 'First User', :email => 'user@example.com', :password => 'please', :password_confirmation => 'please'
-puts 'New user created: ' << user.name
-user2 = User.create! :name => 'Second User', :email => 'user2@example.com', :password => 'please', :password_confirmation => 'please'
-puts 'New user created: ' << user2.name
+# Environment variables (ENV['...']) are set in the file config/application.yml.
+# See http://railsapps.github.com/rails-environment-variables.html
+puts 'DEFAULT USERS'
+user = User.create! :name => ENV['ADMIN_NAME'].dup, :email => ENV['ADMIN_EMAIL'].dup, :password => ENV['ADMIN_PASSWORD'].dup, :password_confirmation => ENV['ADMIN_PASSWORD'].dup
+puts 'user: ' << user.name
@@ -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
@@ -19,7 +19,7 @@ def create_unconfirmed_user
def create_user
create_visitor
delete_user
- @user = FactoryGirl.create(:user, email: @visitor[:email])
+ @user = FactoryGirl.create(:user, @visitor)
end
def delete_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
@@ -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
Oops, something went wrong.

0 comments on commit 216a85b

Please sign in to comment.