sass 3.1.14 → 3.1.15

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 3.1.14
1
+ 3.1.15
@@ -621,7 +621,7 @@ WARNING
621
621
  end
622
622
  Tree::CommentNode.new(value, silent, loud)
623
623
  else
624
- Tree::RuleNode.new(parse_interp(line))
624
+ Tree::RuleNode.new(parse_interp(line.text))
625
625
  end
626
626
  end
627
627
 
@@ -404,6 +404,7 @@ MSG
404
404
  raise error unless error.is_a?(::Sass::SyntaxError) && !@options[:stop_on_error]
405
405
  had_error = true
406
406
  puts_action :error, :red, "#{error.sass_filename} (Line #{error.sass_line}: #{error.message})"
407
+ STDOUT.flush
407
408
  end
408
409
 
409
410
  if @options[:update]
@@ -414,9 +415,18 @@ MSG
414
415
 
415
416
  puts ">>> Sass is watching for changes. Press Ctrl-C to stop."
416
417
 
417
- ::Sass::Plugin.on_template_modified {|template| puts ">>> Change detected to: #{template}"}
418
- ::Sass::Plugin.on_template_created {|template| puts ">>> New template detected: #{template}"}
419
- ::Sass::Plugin.on_template_deleted {|template| puts ">>> Deleted template detected: #{template}"}
418
+ ::Sass::Plugin.on_template_modified do |template|
419
+ puts ">>> Change detected to: #{template}"
420
+ STDOUT.flush
421
+ end
422
+ ::Sass::Plugin.on_template_created do |template|
423
+ puts ">>> New template detected: #{template}"
424
+ STDOUT.flush
425
+ end
426
+ ::Sass::Plugin.on_template_deleted do |template|
427
+ puts ">>> Deleted template detected: #{template}"
428
+ STDOUT.flush
429
+ end
420
430
 
421
431
  ::Sass::Plugin.watch(files)
422
432
  end
@@ -39,6 +39,10 @@ module Sass
39
39
  def initialize(options)
40
40
  @dependencies = self.class.dependencies_cache
41
41
 
42
+ # URIs that are being actively checked for staleness. Protects against
43
+ # import loops.
44
+ @actively_checking = Set.new
45
+
42
46
  # Entries in the following instance-level caches are never explicitly expired.
43
47
  # Instead they are supposed to automaticaly go out of scope when a series of staleness checks
44
48
  # (this instance of StalenessChecker was created for) is finished.
@@ -148,10 +152,16 @@ module Sass
148
152
 
149
153
  def dependency_updated?(css_mtime)
150
154
  Proc.new do |uri, importer|
151
- sass_mtime = mtime(uri, importer)
152
- !sass_mtime ||
153
- sass_mtime > css_mtime ||
154
- dependencies_stale?(uri, importer, css_mtime)
155
+ next true if @actively_checking.include?(uri)
156
+ begin
157
+ @actively_checking << uri
158
+ sass_mtime = mtime(uri, importer)
159
+ !sass_mtime ||
160
+ sass_mtime > css_mtime ||
161
+ dependencies_stale?(uri, importer, css_mtime)
162
+ ensure
163
+ @actively_checking.delete uri
164
+ end
155
165
  end
156
166
  end
157
167
 
@@ -34,8 +34,8 @@ module Sass
34
34
  case text
35
35
  when Script::MATCH
36
36
  name = $1
37
- guarded = $3 == '||=' || $4
38
- val = Script::Parser.parse($3, @line, text.size - $3.size)
37
+ guarded = !!$3
38
+ val = Script::Parser.parse($2, @line, text.size - ($3 || '').size - $2.size)
39
39
 
40
40
  unless guarded && environment.var(name)
41
41
  environment.set_var(name, val.perform(environment))
@@ -982,14 +982,23 @@ module Sass::Script
982
982
  declare :mix, [:color_1, :color_2]
983
983
  declare :mix, [:color_1, :color_2, :weight]
984
984
 
985
- # Converts a color to grayscale.
986
- # This is identical to `desaturate(color, 100%)`.
985
+ # @overload grayscale(color)
986
+ # Converts a color to grayscale.
987
+ # This is identical to `desaturate(color, 100%)`.
987
988
  #
988
- # @param color [Color]
989
- # @return [Color]
990
- # @raise [ArgumentError] if `color` isn't a color
991
- # @see #desaturate
989
+ # @param color [Color]
990
+ # @return [Color]
991
+ # @raise [ArgumentError] if `color` isn't a color
992
+ # @see #desaturate
993
+ # @overload grayscale(number)
994
+ # Returns an unquoted string `grayscale(number)`, as though the function
995
+ # were not defined. This is for the `grayscale` function used in
996
+ # `-webkit-filter`.
997
+ #
998
+ # @param number [Number]
999
+ # @return [Sass::Script::String]
992
1000
  def grayscale(color)
1001
+ return Sass::Script::String.new("grayscale(#{color})") if color.is_a?(Sass::Script::Number)
993
1002
  desaturate color, Number.new(100)
994
1003
  end
995
1004
  declare :grayscale, [:color]
@@ -255,7 +255,7 @@ module Sass
255
255
  end
256
256
 
257
257
  def extend_directive
258
- node(Sass::Tree::ExtendNode.new(expr!(:selector)))
258
+ node(Sass::Tree::ExtendNode.new(expr!(:selector_sequence)))
259
259
  end
