compass-rails 2.0.5 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e22b7b8fa47ae1f434e67a5df4072339d0d35cb
-  data.tar.gz: d56d0e16a200bc8fdd45dd82eaf7fa4a573adbae
+  metadata.gz: c832d7ff0b8ead7078794b00ebb92f06c9b39c66
+  data.tar.gz: 6c8f5d59ba1a4ce114ba2a0dd9b12a5c17582b15
 SHA512:
-  metadata.gz: ef6b6a3aa8254ef499dd9ae778fbef9009faf64711187dffafc53d513447883731e0b1ce338af06f3d6345e40e4b46ee8b4db12641d04023a02c540a8480d6ed
-  data.tar.gz: cb3124eae3b8a7977d2c50c532f277a7573ca0de55d8990034c98d57045eee34b74cfa3bfbb9fb582f6081094a5305f4e556b963a91334744677f136be7051b0
+  metadata.gz: e9126f0cd8877d5fb4252e402535994306c3beae1b324c7acb4777e6921eece4bb04d7da9bc36f68bbc17b3a6e8919902c0b869127000cc0ffc6812a05f9ea8f
+  data.tar.gz: 3b1a7de4da19c7ebcee67bae8e0967af771a753c21712f9662c96c43f765d3c3711b618f84cbce7d3c97ecc34be33c2c31e78bea0ab9cc8f72db0c2520393c63

data/.travis.yml

@@ -1,22 +1,28 @@
 language: ruby
-
 sudo: false
-
 rvm:
-  - 1.9.3
+  - 1.9
   - 2.0
   - 2.1
-  - 2.2
+  - 2.2.4
+  - 2.3.0
+  - ruby-head
   - jruby-head
-  - rbx-2.4.1
-
-matrix:
-  allow_failures:
-    - rvm: jruby-head
-    - rvm: rbx-2.4.1
-
 gemfile:
   - gemfiles/rails31.gemfile
   - gemfiles/rails32.gemfile
   - gemfiles/rails40.gemfile
   - gemfiles/rails42.gemfile
+  - gemfiles/rails50.gemfile
+matrix:
+  fast_finish: true
+  exclude:
+    - gemfile: gemfiles/rails50.gemfile
+      rvm: 1.9
+    - gemfile: gemfiles/rails50.gemfile
+      rvm: 2.0
+    - gemfile: gemfiles/rails50.gemfile
+      rvm: 2.1
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head

data/Appraisals

@@ -1,19 +1,29 @@
 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", "< 2.13"
+  gem "sass-rails", "~> 5.0"
+end
+
+appraise "rails50" do
+  gem "rails", ">= 5.0.0.alpha", "< 5.1"
+  gem "sprockets", "< 4.0"
   gem "sass-rails", "~> 5.0"
 end

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 # Change log
 
-## 2.0.2 - 2015-01-03
+## 3.0.0 - Unreleased
+### 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

data/Gemfile

@@ -15,3 +15,4 @@ unless ENV["CI"]
   gem 'guard'
   gem 'guard-test'
 end
+

data/Rakefile

@@ -1,21 +1,9 @@
 #!/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']
@@ -23,3 +11,5 @@ Rake::TestTask.new :test do |t|
   t.test_files = test_files
   t.verbose = true
 end
+
+task :default => [:test]

data/compass-rails.gemspec

@@ -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 'compass',    '~> 1.0.0'
+  gem.add_dependency 'sprockets',  '< 4.0'
   gem.add_dependency 'sass-rails', '< 5.1'
 end

data/gemfiles/rails31.gemfile

@@ -7,6 +7,7 @@ gem "ruby_gntp", :require => false
 gem "guard"
 gem "guard-test"
 gem "rails", "3.1.3"
+gem "sprockets", "< 2.13"
 gem "sass-rails"
 
 group :test do

data/gemfiles/rails32.gemfile

@@ -7,6 +7,7 @@ gem "ruby_gntp", :require => false
 gem "guard"
 gem "guard-test"
 gem "rails", "~> 3.2"
+gem "sprockets", "< 2.13"
 gem "sass-rails"
 
 group :test do

data/gemfiles/rails40.gemfile

@@ -7,6 +7,7 @@ gem "ruby_gntp", :require => false
 gem "guard"
 gem "guard-test"
 gem "rails", "~> 4.0.0"
+gem "sprockets", "< 2.13"
 gem "sass-rails"
 
 group :test do

data/gemfiles/rails42.gemfile

@@ -7,6 +7,7 @@ gem "ruby_gntp", :require => false
 gem "guard"
 gem "guard-test"
 gem "rails", "~> 4.2.0"
+gem "sprockets", "< 2.13"
 gem "sass-rails", "~> 5.0"
 
 group :test do

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.alpha", "< 5.1"
+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.rb

@@ -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

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

@@ -12,8 +12,14 @@ Compass::Core::SassExtensions::Functions::Urls::GeneratedImageUrl.module_eval do
     generated_images_dir = Compass.configuration.generated_images_dir
     generated_images_dir = Rails.root.join(generated_images_dir)
 
-    sprockets_env     = options[:sprockets][:environment]
-    sprockets_trail   = sprockets_env.send(:trail)
+    sprockets_env = options[:sprockets][:environment]
+
+    if sprockets_env.respond_to?(:trail, true)
+      sprockets_trail = sprockets_env.send(:trail)
+    else
+      sprockets_trail = sprockets_env.index
+    end
+
     sprockets_entries = sprockets_trail.instance_variable_get(:@entries) || {}
     sprockets_stats   = sprockets_trail.instance_variable_get(:@stats) || {}
 

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

