compass-rails 2.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32048be7b100642ba51ac64ba90f5d8772db0089
-  data.tar.gz: 72b5056ea2292f497bc0bcbf2b3bdb94f9aae889
+  metadata.gz: eea50b65faf9ecd3bf9bcd471f11376149600c62
+  data.tar.gz: 8ffed3f19d288998804e98dbed2e25c473a06afc
 SHA512:
-  metadata.gz: 52f299102a23a6cc39be6bb5b38fcaa9e7fa68f5988eb1f055420508729e626497f91d4540ea364e70eb4141de3f5cf1e84c135fd48438dc8d8010e87ad63453
-  data.tar.gz: cdb26631fb53897b9a4ecdb3d304fd514956f23bebfd766f4825c90711a2cbfcad708fcbaa81a24dc28c493c2e98cc72a4f575c9b05d828d5739babba8bba847
+  metadata.gz: 671825816ee26661cfaf09da988a0ff3fd9535a63cdef5c8513bd44d1cb27835dad9127eb13382cac3e21181df4038c1587e40c73f2926c6fe2e200e9ef8a1a6
+  data.tar.gz: f8eb49b0f9369b164c5679a52b0fc10ec2efe8241c5899dfa4738133a403b773bfbc8b9643f76ce9f8ca85558ece494d4eb1854c21bd95029303ebde102daece

data/.gitignore

@@ -1,6 +1,7 @@
 *.gem
 *.rbc
 .bundle
