diff --git a/Gemfile b/Gemfile index b9cc846..4a82c7c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,33 +1,27 @@ # -*- mode: yaml; -*- source 'http://rubygems.org' -gem 'rails', '3.2.12' +gem 'rails', '4.0.1' gem 'pg' -gem 'bootstrap-sass', '2.0.2' +gem 'bootstrap-sass', '~> 3.0.0.0' # Bourbon: fancy css mixins – https://github.com/thoughtbot/bourbon -gem 'bourbon', '1.4.0' - -gem 'activeadmin', '0.4.0' +gem 'bourbon' # https://github.com/plataformatec/devise -gem 'devise', '2.0.4' -gem 'bcrypt-ruby', '3.0.1' +gem 'devise' +gem 'bcrypt-ruby' # https://github.com/ryanb/cancan -gem 'cancan', '1.6.5' +gem 'cancan' # Deploy with Capistrano -gem 'capistrano', '2.5.21' +gem 'capistrano' # For avatar images: https://github.com/jnicklas/carrierwave -# gem 'rmagick', '2.9.2' -gem 'carrierwave', '0.6.2' - -# Specify this directly in order to use version we also have @production site. Otherwise, 'rdoc' pulls newest version in. -gem 'json', '1.6.5' +gem 'carrierwave' # We are sending mail. The latest version is just fine. gem 'mail' @@ -42,15 +36,12 @@ gem 'mail' # gem 'sqlite3-ruby', :require => 'sqlite3' # gem 'aws-s3', :require => 'aws/s3' -# Gems used only for assets and not required -# in production environments by default. -group :assets do - gem 'sass-rails', '3.2.5' - gem 'coffee-rails', '3.2.2' - gem 'uglifier' -end +# These used to be in an ":assets" group. Which has been removed by Rails 4. +gem 'sass-rails' +gem 'coffee-rails' +gem 'uglifier' -# gem 'jquery-rails' +gem 'jquery-rails' # Bundle gems for the local environment. Make sure to # put test-only gems in this group so their generators diff --git a/Gemfile.lock b/Gemfile.lock index 0a6c084..76f4b2d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,181 +1,148 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.12) - actionpack (= 3.2.12) - mail (~> 2.4.4) - actionpack (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) - builder (~> 3.0.0) + actionmailer (4.0.1) + actionpack (= 4.0.1) + mail (~> 2.5.4) + actionpack (4.0.1) + activesupport (= 4.0.1) + builder (~> 3.1.0) erubis (~> 2.7.0) - journey (~> 1.0.4) - rack (~> 1.4.5) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.2.1) - activeadmin (0.4.0) - bourbon (>= 1.0.0) - devise (>= 1.1.2) - fastercsv - formtastic (>= 2.0.0) - inherited_resources (< 1.3.0) - jquery-rails (>= 1.0.0) - kaminari (>= 0.13.0) - meta_search (>= 0.9.2) - rails (>= 3.0.0) - sass (>= 3.1.0) - activemodel (3.2.12) - activesupport (= 3.2.12) - builder (~> 3.0.0) - activerecord (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activeresource (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) - activesupport (3.2.12) - i18n (~> 0.6) - multi_json (~> 1.0) - arel (3.0.2) - bcrypt-ruby (3.0.1) - bootstrap-sass (2.0.2) - bourbon (1.4.0) - sass (>= 3.1) - builder (3.0.4) - cancan (1.6.5) - capistrano (2.5.21) - highline - net-scp (>= 1.0.0) - net-sftp (>= 2.0.0) - net-ssh (>= 2.0.14) - net-ssh-gateway (>= 1.0.0) - carrierwave (0.6.2) + rack (~> 1.5.2) + rack-test (~> 0.6.2) + activemodel (4.0.1) + activesupport (= 4.0.1) + builder (~> 3.1.0) + activerecord (4.0.1) + activemodel (= 4.0.1) + activerecord-deprecated_finders (~> 1.0.2) + activesupport (= 4.0.1) + arel (~> 4.0.0) + activerecord-deprecated_finders (1.0.3) + activesupport (4.0.1) + i18n (~> 0.6, >= 0.6.4) + minitest (~> 4.2) + multi_json (~> 1.3) + thread_safe (~> 0.1) + tzinfo (~> 0.3.37) + arel (4.0.1) + atomic (1.1.14) + bcrypt-ruby (3.1.2) + bootstrap-sass (3.0.0.0) + sass (~> 3.2) + bourbon (3.1.8) + sass (>= 3.2.0) + thor + builder (3.1.4) + cancan (1.6.10) + capistrano (3.0.1) + i18n + rake (>= 10.0.0) + sshkit (>= 0.0.23) + carrierwave (0.9.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) - coffee-rails (3.2.2) + json (>= 1.7) + coffee-rails (4.0.1) coffee-script (>= 2.2.0) - railties (~> 3.2.0) + railties (>= 4.0.0, < 5.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.3.3) - devise (2.0.4) + coffee-script-source (1.6.3) + devise (3.1.1) bcrypt-ruby (~> 3.0) - orm_adapter (~> 0.0.3) - railties (~> 3.1) - warden (~> 1.1.1) + orm_adapter (~> 0.1) + railties (>= 3.2.6, < 5) + thread_safe (~> 0.1) + warden (~> 1.2.3) erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) - fastercsv (1.5.5) - formtastic (2.2.1) - actionpack (>= 3.0) - has_scope (0.5.1) - highline (1.6.12) - hike (1.2.1) - i18n (0.6.1) - inherited_resources (1.2.2) - has_scope (~> 0.5.0) - responders (~> 0.6.0) - journey (1.0.4) - jquery-rails (2.0.2) - railties (>= 3.2.0, < 5.0) - thor (~> 0.14) - json (1.6.5) - kaminari (0.13.0) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) - railties (>= 3.0.0) - mail (2.4.4) - i18n (>= 0.4.0) + execjs (2.0.2) + hike (1.2.3) + i18n (0.6.5) + jquery-rails (3.0.4) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.8.1) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - meta_search (1.1.3) - actionpack (~> 3.1) - activerecord (~> 3.1) - activesupport (~> 3.1) - polyamorous (~> 0.5.0) - mime-types (1.21) - multi_json (1.6.0) - net-scp (1.0.4) - net-ssh (>= 1.99.1) - net-sftp (2.0.5) - net-ssh (>= 2.0.9) - net-ssh (2.5.2) - net-ssh-gateway (1.1.0) - net-ssh (>= 1.99.1) - orm_adapter (0.0.7) - pg (0.14.0) - polyamorous (0.5.0) - activerecord (~> 3.0) + mime-types (1.25) + minitest (4.7.5) + multi_json (1.8.2) + net-scp (1.1.2) + net-ssh (>= 2.6.5) + net-ssh (2.7.0) + orm_adapter (0.4.0) + pg (0.17.0) polyglot (0.3.3) - rack (1.4.5) - rack-cache (1.2) - rack (>= 0.4) - rack-ssl (1.3.3) - rack + rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - rails (3.2.12) - actionmailer (= 3.2.12) - actionpack (= 3.2.12) - activerecord (= 3.2.12) - activeresource (= 3.2.12) - activesupport (= 3.2.12) - bundler (~> 1.0) - railties (= 3.2.12) - railties (3.2.12) - actionpack (= 3.2.12) - activesupport (= 3.2.12) - rack-ssl (~> 1.3.2) + rails (4.0.1) + actionmailer (= 4.0.1) + actionpack (= 4.0.1) + activerecord (= 4.0.1) + activesupport (= 4.0.1) + bundler (>= 1.3.0, < 2.0) + railties (= 4.0.1) + sprockets-rails (~> 2.0.0) + railties (4.0.1) + actionpack (= 4.0.1) + activesupport (= 4.0.1) rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) - rake (10.0.3) - rdoc (3.12.1) - json (~> 1.4) - responders (0.6.5) - sass (3.1.19) - sass-rails (3.2.5) - railties (~> 3.2.0) + thor (>= 0.18.1, < 2.0) + rake (10.1.0) + sass (3.2.12) + sass-rails (4.0.1) + railties (>= 4.0.0, < 5.0) sass (>= 3.1.10) - tilt (~> 1.3) - sprockets (2.2.2) + sprockets-rails (~> 2.0.0) + sprockets (2.10.0) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - thor (0.17.0) - tilt (1.3.3) - treetop (1.4.12) + sprockets-rails (2.0.1) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (~> 2.8) + sshkit (1.1.0) + net-scp + net-ssh + term-ansicolor + term-ansicolor (1.2.2) + tins (~> 0.8) + thor (0.18.1) + thread_safe (0.1.3) + atomic + tilt (1.4.1) + tins (0.12.0) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.35) - uglifier (1.2.4) + tzinfo (0.3.38) + uglifier (2.3.0) execjs (>= 0.3.0) - multi_json (>= 1.0.2) - warden (1.1.1) + json (>= 1.8.0) + warden (1.2.3) rack (>= 1.0) PLATFORMS ruby DEPENDENCIES - activeadmin (= 0.4.0) - bcrypt-ruby (= 3.0.1) - bootstrap-sass (= 2.0.2) - bourbon (= 1.4.0) - cancan (= 1.6.5) - capistrano (= 2.5.21) - carrierwave (= 0.6.2) - coffee-rails (= 3.2.2) - devise (= 2.0.4) - json (= 1.6.5) + bcrypt-ruby + bootstrap-sass (~> 3.0.0.0) + bourbon + cancan + capistrano + carrierwave + coffee-rails + devise + jquery-rails mail pg - rails (= 3.2.12) - sass-rails (= 3.2.5) + rails (= 4.0.1) + sass-rails uglifier diff --git a/app/models/user.rb b/app/models/user.rb index 2b41938..4f642f8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -6,7 +6,8 @@ class User < ActiveRecord::Base :recoverable, :rememberable, :trackable, :validatable # Setup accessible (or protected) attributes for your model - attr_accessible :email, :password, :password_confirmation, :remember_me + # Note: This is not needed anymore as devise now complies with the strong parameters rules of Rails 4 (which are handled in the ApplicationController). + # attr_accessible :email, :password, :password_confirmation, :remember_me # This is needed by CanCan def admin? diff --git a/config/routes.rb b/config/routes.rb index a93cbba..412b344 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,7 +9,7 @@ ContactORama::Application.routes.draw do end resources :contacts - match 'uielements/' => 'uielements#index' + get 'uielements/', to: 'uielements#index' # The priority is based upon order of creation: # first created -> highest priority. @@ -60,9 +60,9 @@ ContactORama::Application.routes.draw do # Use CanCan to (optionally) lead logged in users to someplace special. # http://railsapps.github.com/tutorial-rails-bootstrap-devise-cancan.html - authenticated :user do - root :to => 'welcome#index' - end + # authenticated :user do + # root :to => 'welcome#index' + # end root :to => "welcome#index" # See how all your routes lay out with "rake routes"