updated to Rails 4.2

This commit is contained in:
Hauke Klement
2015-02-18 10:41:26 +01:00
parent fcc5a85a76
commit 56acd4c3c3
16 changed files with 199 additions and 132 deletions

11
Gemfile
View File

@ -4,7 +4,7 @@ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
gem 'bcrypt', '~> 3.1.7' gem 'bcrypt', '~> 3.1.7'
gem 'bootstrap-will_paginate' gem 'bootstrap-will_paginate'
gem 'carrierwave' gem 'carrierwave'
gem 'coffee-rails', '~> 4.0.0' gem 'coffee-rails', '~> 4.1.0'
gem 'concurrent-ruby' gem 'concurrent-ruby'
gem 'concurrent-ruby-ext', platform: :ruby gem 'concurrent-ruby-ext', platform: :ruby
gem 'docker-api', require: 'docker' gem 'docker-api', require: 'docker'
@ -20,11 +20,11 @@ gem 'pg', platform: :ruby
gem 'pry' gem 'pry'
gem 'puma' gem 'puma'
gem 'pundit' gem 'pundit'
gem 'rails', '~> 4.1.2' gem 'rails', '~> 4.2.0'
gem 'rails-i18n', '~> 4.0.0' gem 'rails-i18n', '~> 4.0.0'
gem 'ransack' gem 'ransack'
gem 'rubytree' gem 'rubytree'
gem 'sass-rails', '~> 4.0.3' gem 'sass-rails', '~> 5.0'
gem 'sdoc', '~> 0.4.0', group: :doc gem 'sdoc', '~> 0.4.0', group: :doc
gem 'slim' gem 'slim'
gem 'sorcery' gem 'sorcery'
@ -43,7 +43,12 @@ group :development do
gem 'capistrano-upload-config' gem 'capistrano-upload-config'
gem 'rubocop', require: false gem 'rubocop', require: false
gem 'rubocop-rspec' gem 'rubocop-rspec'
end
group :development, :test do
gem 'byebug'
gem 'spring' gem 'spring'
gem 'web-console', '~> 2.0'
end end
group :test do group :test do

View File