+.idea
 .config
 .yardoc
 gemfiles/*.gemfile.lock

data/.travis.yml

@@ -1,5 +1,35 @@
+language: ruby
+sudo: false
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-script: "bundle exec rake appraisal:install test"
+  - 2.2.4
+  - 2.3.0
+  - 2.4.0
+  - ruby-head
+  - jruby-head
+gemfile:
+  - gemfiles/rails31.gemfile
+  - gemfiles/rails32.gemfile
+  - gemfiles/rails40.gemfile
+  - gemfiles/rails42.gemfile
+  - gemfiles/rails50.gemfile
+  - gemfiles/rails51.gemfile
+  - gemfiles/rails_edge.gemfile
+matrix:
+  exclude:
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails31.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails32.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails40.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails31.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails32.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails40.gemfile
+  fast_finish: true
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - gemfile: gemfiles/rails_edge.gemfile

data/Appraisals

@@ -1,14 +1,44 @@
 appraise "rails31" do
   gem "rails", "3.1.3"
+  gem "sprockets", "< 2.13"
   gem "sass-rails"
 end
 
 appraise "rails32" do
   gem "rails", "~> 3.2"
+  gem "sprockets", "< 2.13"
   gem "sass-rails"
 end
 
 appraise "rails40" do
   gem "rails", "~> 4.0.0"
+  gem "sprockets", "< 2.13"
   gem "sass-rails"
 end
+
+appraise "rails42" do
+  gem "rails", "~> 4.2.0"
+  gem "sprockets", "< 4.0"
+  gem "sass-rails", "~> 5.0"
+end
+
+appraise "rails50" do
+  gem "rails", "~> 5.0.0"
+  gem "sprockets", "< 4.0"
+  gem "sass-rails", "~> 5.0"
+end
+
+appraise "rails51" do
+  gem "rails", "~> 5.1.0"
+  gem "sprockets", "< 4.0"
+  gem "sass-rails", "~> 5.0"
+end
+
+appraise "rails_edge" do
+  git 'git://github.com/rails/rails.git' do
+    gem "rails"
+  end
+
+  gem "sprockets", "< 4.0"
+  gem "sass-rails", "~> 5.0"
+end

data/CHANGELOG.md

@@ -0,0 +1,82 @@
+# Change log
+
+## 3.0.1 - 2016-2
+### Fixed
+- Fix running rake assts:precompile to be run in production mode. Issue #257.
+
+## 3.0.0 - 2016-01-23
+### Added
+- Added Sprockets 3 support. Issue #232, #236, #244.
+
+### Fixed
+- Sprockets cache files are no longer saved to /tmp and now use the app-level tmp folder instead.
+
+## 2.0.2 - 2015-01-03
+### Fixed
+- Fixed test suite to test against Rails 3.1, 3.2, 4.0, 4.2 on Ruby 1.9.3, 2.0.0, 2.1.0, 2.2.0 and jruby-head. Issue #206
+- Support up to sass-rails 5.0.1. Issue #198
+- Fix sass_importer patches having incorrect method signatures. Issue #195
+- Fixed incorrect path generation for sprites in Rails 4. Issue #190
+
+## 2.0.0 - 2014-07-10
+### Added
+- Support for Rails 4.2
+- Allow newer sass-rails with Sass 3.3 support (see #160).
+
+### Removed
+- Rails 3.0 support.
+
+### Fixed
+- Properly bust the cache on image sprites within a sub-directory that
+are imported with a wildcard (see #166).
+
+## 1.1.7 - 2014-03-18
+### Fixed
+- Locked Sprockets version to 2.11.0 (see #146).
+
+## 1.1.6 - 2014-03-11
+### Fixed
+- Leave bundle selection to rails environment.
+
+## 1.1.5 - 2014-03-11
+### Added
+- Support for Ruby 2.1.0.
+
+### Fixed
+- Fixed `rails_loaded?` for when Rails is defined but no application is actually loaded.
+
+## 1.1.4 - 2014-03-18
+### Changed
+- Simplified README.
+
+## 1.1.3 - 2013-12-27
+### Fixed
+- No longer assuming asset pipeline is running when generating sprites.
+
+## 1.1.2 - 2013-12-06
+### Fixed
+- Reverted fix for `generated_image_url` introduced in 1.1.0.
+
+## 1.1.1 - 2013-12-05
+### Added
+- Support for Compass versions greater than 0.12.2.
+
+## 1.1.0 - 2013-12-05
+### Added
+- Rails 4 support.
+- Ruby 2.0 support.
+
+### Fixed
+- Allow compass-rails without asset pipeline on Rails 3.2.
+- Fix `generated_image_url` when `generated_images_dir` is set.
+
+### Removed
+- Support for Ruby 1.8.7 and 1.9.2.
+- Support for Rails 2.3.
+
+## 1.0.3 - 2012-06-26
+### Added
+- Bumped Compass version to 0.12.2.
+
+### Fixed
+- `FixedStaticCompiler` hack so sprite source files dont show up in manifest.

data/Gemfile

@@ -3,16 +3,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in compass-rails.gemspec
 gemspec
 
-group :assets do
-  gem "compass", '~> 0.13.alpha.0'
-  gem "compass-rails", :path=>"."
-  gem 'compass-blueprint'
-end
-
 group :test do
   gem 'mocha'
-  gem "appraisal", :git => 'https://github.com/scottdavis/appraisal.git'
-  gem 'rainbow'
+  gem 'appraisal'
+  gem 'minitest'
 end
 
 unless ENV["CI"]
@@ -21,3 +15,4 @@ unless ENV["CI"]
   gem 'guard'
   gem 'guard-test'
 end
+

data/README.md

@@ -1,16 +1,20 @@
 # compass-rails
 
+**Don't start new projects with compass, it is no longer supported, see the [compass statement](https://github.com/Compass/compass/pull/2094)**
+
 **We Take Pull Requests!**
 
-[![Build Status](https://travis-ci.org/Compass/compass-rails.png?branch=master)](https://travis-ci.org/Compass/compass-rails)
-[![Code Climate](https://codeclimate.com/github/Compass/compass-rails.png)](https://codeclimate.com/github/Compass/compass-rails)
+[![Build Status](https://travis-ci.org/Compass/compass-rails.svg?branch=master)](https://travis-ci.org/Compass/compass-rails)
+[![Code Climate](https://codeclimate.com/github/Compass/compass-rails.svg)](https://codeclimate.com/github/Compass/compass-rails)
+[![Gem Version](https://badge.fury.io/rb/compass-rails.svg)](http://badge.fury.io/rb/compass-rails)
+[![Coverage Status](https://coveralls.io/repos/Compass/compass-rails/badge.svg)](https://coveralls.io/r/Compass/compass-rails)
 
 Compass rails is an adapter for the [Compass Stylesheet Authoring
 Framework](http://compass-style.org) for [Ruby on Rails](http://rubyonrails.org/).
 
 Since Compass v0.12.0, this is the only way to use compass with your rails application.
 
-Supports Rails 3.2, 4.x releases.
+Supports Rails 3.2, 4.x and 5.x releases.
 
 ## Installation
 
@@ -52,13 +56,11 @@ Use `application.css` to require files that use compass features. Ex:
 
 ### Configuration
 
-If you have a compass configuration file (recommended) then you can
-use the [Compass configuration 
-reference](http://compass-style.org/help/tutorials/configuration-reference/)
-as is. If you choose to configure compass from your rails configuration
-files, then you should understand that the compass configuration
-options explained there will be methods and properties on the `config.compass`
-configuration object exposed to rails within any configuration block.
+Compass-rails is configured out of the box to work with Rails. 
+
+Advanced users can choose to add a `config/compass.rb` and take advantage of the [Compass configuration 
+reference](http://compass-style.org/help/documentation/configuration-reference/)
+as is.
 
 ### Installing Compass extensions
 
@@ -72,7 +74,7 @@ For example, if you want to use susy.
 ```ruby
 # Gemfile
 gem 'compass-rails'
-gem 'compass-susy-plugin'
+gem 'susy'
 ```
 
 then run:

data/Rakefile

@@ -1,34 +1,15 @@
 #!/usr/bin/env rake
-require 'rubygems'
-require 'bundler'
-Bundler.setup
-require 'rake/dsl_definition' rescue nil
-
-require "bundler/gem_tasks"
-require 'appraisal'
-require 'compass'
-
-# ----- Default: Testing ------
-
-task :default => [:test, :features]
-
+require 'bundler/gem_tasks'
 require 'rake/testtask'
-require 'fileutils'
 
 Rake::TestTask.new :test do |t|
+  require 'fileutils'
   t.libs << 'lib'
   t.libs << 'test'
-  test_files = FileList['test/**/*_test.rb']
+  test_files = FileList['test/**/*_{test,spec}.rb']
   test_files.exclude('test/rails/*', 'test/haml/*')
   t.test_files = test_files
   t.verbose = true
 end
 
-Rake::TestTask.new :units do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  test_files = FileList['test/units/**/*_test.rb']
-  test_files.exclude('test/rails/*', 'test/haml/*')
-  t.test_files = test_files
-  t.verbose = true
-end
+task :default => [:test]

data/compass-rails.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = CompassRails::VERSION
   gem.license       = "MIT"
 
-  gem.add_dependency 'compass', '>= 0.12.2'
-
+  gem.add_dependency 'compass',    '~> 1.0.0'
+  gem.add_dependency 'sprockets',  '< 4.0'
+  gem.add_dependency 'sass-rails', '< 5.1'
 end

data/gemfiles/rails31.gemfile

@@ -2,22 +2,18 @@
 
 source "https://rubygems.org"
 
-gem "rb-fsevent", :require=>false
-gem "ruby_gntp", :require=>false
+gem "rb-fsevent", require: false
+gem "ruby_gntp", require: false
 gem "guard"
 gem "guard-test"
 gem "rails", "3.1.3"
+gem "sprockets", "< 2.13"
 gem "sass-rails"
 
-group :assets do
-  gem "compass", "~> 0.13.alpha.0"
-  gem "compass-rails", :path=>".."
-  gem "compass-blueprint"
-end
 group :test do
   gem "mocha"
-  gem "appraisal", :git=>"https://github.com/scottdavis/appraisal.git"
-  gem "rainbow"
+  gem "appraisal"
+  gem "minitest"
 end
 
-gemspec :path=>"../"
+gemspec path: "../"

data/gemfiles/rails32.gemfile

@@ -2,22 +2,18 @@
 
 source "https://rubygems.org"
 
-gem "rb-fsevent", :require=>false
-gem "ruby_gntp", :require=>false
+gem "rb-fsevent", require: false
+gem "ruby_gntp", require: false
 gem "guard"
 gem "guard-test"
 gem "rails", "~> 3.2"
+gem "sprockets", "< 2.13"
 gem "sass-rails"
 
-group :assets do
-  gem "compass", "~> 0.13.alpha.0"
-  gem "compass-rails", :path=>".."
-  gem "compass-blueprint"
-end
 group :test do
   gem "mocha"
-  gem "appraisal", :git=>"https://github.com/scottdavis/appraisal.git"
-  gem "rainbow"
+  gem "appraisal"
+  gem "minitest"
 end
 
