Skip to content

Commit

Permalink
update to rails 4.2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielKehoe committed Nov 17, 2015
1 parent cfdd3b9 commit 3ca2731
Show file tree
Hide file tree
Showing 12 changed files with 326 additions and 18 deletions.
7 changes: 6 additions & 1 deletion .gitignore
Expand Up @@ -21,14 +21,16 @@ db/*.sqlite3
/log/*
/tmp/*

# add /config/database.yml if it contains passwords
# /config/database.yml

# various artifacts
**.war
*.rbc
*.sassc
.redcar/
.sass-cache
/config/config.yml
/config/database.yml
/coverage.data
/coverage/
/db/*.javadb/
Expand Down Expand Up @@ -77,3 +79,6 @@ pickle-email-*.html
# Environment files that may contain sensitive data
.env
.powenv

# tilde files are usually backup files from a text editor
*~
2 changes: 1 addition & 1 deletion .ruby-version
@@ -1 +1 @@
2.2.2
2.2.3
3 changes: 2 additions & 1 deletion Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
ruby '2.2.3'
gem 'rails', '4.2.4'
gem 'rails', '4.2.5'
gem 'sqlite3'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'
Expand All @@ -18,6 +18,7 @@ end
gem 'bootstrap-sass'
gem 'devise'
gem 'gibbon'
gem 'high_voltage'
gem 'sucker_punch'
group :development do
gem 'better_errors'
Expand Down
272 changes: 272 additions & 0 deletions Gemfile.lock
@@ -0,0 +1,272 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.5)
actionpack (= 4.2.5)
actionview (= 4.2.5)
activejob (= 4.2.5)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.5)
actionview (= 4.2.5)
activesupport (= 4.2.5)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.5)
activesupport (= 4.2.5)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.5)
activesupport (= 4.2.5)
globalid (>= 0.3.0)
activemodel (4.2.5)
activesupport (= 4.2.5)
builder (~> 3.1)
activerecord (4.2.5)
activemodel (= 4.2.5)
activesupport (= 4.2.5)
arel (~> 6.0)
activesupport (4.2.5)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.3.8)
arel (6.0.3)
autoprefixer-rails (6.1.0.1)
execjs
json
bcrypt (3.1.10)
better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.3.5.1)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.3.0)
builder (3.2.2)
byebug (8.2.0)
capybara (2.5.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
celluloid (0.17.2)
celluloid-essentials
celluloid-extras
celluloid-fsm
celluloid-pool
celluloid-supervision
timers (>= 4.1.1)
celluloid-essentials (0.20.5)
timers (>= 4.1.1)
celluloid-extras (0.20.5)
timers (>= 4.1.1)
celluloid-fsm (0.20.5)
timers (>= 4.1.1)
celluloid-pool (0.20.5)
timers (>= 4.1.1)
celluloid-supervision (0.20.5)
timers (>= 4.1.1)
childprocess (0.5.8)
ffi (~> 1.0, >= 1.0.11)
coderay (1.1.0)
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
database_cleaner (1.5.1)
debug_inspector (0.0.2)
devise (3.5.2)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
diff-lcs (1.2.5)
erubis (2.7.0)
execjs (2.6.0)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.5.0)
factory_girl (~> 4.5.0)
railties (>= 3.0.0)
faker (1.5.0)
i18n (~> 0.5)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.10)
gibbon (2.1.2)
faraday (>= 0.9.1)
multi_json (>= 1.11.0)
globalid (0.3.6)
activesupport (>= 4.1.0)
high_voltage (2.4.0)
hitimes (1.2.3)
i18n (0.7.0)
jbuilder (2.3.2)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
jquery-rails (4.0.5)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
launchy (2.4.3)
addressable (~> 2.3)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mime-types (2.6.2)
mini_portile (0.6.2)
minitest (5.8.2)
multi_json (1.11.2)
multipart-post (2.0.0)
nokogiri (1.6.6.3)
mini_portile (~> 0.6.0)
orm_adapter (0.5.0)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.5)
actionmailer (= 4.2.5)
actionpack (= 4.2.5)
actionview (= 4.2.5)
activejob (= 4.2.5)
activemodel (= 4.2.5)
activerecord (= 4.2.5)
activesupport (= 4.2.5)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.5)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
rails_layout (1.0.28)
railties (4.2.5)
actionpack (= 4.2.5)
activesupport (= 4.2.5)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
responders (2.1.0)
railties (>= 4.2.0, < 5)
rspec-core (3.4.0)
rspec-support (~> 3.4.0)
rspec-expectations (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0)
rspec-mocks (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0)
rspec-rails (3.4.0)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.0)
rubyzip (1.1.7)
sass (3.4.19)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
selenium-webdriver (2.48.1)
childprocess (~> 0.5)
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0)
spring (1.4.3)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (3.4.0)
rack (> 1, < 3)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.11)
sucker_punch (1.6.0)
celluloid (~> 0.17.2)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.1)
timers (4.1.1)
hitimes
turbolinks (2.5.3)
coffee-rails
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
warden (1.2.3)
rack (>= 1.0)
web-console (2.2.1)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)
websocket (1.2.2)
xpath (2.0.0)
nokogiri (~> 1.3)

PLATFORMS
ruby

DEPENDENCIES
better_errors
bootstrap-sass
byebug
capybara
coffee-rails (~> 4.1.0)
database_cleaner
devise
factory_girl_rails
faker
gibbon
high_voltage
jbuilder (~> 2.0)
jquery-rails
launchy
quiet_assets
rails (= 4.2.5)
rails_layout
rspec-rails
sass-rails (~> 5.0)
selenium-webdriver
spring
spring-commands-rspec
sqlite3
sucker_punch
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)

BUNDLED WITH
1.10.6
12 changes: 12 additions & 0 deletions app/views/layouts/_nav_links_for_auth.html.erb
@@ -0,0 +1,12 @@
<% if user_signed_in? %>
<li><%= link_to 'Edit account', edit_user_registration_path %></li>
<li><%= link_to 'Sign out', destroy_user_session_path, :method=>'delete' %></li>
<% else %>
<li><%= link_to 'Sign in', new_user_session_path %></li>
<li><%= link_to 'Sign up', new_user_registration_path %></li>
<% end %>
<% if user_signed_in? %>
<% if current_user.try(:admin?) %>
<li><%= link_to 'Users', users_path %></li>
<% end %>
<% end %>
1 change: 1 addition & 0 deletions app/views/layouts/_navigation.html.erb
Expand Up @@ -13,6 +13,7 @@
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<%= render 'layouts/navigation_links' %>
<%= render 'layouts/nav_links_for_auth' %>
</ul>
</div>
</div>
Expand Down
13 changes: 1 addition & 12 deletions app/views/layouts/_navigation_links.html.erb
@@ -1,13 +1,2 @@
<%# add navigation links to this file %>
<% if user_signed_in? %>
<li><%= link_to 'Edit account', edit_user_registration_path %></li>
<li><%= link_to 'Sign out', destroy_user_session_path, :method=>'delete' %></li>
<% else %>
<li><%= link_to 'Sign in', new_user_session_path %></li>
<li><%= link_to 'Sign up', new_user_registration_path %></li>
<% end %>
<% if user_signed_in? %>
<% if current_user.try(:admin?) %>
<li><%= link_to 'Users', users_path %></li>
<% end %>
<% end %>
<li><%= link_to 'About', page_path('about') %></li>
7 changes: 7 additions & 0 deletions app/views/pages/about.html.erb
@@ -0,0 +1,7 @@
<% content_for :title do %>About<% end %>
<h3>About the Website</h3>
<p>
This web application was created with
<%= link_to('Rails Composer', 'http://railsapps.github.io/rails-composer/') %>
from the <%= link_to('RailsApps project', 'http://railsapps.github.io/') %>.
</p>
16 changes: 16 additions & 0 deletions spec/features/visitors/about_page_spec.rb
@@ -0,0 +1,16 @@
# Feature: 'About' page
# As a visitor
# I want to visit an 'about' page
# So I can learn more about the website
feature 'About page' do

# Scenario: Visit the 'about' page
# Given I am a visitor
# When I visit the 'about' page
# Then I see "About the Website"
scenario 'Visit the about page' do
visit 'pages/about'
expect(page).to have_content 'About the Website'
end

end
7 changes: 6 additions & 1 deletion spec/rails_helper.rb
Expand Up @@ -22,7 +22,7 @@
#
Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }

# Checks for pending migrations before tests are run.
# Checks for pending migration and applies them before tests are run.
# If you are not using ActiveRecord, you can remove this line.
ActiveRecord::Migration.maintain_test_schema!

Expand All @@ -49,4 +49,9 @@
# The different available types are documented in the features, such as in
# https://relishapp.com/rspec/rspec-rails/docs
config.infer_spec_type_from_file_location!

# Filter lines from Rails gems in backtraces.
config.filter_rails_from_backtrace!
# arbitrary gems may also be filtered via:
# config.filter_gems_from_backtrace("gem name")
end

0 comments on commit 3ca2731

Please sign in to comment.