less 0.8.0 → 0.8.1

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/less.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]

data/lib/less/engine.rb

@@ -1,9 +1,9 @@
 module Less  
   class Engine < String
     REGEXP = {
-      :path     => /(?>[#.][->#.\w ]+)?(?> ?> ?)?@([-\w]+)/, # #header > .title > @var
+      :path     => /([#.][->#.\w ]+)?( ?> ?)?@([-\w]+)/,     # #header > .title > @var
       :selector => /[-\w #.>*:]/,                            # .cow .milk > a
-      :variable => /^@([-\w]+)/,                             # @milk-white
+      :variable => /@([-\w]+)/,                              # @milk-white
       :property => /@[-\w]+|[-a-z]+/                         # font-size
     }
     
@@ -23,8 +23,8 @@ module Less
       # can then be deleted.
       #
       @tree = @tree.traverse :leaf do |key, value, path, node|
-        matched = if match = key.match( REGEXP[:variable] )
-          node[:variables] ||= {}
+        matched = if match = key.match( REGEXP[:variable] )          
+          node[:variables] ||= Tree.new
           node[:variables][ match.captures.first ] = value
         elsif value == :mixin
           node[:mixins] ||= []          
@@ -44,38 +44,16 @@ module Less
         end
       end
       
-      #
-      # Evaluate variables
-      #
+      # Call `evaluate` on variables, such as '@dark: @light / 2'
+      @tree = @tree.traverse :branch do |path, node|
+        node.vars.each do |key, value|
+          evaluate key, value, node.vars
+        end if node.vars?
+      end
+      
+      # Call `evaluate` on css properties, such as 'font-size: @big'
       @tree = @tree.traverse :leaf do |key, value, path, node|
-        convert = lambda do |key, value, node|             # We declare this as a lambda, for re-use
-          if value.is_a?(String) && value.include?('@')    # There's a var to evaluate        
-            
-            # Find its value
-            var = value.delete(' ').match( REGEXP[:path] ).captures.join  
-            var = unless var.include? '>'
-              node.var( var ) || @tree.var( var )          # Try local first, then global
-            else
-              @tree.find :var, var.split('>')              # Try finding it in a specific namespace
-            end
-          
-            if var
-              node[ key ] = value.gsub REGEXP[:path], var  # Substitute variable with value
-            else
-              node.delete key                              # Discard the declaration if the variable wasn't found
-            end
-          end
-        end
-        
-        # Call `convert` on css properties, such as 'font-size: @big'
-        convert.call key, value, node
-        
-        # Call `convert` on variables, such as '@dark: @light / 2'
-        if node.vars? 
-          node.vars.each do |key, value|
-            convert.call key, value, node
-          end
-        end
+        evaluate key, value, node
       end
       
       #
@@ -87,9 +65,12 @@ module Less
           if (unit = value.scan(/(%)|\d+(px)|\d+(em)|(#)/i).flatten.compact.uniq).size <= 1
             unit = unit.join            
             value = if unit == '#'
-              evaluate = lambda {|v| unit + eval( v ).to_s(16) }
+              evaluate = lambda do |v| 
+                result = eval v
+                unit + ( result.zero?? '000' : result.to_s(16) )
+              end
               value.gsub(/#([a-z0-9]+)/i) do
-                hex = $1 * ( $1.size == 3 ? 2 : 1 )
+                hex = $1 * ( $1.size < 6 ? 6 / $1.size : 1 )
                 hex.to_i(16)
               end.delete unit
             else
@@ -103,10 +84,31 @@ module Less
           end
         end
       end
-      
     end
     alias render compile
     
+    #
+    # Evaluate variables
+    #
+    def evaluate key, value, node               
+      if value.is_a? String and value.include? '@'       # There's a var to evaluate    
+        value.scan REGEXP[:path] do |p|
+          p = p.join.delete ' '
+          var = if p.include? '>'
+            @tree.find :var, p.split('>')                # Try finding it in a specific namespace
+          else
+            node.var( p ) || @tree.var( p )              # Try local first, then global
+          end
+
+          if var
+            node[ key ] = value.gsub REGEXP[:path], var  # Substitute variable with value
+          else
+            node.delete key                              # Discard the declaration if the variable wasn't found
+          end
+        end    
+      end
+    end
+    
     def to_css
       self.compile.to_css
     end

data/spec/spec.less

@@ -14,8 +14,9 @@ lala
   font-family: "Verdana", 'Baka', serif;
 }
 .dookoo {
+    @fi: @fa;
     @fa: grey;
-    color: @fa;
+    color: .alt > @base-color - .alt > @base-color;
     line-height: 1999px;
     .blah {
       .bloop {
@@ -24,9 +25,9 @@ lala
     }
 }
 .alt {
-    @base-color: green;
-    @darker-color: @base-color / 2;
-    @another-color: * > @base-color;
+    @base-color: #876956 - #111;
+    @darker-color: @base-color - @base-color;
+    @another-color: @base-color;
 }
 #kelkoo {
   color: .dookoo > .blah > .bloop > @supernested;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: less
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - cloudhead