haml 3.1.0 → 3.1.1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of haml might be problematic. Click here for more details.
- data/VERSION +1 -1
- data/vendor/sass/Rakefile +22 -46
- data/vendor/sass/VERSION +1 -1
- data/vendor/sass/VERSION_NAME +1 -1
- data/vendor/sass/bin/scss +8 -0
- data/vendor/sass/doc-src/SASS_CHANGELOG.md +125 -9
- data/vendor/sass/doc-src/SASS_REFERENCE.md +84 -8
- data/vendor/sass/lib/sass.rb +0 -3
- data/vendor/sass/lib/sass/cache_stores.rb +1 -0
- data/vendor/sass/lib/sass/cache_stores/base.rb +2 -2
- data/vendor/sass/lib/sass/cache_stores/chain.rb +33 -0
- data/vendor/sass/lib/sass/cache_stores/filesystem.rb +6 -4
- data/vendor/sass/lib/sass/cache_stores/memory.rb +8 -12
- data/vendor/sass/lib/sass/engine.rb +65 -56
- data/vendor/sass/lib/sass/environment.rb +5 -2
- data/vendor/sass/lib/sass/exec.rb +52 -21
- data/vendor/sass/lib/sass/importers/filesystem.rb +32 -9
- data/vendor/sass/lib/sass/less.rb +1 -1
- data/vendor/sass/lib/sass/plugin.rb +11 -1
- data/vendor/sass/lib/sass/plugin/compiler.rb +21 -12
- data/vendor/sass/lib/sass/plugin/rails.rb +8 -82
- data/vendor/sass/lib/sass/plugin/staleness_checker.rb +10 -10
- data/vendor/sass/lib/sass/railtie.rb +3 -2
- data/vendor/sass/lib/sass/script.rb +2 -25
- data/vendor/sass/lib/sass/script/color.rb +4 -15
- data/vendor/sass/lib/sass/script/funcall.rb +63 -19
- data/vendor/sass/lib/sass/script/functions.rb +257 -19
- data/vendor/sass/lib/sass/script/lexer.rb +1 -4
- data/vendor/sass/lib/sass/script/list.rb +2 -2
- data/vendor/sass/lib/sass/script/node.rb +0 -27
- data/vendor/sass/lib/sass/script/number.rb +1 -1
- data/vendor/sass/lib/sass/script/operation.rb +0 -5
- data/vendor/sass/lib/sass/script/parser.rb +30 -12
- data/vendor/sass/lib/sass/script/string.rb +2 -17
- data/vendor/sass/lib/sass/script/string_interpolation.rb +1 -0
- data/vendor/sass/lib/sass/scss/parser.rb +58 -18
- data/vendor/sass/lib/sass/scss/rx.rb +2 -1
- data/vendor/sass/lib/sass/scss/script_lexer.rb +1 -1
- data/vendor/sass/lib/sass/selector/comma_sequence.rb +2 -3
- data/vendor/sass/lib/sass/selector/sequence.rb +3 -6
- data/vendor/sass/lib/sass/selector/simple_sequence.rb +2 -3
- data/vendor/sass/lib/sass/tree/charset_node.rb +0 -15
- data/vendor/sass/lib/sass/tree/comment_node.rb +20 -71
- data/vendor/sass/lib/sass/tree/debug_node.rb +4 -22
- data/vendor/sass/lib/sass/tree/directive_node.rb +0 -52
- data/vendor/sass/lib/sass/tree/each_node.rb +8 -38
- data/vendor/sass/lib/sass/tree/extend_node.rb +12 -48
- data/vendor/sass/lib/sass/tree/for_node.rb +20 -51
- data/vendor/sass/lib/sass/tree/function_node.rb +27 -0
- data/vendor/sass/lib/sass/tree/if_node.rb +22 -57
- data/vendor/sass/lib/sass/tree/import_node.rb +0 -56
- data/vendor/sass/lib/sass/tree/media_node.rb +0 -43
- data/vendor/sass/lib/sass/tree/mixin_def_node.rb +12 -45
- data/vendor/sass/lib/sass/tree/mixin_node.rb +13 -124
- data/vendor/sass/lib/sass/tree/node.rb +18 -304
- data/vendor/sass/lib/sass/tree/prop_node.rb +24 -92
- data/vendor/sass/lib/sass/tree/return_node.rb +18 -0
- data/vendor/sass/lib/sass/tree/root_node.rb +4 -133
- data/vendor/sass/lib/sass/tree/rule_node.rb +21 -164
- data/vendor/sass/lib/sass/tree/variable_node.rb +14 -23
- data/vendor/sass/lib/sass/tree/visitors/base.rb +75 -0
- data/vendor/sass/lib/sass/tree/visitors/check_nesting.rb +134 -0
- data/vendor/sass/lib/sass/tree/visitors/convert.rb +255 -0
- data/vendor/sass/lib/sass/tree/visitors/cssize.rb +175 -0
- data/vendor/sass/lib/sass/tree/visitors/perform.rb +301 -0
- data/vendor/sass/lib/sass/tree/visitors/to_css.rb +216 -0
- data/vendor/sass/lib/sass/tree/warn_node.rb +4 -28
- data/vendor/sass/lib/sass/tree/while_node.rb +5 -35
- data/vendor/sass/lib/sass/util.rb +0 -50
- data/vendor/sass/sass.gemspec +1 -1
- data/vendor/sass/test/sass/conversion_test.rb +53 -102
- data/vendor/sass/test/sass/engine_test.rb +416 -540
- data/vendor/sass/test/sass/functions_test.rb +306 -4
- data/vendor/sass/test/sass/importer_test.rb +0 -22
- data/vendor/sass/test/sass/plugin_test.rb +51 -21
- data/vendor/sass/test/sass/results/if.css +3 -0
- data/vendor/sass/test/sass/script_conversion_test.rb +0 -38
- data/vendor/sass/test/sass/script_test.rb +19 -4
- data/vendor/sass/test/sass/scss/scss_test.rb +32 -11
- data/vendor/sass/test/sass/templates/if.sass +11 -0
- data/vendor/sass/test/sass/templates/nested_import.sass +2 -0
- data/vendor/sass/test/sass/util_test.rb +0 -21
- data/vendor/sass/test/test_helper.rb +0 -3
- metadata +268 -258
- data/vendor/sass/bin/css2sass +0 -13
- data/vendor/sass/lib/sass/cache_stores/active_support.rb +0 -28
- data/vendor/sass/lib/sass/importers/rails.rb +0 -75
data/vendor/sass/bin/css2sass
DELETED
@@ -1,13 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby
|
2
|
-
|
3
|
-
require File.dirname(__FILE__) + '/../lib/sass'
|
4
|
-
require 'sass/exec'
|
5
|
-
|
6
|
-
warn <<END
|
7
|
-
DEPRECATION WARNING:
|
8
|
-
The css2sass tool is deprecated and will be removed in Sass 3.2.
|
9
|
-
Use the sass-convert tool instead.
|
10
|
-
END
|
11
|
-
|
12
|
-
opts = Sass::Exec::SassConvert.new(%w[--from css --to sass] + ARGV)
|
13
|
-
opts.parse!
|
@@ -1,28 +0,0 @@
|
|
1
|
-
module Sass
|
2
|
-
module CacheStores
|
3
|
-
# A cache store that wraps an ActiveSupport cache store.
|
4
|
-
# This is useful for integrating with an app that uses ActiveSupport,
|
5
|
-
# or for taking advantage of the wide variety of ActiveSupport cache backends.
|
6
|
-
#
|
7
|
-
# This is automatically used within Rails.
|
8
|
-
class ActiveSupport < Base
|
9
|
-
# @param store [::ActiveSupport::Cache::Store] The cache store to wrap.
|
10
|
-
def initialize(store)
|
11
|
-
@store = store
|
12
|
-
end
|
13
|
-
|
14
|
-
# @see Base#_retrieve
|
15
|
-
def _retrieve(key, version, sha)
|
16
|
-
return unless val = @store.fetch('_sass/' + key)
|
17
|
-
return unless val[:version] == version
|
18
|
-
return unless val[:sha] == sha
|
19
|
-
return val[:contents]
|
20
|
-
end
|
21
|
-
|
22
|
-
# @see Base#_store
|
23
|
-
def _store(key, version, sha, contents)
|
24
|
-
@store.write('_sass/' + key, :version => version, :sha => sha, :contents => contents)
|
25
|
-
end
|
26
|
-
end
|
27
|
-
end
|
28
|
-
end
|
@@ -1,75 +0,0 @@
|
|
1
|
-
module Sass
|
2
|
-
module Importers
|
3
|
-
# An importer that wraps the Rails 3.1 view infrastructure.
|
4
|
-
# Loads Sass files as though they were views in Rails.
|
5
|
-
# Currently doesn't support caching.
|
6
|
-
#
|
7
|
-
# This is different from standard Rails rendering
|
8
|
-
# in that Sass doesn't have a concept of importing partials
|
9
|
-
# as a distinct action from importing other Sass files.
|
10
|
-
# Imports within Rails behave more like Sass imports:
|
11
|
-
# they will first attempt to find a non-partial file,
|
12
|
-
# and failing that will fall back on a partial.
|
13
|
-
#
|
14
|
-
# Each importer instance is local to a single request for a single view.
|
15
|
-
# It contains the ActionView::LookupContext for that request,
|
16
|
-
# as well as the controller prefix for the view being generated.
|
17
|
-
class Rails < Base
|
18
|
-
# Creates a new Rails importer that imports files as Rails views.
|
19
|
-
def initialize; end
|
20
|
-
|
21
|
-
# @see Base#find_relative
|
22
|
-
def find_relative(uri, base, options)
|
23
|
-
find_(uri, base.split('/')[0...-1].join('/'), options)
|
24
|
-
end
|
25
|
-
|
26
|
-
# @see Base#find
|
27
|
-
def find(uri, options)
|
28
|
-
find_(uri, nil, options)
|
29
|
-
end
|
30
|
-
|
31
|
-
# @see Base#mtime
|
32
|
-
def mtime(uri, options)
|
33
|
-
return unless template =
|
34
|
-
find_template(uri, nil, !:partial, options) ||
|
35
|
-
find_template(uri, nil, :partial, options)
|
36
|
-
template.updated_at
|
37
|
-
end
|
38
|
-
|
39
|
-
# @see Base#key
|
40
|
-
def key(uri, options)
|
41
|
-
[self.class.name + ":" + uri.split('/')[0...-1].join('/'),
|
42
|
-
uri.split('/')[-1] + "." + options[:syntax].to_s]
|
43
|
-
end
|
44
|
-
|
45
|
-
# @see Base#to_s
|
46
|
-
def to_s
|
47
|
-
"(Rails importer)"
|
48
|
-
end
|
49
|
-
|
50
|
-
private
|
51
|
-
|
52
|
-
def find_(uri, prefix, options)
|
53
|
-
prepare_template(
|
54
|
-
find_template(uri, prefix, !:partial, options) ||
|
55
|
-
find_template(uri, prefix, :partial, options),
|
56
|
-
options)
|
57
|
-
end
|
58
|
-
|
59
|
-
def find_template(uri, prefix, partial, options)
|
60
|
-
return options[:_rails_lookup_context].
|
61
|
-
find_all(uri, prefix, partial).
|
62
|
-
find {|t| t.handler.is_a?(Sass::Plugin::TemplateHandler)}
|
63
|
-
end
|
64
|
-
|
65
|
-
def prepare_template(template, options)
|
66
|
-
return unless template
|
67
|
-
options[:syntax] = template.handler.syntax
|
68
|
-
options[:filename] = template.virtual_path
|
69
|
-
options[:_rails_filename] = template.identifier
|
70
|
-
options[:importer] = self
|
71
|
-
Sass::Engine.new(template.source, options)
|
72
|
-
end
|
73
|
-
end
|
74
|
-
end
|
75
|
-
end
|