sass 3.1.0.alpha.47 → 3.1.0.alpha.48

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.47
+3.1.0.alpha.48

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.47
+3.1.0.alpha.48

data/lib/sass/exec.rb

@@ -231,7 +231,7 @@ END
         opts.on('-q', '--quiet', 'Silence warnings and status messages during compilation.') do
           @options[:for_engine][:quiet] = true
         end
-        opts.on('--compass', 'Loads compass.') do
+        opts.on('--compass', 'Make Compass imports available and load project configuration.') do
           @options[:compass] = true
         end
         opts.on('-g', '--debug-info',

data/lib/sass/tree/for_node.rb

@@ -51,17 +51,5 @@ module Sass::Tree
       end
       children
     end
-
-    # Returns an error message if the given child node is invalid,
-    # and false otherwise.
-    #
-    # {ExtendNode}s are valid within {ForNode}s.
-    #
-    # @param child [Tree::Node] A potential child node.
-    # @return [Boolean, String] Whether or not the child node is valid,
-    #   as well as the error message to display if it is invalid
-    def invalid_child?(child)
-      super unless child.is_a?(ExtendNode)
-    end
   end
 end

data/lib/sass/tree/if_node.rb

@@ -84,17 +84,5 @@ module Sass::Tree
       return @else.perform(environment) if @else
       []
     end
-
-    # Returns an error message if the given child node is invalid,
-    # and false otherwise.
-    #
-    # {ExtendNode}s are valid within {IfNode}s.
-    #
-    # @param child [Tree::Node] A potential child node.
-    # @return [Boolean, String] Whether or not the child node is valid,
-    #   as well as the error message to display if it is invalid
-    def invalid_child?(child)
-      super unless child.is_a?(ExtendNode)
-    end
   end
 end

data/lib/sass/tree/mixin_def_node.rb

@@ -43,18 +43,6 @@ module Sass
         environment.set_mixin(@name, Sass::Mixin.new(@name, @args, environment, children))
         []
       end
-
-      # Returns an error message if the given child node is invalid,
-      # and false otherwise.
-      #
-      # {ExtendNode}s are valid within {MixinDefNode}s.
-      #
-      # @param child [Tree::Node] A potential child node.
-      # @return [Boolean, String] Whether or not the child node is valid,
-      #   as well as the error message to display if it is invalid
-      def invalid_child?(child)
-        super unless child.is_a?(ExtendNode)
-      end
     end
   end
 end

data/lib/sass/tree/mixin_node.rb

@@ -31,18 +31,6 @@ module Sass::Tree
 
     protected
 
-    # Returns an error message if the given child node is invalid,
-    # and false otherwise.
-    #
-    # {ExtendNode}s are valid within {MixinNode}s.
-    #
-    # @param child [Tree::Node] A potential child node
-    # @return [Boolean, String] Whether or not the child node is valid,
-    #   as well as the error message to display if it is invalid
-    def invalid_child?(child)
-      super unless child.is_a?(ExtendNode)
-    end
-
     # @see Node#to_src
     def to_src(tabs, opts, fmt)
       unless @args.empty? && @keywords.empty?

data/lib/sass/tree/node.rb

@@ -340,6 +340,7 @@ module Sass
       # @see #perform
       def perform!(environment)
         self.children = perform_children(Environment.new(environment))
+        self.children.each {|c| check_child! c}
       end
 
       # Non-destructively runs \{#perform} on all children of the current node.
@@ -393,8 +394,6 @@ module Sass
           "Mixins may only be defined at the root of a document."
         when Tree::ImportNode
           "Import directives may only be used at the root of a document."
-        when Tree::ExtendNode
-          "Extend directives may only be used within rules."
         end
       end
 

data/lib/sass/tree/root_node.rb

@@ -148,9 +148,15 @@ module Sass
       #
       # @see Node#invalid_child?
       def invalid_child?(child)
-        return unless child.is_a?(Tree::PropNode)
-        "Properties aren't allowed at the root of a document." +
-          child.pseudo_class_selector_message
+        case child
+        when Tree::ExtendNode
+          "Extend directives may only be used within rules."
+        when Tree::PropNode
+          "Properties aren't allowed at the root of a document." +
+            child.pseudo_class_selector_message
+        else
+          return
+        end
       end
     end
   end

data/lib/sass/tree/rule_node.rb

@@ -225,18 +225,6 @@ module Sass::Tree
       super
     end
 
-    # Returns an error message if the given child node is invalid,
-    # and false otherwise.
-    #
-    # {ExtendNode}s are valid within {RuleNode}s.
-    #
-    # @param child [Tree::Node] A potential child node.
-    # @return [Boolean, String] Whether or not the child node is valid,
-    #   as well as the error message to display if it is invalid
-    def invalid_child?(child)
-      super unless child.is_a?(ExtendNode)
-    end
-
     # A hash that will be associated with this rule in the CSS document
     # if the {file:SASS_REFERENCE.md#debug_info-option `:debug_info` option} is enabled.
     # This data is used by e.g. [the FireSass Firebug extension](https://addons.mozilla.org/en-US/firefox/addon/103988).

data/lib/sass/tree/while_node.rb

@@ -32,17 +32,5 @@ module Sass::Tree
       end
       children
     end
-
-    # Returns an error message if the given child node is invalid,
-    # and false otherwise.
-    #
-    # {ExtendNode}s are valid within {WhileNode}s.
-    #
-    # @param child [Tree::Node] A potential child node.
-    # @return [Boolean, String] Whether or not the child node is valid,
-    #   as well as the error message to display if it is invalid
-    def invalid_child?(child)
-      super unless child.is_a?(ExtendNode)
-    end
   end
 end

data/test/sass/engine_test.rb

@@ -123,6 +123,10 @@ MSG
     "a\n  b: foo($var: a, $var: b)" => 'Keyword argument "$var" passed more than once',
     "a\n  b: foo($var-var: a, $var_var: b)" => 'Keyword argument "$var-var" passed more than once',
     "a\n  b: foo($var_var: a, $var-var: b)" => 'Keyword argument "$var_var" passed more than once',
+    "@if foo\n  @extend .bar" => ["Extend directives may only be used within rules.", 2],
+    "$var: true\n@while $var\n  @extend .bar\n  $var: false" => ["Extend directives may only be used within rules.", 3],
+    "@for $i from 0 to 1\n  @extend .bar" => ["Extend directives may only be used within rules.", 2],
+    "@mixin foo\n  @extend .bar\n@include foo" => ["Extend directives may only be used within rules.", 2],
 
     # Regression tests
     "a\n  b:\n    c\n    d" => ["Illegal nesting: Only properties may be nested beneath properties.", 3],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.47
+  version: 3.1.0.alpha.48
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-29 00:00:00 -05:00
+date: 2010-12-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency