Skip to content
Permalink
Browse files

Upgrade to use Ruby 2.0 & Rails 4.0

Have converted just enough of the sources that the console loads. I've
renamed the original config files to xxx.rails2 for future reference.
  • Loading branch information...
nathanstitt committed Jul 16, 2013
1 parent 3a5d428 commit 4b76e170efa05505dc1552d57b0dcf1ff50bd73a
Showing with 2,797 additions and 590 deletions.
  1. +1 −0 .ruby-version
  2. +30 −30 Gemfile
  3. +144 −73 Gemfile.lock
  4. +2 −6 Rakefile
  5. 0 app/assets/images/.keep
  6. +16 −0 app/assets/javascripts/application.js
  7. +13 −0 app/assets/stylesheets/application.css
  8. +192 −0 app/controllers/application_controller.rb.rails2
  9. 0 app/controllers/concerns/.keep
  10. +0 −3 app/helpers/application_helper.rb
  11. +5 −0 app/helpers/application_helper.rb.rails2
  12. 0 app/mailers/.keep
  13. 0 app/models/.keep
  14. 0 app/models/concerns/.keep
  15. +14 −0 app/views/layouts/application.html.erb
  16. +3 −0 bin/bundle
  17. +4 −0 bin/rails
  18. +4 −0 bin/rake
  19. +4 −0 config.ru
  20. +33 −0 config/application.rb
  21. +3 −123 config/boot.rb
  22. +7 −0 config/environment.rb
  23. +82 −0 config/environment.rb.rails2
  24. +22 −19 config/environments/development.rb
  25. +26 −0 config/environments/development.rb.rails2
  26. +72 −20 config/environments/production.rb
  27. +28 −0 config/environments/production.rb.rails2
  28. +22 −20 config/environments/staging.rb
  29. +28 −0 config/environments/staging.rb.rails2
  30. +29 −24 config/environments/test.rb
  31. +2 −2 config/initializers/aws.rb
  32. +2 −2 config/initializers/backtrace_silencers.rb
  33. +1 −1 config/initializers/custom_exceptions.rb
  34. +4 −0 config/initializers/filter_parameter_logging.rb
  35. +0 −70 config/initializers/fix_rack_110_quote_parsing.rb
  36. +10 −7 config/initializers/inflections.rb
  37. +5 −5 config/initializers/mime_types.rb
  38. +2 −2 config/initializers/misc_constants.rb
  39. +2 −2 config/initializers/omniauth.rb
  40. +12 −0 config/initializers/secret_token.rb
  41. +1 −12 config/initializers/session_store.rb
  42. +5 −5 config/initializers/smtp_configuration.rb
  43. +14 −0 config/initializers/wrap_parameters.rb
  44. +21 −3 config/locales/en.yml
  45. +136 −144 config/routes.rb
  46. +174 −0 config/routes.rb.rails2
  47. +247 −0 db/schema.rb
  48. +1,358 −0 db/structure.sql
  49. 0 lib/assets/.keep
  50. +1 −1 lib/dc/import/calais_fetcher.rb
  51. 0 lib/tasks/.keep
  52. +4 −4 lib/tasks/app.rake
  53. +5 −5 lib/tasks/crowd.rake
  54. +1 −1 lib/tasks/pixel_ping.rake
  55. +6 −6 lib/tasks/remote.rake
  56. 0 vendor/assets/javascripts/.keep
  57. 0 vendor/assets/stylesheets/.keep
@@ -0,0 +1 @@
2.0
60 Gemfile
@@ -1,33 +1,33 @@
source 'https://rubygems.org'

gem 'rails', '~>2.3.18'
gem 'rake'

gem 'json', '>= 1.7.7'
gem 'nokogiri', '1.5.5' # only pegged because nokogiri 1.5.9 installation fucking up on OSX
gem 'curb'
gem 'calais', '>= 0.0.11'
gem 'rest-client', '>= 1.0.3', :require => 'rest_client'
gem 'bcrypt-ruby', '>= 2.1.2', :require => 'bcrypt'
gem 'rubyzip', '>= 0.9.1', :require => 'zip/zip'
gem 'right_aws', '>= 2.0.1' # Our patched version.
gem 'aws-sdk', '>= 1.7.1'
gem 'pg', '>= 0.11.0'
gem 'jammit'
gem 'iconv'
gem 'rails', '~>4.0'
gem 'curb', '~>0.8.4'
gem 'calais', '~> 0.0.13'
gem 'rest-client', '~> 1.6.7'
gem 'bcrypt-ruby', '~> 3.1.1'
gem 'rubyzip', '~> 0.9.9'
gem 'aws-sdk', '~> 1.11.1'
gem 'pg', '~> 0.15.1'
gem 'closure-compiler'
gem 'docsplit', '>= 0.6.4'
gem 'sunspot_rails', '>= 1.3.3'
# running a pre-release to fix rake sunspot:solr:stop task bug
# https://github.com/sunspot/sunspot/pull/221
gem 'sunspot_solr', '>= 2.0.0.pre.120925'
gem 'rdiscount', '>= 1.6.5'
gem 'fastercsv', '>= 1.5.3'

