less 1.1.13 → 1.2.9

data/lib/less/engine/nodes/entity.rb

@@ -57,20 +57,20 @@ module Less
     # An anonymous node, for all the 'other' stuff
     # which doesn't need any specific functionality.
     #
-    class Anonymous < ::String
+    class Anonymous < String
       include Entity
     end
     
     #
     # + * - /
     #
-    class Operator < ::String
+    class Operator < String
       def to_ruby
         self
       end
     end
     
-    class Paren < ::String
+    class Paren < String
       def to_ruby
         self
       end

data/lib/less/engine/nodes/function.rb

@@ -48,17 +48,22 @@ module Less
     #
     #   it calls functions from the Functions module
     #
-    class Function < ::String
+    class Function < String
       include Entity
       include Functions
     
-      def initialize name, *args
-        @args = args.flatten
+      def initialize name, args
+        @args = if args.is_a? Array
+          args.map {|e| e.is_a?(Expression) ? e : Expression.new(e, self)}
+        else
+          [args]
+        end
+        
         super name
       end
       
-      def to_css
-        self.evaluate.to_css
+      def to_css env = nil
+        self.evaluate(env).to_css *env
       end
       
       #
@@ -67,7 +72,7 @@ module Less
       # If the function isn't found, we just print it out,
       # this is the case for url(), for example,
       #
-      def evaluate
+      def evaluate context = nil
         if Functions.available.include? self.to_sym
           send to_sym, *@args
         else

data/lib/less/engine/nodes/literal.rb

@@ -17,7 +17,7 @@ module Less
 
       def initialize r, g, b, a = 1.0
         @r, @g, @b = [r, g, b].map do |c|
-          normalize(c.is_a?(::String) ? c.to_i(16) : c)
+          normalize(c.is_a?(String) ? c.to_i(16) : c)
         end
         @a = normalize(a, 1.0)
       end
@@ -94,7 +94,11 @@ module Less
       def to_s
         "#{super}#@unit"
       end
-    
+      
+      def dup
+        self
+      end
+      
       def to_ruby
         self.to_f
       end
@@ -111,7 +115,7 @@ module Less
     #
     # "hello world"
     #
-    class String < ::String
+    class Quoted < String
       include Literal
       
       attr_reader :quotes, :content
@@ -152,7 +156,7 @@ module Less
     #   
     #   ex: red, small, border-collapse
     #
-    class Keyword < ::String
+    class Keyword < String
       include Entity
       
       def to_css

data/lib/less/engine/nodes/property.rb

@@ -1,33 +1,43 @@
 module Less
   module Node
-    class Property < ::String
+    class Property < String
       include Entity
       
       attr_accessor :value
       
       def initialize key, value = nil, parent = nil
         super key, parent
-
         value = if value.is_a? Array
-          value.each {|v| v.parent = self if v.respond_to? :parent }
+          value.each {|v| v.parent = self if v.respond_to? :parent }.
+                map  {|v| v.is_a?(Expression) ? v : Expression.new(v, self) }
         elsif value.nil?
           []
         else
           value
         end
-        
-        @value = Expression.new(value, self)
-        @eval = false # Store the first evaluation in here
+        @value = value.is_a?(Expression) ? value : Expression.new(value, self)
+        @value.parent = self
+        @value.delimiter = ','
+#        puts "new property #{to_s}: #{value} => #{@value}, contains: #{@value[0].class}"
+#        puts
       end
-  
-      def << token
+      
+      def parent= obj
+        @parent = obj
+        value.parent = self
+      end
+      
+      def copy
+        clone.tap {|c| c.value = value.copy }
+      end
+      
+      def << token        
         token = Node::Anonymous.new(*token) unless token.is_a? Entity or token.respond_to? :to_ruby
         token.parent = self if token.respond_to? :parent
         @value << token
       end
   
       def empty?; !@value || @value.empty? end
-      def eval?;  @eval end
 
       def inspect
         self + (empty?? "" : ": `#{value.map {|i| i.to_s } * ' | '}`")
@@ -49,13 +59,29 @@ module Less
         parent.nearest node
       end
         
-      # TODO: @eval and @value should be merged
-      def evaluate    
-        @eval ||= value.evaluate
+      def evaluate env = nil
+#        puts "evaluating property `#{to_s}`: #{value.inspect}"
+        if value.is_a?(Expression) #Value
+#          puts "value is a Value"
+          value.map {|e| e.evaluate(env) } #6
+        else
+#          puts "value is a #{value.class}"
+          [value.evaluate(env)]
+        end
+        
+        
       end
           
