radiantcms-couchrest_model 0.1.3 → 0.1.4

data/vendor/plugins/haml/lib/sass/tree/prop_node.rb

@@ -3,54 +3,24 @@ module Sass::Tree
   #
   # @see Sass::Tree
   class PropNode < Node
-    # The name of the property,
-    # interspersed with {Sass::Script::Node}s
-    # representing `#{}`-interpolation.
-    # Any adjacent strings will be merged together.
-    #
-    # @return [Array<String, Sass::Script::Node>]
-    attr_accessor :name
-
-    # The name of the property
-    # after any interpolated SassScript has been resolved.
-    # Only set once \{Tree::Node#perform} has been called.
+    # The name of the property.
     #
     # @return [String]
-    attr_accessor :resolved_name
+    attr_accessor :name
 
-    # The value of the property.
+    # The value of the property,
+    # either a plain string or a SassScript parse tree.
     #
-    # @return [Sass::Script::Node]
+    # @return [String, Script::Node]
     attr_accessor :value
 
-    # The value of the property
-    # after any interpolated SassScript has been resolved.
-    # Only set once \{Tree::Node#perform} has been called.
-    #
-    # @return [String]
-    attr_accessor :resolved_value
-
-    # How deep this property is indented
-    # relative to a normal property.
-    # This is only greater than 0 in the case that:
-    #
-    # * This node is in a CSS tree
-    # * The style is :nested
-    # * This is a child property of another property
-    # * The parent property has a value, and thus will be rendered
-    #
-    # @return [Fixnum]
-    attr_accessor :tabs
-
-    # @param name [Array<String, Sass::Script::Node>] See \{#name}
-    # @param value [Sass::Script::Node] See \{#value}
+    # @param name [String] See \{#name}
+    # @param value [String] See \{#value}
     # @param prop_syntax [Symbol] `:new` if this property uses `a: b`-style syntax,
     #   `:old` if it uses `:a b`-style syntax
     def initialize(name, value, prop_syntax)
-      @name = Haml::Util.strip_string_array(
-        Haml::Util.merge_adjacent_strings(name))
+      @name = name
       @value = value
-      @tabs = 0
       @prop_syntax = prop_syntax
       super()
     end
@@ -64,78 +34,69 @@ module Sass::Tree
       self.class == other.class && name == other.name && value == other.value && super
     end
 
-    # Returns a appropriate message indicating how to escape pseudo-class selectors.
-    # This only applies for old-style properties with no value,
-    # so returns the empty string if this is new-style.
-    #
-    # @return [String] The message
-    def pseudo_class_selector_message
-      return "" if @prop_syntax == :new || !value.is_a?(Sass::Script::String) || !value.value.empty?
-      "\nIf #{declaration.dump} should be a selector, use \"\\#{declaration}\" instead."
-    end
-
-    protected
-
-    # @see Node#to_src
-    def to_src(tabs, opts, fmt)
-      res = declaration(tabs, opts, fmt)
-      return res + "#{semi fmt}\n" if children.empty?
-      res + children_to_src(tabs, opts, fmt).rstrip + semi(fmt) + "\n"
-    end
-
     # Computes the CSS for the property.
     #
     # @param tabs [Fixnum] The level of indentation for the CSS
+    # @param parent_name [String] The name of the parent property (e.g. `text`) or nil
     # @return [String] The resulting CSS
-    def _to_s(tabs)
-      to_return = '  ' * (tabs - 1 + self.tabs) + resolved_name + ":" +
-        (style == :compressed ? '' : ' ') + resolved_value + (style == :compressed ? "" : ";")
-    end
-
-    # Converts nested properties into flat properties.
-    #
-    # @param extends [Haml::Util::SubsetMap{Selector::Simple => Selector::Sequence}]
-    #   The extensions defined for this tree
-    # @param parent [PropNode, nil] The parent node of this node,
-    #   or nil if the parent isn't a {PropNode}
     # @raise [Sass::SyntaxError] if the property uses invalid syntax
-    def _cssize(extends, parent)
-      node = super
-      result = node.children.dup
-      if !node.resolved_value.empty? || node.children.empty?
-        node.send(:check!)
-        result.unshift(node)
+    def to_s(tabs, parent_name = nil)
+      if @options[:property_syntax] == :old && @prop_syntax == :new
+        raise Sass::SyntaxError.new("Illegal property syntax: can't use new syntax when :property_syntax => :old is set.", @line)
+      elsif @options[:property_syntax] == :new && @prop_syntax == :old
+        raise Sass::SyntaxError.new("Illegal property syntax: can't use old syntax when :property_syntax => :new is set.", @line)
+      end
+
+      if value[-1] == ?;
+        raise Sass::SyntaxError.new("Invalid property: #{declaration.dump} (no \";\" required at end-of-line).", @line)
+      end
+      real_name = name
+      real_name = "#{parent_name}-#{real_name}" if parent_name
+      
+      if value.empty? && children.empty?
+        message = "Invalid property: #{declaration.dump} (no value)." +
+          pseudo_class_selector_message
+        raise Sass::SyntaxError.new(message, @line)
+      end
+      
+      join_string = case style
+                    when :compact; ' '
+                    when :compressed; ''
+                    else "\n"
+                    end
+      spaces = '  ' * (tabs - 1)
+      to_return = ''
+      if !value.empty?
+        to_return << "#{spaces}#{real_name}:#{style == :compressed ? '' : ' '}#{value};#{join_string}"
       end
-      result
+      
+      children.each do |kid|
+        next if kid.invisible?
+        to_return << kid.to_s(tabs, real_name) << join_string
+      end
+      
+      (style == :compressed && parent_name) ? to_return : to_return[0...-1]
     end
 
-    # Updates the name and indentation of this node based on the parent name
-    # and nesting level.
+    # Returns a appropriate message indicating how to escape pseudo-class selectors.
+    # This only applies for old-style properties with no value,
+    # so returns the empty string if this is new-style.
     #
-    # @param extends [Haml::Util::SubsetMap{Selector::Simple => Selector::Sequence}]
-    #   The extensions defined for this tree
-    # @param parent [PropNode, nil] The parent node of this node,
-    #   or nil if the parent isn't a {PropNode}
-    def cssize!(extends, parent)
-      self.resolved_name = "#{parent.resolved_name}-#{resolved_name}" if parent
-      self.tabs = parent.tabs + (parent.resolved_value.empty? ? 0 : 1) if parent && style == :nested
-      super
+    # @return [String] The message
+    def pseudo_class_selector_message
+      return "" if @prop_syntax == :new || !value.empty?
+      "\nIf #{declaration.dump} should be a selector, use \"\\#{declaration}\" instead."
     end
 
-    # Runs any SassScript that may be embedded in the property,
-    # and invludes the parent property, if any.
+    protected
+
+    # Runs any SassScript that may be embedded in the property.
     #
     # @param environment [Sass::Environment] The lexical environment containing
     #   variable and mixin values
     def perform!(environment)
-      @resolved_name = run_interp(@name, environment)
-      val = @value.perform(environment)
-      @resolved_value =
-        if @value.context == :equals && val.is_a?(Sass::Script::String)
-          val.value
-        else
-          val.to_s
-        end
+      @name = interpolate(@name, environment)
+      @value = @value.is_a?(String) ? interpolate(@value, environment) : @value.perform(environment).to_s
       super
     end
 
@@ -153,68 +114,8 @@ module Sass::Tree
 
     private
 
