compass-rails 2.0.4 → 2.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/compass-rails.gemspec +1 -1
- data/gemfiles/rails31.gemfile +0 -4
- data/gemfiles/rails32.gemfile +0 -4
- data/gemfiles/rails40.gemfile +0 -4
- data/gemfiles/rails42.gemfile +0 -4
- data/lib/compass-rails.rb +0 -6
- data/lib/compass-rails/patches/sass_importer.rb +14 -4
- data/lib/compass-rails/railties.rb +1 -3
- data/lib/compass-rails/version.rb +1 -1
- metadata +6 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7e22b7b8fa47ae1f434e67a5df4072339d0d35cb
|
4
|
+
data.tar.gz: d56d0e16a200bc8fdd45dd82eaf7fa4a573adbae
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ef6b6a3aa8254ef499dd9ae778fbef9009faf64711187dffafc53d513447883731e0b1ce338af06f3d6345e40e4b46ee8b4db12641d04023a02c540a8480d6ed
|
7
|
+
data.tar.gz: cb3124eae3b8a7977d2c50c532f277a7573ca0de55d8990034c98d57045eee34b74cfa3bfbb9fb582f6081094a5305f4e556b963a91334744677f136be7051b0
|
data/README.md
CHANGED
data/compass-rails.gemspec
CHANGED
data/gemfiles/rails31.gemfile
CHANGED
data/gemfiles/rails32.gemfile
CHANGED
data/gemfiles/rails40.gemfile
CHANGED
data/gemfiles/rails42.gemfile
CHANGED
data/lib/compass-rails.rb
CHANGED
@@ -4,7 +4,6 @@ require "compass-rails/configuration"
|
|
4
4
|
|
5
5
|
module CompassRails
|
6
6
|
|
7
|
-
RAILS_4 = %r{^4.[0|1|2]}
|
8
7
|
RAILS_32 = %r{^3.2}
|
9
8
|
RAILS_31 = %r{^3.1}
|
10
9
|
|
@@ -66,11 +65,6 @@ module CompassRails
|
|
66
65
|
version_match RAILS_32
|
67
66
|
end
|
68
67
|
|
69
|
-
def rails4?
|
70
|
-
return false unless defined?(::Rails)
|
71
|
-
version_match RAILS_4
|
72
|
-
end
|
73
|
-
|
74
68
|
def version_match(version)
|
75
69
|
!(rails_version =~ version).nil?
|
76
70
|
end
|
@@ -55,19 +55,29 @@ klass.class_eval do
|
|
55
55
|
private
|
56
56
|
|
57
57
|
def sass_importer_artiy
|
58
|
-
@sass_importer_artiy ||=
|
58
|
+
@sass_importer_artiy ||= sass_importer_class.instance_method(:initialize).arity
|
59
59
|
end
|
60
60
|
|
61
|
-
|
62
61
|
def sass_importer(context, path)
|
63
62
|
case sass_importer_artiy.abs
|
64
63
|
when 1
|
65
|
-
|
64
|
+
sass_importer_class.new(path)
|
66
65
|
else
|
67
|
-
|
66
|
+
sass_importer_class.new(context, path)
|
68
67
|
end
|
69
68
|
end
|
70
69
|
|
70
|
+
# if using haml-rails, self.class.parent = Haml::Filters (which doesn't have an implementation)
|
71
|
+
def sass_importer_class
|
72
|
+
@sass_importer_class ||= if defined?(self.class.parent::SassImporter)
|
73
|
+
self.class.parent::SassImporter
|
74
|
+
elsif defined?(Sass::Rails::SassTemplate)
|
75
|
+
Sass::Rails::SassImporter
|
76
|
+
else
|
77
|
+
Sprockets::SassImporter
|
78
|
+
end
|
79
|
+
end
|
80
|
+
|
71
81
|
def sprockets_cache_store
|
72
82
|
case Rails.application.config.assets.cache_store
|
73
83
|
when :null_store
|
@@ -1,9 +1,7 @@
|
|
1
1
|
if defined?(::Rails)
|
2
2
|
if CompassRails.rails31? || CompassRails.rails32?
|
3
3
|
require "compass-rails/railties/3_1"
|
4
|
-
elsif CompassRails.rails4?
|
5
|
-
require "compass-rails/railties/4_0"
|
6
4
|
else
|
7
|
-
|
5
|
+
require "compass-rails/railties/4_0"
|
8
6
|
end
|
9
7
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: compass-rails
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Scott Davis
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2015-
|
13
|
+
date: 2015-08-15 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: compass
|
@@ -44,16 +44,16 @@ dependencies:
|
|
44
44
|
name: sass-rails
|
45
45
|
requirement: !ruby/object:Gem::Requirement
|
46
46
|
requirements:
|
47
|
-
- - "
|
47
|
+
- - "<"
|
48
48
|
- !ruby/object:Gem::Version
|
49
|
-
version: 5.
|
49
|
+
version: '5.1'
|
50
50
|
type: :runtime
|
51
51
|
prerelease: false
|
52
52
|
version_requirements: !ruby/object:Gem::Requirement
|
53
53
|
requirements:
|
54
|
-
- - "
|
54
|
+
- - "<"
|
55
55
|
- !ruby/object:Gem::Version
|
56
|
-
version: 5.
|
56
|
+
version: '5.1'
|
57
57
|
description: Integrate Compass into Rails 3.0 and up.
|
58
58
|
email:
|
59
59
|
- jetviper21@gmail.com
|