-gemspec :path=>"../"
+gemspec path: "../"

data/gemfiles/rails40.gemfile

@@ -2,22 +2,18 @@
 
 source "https://rubygems.org"
 
-gem "rb-fsevent", :require=>false
-gem "ruby_gntp", :require=>false
+gem "rb-fsevent", require: false
+gem "ruby_gntp", require: false
 gem "guard"
 gem "guard-test"
 gem "rails", "~> 4.0.0"
+gem "sprockets", "< 2.13"
 gem "sass-rails"
 
-group :assets do
-  gem "compass", "~> 0.13.alpha.0"
-  gem "compass-rails", :path=>".."
-  gem "compass-blueprint"
-end
 group :test do
   gem "mocha"
-  gem "appraisal", :git=>"https://github.com/scottdavis/appraisal.git"
-  gem "rainbow"
+  gem "appraisal"
+  gem "minitest"
 end
 
-gemspec :path=>"../"
+gemspec path: "../"

data/gemfiles/rails42.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rb-fsevent", require: false
+gem "ruby_gntp", require: false
+gem "guard"
+gem "guard-test"
+gem "rails", "~> 4.2.0"
+gem "sprockets", "< 4.0"
+gem "sass-rails", "~> 5.0"
+
+group :test do
+  gem "mocha"
+  gem "appraisal"
+  gem "minitest"
+end
+
+gemspec path: "../"

data/gemfiles/rails50.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rb-fsevent", require: false
+gem "ruby_gntp", require: false
+gem "guard"
+gem "guard-test"
+gem "rails", "~> 5.0.0"
+gem "sprockets", "< 4.0"
+gem "sass-rails", "~> 5.0"
+
+group :test do
+  gem "mocha"
+  gem "appraisal"
+  gem "minitest"
+end
+
+gemspec path: "../"

data/gemfiles/rails51.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rb-fsevent", require: false
+gem "ruby_gntp", require: false
+gem "guard"
+gem "guard-test"
+gem "rails", "~> 5.1.0"
+gem "sprockets", "< 4.0"
+gem "sass-rails", "~> 5.0"
+
+group :test do
+  gem "mocha"
+  gem "appraisal"
+  gem "minitest"
+end
+
+gemspec path: "../"

data/gemfiles/rails_edge.gemfile

@@ -0,0 +1,22 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+git "git://github.com/rails/rails.git" do
+  gem "rails"
+end
+
+gem "rb-fsevent", require: false
+gem "ruby_gntp", require: false
+gem "guard"
+gem "guard-test"
+gem "sprockets", "< 4.0"
+gem "sass-rails", "~> 5.0"
+
+group :test do
+  gem "mocha"
+  gem "appraisal"
+  gem "minitest"
+end
+
+gemspec path: "../"

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

@@ -1,17 +1,8 @@
 require 'compass-rails/patches/compass'
 require 'compass-rails/patches/static_compiler'
 
-module Sass::Script::Functions
-  def generated_image_url(path, only_path = nil)
-    asset_url(path, Sass::Script::String.new("image"))
+Compass::Core::SassExtensions::Functions::Urls::GeneratedImageUrl.module_eval do
+  def generated_image_url(path, cache_buster = Sass::Script::Bool.new(false))
+    asset_url(path, Sass::Script::String.new('image'))
   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/4_0.rb

@@ -2,44 +2,38 @@ require 'compass-rails/patches/compass'
 require 'compass-rails/patches/sass_importer'
 require 'compass-rails/patches/sprite_importer'
 
-module Sass::Script::Functions
-  def generated_image_url(path, only_path = nil)
-    pathobject = Pathname.new(path.to_s)
-    subdirectory = pathobject.dirname.to_s
-
-    cachebust_generated_images(path, subdirectory)
+Compass::Core::SassExtensions::Functions::Urls::GeneratedImageUrl.module_eval do
+  def generated_image_url(path, cache_buster = Sass::Script::Bool.new(false))
+    cachebust_generated_images(path)
     asset_url(path)
   end
 
