compass-rails 1.0.0.rc.1 → 1.0.0.rc.2

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :assets do
-  gem 'compass', :git => 'git://github.com/chriseppstein/compass.git', :branch => :master
+  gem 'compass'
   gem 'compass-rails', :path => '.'
 end
 
@@ -19,4 +19,4 @@ unless ENV["CI"]
   gem 'ruby_gntp', :require => false
   gem 'guard'
   gem 'guard-test'
-end
+end

data/README.md

@@ -7,7 +7,7 @@ Since Compass v0.12, this adapter is the only way to install compass
 into your rails application.
 
 This adapter supports rails versions 2.3 and greater. Rails 2.3 and 3.0 users
-please read the caviats below.
+please read the caveats below.
 
 ## Installation
 
@@ -138,7 +138,7 @@ doing things like requiring. These **must not** be used with Sass files.
 Instead use the sass `@import` directive. In rails projects, the
 `@import` directive is configured to work with sprockets via `sass-rails`. For more information on importing in rails 3.1 or greater see the [Sass-Rails REAME](https://github.com/rails/sass-rails/blob/master/README.markdown)
 
-## Rails 3.0 Caviats
+## Rails 3.0 Caveats
 
 If you want rails to compile your stylesheets (instead of using the
 compass watcher) you need to edit `config/application.rb` and change:
@@ -153,7 +153,7 @@ to this:
 Bundler.require(:default, :assets, Rails.env) if defined?(Bundler)
 ```
 
-## Rails 2.3 Caviats
+## Rails 2.3 Caveats
 
 Compass requires that your rails 2.3 project is using Bundler to manage
 your rubygems. If you haven't yet set up your rails 2.3 project to use Bundler,

data/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

data/gemfiles/rails2.gemfile

@@ -9,7 +9,7 @@ gem "guard-test"
 gem "rails", "2.3.14"
 
 group :assets do
-  gem "compass", :git=>"git://github.com/chriseppstein/compass.git", :branch=>:master
+  gem "compass"
   gem "compass-rails", :path=>".."
 end
 group :test do

data/gemfiles/rails2.gemfile.lock

@@ -1,13 +1,3 @@
-GIT
-  remote: git://github.com/chriseppstein/compass.git
-  revision: addbc94716e95a7e6f200baa980b48c7e7a1a568
-  branch: master
-  specs:
-    compass (0.12.rc.4.addbc94)
-      chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
-
 GIT
   remote: git://github.com/scottdavis/appraisal.git
   revision: b39ce49f69e330ccd5a1cb48e690f00e800a45d3
@@ -19,16 +9,8 @@ GIT
 PATH
   remote: ..
   specs:
-    compass-rails (1.0.0.rc.0)
-      compass (~> 0.12.rc.0)
-      rails
-
-PATH
-  remote: ..
-  specs:
-    compass-rails (1.0.0.rc.0)
+    compass-rails (1.0.0.rc.1)
       compass (~> 0.12.rc.0)
-      rails
 
 GEM
   remote: https://rubygems.org/
@@ -44,6 +26,10 @@ GEM
       activesupport (= 2.3.14)
     activesupport (2.3.14)
     chunky_png (1.2.5)
+    compass (0.12.rc.0)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
     ffi (1.0.11)
     fssm (0.2.8.1)
     guard (1.0.0)
@@ -76,7 +62,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal!
-  compass!
+  compass
   compass-rails!
   guard
   guard-test

data/gemfiles/rails3.gemfile

@@ -9,7 +9,7 @@ gem "guard-test"
 gem "rails", "3.0.11"
 
 group :assets do
-  gem "compass", :git=>"git://github.com/chriseppstein/compass.git", :branch=>:master
+  gem "compass"
   gem "compass-rails", :path=>".."
 end
 group :test do

data/gemfiles/rails3.gemfile.lock

@@ -1,13 +1,3 @@
-GIT
-  remote: git://github.com/chriseppstein/compass.git
-  revision: addbc94716e95a7e6f200baa980b48c7e7a1a568
-  branch: master
-  specs:
-    compass (0.12.rc.4.addbc94)
-      chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
-
 GIT
   remote: git://github.com/scottdavis/appraisal.git
   revision: b39ce49f69e330ccd5a1cb48e690f00e800a45d3
@@ -19,16 +9,8 @@ GIT
 PATH
   remote: ..
   specs:
-    compass-rails (1.0.0.rc.0)
-      compass (~> 0.12.rc.0)
-      rails
-
-PATH
-  remote: ..
-  specs:
-    compass-rails (1.0.0.rc.0)
+    compass-rails (1.0.0.rc.1)
       compass (~> 0.12.rc.0)
-      rails
 
 GEM
   remote: https://rubygems.org/
@@ -63,6 +45,10 @@ GEM
     arel (2.0.10)
     builder (2.1.2)
     chunky_png (1.2.5)
+    compass (0.12.rc.0)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     ffi (1.0.11)
@@ -123,7 +109,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal!
-  compass!
+  compass
   compass-rails!
   guard
   guard-test

data/gemfiles/rails31.gemfile

@@ -10,7 +10,7 @@ gem "rails", "3.1.3"
 gem "sass-rails"
 
 group :assets do
-  gem "compass", :git=>"git://github.com/chriseppstein/compass.git", :branch=>:master
+  gem "compass"
   gem "compass-rails", :path=>".."
 end
 group :test do

data/gemfiles/rails31.gemfile.lock

@@ -1,13 +1,3 @@
-GIT
-  remote: git://github.com/chriseppstein/compass.git
-  revision: addbc94716e95a7e6f200baa980b48c7e7a1a568
-  branch: master
-  specs:
-    compass (0.12.rc.4.addbc94)
-      chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
-
 GIT
   remote: git://github.com/scottdavis/appraisal.git
   revision: b39ce49f69e330ccd5a1cb48e690f00e800a45d3
@@ -19,16 +9,8 @@ GIT
 PATH
   remote: ..
   specs:
-    compass-rails (1.0.0.rc.0)
-      compass (~> 0.12.rc.0)
-      rails
-
-PATH
-  remote: ..
-  specs:
-    compass-rails (1.0.0.rc.0)
+    compass-rails (1.0.0.rc.1)
       compass (~> 0.12.rc.0)
-      rails
 
 GEM
   remote: https://rubygems.org/
@@ -64,6 +46,10 @@ GEM
     arel (2.2.1)
     builder (3.0.0)
     chunky_png (1.2.5)
+    compass (0.12.rc.0)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
     erubis (2.7.0)
     ffi (1.0.11)
     fssm (0.2.8.1)
@@ -139,7 +125,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal!
-  compass!
+  compass
   compass-rails!
   guard
   guard-test

data/gemfiles/rails32.gemfile

@@ -10,7 +10,7 @@ gem "rails", "~> 3.2"
 gem "sass-rails"
 
 group :assets do
-  gem "compass", :git=>"git://github.com/chriseppstein/compass.git", :branch=>:master
+  gem "compass"
   gem "compass-rails", :path=>".."
 end
 group :test do

data/gemfiles/rails32.gemfile.lock

@@ -1,13 +1,3 @@
-GIT
-  remote: git://github.com/chriseppstein/compass.git
-  revision: addbc94716e95a7e6f200baa980b48c7e7a1a568
-  branch: master
-  specs:
-    compass (0.12.rc.4.addbc94)
-      chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
-
 GIT
   remote: git://github.com/scottdavis/appraisal.git
   revision: b39ce49f69e330ccd5a1cb48e690f00e800a45d3
@@ -19,16 +9,8 @@ GIT
 PATH
   remote: ..
   specs:
-    compass-rails (1.0.0.rc.0)
-      compass (~> 0.12.rc.0)
-      rails
-
-PATH
-  remote: ..
-  specs:
-    compass-rails (1.0.0.rc.0)
+    compass-rails (1.0.0.rc.1)
       compass (~> 0.12.rc.0)
-      rails
 
 GEM
   remote: https://rubygems.org/
@@ -63,6 +45,10 @@ GEM
     arel (3.0.0)
     builder (3.0.0)
     chunky_png (1.2.5)
+    compass (0.12.rc.0)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
     erubis (2.7.0)
     ffi (1.0.11)
     fssm (0.2.8.1)
@@ -136,7 +122,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal!
-  compass!
+  compass
   compass-rails!
   guard
   guard-test

data/lib/compass-rails.rb

@@ -21,7 +21,7 @@ module CompassRails
       #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 @@ module CompassRails
     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?

data/lib/compass-rails/railties/3_1.rb

@@ -80,6 +80,7 @@ module CompassRails
   class Railtie < Rails::Railtie
 
     initializer "compass.initialize_rails", :group => :all do |app|
+      require 'compass-rails/patches/3_1'
       # Configure compass for use within rails, and provide the project configuration
       # that came via the rails boot process.
       CompassRails.check_for_double_boot!

data/lib/compass-rails/version.rb

@@ -1,5 +1,5 @@
 module CompassRails
   unless defined?(::CompassRails::VERSION)
-    VERSION = "1.0.0.rc.1"
+    VERSION = "1.0.0.rc.2"
   end
 end

metadata

@@ -1,68 +1,36 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: compass-rails
-version: !ruby/object:Gem::Version 
-  hash: 15424055
+version: !ruby/object:Gem::Version
+  version: 1.0.0.rc.2
   prerelease: 6
-  segments: 
-  - 1
-  - 0
-  - 0
-  - rc
-  - 1
-  version: 1.0.0.rc.1
 platform: ruby
-authors: 
+authors:
 - Scott Davis
 - Chris Eppstein
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-31 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+date: 2012-02-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: compass
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70117286090700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15424133
-        segments: 
-        - 0
-        - 12
-        - rc
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.12.rc.0
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *70117286090700
 description: Integrate Compass into Rails 2.3 and up.
-email: 
+email:
 - jetviper21@gmail.com
 - chris@eppsteins.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Appraisals
@@ -94,7 +62,6 @@ files:
 - lib/compass-rails/railties/3_0.rb
 - lib/compass-rails/railties/3_1.rb
 - lib/compass-rails/version.rb
-- lib/compass/app_integration/rails.rb
 - test/fixtures/.gitkeep
 - test/helpers/command_helper.rb
 - test/helpers/debug_helper.rb
@@ -108,43 +75,34 @@ files:
 - test/integrations/rails_32_test.rb
 - test/test_helper.rb
 - test/units/.gitkeep
-has_rdoc: true
 homepage: https://github.com/Compass/compass-rails
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2506839191250395635
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Integrate Compass into Rails 2.3 and up.
-test_files: 
+test_files:
 - test/fixtures/.gitkeep
 - test/helpers/command_helper.rb
 - test/helpers/debug_helper.rb

data/lib/compass/app_integration/rails.rb

@@ -1,10 +0,0 @@
-module Compass
-  module AppIntegration
-    module Rails
-      extend self
-      def initialize!
-        Compass::Util.compass_warn("WARNING:  Please remove the call to Compass::AppIntegration::Rails.initialize! from #{caller[0].sub(/:.*$/,'')};\nWARNING:  This is done automatically now. If this is default compass initializer you can just remove the file.")
-      end
-    end
-  end
-end