Permalink
Browse files

Upgrade Rails 3.0.10 -> 3.1.0

  • Loading branch information...
1 parent 088d1b3 commit 459688c9140f4168a2265d6e3ddb62df52d6213c @esambo committed Sep 17, 2011
Showing with 502 additions and 454 deletions.
  1. +5 −8 .gitignore
  2. +16 −19 Gemfile
  3. +83 −52 Gemfile.lock
  4. +1 −1 README.md
  5. +1 −2 Rakefile
  6. BIN {public → app/assets}/images/GitHub.ico
  7. BIN {public → app/assets}/images/Pivotal_Tracker.ico
  8. BIN {public → app/assets}/images/rails.png
  9. BIN {public → app/assets}/images/relish.png
  10. BIN {public → app/assets}/images/relish_smaller.png
  11. +9 −0 app/assets/javascripts/application.js
  12. +3 −0 app/assets/javascripts/tags.js.coffee
  13. +3 −0 app/assets/javascripts/tasks.js.coffee
  14. +3 −0 app/assets/javascripts/welcome.js.coffee
  15. +8 −0 app/assets/stylesheets/application.css
  16. +56 −0 app/assets/stylesheets/scaffolds.css.scss
  17. +3 −0 app/assets/stylesheets/tags.css.scss
  18. +3 −0 app/assets/stylesheets/tasks.css.scss
  19. +3 −0 app/assets/stylesheets/welcome.css.scss
  20. +19 −19 app/controllers/tags_controller.rb
  21. +24 −24 app/controllers/tasks_controller.rb
  22. +0 −54 app/controllers/users_controller.rb
  23. +1 −1 app/controllers/welcome_controller.rb
  24. 0 app/mailers/.gitkeep
  25. 0 app/models/.gitkeep
  26. +8 −8 app/models/task.rb
  27. +1 −1 app/models/user.rb
  28. +4 −5 app/views/layouts/application.html.erb
  29. +4 −4 app/views/layouts/tasks.html.erb
  30. +1 −1 app/views/tags/index.html.erb
  31. +1 −1 app/views/tags/show.html.erb
  32. +1 −1 app/views/tasks/edit.html.erb
  33. +1 −1 app/views/tasks/new.html.erb
  34. +1 −1 app/views/tasks/show.html.erb
  35. +4 −4 app/views/welcome/index.html.erb
  36. +20 −8 config/application.rb
  37. +5 −8 config/database.yml
  38. +9 −5 config/environments/development.rb
  39. +25 −14 config/environments/production.rb
  40. +10 −3 config/environments/test.rb
  41. +1 −1 config/initializers/session_store.rb
  42. +3 −3 config/initializers/validates_timeliness.rb
  43. +14 −0 config/initializers/wrap_parameters.rb
  44. +1 −1 config/locales/en.yml
  45. +1 −1 config/routes.rb
  46. +2 −2 db/seeds.rb
  47. +44 −1 features/step_definitions/web_steps.rb
  48. 0 lib/assets/.gitkeep
  49. 0 log/.gitkeep
  50. +0 −83 public/stylesheets/application.css
  51. +0 −56 public/stylesheets/scaffold.css
  52. +13 −5 spec/controllers/tags_controller_spec.rb
  53. +20 −12 spec/controllers/tasks_controller_spec.rb
  54. +4 −5 spec/controllers/welcome_controller_spec.rb
  55. +0 −6 spec/helpers/tasks_helper_spec.rb
  56. +15 −0 spec/helpers/welcome_helper_spec.rb
  57. +1 −1 spec/models/tag_task_spec.rb
  58. +14 −14 spec/routing/tags_routing_spec.rb
  59. +14 −14 spec/routing/tasks_routing_spec.rb
  60. +1 −1 spec/views/tags/edit.html.erb_spec.rb
  61. +7 −2 spec/views/tasks/edit.html.erb_spec.rb
  62. +6 −1 spec/views/tasks/new.html.erb_spec.rb
  63. +5 −0 spec/views/welcome/index.html.erb_spec.rb
  64. 0 vendor/assets/stylesheets/.gitkeep
