Merge branch 'stable' of github.com:Compass/compass-rails

sj26 · Feb 2, 2012 · 093feb3 · 093feb3
2 parents 640b237 + 6bcbf21
commit 093feb3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/compass-rails.gemspec b/compass-rails.gemspec
@@ -15,7 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = CompassRails::VERSION
 
-  gem.add_dependency 'rails'
   gem.add_dependency 'compass', '~> 0.12.rc.0'
 
 end
diff --git a/lib/compass-rails.rb b/lib/compass-rails.rb
@@ -21,7 +21,7 @@ def load_rails
       #load the rails config
       require "#{rails_config_path}/config/application.rb"
       if rails31? || rails32?
-        require 'sass-rails' 
+        require 'sass-rails'
         require 'sprockets/railtie'
         require 'rails/engine'
         @app ||= ::Rails.application.initialize!(:assets)
@@ -77,7 +77,9 @@ def rails_loaded?
     end
 
     def rails_version
-      Gem.loaded_specs["rails"].version.to_s
+      rails_spec = (Gem.loaded_specs["railties"] || Gem.loaded_specs["rails"])
+      raise "You have to require Rails before compass" unless rails_spec
+      rails_spec.version.to_s
     end
 
     def rails3?