Permalink
Browse files

conform to app generated by template for Rails 3.1.0.rc4

  • Loading branch information...
1 parent 0410d77 commit c4e9ea2dae61aa151ee6f57e1bedc78b185b6433 @fortuity fortuity committed Jul 11, 2011
View
@@ -62,5 +62,6 @@ tmp/*
# vim artifacts
**.swp
+
# keep OmniAuth service provider secrets out of the Git repo
config/initializers/omniauth.rb
View
12 Gemfile
@@ -1,15 +1,15 @@
source 'http://rubygems.org'
-gem 'rails', '3.1.0.rc1'
-gem 'sass'
+gem 'rails', '3.1.0.rc4'
+gem 'sass-rails', "~> 3.1.0.rc"
gem 'coffee-script'
gem 'uglifier'
gem 'jquery-rails'
gem "rspec-rails", ">= 2.6.1", :group => [:development, :test]
gem "database_cleaner", ">= 0.6.7", :group => :test
-gem "mongoid-rspec", ">= 1.4.2", :group => :test
-gem "factory_girl_rails", ">= 1.1.beta1", :group => :test
-gem "cucumber-rails", ">= 0.5.1", :group => :test
-gem "capybara", ">= 1.0.0.beta1", :group => :test
+gem "mongoid-rspec", ">= 1.4.4", :group => :test
+gem "factory_girl_rails", ">= 1.1.rc1", :group => :test
+gem "cucumber-rails", ">= 1.0.2", :group => :test
+gem "capybara", ">= 1.0.0", :group => :test
gem "launchy", ">= 0.4.0", :group => :test
gem "bson_ext", ">= 1.3.1"
gem "mongoid", ">= 2.0.2"
View
@@ -1,90 +1,89 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.0.rc1)
- actionpack (= 3.1.0.rc1)
+ actionmailer (3.1.0.rc4)
+ actionpack (= 3.1.0.rc4)
mail (~> 2.3.0)
- actionpack (3.1.0.rc1)
- activemodel (= 3.1.0.rc1)
- activesupport (= 3.1.0.rc1)
+ actionpack (3.1.0.rc4)
+ activemodel (= 3.1.0.rc4)
+ activesupport (= 3.1.0.rc4)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6.0beta1)
- rack (~> 1.3.0.beta2)
+ 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.5)
+ sprockets (~> 2.0.0.beta.10)
tzinfo (~> 0.3.27)
- activemodel (3.1.0.rc1)
- activesupport (= 3.1.0.rc1)
+ activemodel (3.1.0.rc4)
+ activesupport (= 3.1.0.rc4)
bcrypt-ruby (~> 2.1.4)
builder (~> 3.0.0)
- i18n (~> 0.6.0beta1)
- activerecord (3.1.0.rc1)
- activemodel (= 3.1.0.rc1)
- activesupport (= 3.1.0.rc1)
+ 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.rc1)
- activemodel (= 3.1.0.rc1)
- activesupport (= 3.1.0.rc1)
- activesupport (3.1.0.rc1)
+ activeresource (3.1.0.rc4)
+ activemodel (= 3.1.0.rc4)
+ activesupport (= 3.1.0.rc4)
+ activesupport (3.1.0.rc4)
multi_json (~> 1.0)
addressable (2.2.4)
- arel (2.1.1)
+ arel (2.1.3)
bcrypt-ruby (2.1.4)
bson (1.3.1)
bson_ext (1.3.1)
builder (3.0.0)
- capybara (1.0.0.beta1)
+ capybara (1.0.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
- selenium-webdriver (>= 0.0.27)
+ selenium-webdriver (~> 0.2.0)
xpath (~> 0.1.4)
childprocess (0.1.9)
ffi (~> 1.0.6)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.1.1)
- configuration (1.2.0)
- cucumber (0.10.3)
+ configuration (1.3.1)
+ cucumber (1.0.1)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
- gherkin (>= 2.3.8)
+ gherkin (~> 2.4.5)
json (>= 1.4.6)
term-ansicolor (>= 1.0.5)
- cucumber-rails (0.5.1)
- capybara (>= 1.0.0.beta1)
- cucumber (>= 0.10.3)
- nokogiri (>= 1.4.4)
- rack-test (>= 0.5.7)
+ cucumber-rails (1.0.2)
+ capybara (>= 1.0.0)
+ cucumber (~> 1.0.0)
+ nokogiri (>= 1.4.6)
database_cleaner (0.6.7)
diff-lcs (1.1.2)
erubis (2.7.0)
- execjs (1.0.0)
+ execjs (1.2.0)
multi_json (~> 1.0)
- factory_girl (2.0.0.beta2)
- factory_girl_rails (1.1.beta1)
- factory_girl (~> 2.0.0.beta)
- rails (>= 3.0.0)
+ factory_girl (2.0.0.rc4)
+ factory_girl_rails (1.1.rc1)
+ factory_girl (~> 2.0.0.rc)
+ railties (>= 3.0.0)
faraday (0.6.1)
addressable (~> 2.2.4)
multipart-post (~> 1.1.0)
- rack (>= 1.1.0, < 2)
+ rack (< 2, >= 1.1.0)
ffi (1.0.9)
- gherkin (2.3.10)
+ gherkin (2.4.5)
json (>= 1.4.6)
- hike (1.0.0)
+ hike (1.1.0)
i18n (0.6.0)
- jquery-rails (1.0.9)
+ jquery-rails (1.0.12)
railties (~> 3.0)
thor (~> 0.14)
- json (1.5.1)
- json_pure (1.5.1)
+ json (1.5.3)
+ json_pure (1.5.3)
launchy (0.4.0)
configuration (>= 0.0.5)
rake (>= 0.8.1)
@@ -99,14 +98,14 @@ GEM
activemodel (~> 3.0)
mongo (~> 1.3)
tzinfo (~> 0.3.22)
- mongoid-rspec (1.4.2)
+ mongoid-rspec (1.4.4)
mongoid (~> 2.0)
rspec (~> 2)
multi_json (1.0.3)
multi_xml (0.2.2)
multipart-post (1.1.2)
net-ldap (0.2.2)
- nokogiri (1.4.4)
+ nokogiri (1.4.7)
oa-basic (0.2.6)
oa-core (= 0.2.6)
rest-client (~> 1.6.0)
@@ -133,7 +132,7 @@ GEM
oa-core (= 0.2.6)
rack-openid (~> 1.3.1)
ruby-openid-apps-discovery (~> 1.2.0)
- oauth (0.4.4)
+ oauth (0.4.5)
oauth2 (0.4.1)
faraday (~> 0.6.1)
multi_json (>= 0.0.5)
@@ -158,28 +157,30 @@ GEM
rack
rack-test (0.6.0)
rack (>= 1.0)
- rails (3.1.0.rc1)
- actionmailer (= 3.1.0.rc1)
- actionpack (= 3.1.0.rc1)
- activerecord (= 3.1.0.rc1)
- activeresource (= 3.1.0.rc1)
- activesupport (= 3.1.0.rc1)
+ 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)
bundler (~> 1.0)
- railties (= 3.1.0.rc1)
- railties (3.1.0.rc1)
- actionpack (= 3.1.0.rc1)
- activesupport (= 3.1.0.rc1)
+ railties (= 3.1.0.rc4)
+ railties (3.1.0.rc4)
+ actionpack (= 3.1.0.rc4)
+ activesupport (= 3.1.0.rc4)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
+ rdoc (~> 3.4)
thor (~> 0.14.6)
- rake (0.9.1)
- rest-client (1.6.1)
+ rake (0.9.2)
+ rdoc (3.8)
+ rest-client (1.6.3)
mime-types (>= 1.16)
rspec (2.6.0)
rspec-core (~> 2.6.0)
rspec-expectations (~> 2.6.0)
rspec-mocks (~> 2.6.0)
- rspec-core (2.6.3)
+ rspec-core (2.6.4)
rspec-expectations (2.6.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.6.0)
@@ -193,13 +194,18 @@ GEM
ruby-openid (>= 2.1.7)
rubyntlm (0.1.1)
rubyzip (0.9.4)
- sass (3.1.2)
- selenium-webdriver (0.2.1)
- childprocess (>= 0.1.7)
+ sass (3.1.4)
+ sass-rails (3.1.0.rc.4)
+ actionpack (~> 3.1.0.rc1)
+ railties (~> 3.1.0.rc1)
+ sass (>= 3.1.4)
+ sprockets (>= 2.0.0.beta.9)
+ selenium-webdriver (0.2.2)
+ childprocess (>= 0.1.9)
ffi (>= 1.0.7)
json_pure
rubyzip
- sprockets (2.0.0.beta.9)
+ sprockets (2.0.0.beta.10)
hike (~> 1.0)
rack (~> 1.0)
tilt (!= 1.3.0, ~> 1.1)
@@ -208,8 +214,8 @@ GEM
tilt (1.3.2)
treetop (1.4.9)
polyglot (>= 0.3.1)
- tzinfo (0.3.27)
- uglifier (0.5.4)
+ tzinfo (0.3.29)
+ uglifier (1.0.0)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
xpath (0.1.4)
@@ -220,17 +226,17 @@ PLATFORMS
DEPENDENCIES
bson_ext (>= 1.3.1)
- capybara (>= 1.0.0.beta1)
+ capybara (>= 1.0.0)
coffee-script
- cucumber-rails (>= 0.5.1)
+ cucumber-rails (>= 1.0.2)
database_cleaner (>= 0.6.7)
- factory_girl_rails (>= 1.1.beta1)
+ factory_girl_rails (>= 1.1.rc1)
jquery-rails
launchy (>= 0.4.0)
mongoid (>= 2.0.2)
- mongoid-rspec (>= 1.4.2)
+ mongoid-rspec (>= 1.4.4)
omniauth (>= 0.2.6)
- rails (= 3.1.0.rc1)
+ rails (= 3.1.0.rc4)
rspec-rails (>= 2.6.1)
- sass
+ sass-rails (~> 3.1.0.rc)
uglifier
@@ -1,5 +1,8 @@
-/*
- Place all the styles related to the matching controller here.
- They will automatically be included in application.css.
- You can use Sass (SCSS) here: http://sass-lang.com/
-*/
+// Place all the styles related to the home controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
+
+body.home {
+ // Add the home class to your body tag
+ // Then, place scoped styles here.
+}
@@ -1,5 +1,8 @@
-/*
- Place all the styles related to the matching controller here.
- They will automatically be included in application.css.
- You can use Sass (SCSS) here: http://sass-lang.com/
-*/
+// Place all the styles related to the users controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
+
+body.users {
+ // Add the users class to your body tag
+ // Then, place scoped styles here.
+}
View
@@ -42,13 +42,6 @@ class Application < Rails::Application
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
# config.i18n.default_locale = :de
- # Please note that JavaScript expansions are *ignored altogether* if the asset
- # pipeline is enabled (see config.assets.enabled below). Put your defaults in
- # app/assets/javascripts/application.js in that case.
- #
- # JavaScript files you want as :defaults (application.js is always included).
- # config.action_view.javascript_expansions[:defaults] = %w(prototype prototype_ujs)
-
# Configure the default encoding used in templates for Ruby 1.9.
config.encoding = "utf-8"
@@ -21,4 +21,7 @@
# Only use best-standards-support built into browsers
config.action_dispatch.best_standards_support = :builtin
+
+ # Do not compress assets
+ config.assets.compress = false
end
@@ -11,9 +11,11 @@
# Disable Rails's static asset server (Apache or nginx will already do this)
config.serve_static_assets = false
- # Compress both stylesheets and JavaScripts
+ # Compress JavaScripts and CSS
+ config.assets.compress = true
+
+ # Specify the default JavaScript compressor
config.assets.js_compressor = :uglifier
- config.assets.css_compressor = :scss
# Specifies the header that your server uses for sending files
# (comment out if your front-end server doesn't support this)
@@ -1,7 +1,7 @@
# Be sure to restart your server when you modify this file.
#
-# This file contains the settings for ActionController::ParametersWrapper
-# which will be enabled by default in the upcoming version of Ruby on Rails.
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
ActionController::Base.wrap_parameters format: [:json]
View
@@ -34,6 +34,12 @@ begin
desc 'Run all features'
task :all => [:ok, :wip]
+
+ task :statsetup do
+ require 'rails/code_statistics'
+ ::STATS_DIRECTORIES << %w(Cucumber\ features features) if File.exist?('features')
+ ::CodeStatistics::TEST_TYPES << "Cucumber features" if File.exist?('features')
+ end
end
desc 'Alias for cucumber:ok'
task :cucumber => 'cucumber:ok'
@@ -47,6 +53,8 @@ begin
# In case we don't have ActiveRecord, append a no-op task that we can depend upon.
task 'db:test:prepare' do
end
+
+ task :stats => 'cucumber:statsetup'
rescue LoadError
desc 'cucumber rake task not available (cucumber not installed)'
task :cucumber do

0 comments on commit c4e9ea2

Please sign in to comment.