-    def check!
-      if @options[:property_syntax] == :old && @prop_syntax == :new
-        raise Sass::SyntaxError.new("Illegal property syntax: can't use new syntax when :property_syntax => :old is set.")
-      elsif @options[:property_syntax] == :new && @prop_syntax == :old
-        raise Sass::SyntaxError.new("Illegal property syntax: can't use old syntax when :property_syntax => :new is set.")
-      elsif resolved_value.empty?
-        raise Sass::SyntaxError.new("Invalid property: #{declaration.dump} (no value)." +
-          pseudo_class_selector_message)
-      end
-    end
-
-    def declaration(tabs = 0, opts = {:old => @prop_syntax == :old}, fmt = :sass)
-      name = self.name.map {|n| n.is_a?(String) ? n : "\#{#{n.to_sass(opts)}}"}.join
-      if name[0] == ?:
-        raise Sass::SyntaxError.new("The \"#{name}: #{self.class.val_to_sass(value, opts)}\" hack is not allowed in the Sass indented syntax")
-      end
-
-      old = opts[:old] && fmt == :sass
-      initial = old ? ':' : ''
-      mid = old ? '' : ':'
-      "#{'  ' * tabs}#{initial}#{name}#{mid} #{self.class.val_to_sass(value, opts)}".rstrip
-    end
-
-    class << self
-      # @private
-      def val_to_sass(value, opts)
-        val_to_sass_comma(value, opts).to_sass(opts)
-      end
-
-      private
-
-      def val_to_sass_comma(node, opts)
-        return node unless node.is_a?(Sass::Script::Operation)
-        return val_to_sass_concat(node, opts) unless node.operator == :comma
-
-        Sass::Script::Operation.new(
-          val_to_sass_concat(node.operand1, opts),
-          val_to_sass_comma(node.operand2, opts),
-          node.operator)
-      end
-
-      def val_to_sass_concat(node, opts)
-        return node unless node.is_a?(Sass::Script::Operation)
-        return val_to_sass_div(node, opts) unless node.operator == :concat
-
-        Sass::Script::Operation.new(
-          val_to_sass_div(node.operand1, opts),
-          val_to_sass_concat(node.operand2, opts),
-          node.operator)
-      end
-
-      def val_to_sass_div(node, opts)
-        unless node.is_a?(Sass::Script::Operation) && node.operator == :div &&
-            node.operand1.is_a?(Sass::Script::Number) &&
-            node.operand2.is_a?(Sass::Script::Number) &&
-            (node.context == :equals || !node.operand1.original || !node.operand2.original)
-          return node
-        end
-
-        Sass::Script::String.new("(#{node.to_sass(opts)})")
-      end
-
+    def declaration
+      (@prop_syntax == :new ? "#{name}: #{value}" : ":#{name} #{value}").strip
     end
   end
 end

data/vendor/plugins/haml/lib/sass/tree/rule_node.rb

@@ -1,5 +1,4 @@
 require 'pathname'
-require 'uri'
 
 module Sass::Tree
   # A static node reprenting a CSS rule.
@@ -7,58 +6,49 @@ module Sass::Tree
   # @see Sass::Tree
   class RuleNode < Node
     # The character used to include the parent selector
+    # @private
     PARENT = '&'
 
-    # The CSS selector for this rule,
-    # interspersed with {Sass::Script::Node}s
-    # representing `#{}`-interpolation.
-    # Any adjacent strings will be merged together.
+    # The CSS selectors for this rule.
+    # Each string is a selector line, and the lines are meant to be separated by commas.
+    # For example,
     #
-    # @return [Array<String, Sass::Script::Node>]
-    attr_accessor :rule
+    #     foo, bar, baz,
+    #     bip, bop, bup
+    #
+    # would be
+    #
+    #     ["foo, bar, baz",
+    #      "bip, bop, bup"]
+    #
+    # @return [Array<String>]
+    attr_accessor :rules
 
-    # The CSS selector for this rule,
-    # without any unresolved interpolation
-    # but with parent references still intact.
+    # The CSS selectors for this rule,
+    # parsed for commas and parent-references.
     # It's only set once {Tree::Node#perform} has been called.
     #
-    # @return [Selector::CommaSequence]
-    attr_accessor :parsed_rules
-
-    # The CSS selector for this rule,
-    # without any unresolved interpolation or parent references.
-    # It's only set once {Tree::Node#cssize} has been called.
+    # It's an array of arrays of arrays.
+    # The first level of arrays represents distinct lines in the Sass file;
+    # the second level represents comma-separated selectors;
+    # the third represents structure within those selectors,
+    # currently only parent-refs (represented by `:parent`).
+    # For example,
     #
-    # @return [Selector::CommaSequence]
-    attr_accessor :resolved_rules
-
-    # How deep this rule is indented
-    # relative to a base-level rule.
-    # This is only greater than 0 in the case that:
+    #     &.foo, bar, baz,
+    #     bip, &.bop, bup
     #
