compass-rails 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aea54e61ee5ba66c77fb1551ac1d84e80f223873
-  data.tar.gz: d7f0097bac198b698810651cb965368961f229b6
+  metadata.gz: 7e22b7b8fa47ae1f434e67a5df4072339d0d35cb
+  data.tar.gz: d56d0e16a200bc8fdd45dd82eaf7fa4a573adbae
 SHA512:
-  metadata.gz: 98f86f7f3febe3e167f2d61f5d76637c685a30cc1b640a5b89df9d13ddf29b54f3d4b6859ee2664e96f90380cb05d6d2ee431eef84bcb71da93236e484e3d3a8
-  data.tar.gz: 3cb173724d727cd77c63294d28cedf7f87260866a4fc3891bc0dab725d10d0d65c9071769b6252c2e5f24382e0da29d4943807ffb6110e96a566815bdf1f82c2
+  metadata.gz: ef6b6a3aa8254ef499dd9ae778fbef9009faf64711187dffafc53d513447883731e0b1ce338af06f3d6345e40e4b46ee8b4db12641d04023a02c540a8480d6ed
+  data.tar.gz: cb3124eae3b8a7977d2c50c532f277a7573ca0de55d8990034c98d57045eee34b74cfa3bfbb9fb582f6081094a5305f4e556b963a91334744677f136be7051b0

data/README.md

@@ -72,7 +72,7 @@ For example, if you want to use susy.
 ```ruby
 # Gemfile
 gem 'compass-rails'
-gem 'compass-susy-plugin'
+gem 'susy'
 ```
 
 then run:

data/compass-rails.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'compass', '~> 1.0.0'
   gem.add_dependency 'sprockets', '< 2.13'
-  gem.add_dependency 'sass-rails', '<= 5.0.1'
+  gem.add_dependency 'sass-rails', '< 5.1'
 end

data/gemfiles/rails31.gemfile

@@ -9,10 +9,6 @@ gem "guard-test"
 gem "rails", "3.1.3"
 gem "sass-rails"
 
-group :assets do
-  gem "compass-blueprint"
-end
-
 group :test do
   gem "mocha"
   gem "appraisal"

data/gemfiles/rails32.gemfile

@@ -9,10 +9,6 @@ gem "guard-test"
 gem "rails", "~> 3.2"
 gem "sass-rails"
 
-group :assets do
-  gem "compass-blueprint"
-end
-
 group :test do
   gem "mocha"
   gem "appraisal"

data/gemfiles/rails40.gemfile

@@ -9,10 +9,6 @@ gem "guard-test"
 gem "rails", "~> 4.0.0"
 gem "sass-rails"
 
-group :assets do
-  gem "compass-blueprint"
-end
-
 group :test do
   gem "mocha"
   gem "appraisal"

data/gemfiles/rails42.gemfile

@@ -9,10 +9,6 @@ gem "guard-test"
 gem "rails", "~> 4.2.0"
 gem "sass-rails", "~> 5.0"
 
-group :assets do
-  gem "compass-blueprint"
-end
-
 group :test do
   gem "mocha"
   gem "appraisal"

data/lib/compass-rails.rb

@@ -4,7 +4,6 @@ require "compass-rails/configuration"
 
 module CompassRails
 
-    RAILS_4 = %r{^4.[0|1|2]}
     RAILS_32 = %r{^3.2}
     RAILS_31 = %r{^3.1}
 
@@ -66,11 +65,6 @@ module CompassRails
       version_match RAILS_32
     end
 
-    def rails4?
-      return false unless defined?(::Rails)
-      version_match RAILS_4
-    end
-
     def version_match(version)
       !(rails_version =~ version).nil?
     end

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

@@ -55,19 +55,29 @@ klass.class_eval do
   private
 
   def sass_importer_artiy
-    @sass_importer_artiy ||= self.class.parent::SassImporter.instance_method(:initialize).arity
+    @sass_importer_artiy ||= sass_importer_class.instance_method(:initialize).arity
   end
 
-
   def sass_importer(context, path)
     case sass_importer_artiy.abs
     when 1
-      self.class.parent::SassImporter.new(path)
+      sass_importer_class.new(path)
     else
-      self.class.parent::SassImporter.new(context, path)
+      sass_importer_class.new(context, path)
     end
   end
 
+  # if using haml-rails, self.class.parent = Haml::Filters (which doesn't have an implementation)
+  def sass_importer_class
+    @sass_importer_class ||= if defined?(self.class.parent::SassImporter)
+                               self.class.parent::SassImporter
+                             elsif defined?(Sass::Rails::SassTemplate)
+                               Sass::Rails::SassImporter
+                             else
+                               Sprockets::SassImporter
+                             end
+  end
+
   def sprockets_cache_store
     case Rails.application.config.assets.cache_store
     when :null_store

data/lib/compass-rails/railties.rb

@@ -1,9 +1,7 @@
 if defined?(::Rails)
   if CompassRails.rails31? || CompassRails.rails32?
     require "compass-rails/railties/3_1"
-  elsif CompassRails.rails4?
-    require "compass-rails/railties/4_0"
   else
-    $stderr.puts "Unsupported rails environment for compass"
+    require "compass-rails/railties/4_0"
   end
 end

data/lib/compass-rails/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Scott Davis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
@@ -44,16 +44,16 @@ dependencies:
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '5.1'
 description: Integrate Compass into Rails 3.0 and up.
 email:
 - jetviper21@gmail.com