-      def to_css
-        "#{self}: #{evaluate.to_css};"
+      def to_css env = nil
+#        puts "property.to_css `#{to_s}` env:#{env ? env.variables : "nil"}"
+        val = evaluate(env)
+        "#{self}: #{if val.respond_to? :to_css
+            val.to_css
+          else
+#            p val
+#            puts "#{val.class} #{val.first.class}"
+            val.map {|i| i.to_css }.join(", ")
+          end};"
       end
     end
 
@@ -75,11 +101,13 @@ module Less
         "@#{super}"
       end
     
-      def evaluate
+      def evaluate env = nil
         if declaration
-          @eval ||= value.evaluate
-        else          
-          @eval ||= self.parent.nearest(to_s).evaluate
+#          puts "evaluating DEC"
+          value.evaluate #2
+        else
+#          puts "evaluating #{to_s} par: #{parent} env: #{env ? env.variables : "nil"}"
+          (env || self.parent).nearest(to_s).evaluate #3
         end
       end
        
@@ -87,20 +115,28 @@ module Less
         evaluate.to_ruby
       end
     
-      def to_css
-        evaluate.to_css
+      def to_css env = nil
+        val = evaluate env
+        if val.respond_to? :to_css
+          env ? val.to_css(env) : val.to_css
+        else
+          val.map {|i| env ? i.to_css(env) : i.to_css }.join ', '
+        end
       end
     end
-  
+
     class Expression < Array
-      attr_reader :parent
+      attr_accessor :parent, :delimiter
       
-      def initialize ary, parent = nil
+      def initialize ary, parent = nil, delimiter = ' '
         self.parent = parent
-        super ary
+        self.delimiter = delimiter
+#        puts "new expression #{ary} |#{delimiter}|"
+        super(ary.is_a?(Array) ? ary : [ary].flatten)
       end
       
       def expressions; select {|i| i.kind_of? Expression } end
+      def variables;   select {|i| i.kind_of? Variable   } end
       def operators;   select {|i| i.is_a? Operator }      end
       def entities;    select {|i| i.kind_of? Entity }     end
       def literals;    select {|i| i.kind_of? Literal }    end
@@ -114,14 +150,23 @@ module Less
         '[' + map {|i| i.inspect }.join(', ') + ']'
       end
       
+      def delimiter= d
+        @delimiter = d.strip + ' '
+      end
+      
+      def flatten
+        self
+      end
+      
       def terminal?
-        expressions.empty?
+        expressions.empty? #&& variables.empty?
       end
-    
-      def to_css
+      
+      def to_css env = nil
+#        puts "TOCSS, delim: |#{@delimiter}|"
         map do |i| 
-          i.respond_to?(:to_css) ? i.to_css : i.to_s
-        end * ' '
+          i.respond_to?(:to_css) ? i.to_css(*env) : i.to_s
+        end * @delimiter
       end
       
       def to_ruby
@@ -134,27 +179,42 @@ module Less
       # Evaluates the expression and instantiates a new Literal with the result
       # ex: [#111, +, #111] will evaluate to a Color node, with value #222
       # 
-      def evaluate
+      def evaluate env = nil
+#        puts "expression #{self.inspect} env: #{env ? env.variables : "nil"}"
         if size > 2 or !terminal?
+#          puts " SIZE > 2 or !terminal"
+          
+#          puts "--- sub evaluation ---"
+
           # Replace self with an evaluated sub-expression
-          replace map {|e| e.respond_to?(:evaluate) ? e.evaluate : e }
+          evaled = self.class.new(map {|e| e.respond_to?(:evaluate) ? e.evaluate(env) : e }, parent, delimiter) #5
+          
+#          puts "======================"
+#          puts "evaled => #{evaled.inspect}"
 
-          unit = literals.map do |node|
+          unit = evaled.literals.map do |node|
             node.unit
           end.compact.uniq.tap do |ary|
-            raise MixedUnitsError, self * ' ' if ary.size > 1 && !operators.empty?
+            raise MixedUnitsError, evaled * ' ' if ary.size > 1 && !evaled.operators.empty?
           end.join
           
-          entity = literals.find {|e| e.unit == unit } || entities.first
-          result = operators.empty?? self : eval(to_ruby.join)
-          
+          entity = evaled.literals.find {|e| e.unit == unit } || evaled.literals.first || evaled.entities.first
+          result = evaled.operators.empty?? evaled : eval(evaled.to_ruby.join)
+
+#          puts "entity is a #{entity.class}"
+#          puts "delimiter is |#{@delimiter}|"
+
           case result
             when Entity     then result