@ -2,46 +2,49 @@ GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
ZenTest (4.11.0) ZenTest (4.11.0)
actionmailer (4.1.9) actionmailer (4.2.0)
actionpack (= 4.1.9) actionpack (= 4.2.0)
actionview (= 4.1.9) actionview (= 4.2.0)
activejob (= 4.2.0)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
actionpack (4.1.9) rails-dom-testing (~> 1.0, >= 1.0.5)
actionview (= 4.1.9) actionpack (4.2.0)
activesupport (= 4.1.9) actionview (= 4.2.0)
rack (~> 1.5.2) activesupport (= 4.2.0)
rack (~> 1.6.0)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
actionview (4.1.9) rails-dom-testing (~> 1.0, >= 1.0.5)
activesupport (= 4.1.9) rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.0)
activesupport (= 4.2.0)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
activemodel (4.1.9) rails-dom-testing (~> 1.0, >= 1.0.5)
activesupport (= 4.1.9) rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (4.2.0)
activesupport (= 4.2.0)
globalid (>= 0.3.0)
activemodel (4.2.0)
activesupport (= 4.2.0)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.1.9) activerecord (4.2.0)
activemodel (= 4.1.9) activemodel (= 4.2.0)
activesupport (= 4.1.9) activesupport (= 4.2.0)
arel (~> 5.0.0) arel (~> 6.0)
activerecord-jdbc-adapter (1.3.14) activesupport (4.2.0)
activerecord (>= 2.2) i18n (~> 0.7)
activerecord-jdbcpostgresql-adapter (1.3.14)
activerecord-jdbc-adapter (~> 1.3.14)
jdbc-postgres (>= 9.1)
activesupport (4.1.9)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
thread_safe (~> 0.1) thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1) tzinfo (~> 1.1)
archive-tar-minitar (0.5.2) archive-tar-minitar (0.5.2)
arel (5.0.1.20140414130214) arel (6.0.0)
ast (2.0.0) ast (2.0.0)
astrolabe (1.3.0) astrolabe (1.3.0)
parser (>= 2.2.0.pre.3, < 3.0) parser (>= 2.2.0.pre.3, < 3.0)
autotest-rails (4.2.1) autotest-rails (4.2.1)
ZenTest (~> 4.5) ZenTest (~> 4.5)
bcrypt (3.1.10) bcrypt (3.1.10)
bcrypt (3.1.10-java)
better_errors (2.1.1) better_errors (2.1.1)
coderay (>= 1.0.0) coderay (>= 1.0.0)
erubis (>= 2.6.6) erubis (>= 2.6.6)
@ -51,6 +54,10 @@ GEM
bootstrap-will_paginate (0.0.10) bootstrap-will_paginate (0.0.10)
will_paginate will_paginate
builder (3.2.2) builder (3.2.2)
byebug (3.5.1)
columnize (~> 0.8)
debugger-linecache (~> 1.2)
slop (~> 3.6)
capistrano (3.2.1) capistrano (3.2.1)
i18n i18n
rake (>= 10.0.0) rake (>= 10.0.0)
@ -85,7 +92,7 @@ GEM
codeclimate-test-reporter (0.4.6) codeclimate-test-reporter (0.4.6)
simplecov (>= 0.7.1, < 1.0.0) simplecov (>= 0.7.1, < 1.0.0)
coderay (1.1.0) coderay (1.1.0)
coffee-rails (4.0.1) coffee-rails (4.1.0)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
coffee-script (2.3.0) coffee-script (2.3.0)
@ -93,21 +100,22 @@ GEM
execjs execjs
coffee-script-source (1.9.0) coffee-script-source (1.9.0)
colorize (0.7.5) colorize (0.7.5)
columnize (0.9.0)
concurrent-ruby (0.8.0) concurrent-ruby (0.8.0)
ref (~> 1.0, >= 1.0.5) ref (~> 1.0, >= 1.0.5)
concurrent-ruby (0.8.0-java)
concurrent-ruby-ext (0.8.0) concurrent-ruby-ext (0.8.0)
concurrent-ruby (~> 0.8.0) concurrent-ruby (~> 0.8.0)
database_cleaner (1.4.0) database_cleaner (1.4.0)
debug_inspector (0.0.2) debug_inspector (0.0.2)
debugger-linecache (1.2.0)
diff-lcs (1.2.5) diff-lcs (1.2.5)
docile (1.1.5) docile (1.1.5)
docker-api (1.17.0) docker-api (1.19.0)
archive-tar-minitar archive-tar-minitar
excon (>= 0.38.0) excon (>= 0.38.0)
json json
erubis (2.7.0) erubis (2.7.0)
excon (0.44.1) excon (0.44.2)
execjs (2.3.0) execjs (2.3.0)
factory_girl (4.5.0) factory_girl (4.5.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
@ -117,8 +125,9 @@ GEM
faraday (0.9.1) faraday (0.9.1)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
ffi (1.9.6) ffi (1.9.6)
ffi (1.9.6-java)
forgery (0.6.0) forgery (0.6.0)
globalid (0.3.3)
activesupport (>= 4.1.0)
highline (1.6.21) highline (1.6.21)
hike (1.2.3) hike (1.2.3)
i18n (0.7.0) i18n (0.7.0)
@ -126,20 +135,21 @@ GEM
builder builder
oauth (~> 0.4.5) oauth (~> 0.4.5)
uuid uuid
jbuilder (2.2.6) jbuilder (2.2.7)
activesupport (>= 3.0.0, < 5) activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2) multi_json (~> 1.2)
jdbc-postgres (9.3.1102) jquery-rails (4.0.3)
jquery-rails (3.1.2) rails-dom-testing (~> 1.0)
railties (>= 3.0, < 5.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
jquery-turbolinks (2.1.0) jquery-turbolinks (2.1.0)
railties (>= 3.1.0) railties (>= 3.1.0)
turbolinks turbolinks
json (1.8.2) json (1.8.2)
json (1.8.2-java)
jwt (1.2.1) jwt (1.2.1)
kramdown (1.5.0) kramdown (1.5.0)
loofah (2.0.1)
nokogiri (>= 1.5.9)
macaddr (1.7.1) macaddr (1.7.1)
systemu (~> 2.6.2) systemu (~> 2.6.2)
mail (2.6.3) mail (2.6.3)
@ -156,7 +166,6 @@ GEM
net-ssh (2.9.2) net-ssh (2.9.2)
nokogiri (1.6.6.2) nokogiri (1.6.6.2)
mini_portile (~> 0.6.0) mini_portile (~> 0.6.0)
nokogiri (1.6.6.2-java)
nyan-cat-formatter (0.11) nyan-cat-formatter (0.11)
rspec (>= 2.99, >= 2.14.2, < 4) rspec (>= 2.99, >= 2.14.2, < 4)
oauth (0.4.7) oauth (0.4.7)
@ -166,7 +175,7 @@ GEM
multi_json (~> 1.3) multi_json (~> 1.3)
multi_xml (~> 0.5) multi_xml (~> 0.5)
rack (~> 1.2) rack (~> 1.2)
parser (2.2.0.2) parser (2.2.0.3)
ast (>= 1.1, < 3.0) ast (>= 1.1, < 3.0)
pg (0.18.1) pg (0.18.1)
polyamorous (1.1.0) polyamorous (1.1.0)
@ -176,36 +185,38 @@ GEM
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.8.1)
slop (~> 3.4) slop (~> 3.4)
pry (0.10.1-java) puma (2.11.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
spoon (~> 0.0)
puma (2.11.0)
rack (>= 1.1, < 2.0)
puma (2.11.0-java)
rack (>= 1.1, < 2.0) rack (>= 1.1, < 2.0)
pundit (0.3.0) pundit (0.3.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
rack (1.5.2) rack (1.6.0)
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.1.9) rails (4.2.0)
actionmailer (= 4.1.9) actionmailer (= 4.2.0)
actionpack (= 4.1.9) actionpack (= 4.2.0)
actionview (= 4.1.9) actionview (= 4.2.0)
activemodel (= 4.1.9) activejob (= 4.2.0)
activerecord (= 4.1.9) activemodel (= 4.2.0)
activesupport (= 4.1.9) activerecord (= 4.2.0)
activesupport (= 4.2.0)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.1.9) railties (= 4.2.0)
sprockets-rails (~> 2.0) sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.5)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.1)
loofah (~> 2.0)
rails-i18n (4.0.3) rails-i18n (4.0.3)
i18n (~> 0.6) i18n (~> 0.6)
railties (~> 4.0) railties (~> 4.0)
railties (4.1.9) railties (4.2.0)
actionpack (= 4.1.9) actionpack (= 4.2.0)
activesupport (= 4.1.9) activesupport (= 4.2.0)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rainbow (2.0.0) rainbow (2.0.0)
@ -252,12 +263,13 @@ GEM
json (~> 1.8) json (~> 1.8)
structured_warnings (~> 0.1) structured_warnings (~> 0.1)
rubyzip (1.1.7) rubyzip (1.1.7)
sass (3.2.19) sass (3.4.12)
sass-rails (4.0.5) sass-rails (5.0.1)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (~> 3.2.2) sass (~> 3.1)
sprockets (~> 2.8, < 3.0) sprockets (>= 2.8, < 4.0)
sprockets-rails (~> 2.0) sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
sdoc (0.4.1) sdoc (0.4.1)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0) rdoc (~> 4.0)
@ -279,9 +291,7 @@ GEM
bcrypt (~> 3.1) bcrypt (~> 3.1)
oauth (~> 0.4, >= 0.4.4) oauth (~> 0.4, >= 0.4.4)
oauth2 (>= 0.8.0) oauth2 (>= 0.8.0)
spoon (0.0.4) spring (1.3.2)
ffi
spring (1.3.0)
sprockets (2.12.3) sprockets (2.12.3)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
@ -300,7 +310,6 @@ GEM
temple (0.7.5) temple (0.7.5)
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.4) thread_safe (0.3.4)
thread_safe (0.3.4-java)
tilt (1.4.1) tilt (1.4.1)
turbolinks (2.5.3) turbolinks (2.5.3)
coffee-rails coffee-rails
@ -311,13 +320,17 @@ GEM
json (>= 1.8.0) json (>= 1.8.0)
uuid (2.3.7) uuid (2.3.7)
macaddr (~> 1.0) macaddr (~> 1.0)
web-console (2.0.0)
activemodel (~> 4.0)
binding_of_caller (>= 0.7.2)
railties (~> 4.0)
sprockets-rails (>= 2.0, < 4.0)
websocket (1.2.1) websocket (1.2.1)
will_paginate (3.0.7) will_paginate (3.0.7)
xpath (2.0.0) xpath (2.0.0)
nokogiri (~> 1.3) nokogiri (~> 1.3)
PLATFORMS PLATFORMS
java
ruby ruby
DEPENDENCIES DEPENDENCIES
@ -327,6 +340,7 @@ DEPENDENCIES
better_errors better_errors
binding_of_caller binding_of_caller
bootstrap-will_paginate bootstrap-will_paginate
byebug
capistrano (~> 3.2.1) capistrano (~> 3.2.1)
capistrano-rails (~> 1.1) capistrano-rails (~> 1.1)
capistrano-rvm capistrano-rvm
@ -335,7 +349,7 @@ DEPENDENCIES
capybara capybara
carrierwave carrierwave
codeclimate-test-reporter codeclimate-test-reporter
coffee-rails (~> 4.0.0) coffee-rails (~> 4.1.0)
concurrent-ruby concurrent-ruby
concurrent-ruby-ext concurrent-ruby-ext
database_cleaner database_cleaner
@ -353,7 +367,7 @@ DEPENDENCIES
pry pry
puma puma
pundit pundit
rails (~> 4.1.2) rails (~> 4.2.0)
rails-i18n (~> 4.0.0) rails-i18n (~> 4.0.0)
rake rake
ransack ransack
@ -362,7 +376,7 @@ DEPENDENCIES
rubocop rubocop
rubocop-rspec rubocop-rspec
rubytree rubytree
sass-rails (~> 4.0.3) sass-rails (~> 5.0)
sdoc (~> 0.4.0) sdoc (~> 0.4.0)
selenium-webdriver selenium-webdriver
simplecov simplecov
@ -372,4 +386,5 @@ DEPENDENCIES
thread_safe thread_safe
turbolinks turbolinks
uglifier (>= 1.3.0) uglifier (>= 1.3.0)
web-console (~> 2.0)
will_paginate (~> 3.0) will_paginate (~> 3.0)