-    # * This node is in a CSS tree
-    # * The style is :nested
-    # * This is a child rule of another rule
-    # * The parent rule has properties, and thus will be rendered
+    # would be
     #
-    # @return [Fixnum]
-    attr_accessor :tabs
-
-    # Whether or not this rule is the last rule in a nested group.
-    # This is only set in a CSS tree.
+    #     [[[:parent, "foo"], ["bar"], ["baz"]],
+    #      [["bip"], [:parent, "bop"], ["bup"]]]
     #
-    # @return [Boolean]
-    attr_accessor :group_end
+    # @return [Array<Array<Array<String|Symbol>>>]
+    attr_accessor :parsed_rules
 
-    # @param rule [Array<String, Sass::Script::Node>]
-    #   The CSS rule. See \{#rule}
+    # @param rule [String] The first CSS rule. See \{#rules}
     def initialize(rule)
-      #p rule
-      merged = Haml::Util.merge_adjacent_strings(rule)
-      #p merged
-      @rule = Haml::Util.strip_string_array(merged)
-      #p @rule
-      @tabs = 0
+      @rules = [rule]
       super()
     end
 
@@ -68,90 +58,63 @@ module Sass::Tree
     # @return [Boolean] Whether or not this node and the other object
     #   are the same
     def ==(other)
-      self.class == other.class && rule == other.rule && super
+      self.class == other.class && rules == other.rules && super
     end
 
     # Adds another {RuleNode}'s rules to this one's.
     #
     # @param node [RuleNode] The other node
     def add_rules(node)
-      @rule = Haml::Util.strip_string_array(
-        Haml::Util.merge_adjacent_strings(@rule + ["\n"] + node.rule))
+      @rules += node.rules
     end
 
     # @return [Boolean] Whether or not this rule is continued on the next line
     def continued?
-      last = @rule.last
-      last.is_a?(String) && last[-1] == ?,
-    end
-
-    # @see Node#to_sass
-    def to_sass(tabs, opts = {})
-      name = selector_to_sass(rule, opts)
-      name = "\\" + name if name[0] == ?:
-      name.gsub(/^/, '  ' * tabs) + children_to_src(tabs, opts, :sass)
-    end
-
-    # @see Node#to_scss
-    def to_scss(tabs, opts = {})
-      name = selector_to_scss(rule, tabs, opts)
-      res = name + children_to_src(tabs, opts, :scss)
-
-      if children.last.is_a?(CommentNode) && children.last.silent
-        res.slice!(-3..-1)
-        res << "\n" << ('  ' * tabs) << "}\n"
-      end
-
-      res
-    end
-
-    # Extends this Rule's selector with the given `extends`.
-    #
-    # @see Node#do_extend
-    def do_extend(extends)
-      node = dup
-      node.resolved_rules = resolved_rules.do_extend(extends)
-      node
+      @rules.last[-1] == ?,
     end
 
-    protected
-
     # Computes the CSS for the rule.
     #
     # @param tabs [Fixnum] The level of indentation for the CSS
+    # @param super_rules [Array<Array<String>>] The rules for the parent node
+    #   (see \{#rules}), or `nil` if there are no parents
     # @return [String] The resulting CSS
-    def _to_s(tabs)
-      tabs = tabs + self.tabs
+    # @raise [Sass::SyntaxError] if the rule has no parents but uses `&`
+    def to_s(tabs, super_rules = nil)
+      resolved_rules = resolve_parent_refs(super_rules)
+
+      properties = []
+      sub_rules = []
 
       rule_separator = style == :compressed ? ',' : ', '
-      line_separator =
-        case style
-          when :nested, :expanded; "\n"
-          when :compressed; ""
-          else; " "
-        end
+      line_separator = [:nested, :expanded].include?(style) ? ",\n" : rule_separator
       rule_indent = '  ' * (tabs - 1)
       per_rule_indent, total_indent = [:nested, :expanded].include?(style) ? [rule_indent, ''] : ['', rule_indent]
 
