compass-rails 1.0.3 → 1.1.0.pre

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+gemfiles/*.gemfile.lock
 Gemfile.lock
 InstalledFiles
 _yardoc

data/.travis.yml

@@ -1,5 +1,4 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
 script: "bundle exec rake appraisal:install test"

data/Appraisals

@@ -1,7 +1,3 @@
-appraise "rails2" do
-  gem "rails", "2.3.14"
-end
-
 appraise "rails3" do
   gem "rails", "3.0.11"
 end
@@ -14,4 +10,9 @@ end
 appraise "rails32" do
   gem "rails", "~> 3.2"
   gem "sass-rails"
-end
+end
+
+appraise "rails40" do
+  gem "rails", "~> 4.0.0"
+  gem "sass-rails"
+end

data/Gemfile

@@ -4,13 +4,14 @@ source 'https://rubygems.org'
 gemspec
 
 group :assets do
-  gem 'compass'
-  gem 'compass-rails', :path => '.'
+  gem "compass", '~> 0.13.alpha.0'
+  gem "compass-rails", :path=>"."
+  gem 'compass-blueprint'
 end
 
 group :test do
   gem 'mocha'
-  gem "appraisal", :git => 'git://github.com/scottdavis/appraisal.git'
+  gem "appraisal", :git => 'https://github.com/scottdavis/appraisal.git'
   gem 'rainbow'
 end
 

data/README.md

@@ -1,12 +1,14 @@
 # CompassRails
 
+[![Build Status](https://travis-ci.org/Compass/compass-rails.png?branch=stable)](https://travis-ci.org/Compass/compass-rails)
+
 Compass rails is an adapter for the [Compass Stylesheet Authoring
-Framework](http://compass-style.org) for [Ruby on Rails](http://http://rubyonrails.org/).
+Framework](http://compass-style.org) for [Ruby on Rails](http://rubyonrails.org/).
 
 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
+This adapter supports rails versions 3.0 and greater. Rails 3.0 users
 please read the caveats below.
 
 ## Installation
@@ -168,35 +170,6 @@ to this:
 Bundler.require(:default, :assets, Rails.env) if defined?(Bundler)
 ```
 
-## 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,
-please do so prior to upgrading. [Bundler installation guide for rails
-2.3](http://gembundler.com/rails23.html).
-
-After following the instructions there, if you want rails to compile
-your stylesheets (instead of using the compass watcher) you need
-edit `config/boot.rb` and change this:
-
-```ruby
-Rails::Initializer.class_eval do
-  def load_gems
-    @bundler_loaded ||= Bundler.require :default, Rails.env
-  end
-end
-```
-
-To this:
-
-```ruby
-Rails::Initializer.class_eval do
-  def load_gems
-    @bundler_loaded ||= Bundler.require :default, :assets, Rails.env
-  end
-end
-```
-
 ## Contributing
 
 1. Fork it

data/changelog.markdown

@@ -0,0 +1,11 @@
+# Compass Rails
+
+## 2.0.alpha.0
+
+* Removed rails 2.x support
+* Added Alpha support for rails 4
+
+## 1.0.3
+
+* StaticCompiler hack so sprite source files dont show up in manifest
+* Compass version bump to 0.12.2

data/compass-rails.gemspec

@@ -3,9 +3,9 @@ require File.expand_path('../lib/compass-rails/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Scott Davis", "Chris Eppstein"]
-  gem.email         = ["jetviper21@gmail.com", "chris@eppsteins.net"]
-  gem.description   = %q{Integrate Compass into Rails 2.3 and up.}
-  gem.summary       = %q{Integrate Compass into Rails 2.3 and up.}
+  gem.email         = ["jetviper21@gmail.com", "chris@eppsteins.net", "craig.mcnamara@gmail.com"]
+  gem.description   = %q{Integrate Compass into Rails 3.0 and up.}
+  gem.summary       = %q{Integrate Compass into Rails 3.0 and up.}
   gem.homepage      = "https://github.com/Compass/compass-rails"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/gemfiles/rails3.gemfile

@@ -9,12 +9,13 @@ gem "guard-test"
 gem "rails", "3.0.11"
 
 group :assets do
-  gem "compass"
+  gem "compass", "~> 0.13.alpha.0"
   gem "compass-rails", :path=>".."
+  gem "compass-blueprint"
 end
 group :test do
   gem "mocha"
-  gem "appraisal", :git=>"git://github.com/scottdavis/appraisal.git"
+  gem "appraisal", :git=>"https://github.com/scottdavis/appraisal.git"
   gem "rainbow"
 end
 

data/gemfiles/rails31.gemfile

@@ -10,12 +10,13 @@ gem "rails", "3.1.3"
 gem "sass-rails"
 
 group :assets do
-  gem "compass"
+  gem "compass", "~> 0.13.alpha.0"
   gem "compass-rails", :path=>".."
+  gem "compass-blueprint"
 end
 group :test do
   gem "mocha"
-  gem "appraisal", :git=>"git://github.com/scottdavis/appraisal.git"
+  gem "appraisal", :git=>"https://github.com/scottdavis/appraisal.git"
   gem "rainbow"
 end
 

data/gemfiles/rails32.gemfile

@@ -10,12 +10,13 @@ gem "rails", "~> 3.2"
 gem "sass-rails"
 
 group :assets do
-  gem "compass"
+  gem "compass", "~> 0.13.alpha.0"
   gem "compass-rails", :path=>".."
+  gem "compass-blueprint"
 end
 group :test do
   gem "mocha"
-  gem "appraisal", :git=>"git://github.com/scottdavis/appraisal.git"
+  gem "appraisal", :git=>"https://github.com/scottdavis/appraisal.git"
   gem "rainbow"
 end
 

data/gemfiles/{rails2.gemfile → rails40.gemfile}

@@ -6,15 +6,17 @@ gem "rb-fsevent", :require=>false
 gem "ruby_gntp", :require=>false
 gem "guard"
 gem "guard-test"
-gem "rails", "2.3.14"
+gem "rails", "~> 4.0.0"
+gem "sass-rails"
 
 group :assets do
-  gem "compass"
+  gem "compass", "~> 0.13.alpha.0"
   gem "compass-rails", :path=>".."
+  gem "compass-blueprint"
 end
 group :test do
   gem "mocha"
-  gem "appraisal", :git=>"git://github.com/scottdavis/appraisal.git"
+  gem "appraisal", :git=>"https://github.com/scottdavis/appraisal.git"
   gem "rainbow"
 end
 

data/lib/compass-rails.rb

@@ -4,6 +4,7 @@ require "compass-rails/configuration"
 
 module CompassRails
 
+    RAILS_4 = %r{^4.[0|1]}
     RAILS_32 = %r{^3.2}
     RAILS_31 = %r{^3.1}
     RAILS_23 = %r{^2.3}
@@ -12,6 +13,7 @@ module CompassRails
     extend self
 
     def load_rails
+      return true if rails_loaded?
       return if defined?(::Rails) && ::Rails.respond_to?(:application) && !::Rails.application.nil?
 
       rails_config_path = Dir.pwd
@@ -21,7 +23,7 @@ module CompassRails
       end
       #load the rails config
       require "#{rails_config_path}/config/application.rb"
-      if rails31? || rails32?
+      if rails31? || rails32? || rails4?
         require 'sass-rails'
         require 'sprockets/railtie'
         require 'rails/engine'
@@ -85,21 +87,30 @@ module CompassRails
 
     def rails3?
       return false unless defined?(::Rails)
-      rails_version =~ RAILS_3
+      version_match RAILS_3
     end
 
     def rails31?
       return false unless defined?(::Rails)
-      rails_version =~ RAILS_31
+      version_match RAILS_31
     end
 
     def rails32?
       return false unless defined?(::Rails)
-      rails_version =~ RAILS_32
+      version_match RAILS_32
     end
 
-    def rails2?
-      rails_version =~ RAILS_23
+    def rails4?
+      return false unless defined?(::Rails)
+      version_match RAILS_4
+    end
+
+    def version_match(version)
+      if (rails_version =~ version).nil?
+        return false
+      end
+
+      true
     end
 
     def booted!
@@ -111,10 +122,10 @@ module CompassRails
     end
 
     def configuration
-      load_rails unless rails2?
+      load_rails
       config = Compass::Configuration::Data.new('rails')
       config.extend(Configuration::Default)
-      if (rails31? || rails32?)
+      if (rails31? || rails32? || rails4?)
         if asset_pipeline_enabled?
           require "compass-rails/configuration/3_1"
           config.extend(Configuration::Rails3_1)
@@ -210,7 +221,11 @@ module CompassRails
   def asset_pipeline_enabled?
     return false unless rails_loaded?
     rails_config = ::Rails.application.config
-    rails_config.respond_to?(:assets) && rails_config.assets.try(:enabled)
+    unless rails4?
+      rails_config.respond_to?(:assets) && rails_config.assets.try(:enabled)
+    else
+      rails_config.respond_to?(:assets)
+    end
   end
 
   private

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

@@ -42,6 +42,10 @@ module CompassRails
         ::Rails.application.config.sass.preferred_syntax rescue nil
       end
 
+      def default_sprite_load_path
+        CompassRails.sprockets.paths
+      end
+
     end
   end
 end

data/lib/compass-rails/patches.rb

@@ -1,6 +1,6 @@
 if CompassRails.rails31? || CompassRails.rails32?
-  unless CompassRails.rails_loaded? 
-    CompassRails.load_rails
-  end
+  CompassRails.load_rails
   require 'compass-rails/patches/importer'
-end
+elsif CompassRails.rails4?
+  CompassRails.load_rails
+end

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

@@ -2,6 +2,11 @@ require 'compass-rails/patches/static_compiler'
 
 module Sass::Script::Functions
   def generated_image_url(path, only_path = nil)
+    path = if Compass.configuration.generated_images_dir
+             full_path = File.join(Compass.configuration.generated_images_dir, path.value)
+             Sass::Script::String.new full_path.sub(File.join('app', 'assets', 'images'), "")[1..-1]
+           end
+
     asset_url(path, Sass::Script::String.new("image"))
   end
 end
@@ -9,7 +14,7 @@ end
 
 module Compass::RailsImageFunctionPatch
   private
-  
+
   def image_path_for_size(image_file)
     begin
       file = ::Rails.application.assets.find_asset(image_file)

data/lib/compass-rails/patches/4_0.rb

@@ -0,0 +1,30 @@
+require 'compass-rails/patches/sass_importer'
+require 'compass-rails/patches/sprite_importer'
+module Sass::Script::Functions
+  def generated_image_url(path, only_path = nil)
+    asset_url(path)
+  end
+end
+
+
+module Compass::RailsImageFunctionPatch
+  private
+  
+  def image_path_for_size(image_file)
+    begin
+      file = ::Rails.application.assets.find_asset(image_file)
+      return file
+    rescue ::Sprockets::FileOutsidePaths
+      return super(image_file)
+    end
+  end
+end
+
+module Sass::Script::Functions
+  include Compass::RailsImageFunctionPatch
+end
+
+# Wierd that this has to be re-included to pick up sub-modules. Ruby bug?
+class Sass::Script::Functions::EvaluationContext
+  include Sass::Script::Functions
+end

data/lib/compass-rails/patches/sass_importer.rb

@@ -0,0 +1,31 @@
+module Sprockets
+  class SassTemplate < Tilt::Template
+    def evaluate(context, locals, &block)
+      # Use custom importer that knows about Sprockets Caching
+      cache_store = SassCacheStore.new(context.environment)
+      paths  = context.environment.paths.map { |path| CompassRails::SpriteImporter.new(context, path) }
+      paths += context.environment.paths.map { |path| SassImporter.new(context, path) }
+      paths += ::Rails.application.config.sass.load_paths
+
+
+      options = CompassRails.sass_config.merge( {
+        :filename => eval_file,
+        :line => line,
+        :syntax => syntax,
+        :cache_store => cache_store,
+        :importer => SassImporter.new(context, context.pathname),
+        :load_paths => paths,
+        :sprockets => {
+          :context => context,
+          :environment => context.environment
+        }
+      })
+
+      ::Sass::Engine.new(data, options).render
+    rescue ::Sass::SyntaxError => e
+      # Annotates exception message with parse line number
+      context.__LINE__ = e.sass_backtrace.first[:line]
+      raise e
+    end
+  end
+end

data/lib/compass-rails/patches/sprite_importer.rb

@@ -1,38 +1,30 @@
 require 'sprockets'
 require 'compass/sprite_importer'
 
-module Compass
-  class SpriteImporter < Sass::Importers::Base
+module CompassRails
+  class SpriteImporter < Compass::SpriteImporter
+    attr_reader :context, :root
 
-    alias :old_find :find
+    def initialize(context, root)
+      @context = context
+      @root = root
+    end
 
     def find(uri, options)
-
-      if old = old_find(uri, options)
-        @_options = options
+      if old = super(uri, options)
         self.class.files(uri).each do |file|
-          if pathname = resolve(file)
-            context.depend_on(pathname)
+          puts file.inspect
+          relative_path = Pathname.new(file).relative_path_from(Pathname.new(root))
+          begin
+            pathname = context.resolve(relative_path)
+            context.depend_on_asset(pathname)
+          rescue Sprockets::FileNotFound
+
           end
         end
       end
 
       old
     end
-
-  private
-
-    def resolve(uri)
-      resolver.resolve(Pathname.new(uri))
-    end
-
-    def context
-     resolver.context
-    end
-
-    def resolver
-      @_options[:custom][:resolver]
-    end
-
   end
 end