260
260
 
261
261
  def import_directive
@@ -318,7 +318,9 @@ WARNING
318
318
  def handle_import_loop!(node)
319
319
  msg = "An @import loop has been found:"
320
320
  files = @environment.stack.map {|s| s[:filename]}.compact
321
- raise Sass::SyntaxError.new("#{msg} #{node.filename} imports itself") if files.size == 1
321
+ if node.filename == node.imported_file.options[:filename]
322
+ raise Sass::SyntaxError.new("#{msg} #{node.filename} imports itself")
323
+ end
322
324
 
323
325
  files << node.filename << node.imported_file.options[:filename]
324
326
  msg << "\n" << Sass::Util.enum_cons(files, 2).map do |m1, m2|
@@ -771,6 +771,16 @@ SASS
771
771
  SCSS
772
772
  end
773
773
 
774
+ def test_comma_extendee
775
+ assert_renders <<SASS, <<SCSS
776
+ .baz
777
+ @extend .foo, .bar
778
+ SASS
779
+ .baz {
780
+ @extend .foo, .bar; }
781
+ SCSS
782
+ end
783
+
774
784
  def test_argless_mixin_definition
775
785
  assert_renders <<SASS, <<SCSS
776
786
  =foo-bar
@@ -2482,6 +2482,13 @@ a > b, c + d, :-moz-any(e, f, g)
2482
2482
  SASS
2483
2483
  end
2484
2484
 
2485
+ def test_comment_like_selector
2486
+ assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "": expected selector, was "/ foo"') {render(<<SASS)}
2487
+ / foo
2488
+ a: b
2489
+ SASS
2490
+ end
2491
+
2485
2492
  # Encodings
2486
2493
 
2487
2494
  unless Sass::Util.ruby1_8?
@@ -876,6 +876,20 @@ CSS
876
876
  SCSS
877
877
  end
878
878
 
879
+ def test_comma_extendee
880
+ assert_equal <<CSS, render(<<SCSS)
881
+ .foo, .baz {
882
+ a: b; }
883
+
884
+ .bar, .baz {
885
+ c: d; }
886
+ CSS
887
+ .foo {a: b}
888
+ .bar {c: d}
889
+ .baz {@extend .foo, .bar}
890
+ SCSS
891
+ end
892
+
879
893
  ## Long Extendees
880
894
 
881
895
  def test_long_extendee
@@ -772,6 +772,9 @@ class SassFunctionTest < Test::Unit::TestCase
772
772
  assert_equal("white", evaluate("grayscale(white)"))
773
773
  assert_equal("black", evaluate("grayscale(black)"))
774
774
  assert_equal("black", evaluate("grayscale($color: black)"))
775
+
776
+ assert_equal("grayscale(2)", evaluate("grayscale(2)"))
777
+ assert_equal("grayscale(-5px)", evaluate("grayscale(-5px)"))
775
778
  end
776
779
 
777
780
  def tets_grayscale_tests_types
@@ -110,6 +110,30 @@ CSS
110
110
  File.delete(tempfile_loc('bork1'))
111
111
  end
112
112
 
