Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update #1

Open
wants to merge 61 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
88e6b4d
allow up to sass-rails 5.0.x
y-yagi Mar 31, 2015
4c7cf5c
Merge pull request #230 from y-yagi/sass-rails-5_0_x
craigmcnamara Apr 22, 2015
ef8d0ad
Updates the package name for sasy in README
jammons Apr 26, 2015
c4fc6f7
sass-rails changed Sass::Rails::SassTemplate so it no longer extends …
Apr 28, 2015
9915e76
First attempt was naive, work around the fact that sometimes the patc…
Apr 28, 2015
40fbdde
Right idea, but typoed the class names of the importers
Apr 28, 2015
8fffce9
Merge pull request #240 from reidnimz/adjust-sass-importer-patch-for-…
craigmcnamara Apr 29, 2015
db1f12e
Merge pull request #237 from jammons/master
craigmcnamara Apr 29, 2015
ec2282b
compass-blueprint isn’t necessary for other gemfiles
imogenkinsman Apr 30, 2015
3e88f99
Merge pull request #241 from zetsubo/master
craigmcnamara May 4, 2015
d600de4
Version bump
Aug 15, 2015
f9b9bf5
Version bump
Aug 25, 2015
68125b8
Allow sprockets >= 3
Aug 25, 2015
e9d58e5
Wrap the sass cache store in a Sprockets::Cache
Aug 26, 2015
ecd14a6
Updates to cope with Hike no longer being included
Aug 26, 2015
c9e6be3
Fix respond_to checks
Aug 26, 2015
b54f80c
Update changelog
Aug 26, 2015
e797d05
Loosen Sprockets version constraint
Aug 26, 2015
9764310
We shouldn't be writing cache files to the root /tmp folder.
Aug 28, 2015
d42ec06
Updated changelog
Sep 1, 2015
a1c8906
Merge pull request #246 from robkilby/sprockets-3
craigmcnamara Oct 23, 2015
06a6c4c
Updated Appraisals, Travis CI to confirm gem works in Rails 5
mvastola Jan 8, 2016
b6bdaf7
Fix error when using relative_path
tono Jan 7, 2016
6dc0a83
Merge pull request #258 from Partyista/master
craigmcnamara Jan 23, 2016
6a86455
Merge pull request #259 from tono/master
craigmcnamara Jan 23, 2016
9148740
Fixed testing regression in 6dc0a83.
mvastola Jan 23, 2016
5b16c6c
Merge pull request #260 from Partyista/master
craigmcnamara Jan 24, 2016
71d3531
Add failing test for a mimic of production mode
timhaines Feb 7, 2016
8d98dcf
Build the sprockets environment if it doesn't exist.
timhaines Feb 7, 2016
f7eff64
Update changelog
timhaines Feb 7, 2016
29c5fc2
Update version to 3.0.1
timhaines Feb 7, 2016
47db9cb
Merge pull request #263 from timhaines/production-mode
craigmcnamara Feb 15, 2016
a87f456
Fixed TypeError: no implicit conversion of Sprockets::Asset into String
vojtad Feb 15, 2016
4961926
Merge pull request #264 from vojtad/sprockets-3
craigmcnamara Feb 16, 2016
62e37c7
Version bump
Mar 3, 2016
28bfd19
Switch to SVG badges in README
rmm5t Apr 20, 2016
86afb2c
Merge pull request #266 from rmm5t/patch-1
craigmcnamara May 5, 2016
af076ff
Readme changes : Added rails 5 compatibility infos
Jul 26, 2016
3f967c8
fix error due to Sprockets 4 no longer handling pathnames
f1sherman Aug 19, 2016
498dfd9
Merge pull request #268 from Erowlin/patch-1
craigmcnamara Oct 21, 2016
b6ff83d
Merge pull request #270 from f1sherman/fix-sprockets4
craigmcnamara Oct 21, 2016
08068b4
Only add dependendency if file really exist.
fpellanda Feb 13, 2017
ebd65d1
Merge pull request #272 from fpellanda/import_once_file_not_found
craigmcnamara Mar 31, 2017
1741443
Update rubies to test on
Mar 31, 2017
a9627fc
Update README to advise people not to start new projects with compass
aCandidMind May 24, 2017
8703eb1
Update Appraisals to point to Rails 5.0
yuki24 May 31, 2017
fb02e2d
Do not test against combinations of too new Rubies + old Rails
yuki24 May 31, 2017
1b0676f
Test against Rails 5.1 and edge
yuki24 May 31, 2017
aae6cfa
Merge pull request #277 from yuki24/less-tests
Apr 27, 2018
3a1cf00
Merge pull request #276 from yuki24/really-test-against-rails-50
Apr 27, 2018
3aab6e3
Merge pull request #278 from yuki24/test-against-rails-51-and-edge
Apr 27, 2018
07bea34
Merge pull request #275 from aCandidMind/patch-1
Apr 27, 2018
be1f751
Final Version Bump
Apr 27, 2018
3d64d51
Support Rails 6.0, and drop 3.x, 4.0, and 4.1
yhirano55 Jan 5, 2020
b55d2ce
Drop rails version 4.2, 5.0 and 5.1
yhirano55 Jan 5, 2020
c0ed209
Merge pull request #280 from yhirano55/support_rails_v6.0
craigmcnamara Feb 18, 2020
583af03
Bump version
craigmcnamara Feb 18, 2020
ee9660d
Update README.md
craigmcnamara Feb 19, 2020
23aa737
EOL compass-rails
craigmcnamara Mar 24, 2020
350aa40
EOL
craigmcnamara Jun 4, 2020
f6391d0
Really EOL
craigmcnamara Jun 4, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
language: ruby