gem 'omniauth', '>= 1.0'
gem 'omniauth-twitter', '>= 0.0.13'
gem 'omniauth-facebook', '>= 1.4.0'
gem 'omniauth-google-oauth2', '>= 0.1.13'
gem 'sanitize'
gem 'docsplit', '>= 0.6.4'
gem 'sunspot_rails', '~> 2.0'
gem 'cloud-crowd', '~> 0.3.3'
gem 'sqlite3', '~> 1.3.7'

gem 'omniauth', '~> 1.1.4'
gem 'omniauth-twitter', '~> 1.0'
gem 'omniauth-facebook', '~> 1.4.1'
gem 'omniauth-google-oauth2', '~> 0.2.0'
gem 'sanitize', '~> 2.0.6'
gem 'sunspot_solr', '~> 2.0.0'
gem 'rdiscount', '~> 2.1.6'

gem 'right_http_connection'
gem 'rake'
gem 'jammit', '0.6.6', :git=>'https://github.com/documentcloud/jammit.git'
gem 'nokogiri', '1.5.6' # only pegged because nokogiri 1.5.9 installation fucking up on OSX
gem 'right_aws', '2.0.1', :git=>'https://github.com/documentcloud/right_aws.git' # Our patched version.

gem 'cloud-crowd'
gem 'sqlite3'
group :test do
gem 'minitest-spec-rails'
end
@@ -1,138 +1,209 @@
GIT
remote: https://github.com/documentcloud/jammit.git
revision: 332eebc9bd4507b1ed94816acaa0740fbe2a9b36
specs:
jammit (0.6.6)
cssmin (>= 1.0.3)
jsmin (>= 1.0.1)

GIT
remote: https://github.com/documentcloud/right_aws.git
revision: 57beab61fac4a621614b67f2014ec879bac25890
specs:
right_aws (2.0.1)

GEM
remote: https://rubygems.org/
specs:
actionmailer (2.3.18)
actionpack (= 2.3.18)
actionpack (2.3.18)
activesupport (= 2.3.18)
rack (~> 1.1.0)
activerecord (2.3.18)
activesupport (= 2.3.18)
activeresource (2.3.18)
activesupport (= 2.3.18)
activesupport (2.3.18)
aws-sdk (1.11.0)
actionmailer (4.0.0)
actionpack (= 4.0.0)
mail (~> 2.5.3)
actionpack (4.0.0)
activesupport (= 4.0.0)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.0)
activesupport (= 4.0.0)
builder (~> 3.1.0)
activerecord (4.0.0)
activemodel (= 4.0.0)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.0)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.0)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
arel (4.0.0)
atomic (1.1.10)
aws-sdk (1.11.3)
json (~> 1.4)
nokogiri (>= 1.4.4)
nokogiri (< 1.6.0)
uuidtools (~> 2.1)
bcrypt-ruby (3.0.1)
builder (3.2.1)
bcrypt-ruby (3.1.1)
builder (3.1.4)
calais (0.0.13)
json (>= 1.1.3)
nokogiri (>= 1.3.3)
closure-compiler (1.1.10)
cloud-crowd (0.6.2)
activerecord (~> 2.3)
cloud-crowd (0.3.3)
activerecord (>= 2.3.3)
json (>= 1.1.7)
rest-client (>= 1.4)
sinatra (~> 0.9)
rest-client (>= 1.0.3)
right_aws (>= 1.10.0)
sinatra (>= 0.9.4)
thin (>= 1.2.4)
cssmin (1.0.3)
curb (0.8.4)
daemons (1.1.9)
docsplit (0.7.2)
erubis (2.7.0)
eventmachine (1.0.3)
faraday (0.8.7)
multipart-post (~> 1.1)
fastercsv (1.5.5)
hashie (2.0.5)
hike (1.2.3)
httpauth (0.2.0)
jammit (0.6.6)
cssmin (>= 1.0.3)
jsmin (>= 1.0.1)
i18n (0.6.4)
iconv (1.0.3)
jsmin (1.0.1)
json (1.8.0)
jwt (0.1.8)
multi_json (>= 1.5)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.23)
multi_json (1.7.4)
minitest (4.7.5)
minitest-rails (0.9.2)
minitest (~> 4.7)
rails (>= 3.0)
multi_json (1.7.7)
multipart-post (1.2.0)
nokogiri (1.5.5)
nokogiri (1.5.6)
oauth (0.4.7)
oauth2 (0.6.1)
faraday (~> 0.7)
oauth2 (0.8.1)
faraday (~> 0.8)
httpauth (~> 0.1)
multi_json (~> 1.3)
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
omniauth (1.1.4)
hashie (>= 1.2, < 3)
rack
omniauth-facebook (1.4.0)
omniauth-oauth2 (~> 1.0.2)
omniauth-google-oauth2 (0.1.17)
omniauth-facebook (1.4.1)
omniauth-oauth2 (~> 1.1.0)
omniauth-google-oauth2 (0.2.0)
omniauth (~> 1.0)
omniauth-oauth2
omniauth-oauth (1.0.1)
oauth
omniauth (~> 1.0)
omniauth-oauth2 (1.0.2)
oauth2 (~> 0.6.0)
omniauth-oauth2 (1.1.1)
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
omniauth-twitter (0.0.16)
omniauth-twitter (1.0.0)
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
pg (0.15.1)
polyglot (0.3.3)
pr_geohash (1.0.0)
rack (1.1.6)
rails (2.3.18)
actionmailer (= 2.3.18)
actionpack (= 2.3.18)
activerecord (= 2.3.18)
activeresource (= 2.3.18)
activesupport (= 2.3.18)
rake (>= 0.8.3)
rake (10.0.4)
rack (1.5.2)
rack-protection (1.5.0)
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (4.0.0)
actionmailer (= 4.0.0)
actionpack (= 4.0.0)
activerecord (= 4.0.0)
activesupport (= 4.0.0)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.0)
sprockets-rails (~> 2.0.0)
railties (4.0.0)
actionpack (= 4.0.0)
activesupport (= 4.0.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.1.0)
rdiscount (2.1.6)
rest-client (1.6.7)
mime-types (>= 1.16)
right_aws (3.0.5)
right_http_connection (>= 1.2.5)
right_http_connection (1.3.0)
right_http_connection (1.4.0)
rsolr (1.0.9)
builder (>= 2.1.2)
rubyzip (0.9.9)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
sinatra (0.9.6)
rack (>= 0.9.1)
sanitize (2.0.6)
nokogiri (>= 1.4.4)
sinatra (1.4.3)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
sprockets (2.10.0)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.7)
sunspot (2.0.0)
pr_geohash (~> 1.0)
rsolr (~> 1.0.7)
sunspot_rails (2.0.0)
nokogiri
sunspot (= 2.0.0)
sunspot_solr (2.0.0.pre.130115)
sunspot_solr (2.0.0)
thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.18.1)
thread_safe (0.1.0)
atomic
tilt (1.4.1)
treetop (1.4.14)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)
uuidtools (2.1.4)