View File

@ -1,4 +1,8 @@
#!/usr/bin/env ruby #!/usr/bin/env ruby
begin
load File.expand_path("../spring", __FILE__)
rescue LoadError
end
APP_PATH = File.expand_path('../../config/application', __FILE__) APP_PATH = File.expand_path('../../config/application', __FILE__)
require_relative '../config/boot' require_relative '../config/boot'
require 'rails/commands' require 'rails/commands'

View File

@ -1,4 +1,8 @@
#!/usr/bin/env ruby #!/usr/bin/env ruby
begin
load File.expand_path("../spring", __FILE__)
rescue LoadError
end
require_relative '../config/boot' require_relative '../config/boot'
require 'rake' require 'rake'
Rake.application.run Rake.application.run

29
bin/setup Executable file
View File

@ -0,0 +1,29 @@
#!/usr/bin/env ruby
require 'pathname'
# path to your application root.
APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
Dir.chdir APP_ROOT do
# This script is a starting point to setup your application.
# Add necessary setup steps to this file:
puts "== Installing dependencies =="
system "gem install bundler --conservative"
system "bundle check || bundle install"
# puts "\n== Copying sample files =="
# unless File.exist?("config/database.yml")
# system "cp config/database.yml.sample config/database.yml"
# end
puts "\n== Preparing database =="
system "bin/rake db:setup"
puts "\n== Removing old logs and tempfiles =="
system "rm -f log/*"
system "rm -rf tmp/cache"
puts "\n== Restarting application server =="
system "touch tmp/restart.txt"
end