sudo: false

rvm:
- 1.9.3
- 2.0
- 2.1
- 2.2
- 2.4.9
- 2.5.7
- 2.6.5
- 2.7.0
- ruby-head
- jruby-head
- rbx-2.4.1

gemfile:
- gemfiles/rails52.gemfile
- gemfiles/rails60.gemfile
- gemfiles/rails_edge.gemfile
matrix:
exclude:
- rvm: 2.4.9
gemfile: gemfiles/rails60.gemfile
- rvm: 2.4.9
gemfile: gemfiles/rails_edge.gemfile
fast_finish: true
allow_failures:
- rvm: ruby-head
- rvm: jruby-head
- rvm: rbx-2.4.1

gemfile:
- gemfiles/rails31.gemfile
- gemfiles/rails32.gemfile
- gemfiles/rails40.gemfile
- gemfiles/rails42.gemfile
- gemfile: gemfiles/rails_edge.gemfile
28 changes: 16 additions & 12 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
appraise "rails31" do
gem "rails", "3.1.3"
gem "sass-rails"
appraise "rails52" do
gem "rails", "~> 5.2.0"
gem "sprockets", "< 4.0"
gem "sass-rails", "~> 5.0"
gem "bootsnap", require: false
end

appraise "rails32" do
gem "rails", "~> 3.2"
gem "sass-rails"
appraise "rails60" do
gem "rails", "~> 6.0.0"
gem "sprockets", "< 4.0"
gem "sass-rails", "~> 5.0"
gem "webpacker", "~> 4.0"
gem "bootsnap", ">= 1.4.2", require: false
end

appraise "rails40" do
gem "rails", "~> 4.0.0"
gem "sass-rails"
end
appraise "rails_edge" do
gem "rails", github: "rails/rails"

appraise "rails42" do
gem "rails", "~> 4.2.0"
gem "sprockets", "< 4.0"
gem "sass-rails", "~> 5.0"
gem "webpacker", "~> 4.0"
gem "bootsnap", ">= 1.4.2", require: false
end
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
# Change log

## 2.0.2 - 2015-01-03
## 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
Expand Down
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

# Specify your gem's dependencies in compass-rails.gemspec
gemspec
Expand All @@ -15,3 +16,4 @@ unless ENV["CI"]
gem 'guard'
gem 'guard-test'
end

26 changes: 11 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# compass-rails
# END OF LIFE - compass-rails

**We Take Pull Requests!**
**Don't use compass, it is no longer supported, see the [compass statement](https://github.com/Compass/compass/pull/2094)**

