Permalink
Browse files

upgrade to Rails v3.1.0

  • Loading branch information...
1 parent a27763d commit afd356930a59c0a0781a99bdca3f77a681d110ea @hakanensari hakanensari committed Sep 10, 2011
View
16 Gemfile
@@ -1,29 +1,27 @@
source 'http://rubygems.org'
-gem 'rails', '3.1.0.rc4'
+gem 'rails', '3.1.0'
gem 'sinatra'
# Asset template engines
-gem 'sass-rails', "~> 3.1.0.rc"
+gem 'sass-rails'
gem 'coffee-script'
gem 'uglifier'
gem 'jquery-rails'
# async wrappers
-gem 'eventmachine', :git => 'git://github.com/eventmachine/eventmachine.git'
+gem 'eventmachine'
gem 'rack-fiber_pool', :require => 'rack/fiber_pool'
-gem 'em-synchrony', :git => 'git://github.com/igrigorik/em-synchrony.git', :require => [
- 'em-synchrony',
- 'em-synchrony/em-http',
- 'em-synchrony/activerecord'
- ]
+gem 'em-synchrony', :require => ['em-synchrony',
+ 'em-synchrony/em-http',
+ 'em-synchrony/activerecord']
# async activerecord requires
gem 'mysql2'
# async http requires
-gem 'em-http-request',:git => 'git://github.com/igrigorik/em-http-request.git', :require => 'em-http'
+gem 'em-http-request', :require => 'em-http'
gem 'addressable', :require => 'addressable/uri'
gem 'thin'
View
@@ -1,77 +1,61 @@
-GIT
- remote: git://github.com/eventmachine/eventmachine.git
- revision: 5222bcd4fc3eccbf19212cd007c6f9bb42122538
- specs:
- eventmachine (1.0.0.beta.4)
-
-GIT
- remote: git://github.com/igrigorik/em-http-request.git
- revision: 9172f3a270097372014a47be0dad1a513b9d9460
- specs:
- em-http-request (1.0.0.beta.4)
- addressable (>= 2.2.3)
- em-socksify
- eventmachine (>= 1.0.0.beta.3)
- http_parser.rb (>= 0.5.1)
-
-GIT
- remote: git://github.com/igrigorik/em-synchrony.git
- revision: 54194c00c65b7cfb94dfb74a41e01829ebb57e55
- specs:
- em-synchrony (0.3.0.beta.1)
- eventmachine (>= 1.0.0.beta.1)
-
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.0.rc4)
- actionpack (= 3.1.0.rc4)
+ actionmailer (3.1.0)
+ actionpack (= 3.1.0)
mail (~> 2.3.0)
- actionpack (3.1.0.rc4)
- activemodel (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
+ 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.0)
- rack-cache (~> 1.0.1)
- rack-mount (~> 0.8.1)
- rack-test (~> 0.6.0)
- sprockets (~> 2.0.0.beta.10)
- tzinfo (~> 0.3.27)
- activemodel (3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
- bcrypt-ruby (~> 2.1.4)
+ 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.rc4)
- activemodel (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
- arel (~> 2.1.1)
- tzinfo (~> 0.3.27)
- activeresource (3.1.0.rc4)
- activemodel (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
- activesupport (3.1.0.rc4)
+ 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)
- arel (2.1.4)
- bcrypt-ruby (2.1.4)
+ arel (2.2.1)
+ bcrypt-ruby (3.0.0)
builder (3.0.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.1.2)
daemons (1.1.4)
+ em-http-request (1.0.0)
+ addressable (>= 2.2.3)
+ em-socksify
+ eventmachine (>= 1.0.0.beta.3)
+ http_parser.rb (>= 0.5.2)
em-socksify (0.1.0)
eventmachine
+ em-synchrony (1.0.0)
+ eventmachine (>= 1.0.0.beta.1)
erubis (2.7.0)
+ eventmachine (1.0.0.beta.3)
execjs (1.2.4)
multi_json (~> 1.0)
hike (1.2.1)
http_parser.rb (0.5.2)
i18n (0.6.0)
- jquery-rails (1.0.13)
+ jquery-rails (1.0.14)
railties (~> 3.0)
thor (~> 0.14)
mail (2.3.0)
@@ -83,45 +67,44 @@ GEM
mysql2 (0.3.7)
polyglot (0.3.2)
rack (1.3.2)
- rack-cache (1.0.2)
+ rack-cache (1.0.3)
rack (>= 0.4)
rack-fiber_pool (0.9.2)
- rack-mount (0.8.2)
+ rack-mount (0.8.3)
rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.0.rc4)
- actionmailer (= 3.1.0.rc4)
- actionpack (= 3.1.0.rc4)
- activerecord (= 3.1.0.rc4)
- activeresource (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
+ 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.1.0.rc4)
- railties (3.1.0.rc4)
- actionpack (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
+ 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.6)
rake (0.9.2)
rdoc (3.9.4)
sass (3.1.7)
- sass-rails (3.1.0.rc.5)
- actionpack (~> 3.1.0.rc1)
- railties (~> 3.1.0.rc1)
+ sass-rails (3.1.0)
+ actionpack (~> 3.1.0)
+ railties (~> 3.1.0)
sass (>= 3.1.4)
- sprockets (>= 2.0.0.beta.9)
sinatra (1.2.6)
rack (~> 1.1)
tilt (< 2.0, >= 1.2.2)
- sprockets (2.0.0.beta.15)
+ sprockets (2.0.0)
hike (~> 1.2)
rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
+ tilt (!= 1.3.0, ~> 1.1)
thin (1.2.11)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
@@ -132,7 +115,7 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.29)
- uglifier (1.0.1)
+ uglifier (1.0.3)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
@@ -142,14 +125,14 @@ PLATFORMS
DEPENDENCIES
addressable
coffee-script
- em-http-request!
- em-synchrony!
- eventmachine!
+ em-http-request
+ em-synchrony
+ eventmachine
jquery-rails
mysql2
rack-fiber_pool
- rails (= 3.1.0.rc4)
- sass-rails (~> 3.1.0.rc)
+ rails (= 3.1.0)
+ sass-rails
sinatra
thin
uglifier
View
@@ -2,9 +2,12 @@
require 'rails/all'
-# If you have a Gemfile, require the gems listed there, including any gems
-# you've limited to :test, :development, or :production.
-Bundler.require(:default, Rails.env) if defined?(Bundler)
+if defined?(Bundler)
+ # If you precompile assets before deploying to production, use this line
+ Bundler.require *Rails.groups(:assets => %w(development test))
+ # If you want your assets lazily compiled in production, use this line
+ # Bundler.require(:default, :assets, Rails.env)
+end
module AsyncRails3
class Application < Rails::Application
@@ -38,5 +41,8 @@ class Application < Rails::Application
# Enable the asset pipeline
config.assets.enabled = true
+
+ # Version of your assets, change this if you want to expire all your assets
+ config.assets.version = '1.0'
end
end
@@ -1,54 +1,33 @@
AsyncRails3::Application.configure do
# Settings specified here will take precedence over those in config/application.rb
- # Code is not reloaded between requests
- config.cache_classes = true
+ # In the development environment your application's code is reloaded on
+ # every request. This slows down response time but is perfect for development
+ # since you don't have to restart the web server when you make code changes.
+ config.cache_classes = false
- # Full error reports are disabled and caching is turned on
- config.consider_all_requests_local = false
- config.action_controller.perform_caching = true
+ # Log error messages when you accidentally call methods on nil.
+ config.whiny_nils = true
- # Disable Rails's static asset server (Apache or nginx will already do this)
- config.serve_static_assets = false
+ # Show full error reports and disable caching
+ config.consider_all_requests_local = true
+ config.action_controller.perform_caching = false
- # Compress JavaScripts and CSS
- config.assets.compress = true
+ # Don't care if the mailer can't send
+ config.action_mailer.raise_delivery_errors = false
- # Specify the default JavaScript compressor
- config.assets.js_compressor = :uglifier
+ # Print deprecation notices to the Rails logger
+ config.active_support.deprecation = :log
- # Specifies the header that your server uses for sending files
- # (comment out if your front-end server doesn't support this)
- config.action_dispatch.x_sendfile_header = "X-Sendfile" # Use 'X-Accel-Redirect' for nginx
+ # Only use best-standards-support built into browsers
+ config.action_dispatch.best_standards_support = :builtin
- # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
- # config.force_ssl = true
+ # Do not compress assets
+ config.assets.compress = false
- # See everything in the log (default is :info)
- # config.log_level = :debug
-
- # Use a different logger for distributed setups
- # config.logger = SyslogLogger.new
-
- # Use a different cache store in production
- # config.cache_store = :mem_cache_store
-
- # Enable serving of images, stylesheets, and JavaScripts from an asset server
- # config.action_controller.asset_host = "http://assets.example.com"
-
- # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
- # config.assets.precompile += %w( search.js )
-
- # Disable delivery errors, bad email addresses will be ignored
- # config.action_mailer.raise_delivery_errors = false
# Enable threaded mode
config.threadsafe!
-
- # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
- # the I18n.default_locale when a translation can not be found)
- config.i18n.fallbacks = true
-
- # Send deprecation notices to registered listeners
- config.active_support.deprecation = :notify
+ # Expands the lines which load the assets
+ config.assets.debug = true
end
@@ -14,12 +14,18 @@
# Compress JavaScripts and CSS
config.assets.compress = true
- # Specify the default JavaScript compressor
- config.assets.js_compressor = :uglifier
+ # Don't fallback to assets pipeline if a precompiled asset is missed
+ config.assets.compile = false
+
+ # Generate digests for assets URLs
+ config.assets.digest = true
+
+ # Defaults to Rails.root.join("public/assets")
+ # config.assets.manifest = YOUR_PATH
# Specifies the header that your server uses for sending files
- # (comment out if your front-end server doesn't support this)
- config.action_dispatch.x_sendfile_header = "X-Sendfile" # Use 'X-Accel-Redirect' for nginx
+ # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+ # 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.
# config.force_ssl = true
@@ -48,4 +54,7 @@
# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
# the I18n.default_locale when a translation can not be found)
config.i18n.fallbacks = true
+
+ # Send deprecation notices to registered listeners
+ config.active_support.deprecation = :notify
end
Oops, something went wrong.

0 comments on commit afd3569

Please sign in to comment.