haml-edge 2.3.176 → 2.3.177
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.
- data/EDGE_GEM_VERSION +1 -1
- data/VERSION +1 -1
- data/lib/sass/files.rb +9 -1
- data/lib/sass/plugin.rb +7 -2
- data/test/sass/engine_test.rb +6 -1
- metadata +1 -1
data/EDGE_GEM_VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
2.3.
|
|
1
|
+
2.3.177
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
2.3.
|
|
1
|
+
2.3.177
|
data/lib/sass/files.rb
CHANGED
|
@@ -79,7 +79,15 @@ If you really need #{filename}.css, import it explicitly.
|
|
|
79
79
|
END
|
|
80
80
|
return filename + '.css'
|
|
81
81
|
end
|
|
82
|
-
|
|
82
|
+
|
|
83
|
+
message = "File to import not found or unreadable: #{original_filename}.\n"
|
|
84
|
+
if load_paths.size == 1
|
|
85
|
+
message << "Load path: #{load_paths.first}"
|
|
86
|
+
else
|
|
87
|
+
message << "Load paths:\n " << load_paths.join("\n ")
|
|
88
|
+
end
|
|
89
|
+
|
|
90
|
+
raise SyntaxError.new(message)
|
|
83
91
|
end
|
|
84
92
|
|
|
85
93
|
private
|
data/lib/sass/plugin.rb
CHANGED
|
@@ -396,8 +396,13 @@ module Sass
|
|
|
396
396
|
|
|
397
397
|
def dependency_updated?(css_mtime)
|
|
398
398
|
lambda do |dep|
|
|
399
|
-
|
|
400
|
-
|
|
399
|
+
begin
|
|
400
|
+
File.mtime(dep) > css_mtime ||
|
|
401
|
+
dependencies(dep).any?(&dependency_updated?(css_mtime))
|
|
402
|
+
rescue Sass::SyntaxError
|
|
403
|
+
# If there's an error finding depenencies, default to recompiling.
|
|
404
|
+
true
|
|
405
|
+
end
|
|
401
406
|
end
|
|
402
407
|
end
|
|
403
408
|
|
data/test/sass/engine_test.rb
CHANGED
|
@@ -57,7 +57,12 @@ MSG
|
|
|
57
57
|
"a," => "Rules can\'t end in commas.",
|
|
58
58
|
"a,\n!b = 1" => ["Rules can\'t end in commas.", 1],
|
|
59
59
|
"!a = b\n :c d\n" => "Illegal nesting: Nothing may be nested beneath variable declarations.",
|
|
60
|
-
"@import foo.sass" =>
|
|
60
|
+
"@import foo.sass" => <<MSG,
|
|
61
|
+
File to import not found or unreadable: foo.sass.
|
|
62
|
+
Load paths:
|
|
63
|
+
test/sass
|
|
64
|
+
.
|
|
65
|
+
MSG
|
|
61
66
|
"@import templates/basic\n foo" => "Illegal nesting: Nothing may be nested beneath import directives.",
|
|
62
67
|
"foo\n @import templates/basic" => "Import directives may only be used at the root of a document.",
|
|
63
68
|
"foo\n @import #{File.dirname(__FILE__)}/templates/basic" => "Import directives may only be used at the root of a document.",
|