cloudhead-less 0.8.3 → 0.8.4

data/VERSION

@@ -1 +1 @@
-0.8.3
+0.8.4

data/less.gemspec

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

data/lib/less/engine.rb

@@ -52,13 +52,13 @@ module Less
       # 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
+          evaluate key, value, path, 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|
-        evaluate key, value, node
+        evaluate key, value, path, node
       end
       
       #
@@ -95,14 +95,14 @@ module Less
     #
     # Evaluate variables
     #
-    def evaluate key, value, node               
-      if value.is_a? String and value.include? '@'       # There's a var to evaluate    
-        value.scan REGEX[: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
+    def evaluate key, value, path, node               
+      if value.is_a? String and value.include? '@'      # There's a var to evaluate    
+        value.scan REGEX[:path] do |var|
+          var = var.join.delete ' '
+          var = if var.include? '>'
+            @tree.find :var, var.split('>')             # Try finding it in a specific namespace
+          else            
+           node.var( var ) or @tree.nearest var, path   # Try local first, then nearest scope            
           end
 
           if var

data/lib/less/tree.rb

@@ -16,6 +16,9 @@ module Less
       self[:variables] ? self[:variables] : nil
     end
     
+    #
+    # Find a variable or mixin from a specific path
+    #
     def find what = :var, path = []
       path.inject(self) do |branch, k|        
         if what == :var && k == path.last
@@ -26,40 +29,52 @@ module Less
       end
     end
     
+    #
+    # Find the nearest variable in the hierarchy
+    #
+    def nearest var, path
+      values = []
+      path.inject(self) do |branch, k|
+        values << branch.var( var )
+        branch[ k ]
+      end
+      values.compact.last
+    end
+    
     def traverse by = :leaf, path = [], &blk
     #
     # Traverse the whole tree, returning each leaf or branch (recursive)
     #
     ###
-      #   Aside from the key & value, 
-      #   we yield the full path of the leaf, aswell as
-      #   the branch which contains it (self).
+      #   Aside from the key & value, we yield the full path of the leaf,  
+      #   aswell as the branch which contains it (self).
+      #   Note that in :branch mode, we only return 'twigs', branches which contain leaves.
       #
       self.each do |key, value|                        # `self` is the current node, starting with the trunk
         if value.is_a? Hash and key != :variables      # If the node is a branch, we can go deeper
           path << key                                  # Add the current branch to the path
           self[ key ] = value.to_tree.                 # Make sure any change is saved to the main tree
-                        traverse by, path, &blk        # Recurse, with the current node becoming `self`
-          if by == :branch             
-            yield path, self[ key ]                    # The node is a branch, yield it to the block
-            path.pop
-          end
+                        traverse by, path, &blk        # Recurse, with the current node becoming `self`                       
+          yield path, self[ key ] if by == :branch     # The node is a branch, yield it to the block
+          path.pop                                     # We're returning from a branch, pop the last element
         elsif by == :leaf and key.is_a? String
           yield key, value, path, self                 # The node is a leaf, yield it to the block
-          path.pop
         else
           next
         end
       end
       self
     end
-
+    
+    #
+    # Convert the tree to css, using full paths
+    #
     def to_css css = []
       self.traverse :branch do |path, node|
         properties = node.inject("") do |s, (k, v)|          
           v.is_a?(String) ? (s + "#{k}: #{CGI.unescape(v)}; ") : s   # Add the property to the list
         end
-        css << path * ' > ' + " { " + properties + "}" # Add the rule-set to the CSS
+        css << path * ' > ' + " { " + properties + "}"               # Add the rule-set to the CSS
       end
       css.join "\n"
     end

data/spec/spec.less

@@ -46,7 +46,9 @@
         .second {
             @color: blue;
             .third {
-                color: @main-color; // #444
+                background-color: @color; // blue
+                font-size: @size; // 8px
+                color: @main-color; // red
                 border-color: .root > .first > .second > @color; // 'blue'
             }
         }

metadata

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