PLATFORMS
ruby

DEPENDENCIES
aws-sdk (>= 1.7.1)
bcrypt-ruby (>= 2.1.2)
calais (>= 0.0.11)
aws-sdk (~> 1.11.1)
bcrypt-ruby (~> 3.1.1)
calais (~> 0.0.13)
closure-compiler
cloud-crowd
curb
cloud-crowd (~> 0.3.3)
curb (~> 0.8.4)
docsplit (>= 0.6.4)
fastercsv (>= 1.5.3)
jammit
json (>= 1.7.7)
nokogiri (= 1.5.5)
omniauth (>= 1.0)
omniauth-facebook (>= 1.4.0)
omniauth-google-oauth2 (>= 0.1.13)
omniauth-twitter (>= 0.0.13)
pg (>= 0.11.0)
rails (~> 2.3.18)
iconv
jammit (= 0.6.6)!
minitest-rails
nokogiri (= 1.5.6)
omniauth (~> 1.1.4)
omniauth-facebook (~> 1.4.1)
omniauth-google-oauth2 (~> 0.2.0)
omniauth-twitter (~> 1.0)
pg (~> 0.15.1)
rails (~> 4.0)
rake
rdiscount (>= 1.6.5)
rest-client (>= 1.0.3)
right_aws (>= 2.0.1)
rubyzip (>= 0.9.1)
sanitize
sqlite3
sunspot_rails (>= 1.3.3)
sunspot_solr (>= 2.0.0.pre.120925)
rdiscount (~> 2.1.6)
rest-client (~> 1.6.7)
right_aws (= 2.0.1)!
right_http_connection
rubyzip (~> 0.9.9)
sanitize (~> 2.0.6)
sqlite3 (~> 1.3.7)
sunspot_rails (~> 2.0)
sunspot_solr (~> 2.0.0)
@@ -1,10 +1,6 @@
# 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.join(File.dirname(__FILE__), 'config', 'boot'))
require File.expand_path('../config/application', __FILE__)

require 'rake'
require 'rake/testtask'
#require 'rdoc/task'

require 'tasks/rails'
DC::Application.load_tasks
No changes.
@@ -0,0 +1,16 @@
// This is a manifest file that'll be compiled into application.js, which will include all the files
// listed below.
//
// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
//
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// compiled file.
//
// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
// about supported directives.
//
//= require jquery
//= require jquery_ujs
//= require turbolinks
//= require_tree .
@@ -0,0 +1,13 @@
/*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
*
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
*
* 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_self
*= require_tree .
*/

0 comments on commit 4b76e17

Please sign in to comment.
You can’t perform that action at this time.