113
+ def test_single_level_import_loop
114
+ File.delete(tempfile_loc('single_import_loop'))
115
+ check_for_updates!
116
+ File.open(tempfile_loc('single_import_loop')) do |file|
117
+ assert_equal(<<CSS.strip, file.read.split("\n")[0...2].join("\n"))
118
+ /*
119
+ Sass::SyntaxError: An @import loop has been found: #{template_loc('single_import_loop')} imports itself
120
+ CSS
121
+ end
122
+ end
123
+
124
+ def test_double_level_import_loop
125
+ File.delete(tempfile_loc('double_import_loop1'))
126
+ check_for_updates!
127
+ File.open(tempfile_loc('double_import_loop1')) do |file|
128
+ assert_equal(<<CSS.strip, file.read.split("\n")[0...4].join("\n"))
129
+ /*
130
+ Sass::SyntaxError: An @import loop has been found:
131
+ #{template_loc('double_import_loop1')} imports #{template_loc('_double_import_loop2')}
132
+ #{template_loc('_double_import_loop2')} imports #{template_loc('double_import_loop1')}
133
+ CSS
134
+ end
135
+ end
136
+
113
137
  def test_nonfull_exception_handling
114
138
  old_full_exception = Sass::Plugin.options[:full_exception]
115
139
  Sass::Plugin.options[:full_exception] = false
@@ -0,0 +1 @@
1
+ @import "double_import_loop1"
@@ -0,0 +1 @@
1
+ @import "double_import_loop2"
@@ -0,0 +1 @@
1
+ @import "single_import_loop"
@@ -0,0 +1,14 @@
1
+ # -*- encoding: utf-8 -*-
2
+ $LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
3
+
4
+ require 'rubygems/dependency_installer'
5
+ require 'fssm'
6
+
7
+ # semi-elegant solution or hack? *shrug*
8
+ task :default do
9
+ name, version = FSSM::Support.optimal_backend_dependency
10
+ if name and version
11
+ installer = Gem::DependencyInstaller.new({:domain => :both, :env_shebang => true})
12
+ installer.install name, version
13
+ end
14
+ end
@@ -19,6 +19,9 @@ Gem::Specification.new do |s|
19
19
  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
20
20
  s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
21
21
  s.require_paths = ["lib"]
22
+
23
+ # s.extensions = 'ext/rakefile.rb'
22
24
 
25
+ s.add_development_dependency "rake"
23
26
  s.add_development_dependency "rspec", ">= 2.4.0"
24
27
  end
@@ -1,12 +1,62 @@
1
- dir = File.dirname(__FILE__)
1
+ dir = File.expand_path(File.dirname(__FILE__))
2
2
  $LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
3
3
 
4
- #noinspection ALL
5
- module FSSM
6
- FileNotFoundError = Class.new(StandardError)
7
- FileNotRealError = Class.new(StandardError)
8
- CallbackError = Class.new(StandardError)
4
+ require 'thread'
9
5
 
6
+ module FSSM
7
+
8
+ FSSMError = Class.new(StandardError)
9
+ FileNotFoundError = Class.new(FSSMError)
10
+ FileNotRealError = Class.new(FSSMError)
11
+ CallbackError = Class.new(FSSMError)
12
+
13
+ autoload :VERSION, 'fssm/version'
14
+ autoload :Pathname, 'fssm/pathname'
15
+ autoload :Support, 'fssm/support'
16
+ autoload :Tree, 'fssm/tree'
17
+ autoload :Path, 'fssm/path'
18
+ autoload :Monitor, 'fssm/monitor'
19
+
20
+ module State
21
+ autoload :Directory, 'fssm/state/directory'
22
+ autoload :File, 'fssm/state/file'
23
+ end
24
+
25
+ module Backends
26
+ autoload :Polling, 'fssm/backends/polling'
27
+ autoload :FSEvents, 'fssm/backends/fsevents'
28
+ autoload :RBFSEvent, 'fssm/backends/rbfsevent'
29
+ autoload :Inotify, 'fssm/backends/inotify'
30
+
31
+ class << self
32
+ def set_backend(const_symbol=nil, value=nil)
33
+ const_symbol ||= :Default
34
+ value ||= ::FSSM::Support.backend
35
+
36
+ if (value.is_a?(Symbol) || value.is_a?(String))
37
+ unless const_defined?(value)
38
+ raise NameError,
39
+ "uninitialized constant FSSM::Backends::#{value}"
40
+ end
41
+ value = const_get(value)
42
+ end
43
+
44
+ unless value.is_a?(Class)
45
+ raise ArgumentError,
46
+ "value must be a class or the symbol of an existing backend"
47
+ end
48
+
49
+ remove_const(const_symbol) if const_defined?(const_symbol)
50
+ const_set(const_symbol, value)
51
+ end
52
+
53
+ def const_missing(symbol)
54
+ symbol == :Default ? set_backend(symbol, FSSM::Support.backend) : super
55
+ end
56
+
57
+ end
58
+ end
59
+
10
60
  class << self
11
61
  def dbg(msg=nil)
12
62
  STDERR.puts("FSSM -> #{msg}")
@@ -20,18 +70,5 @@ module FSSM
20
70
  monitor.run
21
71
  end
22
72
  end
73
+
23
74
  end
24
-
25
- require 'thread'
26
-
27
- require 'fssm/version'
28
- require 'fssm/pathname'
29
- require 'fssm/support'
30
- require 'fssm/tree'
31
- require 'fssm/path'
32
- require 'fssm/state/directory'
33
- require 'fssm/state/file'
34
- require 'fssm/monitor'
35
-
36
- require "fssm/backends/#{FSSM::Support.backend.downcase}"
37
- FSSM::Backends::Default = FSSM::Backends.const_get(FSSM::Support.backend)
@@ -3,29 +3,24 @@ require 'rbconfig'
3
3
  module FSSM::Support
4
4
  class << self
5
5
  def usable_backend
6
- choice = case
7
- when mac? && !lion? && !jruby? && carbon_core?
8
- 'FSEvents'
9
- when mac? && rb_fsevent?
10
- 'RBFSEvent'
11
- when linux? && rb_inotify?
12
- 'Inotify'
13
- else
14
- 'Polling'
15
- end
16
-
17
- if (mac? || linux?) && choice == 'Polling'
18
- optimal = case
19
- when mac?
20
- 'rb-fsevent'
21
- when linux?
22
- 'rb-inotify'
23
- end
24
- FSSM.dbg("An optimized backend is available for this platform!")
25
- FSSM.dbg(" gem install #{optimal}")
6
+ case
7
+ when mac? && !lion? && !jruby? && carbon_core?
8
+ 'FSEvents'
9
+ when mac? && rb_fsevent?
10
+ 'RBFSEvent'
11
+ when linux? && rb_inotify?
12
+ 'Inotify'
13
+ else
14
+ 'Polling'
15
+ end
16
+ end
17
+
18
+ def optimal_backend_dependency
19
+ return case
20
+ when mac? then ['rb-fsevent', '>= 0.4.3.1']
21
+ when linux? then ['rb-inotify', '>= 0.8.8']
22
+ else [nil, nil]
26
23
  end
27
-
28
- choice
29
24
  end
30
25
 
31
26
  def backend
@@ -37,15 +32,15 @@ module FSSM::Support
37
32
  end
38
33
 
39
34
  def mac?
40
- Config::CONFIG['target_os'] =~ /darwin/i
35
+ RbConfig::CONFIG['target_os'] =~ /darwin/i
41
36
  end
42
37
 
43
38
  def lion?
44
- Config::CONFIG['target_os'] =~ /darwin11/i
39
+ RbConfig::CONFIG['target_os'] =~ /darwin11/i
45
40
  end
46
41
 
47
42
  def linux?
48
- Config::CONFIG['target_os'] =~ /linux/i
43
+ RbConfig::CONFIG['target_os'] =~ /linux/i
49
44
  end
50
45
 
51
46
  def carbon_core?
@@ -1,3 +1,3 @@
1
1
  module FSSM
2
- VERSION = "0.2.7"
2
+ VERSION = "0.2.8.1"
3
3
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sass
3
3
  version: !ruby/object:Gem::Version
4
- hash: 31
5
- prerelease:
4
+ hash: 29
5
+ prerelease: false
6
6
  segments:
7
7
  - 3
8
8
  - 1
9
- - 14
10
- version: 3.1.14
9
+ - 15
10
+ version: 3.1.15
11
11
  platform: ruby
12
12
  authors:
13
13
  - Nathan Weizenbaum
@@ -17,7 +17,8 @@ autorequire:
17
17
  bindir: bin
18
18
  cert_chain: []
19
19
 
20
- date: 2012-02-05 00:00:00 Z
20
+ date: 2012-02-09 00:00:00 -08:00
21
+ default_executable:
21
22
  dependencies:
22
23
  - !ruby/object:Gem::Dependency
23
24
  name: yard
@@ -63,255 +64,260 @@ extra_rdoc_files: []
63
64
 
64
65
  files:
65
66
  - rails/init.rb
66
- - lib/sass/util/multibyte_string_scanner.rb
67
- - lib/sass/util/subset_map.rb
68
- - lib/sass/shared.rb
69
- - lib/sass/error.rb
70
- - lib/sass/importers.rb
71
- - lib/sass/cache_stores/filesystem.rb
72
- - lib/sass/cache_stores/chain.rb
73
- - lib/sass/cache_stores/memory.rb
74
- - lib/sass/cache_stores/null.rb
75
- - lib/sass/cache_stores/base.rb
76
- - lib/sass/environment.rb
77
- - lib/sass/plugin/rack.rb
78
- - lib/sass/plugin/staleness_checker.rb
67
+ - lib/sass.rb
68
+ - lib/sass/cache_stores.rb
79
69
  - lib/sass/plugin/compiler.rb
80
- - lib/sass/plugin/configuration.rb
81
70
  - lib/sass/plugin/merb.rb
71
+ - lib/sass/plugin/staleness_checker.rb
72
+ - lib/sass/plugin/rack.rb
82
73
  - lib/sass/plugin/rails.rb
74
+ - lib/sass/plugin/configuration.rb
83
75
  - lib/sass/plugin/generic.rb
84
- - lib/sass/railtie.rb
85
- - lib/sass/logger.rb
86
- - lib/sass/callbacks.rb
87
- - lib/sass/script/string.rb
88
- - lib/sass/script/node.rb
89
- - lib/sass/script/lexer.rb
90
- - lib/sass/script/string_interpolation.rb
91
- - lib/sass/script/css_parser.rb
92
- - lib/sass/script/variable.rb
93
- - lib/sass/script/literal.rb
94
- - lib/sass/script/bool.rb
95
- - lib/sass/script/number.rb
96
- - lib/sass/script/unary_operation.rb
97
- - lib/sass/script/css_lexer.rb
98
- - lib/sass/script/operation.rb
99
- - lib/sass/script/parser.rb
100
- - lib/sass/script/funcall.rb
101
- - lib/sass/script/color.rb
102
- - lib/sass/script/interpolation.rb
103
- - lib/sass/script/list.rb
104
- - lib/sass/script/functions.rb
105
76
  - lib/sass/version.rb
106
- - lib/sass/tree/visitors/deep_copy.rb
107
- - lib/sass/tree/visitors/set_options.rb
108
- - lib/sass/tree/visitors/cssize.rb
109
- - lib/sass/tree/visitors/to_css.rb
110
- - lib/sass/tree/visitors/perform.rb
111
- - lib/sass/tree/visitors/base.rb
112
- - lib/sass/tree/visitors/check_nesting.rb
113
- - lib/sass/tree/visitors/convert.rb
77
+ - lib/sass/cache_stores/chain.rb
78
+ - lib/sass/cache_stores/memory.rb
79
+ - lib/sass/cache_stores/null.rb
80
+ - lib/sass/cache_stores/filesystem.rb
81
+ - lib/sass/cache_stores/base.rb
82
+ - lib/sass/shared.rb
83
+ - lib/sass/repl.rb
84
+ - lib/sass/error.rb
85
+ - lib/sass/tree/import_node.rb
86
+ - lib/sass/tree/return_node.rb
114
87
  - lib/sass/tree/root_node.rb
115
- - lib/sass/tree/node.rb
116
88
  - lib/sass/tree/if_node.rb
117
89
  - lib/sass/tree/charset_node.rb
118
- - lib/sass/tree/extend_node.rb
119
- - lib/sass/tree/rule_node.rb
120
- - lib/sass/tree/mixin_def_node.rb
121
- - lib/sass/tree/return_node.rb
122
- - lib/sass/tree/mixin_node.rb
123
- - lib/sass/tree/prop_node.rb
124
- - lib/sass/tree/warn_node.rb
90
+ - lib/sass/tree/function_node.rb
91
+ - lib/sass/tree/media_node.rb
92
+ - lib/sass/tree/while_node.rb
93
+ - lib/sass/tree/for_node.rb
125
94
  - lib/sass/tree/directive_node.rb
95
+ - lib/sass/tree/rule_node.rb
126
96
  - lib/sass/tree/each_node.rb
97
+ - lib/sass/tree/node.rb
98
+ - lib/sass/tree/mixin_node.rb
99
+ - lib/sass/tree/extend_node.rb
100
+ - lib/sass/tree/mixin_def_node.rb
101
+ - lib/sass/tree/visitors/perform.rb
102
+ - lib/sass/tree/visitors/to_css.rb
103
+ - lib/sass/tree/visitors/check_nesting.rb
104
+ - lib/sass/tree/visitors/deep_copy.rb
105
+ - lib/sass/tree/visitors/set_options.rb
106
+ - lib/sass/tree/visitors/cssize.rb
107
+ - lib/sass/tree/visitors/convert.rb
108
+ - lib/sass/tree/visitors/base.rb
127
109
  - lib/sass/tree/comment_node.rb
128
- - lib/sass/tree/media_node.rb
129
- - lib/sass/tree/variable_node.rb
130
- - lib/sass/tree/function_node.rb
110
+ - lib/sass/tree/warn_node.rb
131
111
  - lib/sass/tree/debug_node.rb
132
- - lib/sass/tree/import_node.rb
133
- - lib/sass/tree/while_node.rb
134
- - lib/sass/tree/for_node.rb
112
+ - lib/sass/tree/prop_node.rb
113
+ - lib/sass/tree/variable_node.rb
114
+ - lib/sass/engine.rb
115
+ - lib/sass/plugin.rb
116
+ - lib/sass/root.rb
117
+ - lib/sass/importers.rb
118
+ - lib/sass/logger.rb
119
+ - lib/sass/util/multibyte_string_scanner.rb
120
+ - lib/sass/util/subset_map.rb
121
+ - lib/sass/scss.rb
122
+ - lib/sass/scss/static_parser.rb
123
+ - lib/sass/scss/parser.rb
135
124
  - lib/sass/scss/sass_parser.rb
136
- - lib/sass/scss/script_parser.rb
137
- - lib/sass/scss/css_parser.rb
138
125
  - lib/sass/scss/script_lexer.rb
139
126
  - lib/sass/scss/rx.rb
140
- - lib/sass/scss/parser.rb
141
- - lib/sass/scss/static_parser.rb
127
+ - lib/sass/scss/script_parser.rb
128
+ - lib/sass/scss/css_parser.rb
129
+ - lib/sass/logger/log_level.rb
130
+ - lib/sass/logger/base.rb
131
+ - lib/sass/css.rb
132
+ - lib/sass/script.rb
133
+ - lib/sass/util.rb
134
+ - lib/sass/importers/filesystem.rb
135
+ - lib/sass/importers/base.rb
136
+ - lib/sass/script/color.rb
137
+ - lib/sass/script/variable.rb
138
+ - lib/sass/script/operation.rb
139
+ - lib/sass/script/funcall.rb
140
+ - lib/sass/script/literal.rb
141
+ - lib/sass/script/parser.rb
142
+ - lib/sass/script/functions.rb
143
+ - lib/sass/script/number.rb
144
+ - lib/sass/script/string_interpolation.rb
145
+ - lib/sass/script/interpolation.rb
146
+ - lib/sass/script/node.rb
147
+ - lib/sass/script/bool.rb
148
+ - lib/sass/script/unary_operation.rb
149
+ - lib/sass/script/lexer.rb
150
+ - lib/sass/script/list.rb
151
+ - lib/sass/script/css_lexer.rb
152
+ - lib/sass/script/string.rb
153
+ - lib/sass/script/css_parser.rb
154
+ - lib/sass/selector.rb
142
155
  - lib/sass/less.rb
143
- - lib/sass/selector/simple_sequence.rb
156
+ - lib/sass/callbacks.rb
144
157
  - lib/sass/selector/simple.rb
145
158
  - lib/sass/selector/sequence.rb
146
159
  - lib/sass/selector/abstract_sequence.rb
147
160
  - lib/sass/selector/comma_sequence.rb
148
- - lib/sass/root.rb
149
- - lib/sass/importers/filesystem.rb
150
- - lib/sass/importers/base.rb
151
- - lib/sass/css.rb
152
- - lib/sass/selector.rb
153
- - lib/sass/engine.rb
154
- - lib/sass/plugin.rb
155
- - lib/sass/logger/log_level.rb
156
- - lib/sass/logger/base.rb
157
- - lib/sass/repl.rb
158
- - lib/sass/scss.rb
161
+ - lib/sass/selector/simple_sequence.rb
162
+ - lib/sass/railtie.rb
163
+ - lib/sass/environment.rb
159
164
  - lib/sass/exec.rb
160
- - lib/sass/util.rb
161
- - lib/sass/cache_stores.rb
162
- - lib/sass/script.rb
163
- - lib/sass.rb
164
- - vendor/fssm/lib/fssm.rb
165
- - vendor/fssm/lib/fssm/path.rb
166
- - vendor/fssm/lib/fssm/tree.rb
167
- - vendor/fssm/lib/fssm/monitor.rb
168
- - vendor/fssm/lib/fssm/support.rb
169
- - vendor/fssm/lib/fssm/pathname.rb
165
+ - vendor/fssm/README.markdown
166
+ - vendor/fssm/ext/rakefile.rb
167
+ - vendor/fssm/example.rb
168
+ - vendor/fssm/Gemfile
170
169
  - vendor/fssm/lib/fssm/version.rb
170
+ - vendor/fssm/lib/fssm/pathname.rb
171
171
  - vendor/fssm/lib/fssm/state/file.rb
172
172
  - vendor/fssm/lib/fssm/state/directory.rb
173
- - vendor/fssm/lib/fssm/backends/fsevents.rb
173
+ - vendor/fssm/lib/fssm/monitor.rb
174
+ - vendor/fssm/lib/fssm/tree.rb
175
+ - vendor/fssm/lib/fssm/support.rb
176
+ - vendor/fssm/lib/fssm/backends/rubycocoa/fsevents.rb
174
177
  - vendor/fssm/lib/fssm/backends/polling.rb
175
178
  - vendor/fssm/lib/fssm/backends/inotify.rb
176
- - vendor/fssm/lib/fssm/backends/rubycocoa/fsevents.rb
179
+ - vendor/fssm/lib/fssm/backends/fsevents.rb
177
180
  - vendor/fssm/lib/fssm/backends/rbfsevent.rb
178
- - vendor/fssm/example.rb
179
- - vendor/fssm/LICENSE
180
- - vendor/fssm/README.markdown
181
- - vendor/fssm/Rakefile
182
- - vendor/fssm/profile/prof-fssm-pathname.html
183
- - vendor/fssm/profile/prof-pathname.rb
181
+ - vendor/fssm/lib/fssm/path.rb
182
+ - vendor/fssm/lib/fssm.rb
184
183
  - vendor/fssm/profile/prof-plain-pathname.html
185
- - vendor/fssm/profile/prof-pathname-rubinius.rb
186
- - vendor/fssm/profile/prof-cache.rb
184
+ - vendor/fssm/profile/prof-pathname.rb
187
185
  - vendor/fssm/profile/prof.html
188
- - vendor/fssm/Gemfile
186
+ - vendor/fssm/profile/prof-cache.rb
187
+ - vendor/fssm/profile/prof-fssm-pathname.html
188
+ - vendor/fssm/profile/prof-pathname-rubinius.rb
189
189
  - vendor/fssm/fssm.gemspec
190
- - vendor/fssm/spec/spec_helper.rb
190
+ - vendor/fssm/Rakefile
191
+ - vendor/fssm/LICENSE
192
+ - vendor/fssm/spec/count_down_latch.rb
191
193
  - vendor/fssm/spec/monitor_spec.rb
192
194
  - vendor/fssm/spec/path_spec.rb
193
- - vendor/fssm/spec/count_down_latch.rb
194
- - vendor/fssm/spec/root/duck/quack.txt
195
195
  - vendor/fssm/spec/root/moo/cow.txt
196
- - vendor/fssm/spec/root/file.rb
197
- - vendor/fssm/spec/root/file.css
198
196
  - vendor/fssm/spec/root/file.yml
199
- - bin/sass
200
- - bin/scss
197
+ - vendor/fssm/spec/root/file.css
198
+ - vendor/fssm/spec/root/file.rb
199
+ - vendor/fssm/spec/root/duck/quack.txt
200
+ - vendor/fssm/spec/spec_helper.rb
201
201
  - bin/sass-convert
202
- - test/sass/plugin_test.rb
203
- - test/sass/util/subset_map_test.rb
204
- - test/sass/util/multibyte_string_scanner_test.rb
202
+ - bin/scss
203
+ - bin/sass
204
+ - test/Gemfile
205
+ - test/Gemfile.lock
206
+ - test/test_helper.rb
207
+ - test/sass/engine_test.rb
208
+ - test/sass/functions_test.rb
209
+ - test/sass/fixtures/test_staleness_check_across_importers.scss
210
+ - test/sass/fixtures/test_staleness_check_across_importers.css
211
+ - test/sass/data/hsl-rgb.txt
212
+ - test/sass/extend_test.rb
213
+ - test/sass/logger_test.rb
214
+ - test/sass/css2sass_test.rb
205
215
  - test/sass/templates/basic.sass
206
- - test/sass/templates/line_numbers.sass
207
- - test/sass/templates/nested_bork2.sass
208
- - test/sass/templates/_imported_charset_utf8.sass
209
- - test/sass/templates/mixin_bork.sass
210
- - test/sass/templates/import_charset.sass
216
+ - test/sass/templates/mixins.sass
217
+ - test/sass/templates/options.sass
218
+ - test/sass/templates/scss_import.scss
219
+ - test/sass/templates/subdir/subdir.sass
220
+ - test/sass/templates/subdir/nested_subdir/_nested_partial.sass
221
+ - test/sass/templates/subdir/nested_subdir/nested_subdir.sass
222
+ - test/sass/templates/alt.sass
223
+ - test/sass/templates/nested_bork1.sass
224
+ - test/sass/templates/complex.sass
225
+ - test/sass/templates/units.sass
226
+ - test/sass/templates/nested_import.sass
227
+ - test/sass/templates/importee.sass
211
228
  - test/sass/templates/importee.less
212
- - test/sass/templates/warn.sass
213
- - test/sass/templates/parent_ref.sass
214
- - test/sass/templates/nested_bork3.sass
215
- - test/sass/templates/script.sass
216
- - test/sass/templates/import.sass
217
229
  - test/sass/templates/scss_importee.scss
218
- - test/sass/templates/bork1.sass
219
- - test/sass/templates/compressed.sass
220
- - test/sass/templates/importee.sass
221
- - test/sass/templates/_partial.sass
222
- - test/sass/templates/units.sass
223
- - test/sass/templates/nested_bork1.sass
230
+ - test/sass/templates/line_numbers.sass
231
+ - test/sass/templates/expanded.sass
224
232
  - test/sass/templates/bork3.sass
225
- - test/sass/templates/nested_mixin_bork.sass
226
- - test/sass/templates/complex.sass
227
- - test/sass/templates/if.sass
233
+ - test/sass/templates/bork5.sass
228
234
  - test/sass/templates/nested_bork5.sass
235
+ - test/sass/templates/warn_imported.sass
229
236
  - test/sass/templates/import_charset_ibm866.sass
230
- - test/sass/templates/alt.sass
231
- - test/sass/templates/scss_import.scss
237
+ - test/sass/templates/bork1.sass
238
+ - test/sass/templates/warn.sass
239
+ - test/sass/templates/bork2.sass
240
+ - test/sass/templates/nested.sass
232
241
  - test/sass/templates/compact.sass
242
+ - test/sass/templates/single_import_loop.sass
243
+ - test/sass/templates/multiline.sass
233
244
  - test/sass/templates/_imported_charset_ibm866.sass
234
- - test/sass/templates/nested.sass
235
- - test/sass/templates/subdir/subdir.sass
236
- - test/sass/templates/subdir/nested_subdir/_nested_partial.sass
237
- - test/sass/templates/subdir/nested_subdir/nested_subdir.sass
238
- - test/sass/templates/warn_imported.sass
239
- - test/sass/templates/options.sass
245
+ - test/sass/templates/double_import_loop1.sass
246
+ - test/sass/templates/_double_import_loop2.sass
247
+ - test/sass/templates/import_charset.sass
248
+ - test/sass/templates/parent_ref.sass
249
+ - test/sass/templates/import.sass
250
+ - test/sass/templates/nested_bork3.sass
251
+ - test/sass/templates/script.sass
240
252
  - test/sass/templates/bork4.sass
241
- - test/sass/templates/bork5.sass
253
+ - test/sass/templates/if.sass
254
+ - test/sass/templates/_partial.sass
255
+ - test/sass/templates/nested_mixin_bork.sass
242
256
  - test/sass/templates/import_charset_1_8.sass
257
+ - test/sass/templates/nested_bork2.sass
258
+ - test/sass/templates/mixin_bork.sass
259
+ - test/sass/templates/compressed.sass
243
260
  - test/sass/templates/nested_bork4.sass
244
- - test/sass/templates/nested_import.sass
245
- - test/sass/templates/multiline.sass
246
- - test/sass/templates/expanded.sass
247
- - test/sass/templates/mixins.sass
248
- - test/sass/templates/bork2.sass
249
- - test/sass/script_conversion_test.rb
250
- - test/sass/mock_importer.rb
251
- - test/sass/test_helper.rb
252
- - test/sass/logger_test.rb
253
- - test/sass/fixtures/test_staleness_check_across_importers.css
254
- - test/sass/fixtures/test_staleness_check_across_importers.scss
255
- - test/sass/functions_test.rb
256
- - test/sass/util_test.rb
257
- - test/sass/less_conversion_test.rb
258
- - test/sass/more_results/more1.css
259
- - test/sass/more_results/more1_with_line_comments.css
260
- - test/sass/more_results/more_import.css
261
- - test/sass/data/hsl-rgb.txt
262
- - test/sass/scss/test_helper.rb
263
- - test/sass/scss/css_test.rb
264
- - test/sass/scss/rx_test.rb
265
- - test/sass/scss/scss_test.rb
266
- - test/sass/script_test.rb
267
- - test/sass/importer_test.rb
268
- - test/sass/cache_test.rb
261
+ - test/sass/templates/_imported_charset_utf8.sass
269
262
  - test/sass/conversion_test.rb
270
- - test/sass/more_templates/more1.sass
271
- - test/sass/more_templates/_more_partial.sass
272
- - test/sass/more_templates/more_import.sass
273
- - test/sass/extend_test.rb
274
- - test/sass/engine_test.rb
275
- - test/sass/css2sass_test.rb
263
+ - test/sass/script_test.rb
264
+ - test/sass/util/subset_map_test.rb
265
+ - test/sass/util/multibyte_string_scanner_test.rb
276
266
  - test/sass/callbacks_test.rb
277
- - test/sass/results/units.css
278
- - test/sass/results/alt.css
279
- - test/sass/results/scss_importee.css
280
- - test/sass/results/line_numbers.css
281
- - test/sass/results/import_charset.css
267
+ - test/sass/importer_test.rb
268
+ - test/sass/scss/css_test.rb
269
+ - test/sass/scss/scss_test.rb
270
+ - test/sass/scss/rx_test.rb
271
+ - test/sass/scss/test_helper.rb
272
+ - test/sass/util_test.rb
273
+ - test/sass/results/mixins.css
274
+ - test/sass/results/warn_imported.css
282
275
  - test/sass/results/expanded.css
283
- - test/sass/results/warn.css
284
- - test/sass/results/script.css
285
- - test/sass/results/if.css
286
- - test/sass/results/scss_import.css
287
- - test/sass/results/nested.css
276
+ - test/sass/results/compact.css
277
+ - test/sass/results/compressed.css
278
+ - test/sass/results/scss_importee.css
279
+ - test/sass/results/basic.css
280
+ - test/sass/results/subdir/nested_subdir/nested_subdir.css
281
+ - test/sass/results/subdir/subdir.css
288
282
  - test/sass/results/options.css
289
- - test/sass/results/import_charset_1_8.css
283
+ - test/sass/results/scss_import.css
284
+ - test/sass/results/units.css
290
285
  - test/sass/results/parent_ref.css
286
+ - test/sass/results/script.css
287
+ - test/sass/results/complex.css
288
+ - test/sass/results/import_charset.css
289
+ - test/sass/results/alt.css
290
+ - test/sass/results/if.css
291
291
  - test/sass/results/multiline.css
292
+ - test/sass/results/import_charset_1_8.css
293
+ - test/sass/results/warn.css
292
294
  - test/sass/results/import_charset_ibm866.css
293
- - test/sass/results/subdir/subdir.css
294
- - test/sass/results/subdir/nested_subdir/nested_subdir.css
295
- - test/sass/results/warn_imported.css
296
- - test/sass/results/compact.css
297
- - test/sass/results/mixins.css
298
- - test/sass/results/complex.css
299
- - test/sass/results/compressed.css
300
295
  - test/sass/results/import.css
301
- - test/sass/results/basic.css
302
- - test/test_helper.rb
303
- - test/Gemfile.lock
304
- - test/Gemfile
296
+ - test/sass/results/nested.css
297
+ - test/sass/results/line_numbers.css
298
+ - test/sass/test_helper.rb
299
+ - test/sass/more_templates/_more_partial.sass
300
+ - test/sass/more_templates/more_import.sass
301
+ - test/sass/more_templates/more1.sass
302
+ - test/sass/script_conversion_test.rb
303
+ - test/sass/less_conversion_test.rb
304
+ - test/sass/more_results/more1.css
305
+ - test/sass/more_results/more1_with_line_comments.css
306
+ - test/sass/more_results/more_import.css
307
+ - test/sass/mock_importer.rb
308
+ - test/sass/cache_test.rb
309
+ - test/sass/plugin_test.rb
305
310
  - extra/update_watch.rb
306
311
  - Rakefile
307
312
  - init.rb
308
313
  - .yardopts
309
- - MIT-LICENSE
314
+ - README.md
315
+ - VERSION_NAME
310
316
  - REVISION
317
+ - MIT-LICENSE
311
318
  - VERSION
312
- - VERSION_NAME
313
- - README.md
314
319
  - CONTRIBUTING
320
+ has_rdoc: false
315
321
  homepage: http://sass-lang.com/
316
322
  licenses: []
317
323
 
@@ -343,27 +349,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
343
349
  requirements: []
344
350
 
345
351
  rubyforge_project: sass
346
- rubygems_version: 1.8.15
352
+ rubygems_version: 1.3.7
347
353
  signing_key:
348
354
  specification_version: 3
349
355
  summary: A powerful but elegant CSS compiler that makes CSS fun again.
350
356
  test_files:
351
- - test/sass/plugin_test.rb
357
+ - test/sass/engine_test.rb
358
+ - test/sass/functions_test.rb
359
+ - test/sass/extend_test.rb
360
+ - test/sass/logger_test.rb
361
+ - test/sass/css2sass_test.rb
362
+ - test/sass/conversion_test.rb
363
+ - test/sass/script_test.rb
352
364
  - test/sass/util/subset_map_test.rb
353
365
  - test/sass/util/multibyte_string_scanner_test.rb
354
- - test/sass/script_conversion_test.rb
355
- - test/sass/logger_test.rb
356
- - test/sass/functions_test.rb
357
- - test/sass/util_test.rb
358
- - test/sass/less_conversion_test.rb
366
+ - test/sass/callbacks_test.rb
367
+ - test/sass/importer_test.rb
359
368
  - test/sass/scss/css_test.rb
360
- - test/sass/scss/rx_test.rb
361
369
  - test/sass/scss/scss_test.rb
362
- - test/sass/script_test.rb
363
- - test/sass/importer_test.rb
370
+ - test/sass/scss/rx_test.rb
371
+ - test/sass/util_test.rb
372
+ - test/sass/script_conversion_test.rb
373
+ - test/sass/less_conversion_test.rb
364
374
  - test/sass/cache_test.rb
365
- - test/sass/conversion_test.rb
366
- - test/sass/extend_test.rb
367
- - test/sass/engine_test.rb
368
- - test/sass/css2sass_test.rb
369
- - test/sass/callbacks_test.rb
375
+ - test/sass/plugin_test.rb