View File

@ -1,17 +1,14 @@
#!/usr/bin/env ruby #!/usr/bin/env ruby
# This file loads spring without using Bundler, in order to be fast # This file loads spring without using Bundler, in order to be fast.
# It gets overwritten when you run the `spring binstub` command # It gets overwritten when you run the `spring binstub` command.
unless defined?(Spring) unless defined?(Spring)
require "rubygems" require "rubygems"
require "bundler" require "bundler"
if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ spring \((.*?)\)$.*?^$/m) if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m)
ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR) Gem.paths = { "GEM_PATH" => Bundler.bundle_path.to_s }
ENV["GEM_HOME"] = ""
Gem.paths = ENV
gem "spring", match[1] gem "spring", match[1]
require "spring/binstub" require "spring/binstub"
end end

View File

@ -1,13 +1,6 @@
require File.expand_path('../boot', __FILE__) require File.expand_path('../boot', __FILE__)
# Pick the frameworks you want: require 'rails/all'
require "active_model/railtie"
require "active_record/railtie"
require "action_controller/railtie"
require "action_mailer/railtie"
require "action_view/railtie"
require "sprockets/railtie"
# require "rails/test_unit/railtie"
# Require the gems listed in Gemfile, including any gems # Require the gems listed in Gemfile, including any gems
# you've limited to :test, :development, or :production. # you've limited to :test, :development, or :production.
@ -28,6 +21,9 @@ module CodeOcean
# config.i18n.default_locale = :de # config.i18n.default_locale = :de
config.i18n.available_locales = [:de, :en] config.i18n.available_locales = [:de, :en]
# Do not swallow errors in after_commit/after_rollback callbacks.
config.active_record.raise_in_transactional_callbacks = true
config.autoload_paths << Rails.root.join('lib') config.autoload_paths << Rails.root.join('lib')
config.eager_load_paths << Rails.root.join('lib') config.eager_load_paths << Rails.root.join('lib')
end end

