Permalink
Browse files

bump to Rails 3.2!

  • Loading branch information...
qrush committed Mar 24, 2012
1 parent a8c3d28 commit d398c3d03cb025e43a913e8c339eeb3c56dc6e8f
Showing with 45 additions and 1,052 deletions.
  1. +6 −2 Gemfile
  2. +38 −40 Gemfile.lock
  3. +1 −1 app/controllers/application_controller.rb
  4. BIN vendor/cache/actionmailer-3.1.4.gem
  5. BIN vendor/cache/actionmailer-3.2.2.gem
  6. BIN vendor/cache/actionpack-3.1.4.gem
  7. BIN vendor/cache/actionpack-3.2.2.gem
  8. BIN vendor/cache/activemodel-3.1.4.gem
  9. BIN vendor/cache/activemodel-3.2.2.gem
  10. BIN vendor/cache/activerecord-3.1.4.gem
  11. BIN vendor/cache/activerecord-3.2.2.gem
  12. BIN vendor/cache/activeresource-3.1.4.gem
  13. BIN vendor/cache/activeresource-3.2.2.gem
  14. BIN vendor/cache/activesupport-3.1.4.gem
  15. BIN vendor/cache/activesupport-3.2.2.gem
  16. BIN vendor/cache/arel-2.2.3.gem
  17. BIN vendor/cache/arel-3.0.2.gem
  18. BIN vendor/cache/dynamic_form-1.1.4.gem
  19. BIN vendor/cache/journey-1.0.3.gem
  20. BIN vendor/cache/mail-2.3.3.gem
  21. BIN vendor/cache/mail-2.4.4.gem
  22. BIN vendor/cache/rack-1.3.6.gem
  23. BIN vendor/cache/rack-1.4.1.gem
  24. BIN vendor/cache/rack-mount-0.8.3.gem
  25. BIN vendor/cache/{rails-3.1.4.gem → rails-3.2.2.gem}
  26. BIN vendor/cache/railties-3.1.4.gem
  27. BIN vendor/cache/railties-3.2.2.gem
  28. BIN vendor/cache/silent-postgres-0.1.1.gem
  29. BIN vendor/cache/sprockets-2.0.3.gem
  30. BIN vendor/cache/sprockets-2.1.2.gem
  31. 0 vendor/plugins/.gitkeep
  32. +0 −20 vendor/plugins/dynamic_form/MIT-LICENSE
  33. +0 −13 vendor/plugins/dynamic_form/README
  34. +0 −10 vendor/plugins/dynamic_form/Rakefile
  35. +0 −5 vendor/plugins/dynamic_form/init.rb
  36. +0 −300 vendor/plugins/dynamic_form/lib/action_view/helpers/dynamic_form.rb
  37. +0 −8 vendor/plugins/dynamic_form/lib/action_view/locale/en.yml
  38. +0 −42 vendor/plugins/dynamic_form/test/dynamic_form_i18n_test.rb
  39. +0 −370 vendor/plugins/dynamic_form/test/dynamic_form_test.rb
  40. +0 −9 vendor/plugins/dynamic_form/test/test_helper.rb
  41. +0 −20 vendor/plugins/heroku_asset_cacher/MIT-LICENSE
  42. +0 −48 vendor/plugins/heroku_asset_cacher/README.rdoc
  43. +0 −23 vendor/plugins/heroku_asset_cacher/Rakefile
  44. +0 −2 vendor/plugins/heroku_asset_cacher/init.rb
  45. +0 −17 vendor/plugins/heroku_asset_cacher/lib/actionpack_overrides.rb
  46. +0 −51 vendor/plugins/heroku_asset_cacher/lib/heroku_asset_cacher.rb
  47. +0 −12 vendor/plugins/heroku_asset_cacher/tasks/heroku_asset_cacher_tasks.rake
  48. +0 −49 vendor/plugins/heroku_asset_cacher/test/heroku_asset_cacher_test.rb
  49. +0 −9 vendor/plugins/heroku_asset_cacher/test/test_helper.rb
  50. +0 −1 vendor/plugins/heroku_asset_cacher/uninstall.rb