View
@@ -1,11 +1,8 @@
-tmp/**/*
-log/*.log
-tmp
-tmp/pids/*.pid
-db/*.sqlite3
.bundle
+db/*.sqlite3
+log/*.log
+tmp/
+.sass-cache/
.idea
*.tmproj
-*.sublime-project
-webrat-*.html
-rerun.txt
+*.sublime-*
View
35 Gemfile
@@ -1,21 +1,21 @@
source 'http://rubygems.org'
-gem 'rails', '3.0.10'
+gem 'rails', '3.1.0'
# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
-gem 'sqlite3-ruby', :require => 'sqlite3'
+gem 'sqlite3'
gem 'validates_timeliness'
gem 'chronic_duration'
gem 'ruby-duration'
gem 'devise'
-gem "jquery-rails"
#potential:
# gem 'chronic'
# gem 'delocalize'
+
group :development, :test do
gem 'rspec-rails'
end
@@ -50,25 +50,22 @@ group :test do
# gem 'hpricot', "~>0.8.2" #required by 'mofo'
end
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+ gem 'sass-rails', " ~> 3.1.0"
+ gem 'coffee-rails', "~> 3.1.0"
+ gem 'uglifier'
+end
+
+gem 'jquery-rails'
+
# Use unicorn as the web server
# gem 'unicorn'
# Deploy with Capistrano
# gem 'capistrano'
-# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
-# gem 'ruby-debug'
-# gem 'ruby-debug19'
-
-# Bundle the extra gems:
-# gem 'bj'
-# gem 'nokogiri'
-# gem 'sqlite3-ruby', :require => 'sqlite3'
-# gem 'aws-s3', :require => 'aws/s3'
+# To use debugger
+# gem 'ruby-debug19', :require => 'ruby-debug'
-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
-# group :development, :test do
-# gem 'webrat'
-# end
View
@@ -2,43 +2,45 @@ GEM
remote: http://rubygems.org/
specs:
ZenTest (4.6.2)
- abstract (1.0.0)
- actionmailer (3.0.10)
- actionpack (= 3.0.10)
- mail (~> 2.2.19)
- actionpack (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
- builder (~> 2.1.2)
- erubis (~> 2.6.6)
- i18n (~> 0.5.0)
- rack (~> 1.2.1)
- rack-mount (~> 0.6.14)
- rack-test (~> 0.5.7)
- tzinfo (~> 0.3.23)
- activemodel (3.0.10)
- activesupport (= 3.0.10)
- builder (~> 2.1.2)
- i18n (~> 0.5.0)
- activerecord (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
- arel (~> 2.0.10)
- tzinfo (~> 0.3.23)
- activeresource (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
- activesupport (3.0.10)
+ actionmailer (3.1.0)
+ actionpack (= 3.1.0)
+ mail (~> 2.3.0)
+ actionpack (3.1.0)
+ activemodel (= 3.1.0)
+ activesupport (= 3.1.0)
+ builder (~> 3.0.0)
+ erubis (~> 2.7.0)
+ i18n (~> 0.6)
+ rack (~> 1.3.2)
+ rack-cache (~> 1.0.3)
+ rack-mount (~> 0.8.2)
+ rack-test (~> 0.6.1)
+ sprockets (~> 2.0.0)
+ activemodel (3.1.0)
+ activesupport (= 3.1.0)
+ bcrypt-ruby (~> 3.0.0)
+ builder (~> 3.0.0)
+ i18n (~> 0.6)
+ activerecord (3.1.0)
+ activemodel (= 3.1.0)
+ activesupport (= 3.1.0)
+ arel (~> 2.2.1)
+ tzinfo (~> 0.3.29)
+ activeresource (3.1.0)
+ activemodel (= 3.1.0)
+ activesupport (= 3.1.0)
+ activesupport (3.1.0)
+ multi_json (~> 1.0)
addressable (2.2.6)
archive-tar-minitar (0.5.2)
- arel (2.0.10)
+ arel (2.2.1)
autotest (4.4.6)
ZenTest (>= 4.4.1)
autotest-fsevent (0.2.5)
sys-uname
autotest-growl (0.2.11)
bcrypt-ruby (3.0.1)
- builder (2.1.2)
+ builder (3.0.0)
capybara (1.1.1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@@ -51,6 +53,13 @@ GEM
chronic_duration (0.9.6)
numerizer (~> 0.1.1)
coderay (0.9.8)
+ coffee-rails (3.1.1)
+ coffee-script (>= 2.2.0)
+ railties (~> 3.1.0)
+ coffee-script (2.2.0)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.1.2)
columnize (0.3.4)
cucumber (1.0.6)
builder (>= 2.1.2)
@@ -72,8 +81,9 @@ GEM
email_spec (1.2.1)
mail (~> 2.2)
rspec (~> 2.0)
- erubis (2.6.6)
- abstract (>= 1.0.0)
+ erubis (2.7.0)
+ execjs (1.2.6)
+ multi_json (~> 1.0)
fastthread (1.0.7)
ffi (1.0.9)
gherkin (2.4.18)
@@ -83,7 +93,8 @@ GEM
rest-client (~> 1.6.1)
rubyzip
term-ansicolor (~> 1.0.5)
- i18n (0.5.0)
+ hike (1.2.1)
+ i18n (0.6.0)
jquery-rails (1.0.14)
railties (~> 3.0)
thor (~> 0.14)
@@ -93,14 +104,14 @@ GEM
addressable (~> 2.2.6)
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
- mail (2.2.19)
- activesupport (>= 2.3.6)
+ mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.6.5)
ruby_parser (>= 2.0.5)
mime-types (1.16)
+ multi_json (1.0.3)
nokogiri (1.5.0)
numerizer (0.1.1)
orm_adapter (0.0.5)
@@ -120,25 +131,30 @@ GEM
pry-doc (0.3.0)
pry (>= 0.9.0)
yard (>= 0.6.4)
- rack (1.2.3)
- rack-mount (0.6.14)
+ rack (1.3.2)
+ rack-cache (1.0.3)
+ rack (>= 0.4)
+ rack-mount (0.8.3)
rack (>= 1.0.0)
- rack-test (0.5.7)
+ rack-ssl (1.3.2)
+ rack
+ rack-test (0.6.1)
rack (>= 1.0)
- rails (3.0.10)
- actionmailer (= 3.0.10)
- actionpack (= 3.0.10)
- activerecord (= 3.0.10)
- activeresource (= 3.0.10)
- activesupport (= 3.0.10)
+ rails (3.1.0)
+ actionmailer (= 3.1.0)
+ actionpack (= 3.1.0)
+ activerecord (= 3.1.0)
+ activeresource (= 3.1.0)
+ activesupport (= 3.1.0)
bundler (~> 1.0)
- railties (= 3.0.10)
- railties (3.0.10)
- actionpack (= 3.0.10)
- activesupport (= 3.0.10)
+ railties (= 3.1.0)
+ railties (3.1.0)
+ actionpack (= 3.1.0)
+ activesupport (= 3.1.0)
+ rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.4)
+ thor (~> 0.14.6)
rake (0.9.2)
rdoc (3.9.4)
rest-client (1.6.7)
@@ -170,6 +186,12 @@ GEM
ruby_parser (2.3.0)
sexp_processor (~> 3.0)
rubyzip (0.9.4)
+ sass (3.1.7)
+ sass-rails (3.1.1)
+ actionpack (~> 3.1.0)
+ railties (~> 3.1.0)
+ sass (>= 3.1.4)
+ tilt (~> 1.3.2)
selenium-webdriver (2.6.0)
childprocess (>= 0.2.1)
ffi (>= 1.0.7)
@@ -178,19 +200,25 @@ GEM
sexp_processor (3.0.6)
slop (2.1.0)
spork (0.8.5)
+ sprockets (2.0.0)
+ hike (~> 1.2)
+ rack (~> 1.0)
+ tilt (!= 1.3.0, ~> 1.1)
sqlite3 (1.3.4)
- sqlite3-ruby (1.3.3)
- sqlite3 (>= 1.3.3)
syntax (1.0.0)
sys-uname (0.8.6)
term-ansicolor (1.0.6)
thor (0.14.6)
+ tilt (1.3.3)
time_travel (0.1.0)
timeliness (0.3.4)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.29)
+ uglifier (1.0.3)
+ execjs (>= 0.3.0)
+ multi_json (>= 1.0.2)
validates_timeliness (3.0.6)
timeliness (~> 0.3.3)
warden (1.0.5)
@@ -208,6 +236,7 @@ DEPENDENCIES
autotest-growl
capybara
chronic_duration
+ coffee-rails (~> 3.1.0)
cucumber-rails
database_cleaner
devise
@@ -218,13 +247,15 @@ DEPENDENCIES
powder
pry
pry-doc
- rails (= 3.0.10)
+ rails (= 3.1.0)
rspec-rails
ruby-debug-base19
ruby-debug-ide
ruby-duration
+ sass-rails (~> 3.1.0)
spork
- sqlite3-ruby
+ sqlite3
syntax
time_travel
+ uglifier
validates_timeliness
View
@@ -18,7 +18,7 @@ Take [TimeFliesBy.com](http://www.timefliesby.com) out for a spin and see how yo
* Multi-user support
* Authentication with email verification and strongly encrypted passwords using [Devise](https://github.com/plataformatec/devise)
* [Microformats](http://en.wikipedia.org/wiki/Microformat) [hCalendar](http://microformats.org/wiki/hcalendar) with [Rel-Tag](http://microformats.org/wiki/rel-tag)
- * [Rails](http://rubyonrails.org/) 3.0
+ * [Rails](http://rubyonrails.org/) 3.1
* [Ruby](http://en.wikipedia.org/wiki/Ruby_(programming_language) 1.9.2
* Outside-in [Behavior Driven Development](http://behaviordrivendevelopment.wikispaces.com/)
* [Cucumber](http://cukes.info/)
View
@@ -1,8 +1,7 @@
+#!/usr/bin/env rake
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
require File.expand_path('../config/application', __FILE__)
-require 'rake/dsl_definition'
-require 'rake'
Timefliesby::Application.load_tasks
File renamed without changes.
File renamed without changes
File renamed without changes
@@ -0,0 +1,9 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
@@ -0,0 +1,8 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require scaffolds
+ *= require_self
+ *= require_tree .
+*/
Oops, something went wrong.

0 comments on commit 459688c

Please sign in to comment.