View File

@ -1,4 +1,3 @@
# Set up gems listed in the Gemfile.
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) require 'bundler/setup' # Set up gems listed in the Gemfile.

View File

@ -13,8 +13,6 @@ Rails.application.configure do
config.consider_all_requests_local = true config.consider_all_requests_local = true
config.action_controller.perform_caching = false config.action_controller.perform_caching = false
config.action_mailer.perform_deliveries = true
# Don't care if the mailer can't send. # Don't care if the mailer can't send.
config.action_mailer.raise_delivery_errors = false config.action_mailer.raise_delivery_errors = false
@ -24,6 +22,15 @@ Rails.application.configure do
# Raise an error on page load if there are pending migrations. # Raise an error on page load if there are pending migrations.
config.active_record.migration_error = :page_load config.active_record.migration_error = :page_load
# Debug mode disables concatenation and preprocessing of assets.
# This option may cause significant delays in view rendering with a large
# number of complex assets.
config.assets.debug = true
# Asset digests allow you to set far-future HTTP expiration dates on all assets,
# yet still be able to expire them through the digest params.
config.assets.digest = true
# Adds additional error checking when serving assets at runtime. # Adds additional error checking when serving assets at runtime.
# Checks for improperly declared sprockets dependencies. # Checks for improperly declared sprockets dependencies.
# Raises helpful error messages. # Raises helpful error messages.

View File