-  def cachebust_generated_images(image_path, subdirectory = nil)
-    generated_images_path = Rails.root.join(Compass.configuration.generated_images_dir).to_s
-    if subdirectory.nil? 
-        bust_cache_path = generated_images_path
+  def cachebust_generated_images(path)
+    generated_images_dir = Compass.configuration.generated_images_dir
+    generated_images_dir = Rails.root.join(generated_images_dir)
+
+    sprockets_env = options[:sprockets][:environment]
+
+    if sprockets_env.respond_to?(:trail, true)
+      sprockets_trail = sprockets_env.send(:trail)
     else
-        bust_cache_path = generated_images_path + "/" + subdirectory
+      sprockets_trail = sprockets_env.index
     end
-    bust_image_stat_path = generated_images_path + "/" + image_path.to_s
 
-    sprockets_entries = options[:sprockets][:environment].send(:trail).instance_variable_get(:@entries)
+    sprockets_entries = sprockets_trail.instance_variable_get(:@entries) || {}
+    sprockets_stats   = sprockets_trail.instance_variable_get(:@stats) || {}
 
-    # sprockets_entries.delete(generated_images_path) if sprockets_entries.has_key? generated_images_path
-    if sprockets_entries.has_key? generated_images_path
-        # sprockets_entries.delete(generated_images_path) 
+    if sprockets_entries.key?(generated_images_dir.to_s)
+      path = path.value
+      dir  = File.dirname(path)
 
-        # Delete the entries (directories) which cache the files/dirs in a directory
-        options[:sprockets][:environment].send(:trail).instance_variable_get(:@entries).delete(bust_cache_path) 
+      # Delete the entries (directories) which cache the files/dirs in a directory
+      entry = generated_images_dir.join(dir).to_s
+      sprockets_entries.delete(entry)
 
-        # Delete the stats (file/dir info) which cache the what kind of file/dir each image is
-        options[:sprockets][:environment].send(:trail).instance_variable_get(:@stats).delete(bust_image_stat_path) 
+      # Delete the stats (file/dir info) which cache the what kind of file/dir each image is
+      stat = generated_images_dir.join(path).to_s
+      sprockets_stats.delete(stat)
     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/compass.rb

@@ -1,10 +1,10 @@
-module Compass::RailsImageFunctionPatch
+Compass::Core::SassExtensions::Functions::ImageSize.class_eval do
   private
 
   def image_path_for_size(image_file)
     begin
-      file = ::Rails.application.assets.find_asset(image_file)
-      return file
+      file = ::CompassRails.sprockets.find_asset(image_file)
+      return (file.respond_to?(:pathname) ? file.pathname.to_s : file)
     rescue ::Sprockets::FileOutsidePaths
       return super(image_file)
     end

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

@@ -4,18 +4,16 @@ module Compass
     attr_accessor :sass_options
     STYLESHEET = /stylesheet/
     def sass_options
-      if CompassRails.asset_pipeline_enabled?
-        @sass_options[:custom] ||= {}
-        @sass_options[:custom] = {:resolver => ::Sass::Rails::Resolver.new(CompassRails.context)}
-        @sass_options[:load_paths] ||= []
-        unless @sass_options[:load_paths].any? {|k| k.is_a?(::Sass::Rails::Importer) }
-          ::Rails.application.assets.paths.each do |path|
-            next unless path.to_s =~ STYLESHEET
-            Dir["#{path}/**/*"].each do |pathname|
-              # args are: sprockets environment, the logical_path ex. 'stylesheets', and the full path name for the render
-              context = ::CompassRails.context.new(::Rails.application.assets, File.basename(path), Pathname.new(pathname))
-              @sass_options[:load_paths] << ::Sass::Rails::Importer.new(context)
-            end
+      @sass_options[:custom] ||= {}
+      @sass_options[:custom] = {:resolver => ::Sass::Rails::Resolver.new(CompassRails.context)}
+      @sass_options[:load_paths] ||= []
+      unless @sass_options[:load_paths].any? {|k| k.is_a?(::Sass::Rails::Importer) }
+        ::CompassRails.sprockets.paths.each do |path|
+          next unless path.to_s =~ STYLESHEET
+          Dir["#{path}/**/*"].each do |pathname|
+            # args are: sprockets environment, the logical_path ex. 'stylesheets', and the full path name for the render
+            context = ::CompassRails.context.new(::CompassRails.sprockets, File.basename(path), Pathname.new(pathname))
+            @sass_options[:load_paths] << ::Sass::Rails::Importer.new(context)
           end
         end
       end