radiant 0.9.1 → 1.0.0.rc1

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

@@ -16,17 +16,22 @@ module Sass
 
       protected
 
+      # @see Node#to_src
+      def to_src(tabs, opts, fmt)
+        "#{'  ' * tabs}$#{dasherize(@name, opts)}: #{@expr.to_sass(opts)}#{' !default' if @guarded}#{semi fmt}\n"
+      end
+
       # Loads the new variable value into the environment.
       #
       # @param environment [Sass::Environment] The lexical environment containing
       #   variable and mixin values
       def _perform(environment)
-        if @guarded && environment.var(@name).nil?
-          environment.set_var(@name, @expr.perform(environment))
-        elsif !@guarded
-          environment.set_var(@name, @expr.perform(environment))
+        return [] if @guarded && !environment.var(@name).nil?
+        val = @expr.perform(environment)
+        if @expr.context == :equals && val.is_a?(Sass::Script::String)
+          val = Sass::Script::String.new(val.value)
         end
-
+        environment.set_var(@name, val)
         []
       end
     end

data/vendor/plugins/haml/lib/sass/tree/variable_node.rbc

@@ -0,0 +1,845 @@
+!RBIX
+17831730954501249321
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+28
+99
+7
+0
+65
+49
+1
+2
+13
+99
+12
+7
+2
+12
+7
+3
+12
+65
+12
+49
+4
+4
+15
+49
+2
+0
+15
+2
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+4
+Sass
+x
+11
+open_module
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+4
+Sass
+i
+28
+5
+66
+99
+7
+0
+65
+49
+1
+2
+13
+99
+12
+7
+2
+12
+7
+3
+12
+65
+12
+49
+4
+4
+15
+49
+2
+0
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+4
+Tree
+x
+11
+open_module
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+4
+Tree
+i
+31
+5
+66
+99
+7
+0
+45
+1
+2
+65
+49
+3
+3
+13
+99
+12
+7
+4
+12
+7
+5
+12
+65
+12
+49
+6
+4
+15
+49
+4
+0
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+7
+x
+12
+VariableNode
+x
+4
+Node
+n
+x
+10
+open_class
+x
+14
+__class_init__
+M
+1
+n
+n
+x
+12
+VariableNode
+i
+48
+5
+66
+99
+7
+0
+7
+1
+65
+67
+49
+2
+0
+49
+3
+4
+15
+5
+48
+4
+15
+99
+7
+5
+7
+6
+65
+67
+49
+2
+0
+49
+3
+4
+15
+99
+7
+7
+7
+8
+65
+67
+49
+2
+0
+49
+3
+4
+11
+I
+5
+I
+0
+I
+0
+I
+0
+n
+p
+9
+x
+10
+initialize
+M
+1
+n
+n
+x
+10
+initialize
+i
+20
+20
+0
+38
+0
+15
+20
+1
+38
+1
+15
+20
+2
+38
+2
+15
+54
+52
+3
+0
+11
+I
+4
+I
+3
+I
+3
+I
+3
+n
+p
+4
+x
+5
+@name
+x
+5
+@expr
+x
+8
+@guarded
+x
+10
+initialize
+p
+11
+I
+-1
+I
+a
+I
+0
+I
+b
+I
+5
+I
+c
+I
+a
+I
+d
+I
+f
+I
+e
+I
+14
+x
+78
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/tree/variable_node.rb
+p
+3
+x
+4
+name
+x
+4
+expr
+x
+7
+guarded
+x
+17
+method_visibility
+x
+15
+add_defn_method
+x
+9
+protected
+x
+6
+to_src
+M
+1
+n
+n
+x
+6
+to_src
+i
+65
+7
+0
+64
+20
+0
+49
+1
+1
+47
+101
+2
+7
+3
+5
+39
+4
+20
+1
+47
+49
+5
+2
+47
+101
+2
+7
+6
+39
+7
+20
+1
+49
+8
+1
+47
+101
+2
+39
+9
+9
+46
+7
+10
+64
+8
+47
+1
+47
+101
+2
+5
+20
+2
+47
+49
+11
+1
+47
+101
+2
+7
+12
+63
+8
+11
+I
+b
+I
+3
+I
+3
+I
+3
+n
+p
+13
+s
+2
+  
+x
+1
+*
+x
+4
+to_s
+s
+1
+$
+x
+5
+@name
+x
+9
+dasherize
+s
+2
+: 
+x
+5
+@expr
+x
+7
+to_sass
+x
+8
+@guarded
+s
+9
+ !default
+x
+4
+semi
+s
+1
+
+
+p
+9
+I
+-1
+I
+14
+I
+0
+I
+15
+I
+2f
+I
+0
+I
+32
+I
+15
+I
+41
+x
+78
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/tree/variable_node.rb
+p
+3
+x
+4
+tabs
+x
+4
+opts
+x
+3
+fmt
+x
+8
+_perform
+M
+1
+n
+n
+x
+8
+_perform
+i
+125
+39
+0
+13
+9
+22
+15
+20
+0
+39
+1
+49
+2
+1
+49
+3
+0
+10
+21
+2
+8
+22
+3
+9
+29
+35
+0
+11
+8
+30
+1
+15
+39
+4
+20
+0
+49
+5
+1
+19
+1
+15
+39
+4
+49
+6
+0
+7
+7
+83
+8
+13
+9
+66
+15
+20
+1
+45
+9
+10
+43
+11
+43
+12
+49
+13
+1
+9
+110
+45
+9
+14
+43
+11
+43
+12
+13
+71
+15
+47
+9
+98
+47
+49
+16
+0
+13
+20
+1
+49
+17
+0
+47
+49
+18
+1
+15
+8
+106
+20
+1
+49
+17
+0
+49
+15
+1
+19
+1
+8
+111
+1
+15
+20
+0
+39
+1
+20
+1
+49
+19
+2
+15
+35
+0
+11
+I
+5
+I
+2
+I
+1
+I
+1
+n
+p
+20
+x
+8
+@guarded
+x
+5
+@name
+x
+3
+var
+x
+4
+nil?
+x
+5
+@expr
+x
+7
+perform
+x
+7
+context
+x
+6
+equals
+x
+2
+==
+x
+4
+Sass
+n
+x
+6
+Script
+x
+6
+String
+x
+5
+is_a?
+n
+x
+3
+new
+x
+8
+allocate
+x
+5
+value
+x
+10
+initialize
+x
+7
+set_var
+p
+21
+I
+-1
+I
+1c
+I
+0
+I
+1d
+I
+1e
+I
+0
+I
+1f
+I
+1e
+I
+29
+I
+1f
+I
+44
+I
+20
+I
+6e
+I
+1f
+I
+6f
+I
+0
+I
+70
+I
+22
+I
+7a
+I
+23
+I
+7d
+x
+78
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/tree/variable_node.rb
+p
+2
+x
+11
+environment
+x
+3
+val
+p
+9
+I
+2
+I
+a
+I
+10
+I
+11
+I
+14
+I
+14
+I
+22
+I
+1c
+I
+30
+x
+78
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/tree/variable_node.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+2
+I
+6
+I
+1f
+x
+78
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/tree/variable_node.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+2
+I
+2
+I
+1c
+x
+78
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/tree/variable_node.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+0
+I
+1
+I
+1c
+x
+78
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/tree/variable_node.rb
+p
+0