@ -16,11 +16,13 @@ Rails.application.configure do
# Enable Rack::Cache to put a simple HTTP cache in front of your application # Enable Rack::Cache to put a simple HTTP cache in front of your application
# Add `rack-cache` to your Gemfile before enabling this. # Add `rack-cache` to your Gemfile before enabling this.
# For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid. # For large-scale production use, consider using a caching reverse proxy like
# NGINX, varnish or squid.
# config.action_dispatch.rack_cache = true # config.action_dispatch.rack_cache = true
# Disable Rails's static asset server (Apache or nginx will already do this). # Disable serving static files from the `/public` folder by default since
config.serve_static_assets = false # Apache or NGINX already handles this.
config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
# Compress JavaScripts and CSS. # Compress JavaScripts and CSS.
config.assets.js_compressor = :uglifier config.assets.js_compressor = :uglifier
@ -29,21 +31,22 @@ Rails.application.configure do
# Do not fallback to assets pipeline if a precompiled asset is missed. # Do not fallback to assets pipeline if a precompiled asset is missed.
config.assets.compile = false config.assets.compile = false
# Generate digests for assets URLs. # Asset digests allow you to set far-future HTTP expiration dates on all assets,
# yet still be able to expire them through the digest params.
config.assets.digest = true config.assets.digest = true
# Version of your assets, change this if you want to expire all your assets. # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
config.assets.version = '1.0'
# Specifies the header that your server uses for sending files. # Specifies the header that your server uses for sending files.
# config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
# config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
# config.force_ssl = true # config.force_ssl = true
# Set to :debug to see everything in the log. # Use the lowest log level to ensure availability of diagnostic information
config.log_level = :info # when problems arise.
config.log_level = :debug
# Prepend all log lines with the following tags. # Prepend all log lines with the following tags.
# config.log_tags = [ :subdomain, :uuid ] # config.log_tags = [ :subdomain, :uuid ]
@ -55,11 +58,7 @@ Rails.application.configure do
# config.cache_store = :mem_cache_store # config.cache_store = :mem_cache_store
# Enable serving of images, stylesheets, and JavaScripts from an asset server. # Enable serving of images, stylesheets, and JavaScripts from an asset server.
# config.action_controller.asset_host = "http://assets.example.com" # config.action_controller.asset_host = 'http://assets.example.com'
# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
# config.assets.precompile += %w( search.js )
# Ignore bad email addresses and do not raise email delivery errors. # Ignore bad email addresses and do not raise email delivery errors.
# Set this to true and configure the email server for immediate delivery to raise delivery errors. # Set this to true and configure the email server for immediate delivery to raise delivery errors.
@ -72,9 +71,6 @@ Rails.application.configure do
# Send deprecation notices to registered listeners. # Send deprecation notices to registered listeners.
config.active_support.deprecation = :notify config.active_support.deprecation = :notify
# Disable automatic flushing of the log to improve performance.
# config.autoflush_log = false
# Use default logging formatter so that PID and timestamp are not suppressed. # Use default logging formatter so that PID and timestamp are not suppressed.
config.log_formatter = ::Logger::Formatter.new config.log_formatter = ::Logger::Formatter.new

View File

@ -12,8 +12,8 @@ Rails.application.configure do
# preloads Rails for running tests, you may have to set it to true. # preloads Rails for running tests, you may have to set it to true.
config.eager_load = false config.eager_load = false
# Configure static asset server for tests with Cache-Control for performance. # Configure static file server for tests with Cache-Control for performance.
config.serve_static_assets = true config.serve_static_files = true
config.static_cache_control = 'public, max-age=3600' config.static_cache_control = 'public, max-age=3600'
# Show full error reports and disable caching. # Show full error reports and disable caching.
@ -31,6 +31,9 @@ Rails.application.configure do
# ActionMailer::Base.deliveries array. # ActionMailer::Base.deliveries array.
config.action_mailer.delivery_method = :test config.action_mailer.delivery_method = :test
# Randomize the order test cases are executed.
config.active_support.test_order = :random
# Print deprecation notices to the stderr. # Print deprecation notices to the stderr.
config.active_support.deprecation = :stderr config.active_support.deprecation = :stderr

View File

@ -0,0 +1,11 @@
# Be sure to restart your server when you modify this file.
# Version of your assets, change this if you want to expire all your assets.
Rails.application.config.assets.version = '1.0'
# Add additional assets to the asset load path
# Rails.application.config.assets.paths << Emoji.images_path
# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
# Rails.application.config.assets.precompile += %w( search.js )

View File

@ -1,3 +1,3 @@
# Be sure to restart your server when you modify this file. # Be sure to restart your server when you modify this file.
Rails.application.config.session_store :cookie_store, key: '_hands-on-programming_session' Rails.application.config.session_store :cookie_store, key: '_CodeOcean_session'

View File