View
@@ -1,9 +1,10 @@
source 'https://rubygems.org'
-gem 'rails', '~> 3.1.0'
+gem 'rails', '~> 3.2.2'
gem 'airbrake'
gem 'clearance', '~> 0.13.2'
+gem 'dynamic_form'
gem 'excon'
gem 'fog'
gem 'gchartrb', :require => 'google_chart'
@@ -25,6 +26,10 @@ gem 'will_paginate'
gem 'xml-simple'
gem 'yajl-ruby', :require => 'yajl'
+# enable if on heroku, make sure to toss this into an initializer:
+# Rails.application.config.middleware.use HerokuAssetCacher
+#gem 'heroku_asset_cacher', :git => "git@github.com/qrush/heroku_asset_cacher"
+
group :development do
gem 'capistrano-ext'
gem 'rails-erd'
@@ -33,7 +38,6 @@ group :development do
end
group :development, :test do
- gem 'silent-postgres'
gem 'guard'
gem 'guard-cucumber'
gem 'guard-bundler'
View
@@ -1,39 +1,38 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.1.4)
- actionpack (= 3.1.4)
- mail (~> 2.3.0)
- actionpack (3.1.4)
- activemodel (= 3.1.4)
- activesupport (= 3.1.4)
+ actionmailer (3.2.2)
+ actionpack (= 3.2.2)
+ mail (~> 2.4.0)
+ actionpack (3.2.2)
+ activemodel (= 3.2.2)
+ activesupport (= 3.2.2)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.6)
+ journey (~> 1.0.1)
+ rack (~> 1.4.0)
rack-cache (~> 1.1)
- rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.3)
- activemodel (3.1.4)
- activesupport (= 3.1.4)
+ sprockets (~> 2.1.2)
+ activemodel (3.2.2)
+ activesupport (= 3.2.2)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.4)
- activemodel (= 3.1.4)
- activesupport (= 3.1.4)
- arel (~> 2.2.3)
+ activerecord (3.2.2)
+ activemodel (= 3.2.2)
+ activesupport (= 3.2.2)
+ arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.1.4)
- activemodel (= 3.1.4)
- activesupport (= 3.1.4)
- activesupport (3.1.4)
+ activeresource (3.2.2)
+ activemodel (= 3.2.2)
+ activesupport (= 3.2.2)
+ activesupport (3.2.2)
+ i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.7)
airbrake (3.0.9)
activesupport
builder
- arel (2.2.3)
+ arel (3.0.2)
builder (3.0.0)
capistrano (2.11.2)
highline
@@ -77,6 +76,7 @@ GEM
diesel (0.1.5)
railties
diff-lcs (1.1.3)
+ dynamic_form (1.1.4)
erubis (2.7.0)
excon (0.13.0)
factory_girl (2.6.4)
@@ -112,13 +112,14 @@ GEM
highline (1.6.11)
hike (1.2.1)
i18n (0.6.0)
+ journey (1.0.3)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
json (1.6.5)
launchy (2.1.0)
addressable (~> 2.2.6)
- mail (2.3.3)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
@@ -145,34 +146,32 @@ GEM
coderay (~> 1.0.5)
method_source (~> 0.7.1)
slop (>= 2.4.4, < 3)
- rack (1.3.6)
+ rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
rack-maintenance (0.3.0)
rack (>= 1.0)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
rack-protection (1.2.0)
rack
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.4)
- actionmailer (= 3.1.4)
- actionpack (= 3.1.4)
- activerecord (= 3.1.4)
- activeresource (= 3.1.4)
- activesupport (= 3.1.4)
+ rails (3.2.2)
+ actionmailer (= 3.2.2)
+ actionpack (= 3.2.2)
+ activerecord (= 3.2.2)
+ activeresource (= 3.2.2)
+ activesupport (= 3.2.2)
bundler (~> 1.0)
- railties (= 3.1.4)
+ railties (= 3.2.2)
rails-erd (0.4.5)
activerecord (~> 3.0)
activesupport (~> 3.0)
ruby-graphviz (~> 0.9.18)
- railties (3.1.4)
- actionpack (= 3.1.4)
- activesupport (= 3.1.4)
+ railties (3.2.2)
+ actionpack (= 3.2.2)
+ activesupport (= 3.2.2)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -198,13 +197,12 @@ GEM
shoulda-matchers (~> 1.0.0)
shoulda-context (1.0.0)
shoulda-matchers (1.0.0)
- silent-postgres (0.1.1)
sinatra (1.3.2)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
slop (2.4.4)
- sprockets (2.0.3)
+ sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
@@ -240,6 +238,7 @@ DEPENDENCIES
database_cleaner
delayed_job (~> 3.0.0.pre)
delayed_job_active_record
+ dynamic_form
excon
factory_girl_rails (~> 1.7.0)
fog
@@ -263,15 +262,14 @@ DEPENDENCIES
rack
rack-maintenance
rack-test
- rails (~> 3.1.0)
+ rails (~> 3.2.2)
rails-erd
rdoc
redis
rest-client
rr
rvm
shoulda
- silent-postgres
sinatra
timecop
validates_formatting_of (>= 0.3.0)
@@ -31,7 +31,7 @@ def find_rubygem
if @rubygem.blank?
respond_to do |format|
format.html do
- render :file => "public/404.html", :status => :not_found, :layout => false
+ render :file => "public/404", :status => :not_found, :layout => false, :formats => [:html]
end
format.json do
render :text => "This rubygem could not be found.", :status => :not_found
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
No changes.
@@ -1,20 +0,0 @@
-Copyright (c) 2010 David Heinemeier Hansson
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -1,13 +0,0 @@
-DynamicForm
-===========
-
-DynamicForm holds a few helpers method to help you deal with your models, they are:
-
-* input(record, method, options = {})
-* form(record, options = {})
-* error_message_on(object, method, options={})
-* error_messages_for(record, options={})
-
-It also adds f.error_messages and f.error_messages_on to your form builders.
-
-Copyright (c) 2010 David Heinemeier Hansson, released under the MIT license
@@ -1,10 +0,0 @@
-require 'rake/testtask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the active_model_helper plugin.'
-Rake::TestTask.new(:test) do |t|
- t.libs << 'test'
- t.pattern = 'test/**/*_test.rb'
-end
@@ -1,5 +0,0 @@
-require 'action_view/helpers/dynamic_form'
-
-class ActionView::Base
- include DynamicForm
-end
Oops, something went wrong.

0 comments on commit d398c3d

Please sign in to comment.