[![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.png)](https://coveralls.io/r/Compass/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 5.2 and 6.x releases.

## Installation

Expand Down Expand Up @@ -54,25 +54,25 @@ Use `application.css` to require files that use compass features. Ex:

### Configuration

Compass-rails is configured out of the box to work with Rails.
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
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

Step 1: Add it to your Gemfile and run the `bundle` command to install it.

Step 2: Install the extension's assets: `bundle exec compass install
Step 2: Install the extension's assets: `bundle exec compass install
<extension/template>`

For example, if you want to use susy.

```ruby
# Gemfile
gem 'compass-rails'
gem 'compass-susy-plugin'
gem 'susy'
```

then run:
Expand All @@ -90,8 +90,4 @@ to your application.rb configuration file.

## Contributing

1. Fork it
2. Create your feature branch (`git checkout -b my-new-feature`)
3. Commit your changes (`git commit -am 'Added some feature'`)
4. Push to the branch (`git push origin my-new-feature`)
5. Create new Pull Request
1. This project is EOL. No more changes will be accepted.
18 changes: 4 additions & 14 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,25 +1,15 @@
#!/usr/bin/env rake
require 'rubygems'
require 'bundler'
Bundler.setup
require 'rake/dsl_definition'

require "bundler/gem_tasks"
require 'appraisal'
require 'compass'

# ----- Default: Testing ------

task :default => [:test]

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,spec}.rb']
test_files.exclude('test/rails/*', 'test/haml/*')
t.test_files = test_files
t.verbose = true
end

task :default => [:test]
6 changes: 3 additions & 3 deletions compass-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
gem.version = CompassRails::VERSION
gem.license = "MIT"

gem.add_dependency 'compass', '~> 1.0.0'
gem.add_dependency 'sprockets', '< 2.13'
gem.add_dependency 'sass-rails', '<= 5.0.1'
gem.add_dependency 'compass', '~> 1.0.0'
gem.add_dependency 'sprockets', '< 4.0'
gem.add_dependency 'sass-rails', '< 5.1'
end
22 changes: 0 additions & 22 deletions gemfiles/rails31.gemfile

This file was deleted.

22 changes: 0 additions & 22 deletions gemfiles/rails32.gemfile

This file was deleted.

22 changes: 0 additions & 22 deletions gemfiles/rails40.gemfile

This file was deleted.

14 changes: 6 additions & 8 deletions gemfiles/rails42.gemfile → gemfiles/rails52.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,19 @@

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.2.0"
gem "rails", "~> 5.2.0"
gem "sprockets", "< 4.0"
gem "sass-rails", "~> 5.0"

group :assets do
gem "compass-blueprint"
end
gem "bootsnap", require: false

group :test do
gem "mocha"
gem "appraisal"
gem "minitest"
end

gemspec :path => "../"
gemspec path: "../"
21 changes: 21 additions & 0 deletions gemfiles/rails60.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# 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", "~> 6.0.0"
gem "sprockets", "< 4.0"
gem "sass-rails", "~> 5.0"
gem "webpacker", "~> 4.0"
gem "bootsnap", ">= 1.4.2", require: false

group :test do
gem "mocha"
gem "appraisal"
gem "minitest"
end

gemspec path: "../"
21 changes: 21 additions & 0 deletions gemfiles/rails_edge.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# 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", git: "https://github.com/rails/rails.git"
gem "sprockets", "< 4.0"
gem "sass-rails", "~> 5.0"
gem "webpacker", "~> 4.0"
gem "bootsnap", ">= 1.4.2", require: false

group :test do
gem "mocha"
gem "appraisal"
gem "minitest"
end

gemspec path: "../"
16 changes: 11 additions & 5 deletions lib/compass-rails.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,21 @@ module CompassRails

def setup_fake_rails_env_paths(sprockets_env)
return unless rails_loaded?

if sprockets_env.respond_to?(:trail, true)
sprockets_trail = sprockets_env.send(:trail)
else
sprockets_trail = sprockets_env.index
end

keys = ['app/assets', 'lib/assets', 'vendor/assets']
local = keys.map {|path| ::Rails.root.join(path) }.map { |path| [File.join(path, 'images'), File.join(path, 'stylesheets')] }.flatten!
sprockets_env.send(:trail).paths.unshift(*local)
sprockets_trail.paths.unshift(*local)
paths = []
::Rails::Engine.subclasses.each do |subclass|
paths = subclass.paths
keys.each do |key|
sprockets_env.send(:trail).paths.unshift(*paths[key].existent_directories)
sprockets_trail.paths.unshift(*paths[key].existent_directories)
end
end
end
Expand All @@ -28,14 +35,14 @@ def sass_config
end

def sprockets
@sprockets ||= ::Rails.application.assets
@sprockets ||= Rails.application.assets || ::Sprockets::Railtie.build_environment(Rails.application)
end

def context
@context ||= begin
sprockets.version = ::Rails.env + "-#{sprockets.version}"
setup_fake_rails_env_paths(sprockets)
context = ::Rails.application.assets.context_class
context = ::CompassRails.sprockets.context_class
context.extend(::Sprockets::Helpers::IsolatedHelper)
context.extend(::Sprockets::Helpers::RailsHelper)
context.extend(::Sass::Rails::Railtie::SassContext)
Expand Down Expand Up @@ -118,4 +125,3 @@ def set_maybe(sass_config, compass_config, sass_option, compass_option)
require "compass-rails/patches"
require "compass-rails/railties"
end

Loading