@ -1,20 +1,20 @@
FILENAME_REGEXP = /[\w\.]+/ unless Kernel.const_defined?(:FILENAME_REGEXP) FILENAME_REGEXP = /[\w\.]+/ unless Kernel.const_defined?(:FILENAME_REGEXP)
Rails.application.routes.draw do Rails.application.routes.draw do
root to: 'application#welcome' root 'application#welcome'
namespace :admin do namespace :admin do
get 'dashboard', to: 'dashboard#show' get 'dashboard' => 'dashboard#show'
end end
get '/help', to: 'application#help' get '/help' => 'application#help'
resources :consumers resources :consumers
resources :execution_environments do resources :execution_environments do
member do member do
get :shell get :shell
post 'shell', as: :execute_command, to: :execute_command post 'shell' => :execute_command, as: :execute_command
end end
resources :errors, only: [:create, :index, :show] resources :errors, only: [:create, :index, :show]
@ -40,29 +40,29 @@ Rails.application.routes.draw do
resources :internal_users do resources :internal_users do
member do member do
match 'activate', to: 'internal_users#activate', via: [:get, :patch, :put] match 'activate' => 'internal_users#activate', via: [:get, :patch, :put]
match 'reset_password', to: 'internal_users#reset_password', via: [:get, :patch, :put] match 'reset_password' => 'internal_users#reset_password', via: [:get, :patch, :put]
end end
end end
match '/forgot_password', as: 'forgot_password', to: 'internal_users#forgot_password', via: [:get, :post] match '/forgot_password' => 'internal_users#forgot_password', as: 'forgot_password', via: [:get, :post]
resources :sessions, only: [:create, :destroy, :new] resources :sessions, only: [:create, :destroy, :new]
post '/lti/launch', as: 'lti_launch', to: 'sessions#create_through_lti' post '/lti/launch' => 'sessions#create_through_lti', as: 'lti_launch'
get '/lti/return', as: 'lti_return', to: 'sessions#destroy_through_lti' get '/lti/return' => 'sessions#destroy_through_lti', as: 'lti_return'
get '/sign_in', as: 'sign_in', to: 'sessions#new' get '/sign_in' => 'sessions#new', as: 'sign_in'
delete '/sign_out', as: 'sign_out', to: 'sessions#destroy' delete '/sign_out' => 'sessions#destroy', as: 'sign_out'
resources :submissions, only: [:create, :index, :show] do resources :submissions, only: [:create, :index, :show] do
member do member do
get 'download/:filename', as: :download, constraints: {filename: FILENAME_REGEXP}, to: :download_file get 'download/:filename' => :download_file, as: :download, constraints: {filename: FILENAME_REGEXP}
get 'render/:filename', as: :render, constraints: {filename: FILENAME_REGEXP}, to: :render_file get 'render/:filename' => :render_file, as: :render, constraints: {filename: FILENAME_REGEXP}
get 'run/:filename', as: :run, constraints: {filename: FILENAME_REGEXP}, to: :run get 'run/:filename' => :run, as: :run, constraints: {filename: FILENAME_REGEXP}
get :score get :score
get :statistics get :statistics
post :stop post :stop
get 'test/:filename', as: :test, constraints: {filename: FILENAME_REGEXP}, to: :test get 'test/:filename' => :test, as: :test, constraints: {filename: FILENAME_REGEXP}
end end
end end

View File

@ -31,7 +31,8 @@ describe ExercisesController do
end end
context 'with a file upload' do context 'with a file upload' do
let(:files_attributes) { {'0' => FactoryGirl.build(:file, content: fixture_file_upload('upload.rb', 'text/x-ruby')).attributes} } let(:file_upload) { fixture_file_upload('upload.rb', 'text/x-ruby') }
let(:files_attributes) { {'0' => FactoryGirl.build(:file).attributes.merge(content: file_upload)} }
let(:request) { proc { post :create, exercise: exercise_attributes.merge(files_attributes: files_attributes) } } let(:request) { proc { post :create, exercise: exercise_attributes.merge(files_attributes: files_attributes) } }
it 'creates the file' do it 'creates the file' do