radiantcms-couchrest_model 0.1.3 → 0.1.4

data/vendor/plugins/haml/lib/sass/script/string.rb

@@ -1,67 +1,12 @@
 require 'sass/script/literal'
 
 module Sass::Script
-  # A SassScript object representing a CSS string *or* a CSS identifier.
+  # A SassScript object representing a string of text.
   class String < Literal
     # The Ruby value of the string.
     #
     # @return [String]
     attr_reader :value
-
-    # Whether this is a CSS string or a CSS identifier.
-    # The difference is that strings are written with double-quotes,
-    # while identifiers aren't.
-    #
-    # @return [Symbol] `:string` or `:identifier`
-    attr_reader :type
-
-    # In addition to setting the \{#context} of the string,
-    # this sets the string to be an identifier if the context is `:equals`.
-    #
-    # @see Node#context=
-    def context=(context)
-      super
-      @type = :identifier if context == :equals
-    end
-
-    # Creates a new string.
-    #
-    # @param value [String] See \{#value}
-    # @param type [Symbol] See \{#type}
-    def initialize(value, type = :identifier)
-      super(value)
-      @type = type
-    end
-
-    # @see Literal#plus
-    def plus(other)
-      other_str = other.is_a?(Sass::Script::String) ? other.value : other.to_s
-      Sass::Script::String.new(self.value + other_str, self.type)
-    end
-
-    # @see Node#to_s
-    def to_s(opts = {})
-      if self.type == :identifier
-        return %q{""} if context == :equals && self.value.size == 0
-        return self.value.gsub("\n", " ")
-      end
-
-      return "\"#{value.gsub('"', "\\\"")}\"" if opts[:quote] == %q{"}
-      return "'#{value.gsub("'", "\\'")}'" if opts[:quote] == %q{'}
-      return "\"#{value}\"" unless value.include?('"')
-      return "'#{value}'" unless value.include?("'")
-      "\"#{value.gsub('"', "\\\"")}\"" #'
-    end
-
-    # @see Node#to_sass
-    def to_sass(opts = {})
-      if self.type == :identifier && context == :equals &&
-          self.value !~ Sass::SCSS::RX::URI &&
-          Sass::SCSS::RX.escape_ident(self.value).include?(?\\)
-        return "unquote(#{Sass::Script::String.new(self.value, :string).to_sass})"
-      else
-        return to_s
-      end
-    end
+    alias_method :to_s, :value
   end
 end

data/vendor/plugins/haml/lib/sass/script/unary_operation.rb

@@ -1,6 +1,6 @@
 module Sass::Script
   # A SassScript parse node representing a unary operation,
-  # such as `-$b` or `not true`.
+  # such as `-!b` or `not true`.
   #
   # Currently only `-`, `/`, and `not` are unary operators.
   class UnaryOperation < Node
@@ -10,7 +10,6 @@ module Sass::Script
     def initialize(operand, operator)
       @operand = operand
       @operator = operator
-      super()
     end
 
     # @return [String] A human-readable s-expression representation of the operation
@@ -18,34 +17,12 @@ module Sass::Script
       "(#{@operator.inspect} #{@operand.inspect})"
     end
 
-    # @see Node#to_sass
-    def to_sass(opts = {})
-      operand = @operand.to_sass(opts)
-      if @operand.is_a?(Operation) ||
-          (@operator == :minus &&
-           (operand =~ Sass::SCSS::RX::IDENT) == 0)
-        operand = "(#{@operand.to_sass(opts)})"
-      end
-      op = Lexer::OPERATORS_REVERSE[@operator]
-      op + (op =~ /[a-z]/ ? " " : "") + operand
-    end
-
-    # Returns the operand of the operation.
-    #
-    # @return [Array<Node>]
-    # @see Node#children
-    def children
-      [@operand]
-    end
-
-    protected
-
     # Evaluates the operation.
     #
     # @param environment [Sass::Environment] The environment in which to evaluate the SassScript
     # @return [Literal] The SassScript object that is the value of the operation
     # @raise [Sass::SyntaxError] if the operation is undefined for the operand
-    def _perform(environment)
+    def perform(environment)
       operator = "unary_#{@operator}"
       literal = @operand.perform(environment)
       literal.send(operator)

data/vendor/plugins/haml/lib/sass/script/variable.rb

@@ -10,38 +10,21 @@ module Sass
       # @param name [String] See \{#name}
       def initialize(name)
         @name = name
-        super()
       end
 
       # @return [String] A string representation of the variable
-      def inspect(opts = {})
-        return "!important" if name == "important"
-        "$#{dasherize(name, opts)}"
+      def inspect
+        "!#{name}"
       end
-      alias_method :to_sass, :inspect
-
-      # Returns an empty array.
-      #
-      # @return [Array<Node>] empty
-      # @see Node#children
-      def children
-        []
-      end
-
-      protected
 
       # Evaluates the variable.
       #
       # @param environment [Sass::Environment] The environment in which to evaluate the SassScript
       # @return [Literal] The SassScript object that is the value of the variable
       # @raise [Sass::SyntaxError] if the variable is undefined
-      def _perform(environment)
-        raise SyntaxError.new("Undefined variable: \"$#{name}\".") unless val = environment.var(name)
-        if val.is_a?(Number)
-          val = val.dup
-          val.original = nil
-        end
-        return val
+      def perform(environment)
+        (val = environment.var(name)) && (return val)
+        raise SyntaxError.new("Undefined variable: \"!#{name}\".")
       end
     end
   end

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

@@ -5,7 +5,12 @@ module Sass::Tree
   #
   # @see Sass::Tree
   class CommentNode < Node
-    # The text of the comment, not including `/*` and `*/`.
+    # The lines of text nested beneath the comment.
+    #
+    # @return [Array<Sass::Engine::Line>]
+    attr_accessor :lines
+
+    # The text on the same line as the comment starter.
     #
     # @return [String]
     attr_accessor :value
@@ -19,7 +24,7 @@ module Sass::Tree
     # @param silent [Boolean] See \{#silent}
     def initialize(value, silent)
       @lines = []
-      @value = normalize_indentation value
+      @value = value[2..-1].strip
       @silent = silent
       super()
     end
@@ -30,60 +35,9 @@ module Sass::Tree
     # @return [Boolean] Whether or not this node and the other object
     #   are the same
     def ==(other)
-      self.class == other.class && value == other.value && silent == other.silent
-    end
-
-    # Returns `true` if this is a silent comment
-    # or the current style doesn't render comments.
-    #
-    # @return [Boolean]
-    def invisible?
-      style == :compressed || @silent
-    end
-
-    # @see Node#to_sass
-    def to_sass(tabs, opts = {})
-      content = value.gsub(/\*\/$/, '').rstrip
-      if content =~ /\A[ \t]/
-        # Re-indent SCSS comments like this:
-        #     /* foo
-        #   bar
-        #       baz */
-        content.gsub!(/^/, '   ')
-        content.sub!(/\A([ \t]*)\/\*/, '/*\1')
-      end
-
-      content =
-        unless content.include?("\n")
-          content
-        else
-          content.gsub!(/\n( \*|\/\/)/, "\n  ")
-          spaces = content.scan(/\n( *)/).map {|s| s.first.size}.min
-          sep = silent ? "\n//" : "\n *"
-          if spaces >= 2
-            content.gsub(/\n  /, sep)
-          else
-            content.gsub(/\n#{' ' * spaces}/, sep)
-          end
-        end
-
-      content.gsub!(/\A\/\*/, '//') if silent
-      content.gsub!(/^/, '  ' * tabs)
-      content.rstrip + "\n"
-    end
-
-    # @see Node#to_scss
-    def to_scss(tabs, opts = {})
-      spaces = ('  ' * [tabs - value[/^ */].size, 0].max)
-      if silent
-        value.gsub(/^[\/ ]\*/, '//').gsub(/ *\*\/$/, '')
-      else
-        value
-      end.gsub(/^/, spaces) + "\n"
+      self.class == other.class && value == other.value && silent == other.silent && lines == other.lines
     end
 
-    protected
-
     # Computes the CSS for the comment.
     #
     # Returns `nil` if this is a silent comment
@@ -93,15 +47,29 @@ module Sass::Tree
     # @param tabs [Fixnum] The level of indentation for the CSS
     # @return [String, nil] The resulting CSS
     # @see #invisible?
-    def _to_s(tabs = 0, _ = nil)
+    def to_s(tabs = 0, _ = nil)
       return if invisible?
-      spaces = ('  ' * [tabs - 1 - value[/^ */].size, 0].max)
+      spaces = '  ' * (tabs - 1)
+
+      content = (value.split("\n") + lines.map {|l| l.text})
+      return spaces + "/* */" if content.empty?
+      content.map! {|l| (l.empty? ? "" : " ") + l}
+      content.first.gsub!(/^ /, '')
+      content.last.gsub!(%r{ ?\*/ *$}, '')
+
+      spaces + "/* " + content.join(style == :compact ? '' : "\n#{spaces} *") + " */"
+    end
 
-      content = value.gsub(/^/, spaces)
-      content.gsub!(/\n +(\* *(?!\/))?/, ' ') if style == :compact
-      content
+    # Returns `true` if this is a silent comment
+    # or the current style doesn't render comments.
+    #
+    # @return [Boolean]
+    def invisible?
+      style == :compressed || @silent
     end
 
+    protected
+
     # Removes this node from the tree if it's a silent comment.
     #
     # @param environment [Sass::Environment] The lexical environment containing
@@ -112,17 +80,5 @@ module Sass::Tree
       return [] if @silent
       self
     end
-
-    private
-
-    def normalize_indentation(str)
-      pre = str.split("\n").inject(str[/^[ \t]*/].split("")) do |pre, line|
-        line[/^[ \t]*/].split("").zip(pre).inject([]) do |arr, (a, b)|
-          break arr if a != b
-          arr + [a]
-        end
-      end.join
-      str.gsub(/^#{pre}/, '')
-    end
   end
 end

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

@@ -12,22 +12,16 @@ module Sass
 
       protected
 
-      # @see Node#to_src
-      def to_src(tabs, opts, fmt)
-        "#{'  ' * tabs}@debug #{@expr.to_sass(opts)}#{semi fmt}\n"
-      end
-
       # Prints the expression to STDERR.
       #
       # @param environment [Sass::Environment] The lexical environment containing
       #   variable and mixin values
       def _perform(environment)
         res = @expr.perform(environment)
-        res = res.value if res.is_a?(Sass::Script::String)
         if filename
-          $stderr.puts "#{filename}:#{line} DEBUG: #{res}"
+          STDERR.puts "#{filename}:#{line} DEBUG: #{res}"
         else
-          $stderr.puts "Line #{line} DEBUG: #{res}"
+          STDERR.puts "Line #{line} DEBUG: #{res}"
         end
         []
       end

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

@@ -4,8 +4,8 @@ module Sass::Tree
   # are handled by their own nodes;
   # only CSS directives like `@media` and `@font-face` become {DirectiveNode}s.
   #
-  # `@import` and `@charset` are special cases;
-  # they become {ImportNode}s and {CharsetNode}s, respectively.
+  # `@import` is a bit of a weird case;
+  # it becomes an {ImportNode}.
   #
   # @see Sass::Tree
   class DirectiveNode < Node
@@ -20,56 +20,49 @@ module Sass::Tree
       super()
     end
 
-    protected
-
-    # @see Node#to_src
-    def to_src(tabs, opts, fmt)
-      res = "#{'  ' * tabs}#{value}"
-      return res + "#{semi fmt}\n" unless has_children
-      res + children_to_src(tabs, opts, fmt) + "\n"
-    end
-
     # Computes the CSS for the directive.
     #
     # @param tabs [Fixnum] The level of indentation for the CSS
     # @return [String] The resulting CSS
-    def _to_s(tabs)
-      return value + ";" unless has_children
-      return value + " {}" if children.empty?
-      result = if style == :compressed
-                 "#{value}{"
-               else
-                 "#{'  ' * (tabs - 1)}#{value} {" + (style == :compact ? ' ' : "\n")
-               end
-      was_prop = false
-      first = true
-      children.each do |child|
-        next if child.invisible?
-        if style == :compact
-          if child.is_a?(PropNode)
-            result << "#{child.to_s(first || was_prop ? 1 : tabs + 1)} "
-          else
-            if was_prop
-              result[-1] = "\n"
+    def to_s(tabs)
+      if children.empty?
+        value + ";"
+      else
+        result = if style == :compressed
+                   "#{value}{"
+                 else
+                   "#{'  ' * (tabs - 1)}#{value} {" + (style == :compact ? ' ' : "\n")
+                 end
+        was_prop = false
+        first = true
+        children.each do |child|
+          next if child.invisible?
+          if style == :compact
+            if child.is_a?(PropNode)
+              result << "#{child.to_s(first || was_prop ? 1 : tabs + 1)} "
+            else
+              if was_prop
+                result[-1] = "\n"
+              end
+              rendered = child.to_s(tabs + 1)
+              rendered.lstrip! if first
+              result << rendered
             end
-            rendered = child.to_s(tabs + 1).dup
-            rendered = rendered.lstrip if first
-            result << rendered.rstrip + "\n"
+            was_prop = child.is_a?(PropNode)
+            first = false
+          elsif style == :compressed
+            result << (was_prop ? ";#{child.to_s(1)}" : child.to_s(1))
+            was_prop = child.is_a?(PropNode)
+          else
+            result << child.to_s(tabs + 1) + "\n"
           end
-          was_prop = child.is_a?(PropNode)
-          first = false
-        elsif style == :compressed
-          result << (was_prop ? ";#{child.to_s(1)}" : child.to_s(1))
-          was_prop = child.is_a?(PropNode)
-        else
-          result << child.to_s(tabs + 1) + "\n"
         end
+        result.rstrip + if style == :compressed
+                          "}"
+                        else
+                          (style == :expanded ? "\n" : " ") + "}\n"
+                        end
       end
-      result.rstrip + if style == :compressed
-                        "}"
-                      else
-                        (style == :expanded ? "\n" : " ") + "}\n"
-                      end
     end
   end
 end

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

@@ -20,13 +20,6 @@ module Sass::Tree
 
     protected
 
-    # @see Node#to_src
-    def to_src(tabs, opts, fmt)
-      to = @exclusive ? "to" : "through"
-      "#{'  ' * tabs}@for $#{dasherize(@var, opts)} from #{@from.to_sass(opts)} #{to} #{@to.to_sass(opts)}" +
-        children_to_src(tabs, opts, fmt)
-    end
-
     # Runs the child nodes once for each time through the loop,
     # varying the variable each time.
     #
@@ -51,17 +44,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