@@ -7,11 +7,11 @@ end
 klass.class_eval do
   def evaluate(context, locals, &block)
     # Use custom importer that knows about Sprockets Caching
-    cache_store = 
-      if defined?(Sprockets::SassCacheStore)
-        Sprockets::SassCacheStore.new(context.environment)
-      else
+    cache_store =
+      if defined?(Sprockets::SassProcessor::CacheStore)
         Sprockets::SassProcessor::CacheStore.new(sprockets_cache_store, context.environment)
+      else
+        Sprockets::SassCacheStore.new(context.environment)
       end
 
     paths  = context.environment.paths.map { |path| CompassRails::SpriteImporter.new(path) }
@@ -79,14 +79,18 @@ klass.class_eval do
   end
 
   def sprockets_cache_store
-    case Rails.application.config.assets.cache_store
-    when :null_store
-      Sprockets::Cache::NullStore.new
-    when :memory_store, :mem_cache_store
-      Sprockets::Cache::MemoryStore.new
-    else
-      Sprockets::Cache::FileStore.new(Dir::tmpdir)
-    end
-  end
-end    
+    cache =
+      case Rails.application.config.assets.cache_store
+      when :null_store
+        Sprockets::Cache::NullStore.new
+      when :memory_store, :mem_cache_store
+        Sprockets::Cache::MemoryStore.new
+      else
+        path = "#{Rails.application.config.root}/tmp/cache/assets/#{Rails.env}"
+
+        Sprockets::Cache::FileStore.new(path)
+      end
 
+    Sprockets::Cache.new(cache, Rails.logger)
+  end
+end

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

@@ -15,7 +15,7 @@ module CompassRails
         self.class.files(uri).each do |file|
           relative_path = Pathname.new(file).relative_path_from(Pathname.new(root))
           begin
-            pathname = context.resolve(relative_path)
+            pathname = context.resolve(relative_path.to_s)
             context.depend_on_asset(pathname)
           rescue Sprockets::FileNotFound
 

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

@@ -25,7 +25,12 @@ module CompassRails
 
             # Clear entries in Hike::Index for this sprite's directory.
             # This makes sure the asset can be found by find_assets
-            index = Rails.application.assets.send(:trail).index
+            if Rails.application.assets.respond_to?(:trail, true)
+              index = Rails.application.assets.send(:trail).index
+            else
+              index = Rails.application.assets.index
+            end
+
             index.instance_variable_get(:@entries).delete(File.dirname(filename))
             index.instance_variable_get(:@stats).delete(filename)
 

data/lib/compass-rails/version.rb

@@ -1,5 +1,3 @@
 module CompassRails
-  unless defined?(::CompassRails::VERSION)
-    VERSION = "2.0.5"
-  end
+  VERSION = '3.0.0' unless defined?(::CompassRails::VERSION)
 end

data/test/helpers/rails_helper.rb

@@ -4,6 +4,7 @@ module CompassRails
       include FileHelper
       include DebugHelper
       include CommandHelper
+        RAILS_5_0   = "5.0"
         RAILS_4_2   = "4.2"
         RAILS_4_0   = "4.0"
         RAILS_3_2   = "3.2"
@@ -12,6 +13,7 @@ module CompassRails
         WORKING_DIR = File.join(ROOT_PATH, 'rails-temp')
 
         VERSION_LOOKUP = {
+          RAILS_5_0 => %r{^5\.0\.},
           RAILS_4_2 => %r{^4\.2\.},
           RAILS_4_0 => %r{^4\.0\.},
           RAILS_3_2 => %r{^3\.2\.},
@@ -19,6 +21,7 @@ module CompassRails
         }
 
         GEMFILES = {
+          RAILS_5_0 => GEMFILES_DIR.join("rails50.gemfile").to_s,
           RAILS_4_2 => GEMFILES_DIR.join("rails42.gemfile").to_s,
           RAILS_4_0 => GEMFILES_DIR.join("rails40.gemfile").to_s,
           RAILS_3_2 => GEMFILES_DIR.join("rails32.gemfile").to_s,

data/test/helpers/rails_project.rb

@@ -14,6 +14,7 @@ module CompassRails
       def initialize(directory, version)
         @directory = Pathname.new(directory)
         @version = version
+        disable_cookies! if version == '3.1'
       end
 
       ## FILE METHODS
@@ -71,6 +72,11 @@ module CompassRails
         inject_into_file(directory.join(APPLICATION_FILE), value, :after, 'class Application < Rails::Application')
       end
 
+      def disable_cookies!
+        value = "\n    config.middleware.delete 'ActionDispatch::Session::CookieStore'\n"
+        inject_into_file(directory.join(APPLICATION_FILE), value, :after, 'class Application < Rails::Application')
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 3.0.0
 platform: ruby
 authors:
 - Scott Davis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-15 00:00:00.000000000 Z
+date: 2016-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +77,7 @@ files:
 - gemfiles/rails32.gemfile
 - gemfiles/rails40.gemfile
 - gemfiles/rails42.gemfile
+- gemfiles/rails50.gemfile
 - lib/compass-rails.rb
 - lib/compass-rails/configuration.rb
 - lib/compass-rails/patches.rb