Permalink
Browse files

Update to include as of 2012

  • Loading branch information...
jwo committed Jan 9, 2012
1 parent fa8f256 commit e976da7c45179cec8ae0e356c5a9e2bb0dcaa5b1
Showing with 124 additions and 112 deletions.
  1. +8 −10 Gemfile
  2. +82 −86 Gemfile.lock
  3. +25 −13 README.md
  4. +1 −1 app/assets/javascripts/pages.js.coffee
  5. +3 −2 app/assets/stylesheets/_globals.css.scss
  6. +5 −0 config/application.rb
View
18 Gemfile
@@ -1,25 +1,23 @@
source 'http://rubygems.org'
-gem 'rails', '3.1.0.rc4'
+gem 'rails', '~> 3.1.0'
gem 'sqlite3'
-
-# Asset template engines
-gem 'sass-rails', "~> 3.1.0.rc"
-gem 'coffee-script'
-gem 'uglifier'
gem 'jquery-rails'
gem 'haml'
-gem 'compass', :git => 'https://github.com/chriseppstein/compass.git', :branch => 'rails31'
-# If you don't have node installed. // Will be fixed by 3.1 release
-gem "execjs", "~> 1.1.3"
+group :assets do
+ gem 'sass-rails', '~> 3.1.5'
+ gem 'coffee-rails', '~> 3.1.1'
+ gem 'uglifier', '>= 1.0.3'
+ gem "compass", "0.12.alpha.0"
+end
group :test do
# Pretty printed test output
gem 'turn', :require => false
end
group :production do
- gem 'therubyracer-heroku', '0.8.1.pre3'
+ gem 'therubyracer-heroku'
gem 'pg'
end
View
@@ -1,135 +1,131 @@
-GIT
- remote: https://github.com/chriseppstein/compass.git
- revision: 696d84562d63a3e799efa73a06ba9f24b8d5b73a
- branch: rails31
- specs:
- compass (0.11.3.rails.0.696d845)
- chunky_png (~> 1.1)
- fssm (>= 0.2.7)
- sass (~> 3.1)
-
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.0.rc4)
- actionpack (= 3.1.0.rc4)
+ actionmailer (3.1.3)
+ actionpack (= 3.1.3)
mail (~> 2.3.0)
- actionpack (3.1.0.rc4)
- activemodel (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
+ actionpack (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
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.5)
+ rack-cache (~> 1.1)
+ rack-mount (~> 0.8.2)
+ rack-test (~> 0.6.1)
+ sprockets (~> 2.0.3)
+ activemodel (3.1.3)
+ activesupport (= 3.1.3)
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.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
+ arel (~> 2.2.1)
+ tzinfo (~> 0.3.29)
+ activeresource (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
+ activesupport (3.1.3)
multi_json (~> 1.0)
- ansi (1.2.5)
- arel (2.1.1)
- bcrypt-ruby (2.1.4)
+ ansi (1.4.1)
+ arel (2.2.1)
builder (3.0.0)
- chunky_png (1.2.0)
+ chunky_png (1.2.5)
+ coffee-rails (3.1.1)
+ coffee-script (>= 2.2.0)
+ railties (~> 3.1.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.1)
+ coffee-script-source (1.2.0)
+ compass (0.12.alpha.0)
+ chunky_png (~> 1.2)
+ fssm (>= 0.2.7)
+ sass (~> 3.1)
erubis (2.7.0)
- execjs (1.1.3)
+ execjs (1.2.13)
multi_json (~> 1.0)
- fssm (0.2.7)
- haml (3.1.2)
- hike (1.0.0)
+ fssm (0.2.8.1)
+ haml (3.1.4)
+ hike (1.2.1)
i18n (0.6.0)
- jquery-rails (1.0.10)
+ jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
+ json (1.6.4)
mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.16)
- multi_json (1.0.3)
- pg (0.11.0)
- polyglot (0.3.1)
- rack (1.3.0)
- rack-cache (1.0.2)
+ mime-types (1.17.2)
+ multi_json (1.0.4)
+ pg (0.12.2)
+ polyglot (0.3.3)
+ rack (1.3.6)
+ rack-cache (1.1)
rack (>= 0.4)
- rack-mount (0.8.1)
+ rack-mount (0.8.3)
rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
- rack-test (0.6.0)
+ 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.3)
+ actionmailer (= 3.1.3)
+ actionpack (= 3.1.3)
+ activerecord (= 3.1.3)
+ activeresource (= 3.1.3)
+ activesupport (= 3.1.3)
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.3)
+ railties (3.1.3)
+ actionpack (= 3.1.3)
+ activesupport (= 3.1.3)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
- rake (0.9.2)
- rdoc (3.6.1)
- sass (3.1.2)
- sass-rails (3.1.0.rc.2)
- actionpack (~> 3.1.0.rc1)
- railties (~> 3.1.0.rc1)
- sass (>= 3.1.2)
- sprockets (>= 2.0.0.beta.9)
- sprockets (2.0.0.beta.10)
- hike (~> 1.0)
+ rake (0.9.2.2)
+ rdoc (3.12)
+ json (~> 1.4)
+ sass (3.1.12)
+ sass-rails (3.1.5)
+ actionpack (~> 3.1.0)
+ railties (~> 3.1.0)
+ sass (~> 3.1.10)
+ tilt (~> 1.3.2)
+ sprockets (2.0.3)
+ hike (~> 1.2)
rack (~> 1.0)
- tilt (!= 1.3.0, ~> 1.1)
- sqlite3 (1.3.3)
+ tilt (~> 1.1, != 1.3.0)
+ sqlite3 (1.3.5)
therubyracer-heroku (0.8.1.pre3)
thor (0.14.6)
- tilt (1.3.2)
- treetop (1.4.9)
+ tilt (1.3.3)
+ treetop (1.4.10)
+ polyglot
polyglot (>= 0.3.1)
- turn (0.8.2)
- ansi (>= 1.2.2)
- tzinfo (0.3.28)
- uglifier (0.5.4)
+ turn (0.8.3)
+ ansi
+ tzinfo (0.3.31)
+ uglifier (1.2.1)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
PLATFORMS
ruby
DEPENDENCIES
- coffee-script
- compass!
- execjs (~> 1.1.3)
+ coffee-rails (~> 3.1.1)
+ compass (= 0.12.alpha.0)
haml
jquery-rails
pg
- rails (= 3.1.0.rc4)
- sass-rails (~> 3.1.0.rc)
+ rails (~> 3.1.0)
+ sass-rails (~> 3.1.5)
sqlite3
- therubyracer-heroku (= 0.8.1.pre3)
+ therubyracer-heroku
turn
- uglifier
+ uglifier (>= 1.0.3)
View
@@ -1,19 +1,41 @@
Rails 3.1 with Compass
======================
-Rails 3.1 with Compass was difficult to get working in 3.1.0.rc4, so here's a bootstrapp to get you started!
+Rails 3.1 with Compass was difficult to get working in 3.1, so here's a bootstrapp to get you started!
The secret lies with:
- gem 'compass', :git => 'https://github.com/chriseppstein/compass.git', :branch => 'rails31'
+ gem 'compass', "0.12.alpha.0"
+
+After this, you won't need the compass.rb initializer, and you can include compass in your /app/assrts/stylesheets like:
+
+```
+@import "compass/css3";
+@import "compass/reset";
+@import "blueprint/grid"
+```
+
+You do need to edit the config/application.rb and do the following:
+
+1. Add `require "sass-rails"` under the require rails/all
+2. Add the following so compass can find the stylesheets
+
+```
+config.sass.load_paths ||= []
+config.sass.load_paths << "#{Rails.root}/app/assets/stylesheets"
+config.sass.load_paths << "#{Gem.loaded_specs['compass'].full_gem_path}/frameworks/compass/stylesheets"
+config.sass.load_paths << "#{Gem.loaded_specs['compass'].full_gem_path}/frameworks/blueprint/stylesheets"
+```
+
+Check out the application.rb for full syntax. Obviously don't include Blueprint if you're not using it.
How to get working on Heroku?
-----------------------------
This secret is either being on the heroku cedar stack (node), or:
group :production do
- gem 'therubyracer-heroku', '0.8.1.pre3'
+ gem 'therubyracer-heroku'
end
Commands to get started
@@ -25,16 +47,6 @@ Commands to get started
4. gem install bundler
5. bundler install
-In case you don't want to use this bootstrap, but want to create a rails 3.1 app of your own to play with (and keep the gems in a tightly locked gemset)
-
-1. Have RVM
-2. rvm use 1.9.2
-3. rvm gemset create rails31
-4. rvm use gemset rails31
-5. gem install bundler
-6. gem install rails --pre #3.1.0.rc4
-
-
Contact
-------
@@ -3,6 +3,6 @@
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
pagealert = ->
- alert('Hello!\r\nI am located in app/assets/javascripts/pages.js.coffee; I am loaded by namespace.js');
+ #alert('Hello!\r\nI am located in app/assets/javascripts/pages.js.coffee; I am loaded by namespace.js');
window.pagealert = pagealert
@@ -1,5 +1,6 @@
@import "compass/css3";
-@import "compass/reset";
-@import "blueprint/grid"
+//@import "compass/reset";
+@import "blueprint";
+@import "blueprint/grid";
View
@@ -1,6 +1,7 @@
require File.expand_path('../boot', __FILE__)
require 'rails/all'
+require "sass-rails"
# If you have a Gemfile, require the gems listed there, including any gems
# you've limited to :test, :development, or :production.
@@ -15,6 +16,10 @@ class Application < Rails::Application
# Custom directories with classes and modules you want to be autoloadable.
# config.autoload_paths += %W(#{config.root}/extras)
+ config.sass.load_paths ||= []
+ config.sass.load_paths << "#{Gem.loaded_specs['compass'].full_gem_path}/frameworks/compass/stylesheets"
+ config.sass.load_paths << "#{Gem.loaded_specs['compass'].full_gem_path}/frameworks/blueprint/stylesheets"
+
# Only load the plugins named here, in the order given (default is alphabetical).
# :all can be used as a placeholder for all plugins not explicitly named.
# config.plugins = [ :exception_notification, :ssl_requirement, :all ]

0 comments on commit e976da7

Please sign in to comment.