-      total_rule = total_indent + resolved_rules.members.
-        map {|seq| seq.to_a.join.gsub(/([^,])\n/m, style == :compressed ? '\1 ' : "\\1\n")}.
-        join(rule_separator).split("\n").map do |line|
-        per_rule_indent + line.strip
+      total_rule = total_indent + resolved_rules.map do |line|
+        per_rule_indent + line.join(rule_separator)
       end.join(line_separator)
 
+      children.each do |child|
+        next if child.invisible?
+        if child.is_a? RuleNode
+          sub_rules << child
+        else
+          properties << child
+        end
+      end
+
       to_return = ''
-      old_spaces = '  ' * (tabs - 1)
-      spaces = '  ' * tabs
-      if style != :compressed
-        if @options[:debug_info]
-          to_return << debug_info_rule.to_s(tabs) << "\n"
-        elsif @options[:line_comments]
+      if !properties.empty?
+        old_spaces = '  ' * (tabs - 1)
+        spaces = '  ' * tabs
+        if @options[:line_comments] && style != :compressed
           to_return << "#{old_spaces}/* line #{line}"
 
           if filename
             relative_filename = if @options[:css_filename]
               begin
-                Pathname.new(filename).relative_path_from(
+                Pathname.new(filename).relative_path_from(  
                   Pathname.new(File.dirname(@options[:css_filename]))).to_s
               rescue ArgumentError
                 nil
@@ -163,111 +126,107 @@ module Sass::Tree
 
           to_return << " */\n"
         end
+
+        if style == :compact
+          properties = properties.map { |a| a.to_s(1) }.select{|a| a && a.length > 0}.join(' ')
+          to_return << "#{total_rule} { #{properties} }\n"
+        elsif style == :compressed
+          properties = properties.map { |a| a.to_s(1) }.select{|a| a && a.length > 0}.join(';')
+          to_return << "#{total_rule}{#{properties}}"
+        else
+          properties = properties.map { |a| a.to_s(tabs + 1) }.select{|a| a && a.length > 0}.join("\n")
+          end_props = (style == :expanded ? "\n" + old_spaces : ' ')
+          to_return << "#{total_rule} {\n#{properties}#{end_props}}\n"
+        end
       end
 
-      if style == :compact
-        properties = children.map { |a| a.to_s(1) }.join(' ')
-        to_return << "#{total_rule} { #{properties} }#{"\n" if group_end}"
-      elsif style == :compressed
-        properties = children.map { |a| a.to_s(1) }.join(';')
-        to_return << "#{total_rule}{#{properties}}"
-      else
-        properties = children.map { |a| a.to_s(tabs + 1) }.join("\n")
-        end_props = (style == :expanded ? "\n" + old_spaces : ' ')
-        to_return << "#{total_rule} {\n#{properties}#{end_props}}#{"\n" if group_end}"
+      tabs += 1 unless properties.empty? || style != :nested
+      sub_rules.each do |sub|
+        to_return << sub.to_s(tabs, resolved_rules)
       end
 
       to_return
     end
 
-    # Runs SassScript interpolation in the selector,
-    # and then parses the result into a {Sass::Selector::CommaSequence}.
+    protected
+
+    # Runs any SassScript that may be embedded in the rule,
+    # and parses the selectors for commas.
     #
     # @param environment [Sass::Environment] The lexical environment containing
     #   variable and mixin values
     def perform!(environment)
-      @parsed_rules = Sass::SCSS::StaticParser.new(run_interp(@rule, environment), self.line).
-        parse_selector(self.filename)
+      @parsed_rules = @rules.map {|r| parse_selector(interpolate(r, environment))}
       super
     end
 
-    # Converts nested rules into a flat list of rules.
-    #
-    # @param extends [Haml::Util::SubsetMap{Selector::Simple => Selector::Sequence}]
-    #   The extensions defined for this tree
-    # @param parent [RuleNode, nil] The parent node of this node,
-    #   or nil if the parent isn't a {RuleNode}
-    def _cssize(extends, parent)
-      node = super
-      rules = node.children.select {|c| c.is_a?(RuleNode)}
-      props = node.children.reject {|c| c.is_a?(RuleNode) || c.invisible?}
-
-      unless props.empty?
-        node.children = props
-        rules.each {|r| r.tabs += 1} if style == :nested
-        rules.unshift(node)
-      end
+    private
 
-      rules.last.group_end = true unless parent || rules.empty?
+    def resolve_parent_refs(super_rules)
+      if super_rules.nil?
+        return @parsed_rules.map do |line|
+          line.map do |rule|
+            if rule.include?(:parent)
+              raise Sass::SyntaxError.new("Base-level rules cannot contain the parent-selector-referencing character '#{PARENT}'.", self.line)
+            end
 
-      rules
-    end
+            rule.join
+          end.compact
+        end
+      end
 
-    # Resolves parent references and nested selectors,
-    # and updates the indentation based on the parent's indentation.
-    #
-    # @param extends [Haml::Util::SubsetMap{Selector::Simple => Selector::Sequence}]
-    #   The extensions defined for this tree
-    # @param parent [RuleNode, nil] The parent node of this node,
-    #   or nil if the parent isn't a {RuleNode}
-    # @raise [Sass::SyntaxError] if the rule has no parents but uses `&`
-    def cssize!(extends, parent)
-      self.resolved_rules = @parsed_rules.resolve_parent_refs(parent && parent.resolved_rules)
-      super
-    end
+      new_rules = []
+      super_rules.each do |super_line|
+        @parsed_rules.each do |line|
+          new_rules << []
 
-    # 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
+          super_line.each do |super_rule|
+            line.each do |rule|
+              rule = [:parent, " ", *rule] unless rule.include?(:parent)
 
-    # 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).
-    #
-    # @return [{#to_s => #to_s}]
-    def debug_info
-      {:filename => filename && ("file://" + URI.escape(File.expand_path(filename))),
-       :line => self.line}
+              new_rules.last << rule.map do |segment|
+                next segment unless segment == :parent
+                super_rule
+              end.join
+            end
+          end
+        end
+      end
+      new_rules
     end
 
-    private
+    def parse_selector(text)
+      scanner = StringScanner.new(text)
+      rules = [[]]
+
+      while scanner.rest?
+        rules.last << scanner.scan(/[^",&]*/)
+        case scanner.scan(/./)
+        when '&'
+          warn <<END unless rules.last.empty? || rules.last.last =~ /(^|\s)$/
+DEPRECATION WARNING:
+On line #{@line}#{" of '#{@filename}'" if @filename}
+In Sass 3, parent selectors will only be able to appear
+at the beginning of simple selector sequences.
+For example, ".foo &.bar" is allowed but ".bar&" is not.
+END
+          rules.last << :parent
+        when ','
+          scanner.scan(/\s*/)
+          rules << [] if scanner.rest?
+        when '"'
+          rules.last << '"' << scanner.scan(/([^"\\]|\\.)*/)
+          # We don't want to enforce that strings are closed,
+          # but we do want to consume quotes or trailing backslashes.
+          rules.last << scanner.scan(/./) if scanner.rest?
+        end
+      end
 
-    def debug_info_rule
-      node = DirectiveNode.new("@media -sass-debug-info")
-      debug_info.map {|k, v| [k.to_s, v.to_s]}.sort.each do |k, v|
-        rule = RuleNode.new([""])
-        rule.resolved_rules = Sass::Selector::CommaSequence.new(
-          [Sass::Selector::Sequence.new(
-              [Sass::Selector::SimpleSequence.new(
-                  [Sass::Selector::Element.new(k.to_s.gsub(/[^\w-]/, "\\\\\\0"), nil)])
-              ])
-          ])
-        prop = PropNode.new([""], "", :new)
-        prop.resolved_name = "font-family"
-        prop.resolved_value = Sass::SCSS::RX.escape_ident(v.to_s)
-        rule << prop
-        node << rule
+      rules.map! do |l|
+        Haml::Util.merge_adjacent_strings(l).reject {|r| r.is_a?(String) && r.empty?}
       end
-      node.options = @options.merge(:debug_info => false, :line_comments => false, :style => :compressed)
-      node
+
+      rules
     end
   end
 end