-            when Expression then result.one?? result.first : self.class.new(result)
+            when Expression then result.one?? result.first : self.class.new(result, parent, delimiter)
             else entity.class.new(result, *(unit if entity.class == Node::Number))
           end
         elsif size == 1
-          first
+          if first.is_a? Variable
+            first.evaluate(env)
+          else
+            first
+          end
         else
           self
         end

data/lib/less/engine/nodes/selector.rb

@@ -1,6 +1,6 @@
 module Less
   module Node
-    class Selector < ::String
+    class Selector < String
       include Entity
       
       Selectors = {

data/spec/css/css-3.css

@@ -1,3 +1,17 @@
+.comma-delimited {
+  background: url(bg.jpg) no-repeat, url(bg.png) repeat-x top left, url(bg);
+  text-shadow: -1px -1px 1px red, 6px 5px 5px yellow;
+  -moz-box-shadow: 0pt 0pt 2px rgba(255, 255, 255, 0.4) inset, 0pt 4px 6px rgba(255, 255, 255, 0.4) inset;
+}
+@font-face {
+  font-family: Headline;
+  src: local(Futura-Medium), url(fonts.svg#MyGeometricModern) format("svg");
+}
+.other { -moz-transform: translate(0, 11em) rotate(-90deg); }
 p:not([class*="lead"]) { color: black; }
+input[type="text"].class#id[attr=32]:not(1) { color: white; }
+div#id.class[a=1][b=2].class:not(1) { color: white; }
+ul.comma > li:not(:only-child)::after { color: white; }
+ol.comma > li:nth-last-child(2)::after { color: white; }
 a[href^="http://"], a[href$="http://"] { color: black; }
 p::before { color: black; }

data/spec/css/mixins-args.css

@@ -0,0 +1,31 @@
+.two-args {
+  color: blue;
+  width: 10px;
+  height: 99%;
+}
+.one-arg {
+  width: 15px;
+  height: 49%;
+}
+.no-parens {
+  width: 5px;
+  height: 49%;
+}
+.no-args {
+  width: 5px;
+  height: 49%;
+}
+.var-args {
+  width: 45;
+  height: 17%;
+}
+.multi-mix {
+  width: 10px;
+  height: 29%;
+  margin: 4;
+  padding: 5;
+}
+body {
+  padding: 30px;
+  color: #ff0000;
+}

data/spec/css/variables.css

@@ -3,4 +3,5 @@
   height: 24px;
   color: #888888;
   font-family: "Trebuchet MS", Verdana, sans-serif;
+  quotes: "~" "~";
 }

data/spec/css/whitespace.css

@@ -3,4 +3,5 @@
   color: white;
   white-space: pre;
 }
+.no-semi-column { border: 2px solid white; }
 .newlines { border: 2px solid black; }

data/spec/engine_spec.rb

@@ -84,16 +84,17 @@ describe Less::Engine do
 
     it "should handle custom functions" do
       module Less::Functions
-        def color arg
+        def color args
+          arg = args.first
           Less::Node::Color.new("99", "99", "99") if arg == "evil red"
         end
         
         def increment a
-          Less::Node::Number.new(a.to_i + 1)
+          Less::Node::Number.new(a.evaluate.to_i + 1)
         end
         
         def add a, b
-          Less::Node::Number.new(a + b)
+          Less::Node::Number.new(a.evaluate + b.evaluate)
         end
       end
       lessify(:functions).should == css(:functions)

data/spec/less/css-3.less

@@ -1,7 +1,37 @@
+.comma-delimited { 
+  background: url(bg.jpg) no-repeat, url(bg.png) repeat-x top left, url(bg);
+  text-shadow: -1px -1px 1px red, 6px 5px 5px yellow;
+  -moz-box-shadow: 0pt 0pt 2px rgba(255, 255, 255, 0.4) inset,
+    0pt 4px 6px rgba(255, 255, 255, 0.4) inset;
+}
+@font-face {
+  font-family: Headline;
+  src: local(Futura-Medium),
+       url(fonts.svg#MyGeometricModern) format("svg");
+}
+.other {
+  -moz-transform: translate(0, 11em) rotate(-90deg);
+}
 p:not([class*="lead"]) {
   color: black; 
 }
 
+input[type="text"].class#id[attr=32]:not(1) {
+  color: white;
+}
+
+div#id.class[a=1][b=2].class:not(1) {
+  color: white;
+}
+
+ul.comma > li:not(:only-child)::after { 
+  color: white;
+}
+
+ol.comma > li:nth-last-child(2)::after {
+  color: white;
+}
+
 a[href^="http://"] {
   color: black;
 }