Commit d5948064
Changed files (13)
bin
config
environments
initializers
public
bin/setup
@@ -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
config/environments/development.rb
@@ -28,6 +28,10 @@ Rails.application.configure do
# 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.
# Checks for improperly declared sprockets dependencies.
# Raises helpful error messages.
config/environments/test.rb
@@ -32,6 +32,9 @@ Rails.application.configure do
config.action_mailer.delivery_method = :test
config.action_mailer.default_url_options = { :host => 'www.blah.com'}
+ # Randomize the order test cases are executed.
+ config.active_support.test_order = :random
+
# Print deprecation notices to the stderr.
config.active_support.deprecation = :stderr
config/initializers/assets.rb
@@ -3,6 +3,9 @@
# 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 )
config/initializers/mime_types.rb
@@ -2,4 +2,3 @@
# Add new mime types for use in respond_to blocks:
# Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register_alias "text/html", :iphone
config/initializers/session_store.rb
@@ -3,4 +3,4 @@ configuration = {
key: '_cake_eater',
expire_after: 1.day
}
-Cake::Application.config.session_store ActionDispatch::Session::CacheStore, configuration
+Rails.application.config.session_store ActionDispatch::Session::CacheStore, configuration
config/application.rb
@@ -2,6 +2,7 @@ require File.expand_path('../boot', __FILE__)
# Pick the frameworks you want:
require "active_model/railtie"
+require "active_job/railtie"
require "active_record/railtie"
require "action_controller/railtie"
require "action_mailer/railtie"
@@ -33,6 +34,9 @@ module Cake
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
# config.i18n.default_locale = :de
+ # Do not swallow errors in after_commit/after_rollback callbacks.
+ config.active_record.raise_in_transactional_callbacks = true
+
config.middleware.use Rack::Cors do
allow do
origins "*"
config/boot.rb
@@ -1,4 +1,3 @@
-# Set up gems listed in the Gemfile.
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' # Set up gems listed in the Gemfile.
public/404.html
@@ -1,4 +1,6 @@
<!doctype html>
+<html>
+<head>
<title>Page Not Found</title>
<style>
body { text-align: center;}
@@ -12,7 +14,9 @@
a { color: rgb(36, 109, 56); text-decoration:none; }
a:hover { color: rgb(96, 73, 141) ; text-shadow: 2px 2px 2px rgba(36, 109, 56, 0.5); }
</style>
+</head>
+<body>
<article>
<h1>Oh, Snap! <span frown>:(</span></h1>
<div>
@@ -28,3 +32,5 @@
</script>
<script src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
</article>
+</body>
+</html>
public/500.html
@@ -1,4 +1,6 @@
<!doctype html>
+<html>
+<head>
<title>Don't you dare blow up at this table (500)</title>
<style>
body { text-align: center;}
@@ -12,6 +14,8 @@
a { color: rgb(36, 109, 56); text-decoration:none; }
a:hover { color: rgb(96, 73, 141) ; text-shadow: 2px 2px 2px rgba(36, 109, 56, 0.5); }
</style>
+</head>
+<body>
<article>
<h1>Oh, Snap! <span frown>:(</span></h1>
@@ -29,3 +33,5 @@
</script>
<script src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
</article>
+</body>
+</html>
public/robots.txt
@@ -2,4 +2,3 @@
#
# To ban all spiders from the entire site uncomment the next two lines:
User-agent: *
-
Gemfile
@@ -1,17 +1,14 @@
source 'https://rubygems.org'
-gem 'rails'
-gem 'sass-rails'
-gem 'uglifier'
-gem 'coffee-rails'
+gem 'rails', '4.2.0'
+gem 'sass-rails', '~> 5.0'
+gem 'uglifier', '>= 1.3.0'
+gem 'coffee-rails', '~> 4.1.0'
gem 'jquery-rails'
gem 'turbolinks'
-gem 'jbuilder'
-gem 'bcrypt-ruby'
-group :doc do
- # bundle exec rake doc:rails generates the API under doc/api.
- gem 'sdoc', '~> 0.4.0'
-end
+gem 'jbuilder', '~> 2.0'
+gem 'bcrypt', '~> 3.1.7'
+gem 'sdoc', '~> 0.4.0', group: :doc
# to remove
gem 'acts-as-taggable-on'
@@ -21,8 +18,8 @@ gem 'jquery-turbolinks'
gem 'mini_magick'
gem "kaminari"
gem 'bootstrap-sass', '~> 2.3.0'
-gem 'delayed_job'
-gem 'delayed_job_active_record'
+#gem 'delayed_job'
+#gem 'delayed_job_active_record'
gem 'daemons'
gem 'dotenv-rails'
gem 'pg'
@@ -48,14 +45,14 @@ gem 'groupdate'
gem 'rack-cors', require: 'rack/cors'
group :development do
- gem 'capistrano', '~> 3.0', require: false
- gem 'capistrano-rails', '~> 1.1', require: false
+ #gem 'capistrano', '~> 3.0', require: false
+ #gem 'capistrano-rails', '~> 1.1', require: false
+ gem 'capistrano-rails'
gem 'capistrano-bundler', '~> 1.1', require: false
gem 'capistrano-rbenv', '~> 2.0', require: false
- gem 'bullet'
+ #gem 'bullet'
gem 'better_errors'
gem 'lol_dba'
- gem 'spring'
gem 'pry-rails'
end
@@ -71,6 +68,9 @@ group :development, :test do
gem 'phantomjs', :require => 'phantomjs/poltergeist'
gem 'binding_of_caller'
gem 'foreman'
+ gem 'spring'
+ gem 'byebug'
+ gem 'web-console', '~> 2.0'
end
group :production, :staging do
Gemfile.lock
@@ -2,36 +2,45 @@ GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.2.8)
- actionmailer (4.1.8)
- actionpack (= 4.1.8)
- actionview (= 4.1.8)
+ actionmailer (4.2.0)
+ actionpack (= 4.2.0)
+ actionview (= 4.2.0)
+ activejob (= 4.2.0)
mail (~> 2.5, >= 2.5.4)
- actionpack (4.1.8)
- actionview (= 4.1.8)
- activesupport (= 4.1.8)
- rack (~> 1.5.2)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ actionpack (4.2.0)
+ actionview (= 4.2.0)
+ activesupport (= 4.2.0)
+ rack (~> 1.6.0)
rack-test (~> 0.6.2)
- actionview (4.1.8)
- activesupport (= 4.1.8)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ rails-html-sanitizer (~> 1.0, >= 1.0.1)
+ actionview (4.2.0)
+ activesupport (= 4.2.0)
builder (~> 3.1)
erubis (~> 2.7.0)
- activemodel (4.1.8)
- activesupport (= 4.1.8)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ 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)
- activerecord (4.1.8)
- activemodel (= 4.1.8)
- activesupport (= 4.1.8)
- arel (~> 5.0.0)
- activesupport (4.1.8)
- i18n (~> 0.6, >= 0.6.9)
+ activerecord (4.2.0)
+ activemodel (= 4.2.0)
+ activesupport (= 4.2.0)
+ arel (~> 6.0)
+ activesupport (4.2.0)
+ i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
- thread_safe (~> 0.1)
+ thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
acts-as-taggable-on (3.4.2)
activerecord (>= 3.2, < 5)
addressable (2.3.6)
- arel (5.0.1.20140414130214)
+ arel (6.0.0)
asin (2.0.1)
confiture (>= 0.1)
crack (>= 0.3)
@@ -41,14 +50,12 @@ GEM
asset_sync (1.0.0)
activemodel
fog (>= 1.8.0)
- aws-sdk (1.59.0)
- aws-sdk-v1 (= 1.59.0)
- aws-sdk-v1 (1.59.0)
+ aws-sdk (1.60.1)
+ aws-sdk-v1 (= 1.60.1)
+ aws-sdk-v1 (1.60.1)
json (~> 1.4)
nokogiri (>= 1.4.4)
bcrypt (3.1.9)
- bcrypt-ruby (3.1.5)
- bcrypt (>= 3.1.3)
better_errors (2.0.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
@@ -60,10 +67,12 @@ GEM
browser_sniffer (1.0.7)
buftok (0.2.0)
builder (3.2.2)
- bullet (4.14.0)
- activesupport (>= 3.0.0)
- uniform_notifier (>= 1.6.0)
- capistrano (3.2.1)
+ byebug (3.5.1)
+ columnize (~> 0.8)
+ debugger-linecache (~> 1.2)
+ slop (~> 3.6)
+ capistrano (3.3.5)
+ capistrano-stats (~> 1.1.0)
i18n
rake (>= 10.0.0)
sshkit (~> 1.3)
@@ -76,6 +85,7 @@ GEM
capistrano-rbenv (2.0.2)
capistrano (~> 3.1)
sshkit (~> 1.3)
+ capistrano-stats (1.1.1)
capybara (2.4.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@@ -92,7 +102,8 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.8.0)
- colorize (0.7.3)
+ colorize (0.7.5)
+ columnize (0.9.0)
confiture (0.1.4)
crack (0.4.2)
safe_yaml (~> 1.0.0)
@@ -101,11 +112,7 @@ GEM
dalli (2.7.2)
database_cleaner (1.3.0)
debug_inspector (0.0.2)
- delayed_job (4.0.4)
- activesupport (>= 3.0, < 4.2)
- delayed_job_active_record (4.0.2)
- activerecord (>= 3.0, < 4.2)
- delayed_job (>= 3.0, < 4.1)
+ debugger-linecache (1.2.0)
diff-lcs (1.2.5)
docile (1.1.5)
dotenv (1.0.2)
@@ -119,7 +126,7 @@ GEM
exception_notification (4.0.1)
actionmailer (>= 3.0.4)
activesupport (>= 3.0.4)
- excon (0.41.0)
+ excon (0.42.1)
execjs (2.2.2)
exifr (1.2.0)
factory_girl (4.5.0)
@@ -132,32 +139,40 @@ GEM
ffaker (1.25.0)
fission (0.5.0)
CFPropertyList (~> 2.2)
- fog (1.25.0)
+ fog (1.26.0)
+ fog-atmos
fog-brightbox (~> 0.4)
- fog-core (~> 1.25)
+ fog-core (~> 1.27, >= 1.27.1)
+ fog-ecloud
fog-json
fog-profitbricks
fog-radosgw (>= 0.0.2)
fog-sakuracloud (>= 0.0.4)
fog-softlayer
+ fog-storm_on_demand
fog-terremark
fog-vmfusion
fog-voxel
fog-xml (~> 0.1.1)
ipaddress (~> 0.5)
nokogiri (~> 1.5, >= 1.5.11)
- opennebula
- fog-brightbox (0.6.1)
+ fog-atmos (0.1.0)
+ fog-core
+ fog-xml
+ fog-brightbox (0.7.1)
fog-core (~> 1.22)
fog-json
- inflecto
- fog-core (1.25.0)
+ inflecto (~> 0.0.2)
+ fog-core (1.27.2)
builder
excon (~> 0.38)
formatador (~> 0.2)
mime-types
net-scp (~> 1.1)
net-ssh (>= 2.1.3)
+ fog-ecloud (0.0.2)
+ fog-core
+ fog-xml
fog-json (1.0.0)
multi_json (~> 1.0)
fog-profitbricks (0.0.1)
@@ -171,7 +186,10 @@ GEM
fog-sakuracloud (0.1.1)
fog-core
fog-json
- fog-softlayer (0.3.24)
+ fog-softlayer (0.3.26)
+ fog-core
+ fog-json
+ fog-storm_on_demand (0.1.0)
fog-core
fog-json
fog-terremark (0.0.3)
@@ -180,21 +198,23 @@ GEM
fog-vmfusion (0.0.1)
fission
fog-core
- fog-voxel (0.0.1)
+ fog-voxel (0.0.2)
fog-core
fog-xml
fog-xml (0.1.1)
fog-core
nokogiri (~> 1.5, >= 1.5.11)
- foreman (0.63.0)
- dotenv (>= 0.7)
- thor (>= 0.13.6)
+ foreman (0.76.0)
+ dotenv (~> 1.0.2)
+ thor (~> 0.19.1)
formatador (0.2.5)
geoip (1.4.0)
gibbon (1.1.4)
httparty
multi_json (>= 1.3.4)
- github-markdown (0.6.7)
+ github-markdown (0.6.8)
+ globalid (0.3.0)
+ activesupport (>= 4.1.0)
groupdate (2.3.0)
activesupport (>= 3)
hashie (2.0.5)
@@ -207,14 +227,15 @@ GEM
multi_xml (>= 0.5.2)
httpi (2.3.0)
rack
- i18n (0.6.11)
+ i18n (0.7.0)
inflecto (0.0.2)
ipaddress (0.8.0)
- jbuilder (2.2.5)
+ jbuilder (2.2.6)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
- jquery-rails (3.1.2)
- railties (>= 3.0, < 5.0)
+ jquery-rails (4.0.2)
+ rails-dom-testing (~> 1.0)
+ railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-turbolinks (2.1.0)
railties (>= 3.1.0)
@@ -233,15 +254,17 @@ GEM
actionpack (>= 3.0)
activerecord (>= 3.0)
railties (>= 3.0)
+ loofah (2.0.1)
+ nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.8.2)
mime-types (2.4.3)
- mini_magick (4.0.0)
+ mini_magick (4.0.1)
mini_portile (0.6.1)
- minitest (5.4.3)
+ minitest (5.5.0)
multi_json (1.10.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
@@ -249,13 +272,9 @@ GEM
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.1)
- newrelic_rpm (3.9.7.266)
- nokogiri (1.6.4.1)
+ newrelic_rpm (3.9.8.273)
+ nokogiri (1.6.5)
mini_portile (~> 0.6.0)
- opennebula (4.10.1)
- json
- nokogiri
- rbvmomi
pg (0.17.1)
phantomjs (1.9.7.1)
poltergeist (1.5.1)
@@ -269,36 +288,41 @@ GEM
slop (~> 3.4)
pry-rails (0.3.2)
pry (>= 0.9.10)
- rack (1.5.2)
+ rack (1.6.0)
rack-attack (4.2.0)
rack
rack-cors (0.2.9)
rack-test (0.6.2)
rack (>= 1.0)
- rails (4.1.8)
- actionmailer (= 4.1.8)
- actionpack (= 4.1.8)
- actionview (= 4.1.8)
- activemodel (= 4.1.8)
- activerecord (= 4.1.8)
- activesupport (= 4.1.8)
+ rails (4.2.0)
+ actionmailer (= 4.2.0)
+ actionpack (= 4.2.0)
+ actionview (= 4.2.0)
+ activejob (= 4.2.0)
+ activemodel (= 4.2.0)
+ activerecord (= 4.2.0)
+ activesupport (= 4.2.0)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.1.8)
- sprockets-rails (~> 2.0)
- railties (4.1.8)
- actionpack (= 4.1.8)
- activesupport (= 4.1.8)
+ railties (= 4.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)
+ railties (4.2.0)
+ actionpack (= 4.2.0)
+ activesupport (= 4.2.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
- rake (10.3.2)
+ rake (10.4.2)
rash (0.4.0)
hashie (~> 2.0.0)
- rbvmomi (1.8.2)
- builder
- nokogiri (>= 1.4.1)
- trollop
- rdoc (4.1.2)
+ rdoc (4.2.0)
json (~> 1.4)
rspec-core (3.1.7)
rspec-support (~> 3.1.0)
@@ -317,12 +341,13 @@ GEM
rspec-support (~> 3.1.0)
rspec-support (3.1.2)
safe_yaml (1.0.4)
- sass (3.2.19)
- sass-rails (4.0.4)
+ sass (3.4.9)
+ sass-rails (5.0.0)
railties (>= 4.0.0, < 5.0)
- sass (~> 3.2.2)
- sprockets (~> 2.8, < 2.12)
- sprockets-rails (~> 2.0)
+ sass (~> 3.1)
+ sprockets (>= 2.8, < 4.0)
+ sprockets-rails (>= 2.0, < 4.0)
+ tilt (~> 1.1)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
@@ -335,18 +360,18 @@ GEM
slop (3.6.0)
spank (0.0.1393558686)
spring (1.2.0)
- sprockets (2.11.3)
+ sprockets (2.12.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sprockets-rails (2.2.0)
+ sprockets-rails (2.2.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.10)
- sshkit (1.5.1)
- colorize
+ sshkit (1.6.1)
+ colorize (>= 0.7.0)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
teaspoon (0.8.0)
@@ -354,8 +379,7 @@ GEM
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
- trollop (2.0)
- turbolinks (2.5.2)
+ turbolinks (2.5.3)
coffee-rails
twitter (5.13.0)
addressable (~> 2.3)
@@ -370,7 +394,7 @@ GEM
simple_oauth (~> 0.3.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
- uglifier (2.5.3)
+ uglifier (2.6.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
unf (0.1.4)
@@ -380,8 +404,14 @@ GEM
kgio (~> 2.6)
rack
raindrops (~> 0.7)
- uniform_notifier (1.6.2)
- websocket-driver (0.4.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-driver (0.5.1)
+ websocket-extensions (>= 0.1.0)
+ websocket-extensions (0.1.1)
xpath (2.0.0)
nokogiri (~> 1.3)
@@ -393,24 +423,21 @@ DEPENDENCIES
asin
asset_sync (~> 1.0.0)
aws-sdk
- bcrypt-ruby
+ bcrypt (~> 3.1.7)
better_errors
binding_of_caller
bootstrap-sass (~> 2.3.0)
browser_sniffer
- bullet
- capistrano (~> 3.0)
+ byebug
capistrano-bundler (~> 1.1)
- capistrano-rails (~> 1.1)
+ capistrano-rails
capistrano-rbenv (~> 2.0)
chartkick
- coffee-rails
+ coffee-rails (~> 4.1.0)
curb
daemons
dalli
database_cleaner
- delayed_job
- delayed_job_active_record
dotenv-deployment
dotenv-rails
ejs
@@ -423,7 +450,7 @@ DEPENDENCIES
gibbon
github-markdown
groupdate
- jbuilder
+ jbuilder (~> 2.0)
jquery-rails
jquery-turbolinks
jquery-ui-rails (~> 4.0.0)
@@ -439,9 +466,9 @@ DEPENDENCIES
pry-rails
rack-attack
rack-cors
- rails
+ rails (= 4.2.0)
rspec-rails
- sass-rails
+ sass-rails (~> 5.0)
sdoc (~> 0.4.0)
simplecov
spank
@@ -450,6 +477,7 @@ DEPENDENCIES
teaspoon
turbolinks
twitter
- uglifier
+ uglifier (>= 1.3.0)
unf
unicorn
+ web-console (~> 2.0)