less 1.0.11 → 1.0.12

data/VERSION

@@ -1 +1 @@
-1.0.11
+1.0.12

data/less.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "1.0.11"
+  s.version = "1.0.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2009-07-17}
+  s.date = %q{2009-07-20}
   s.default_executable = %q{lessc}
   s.description = %q{LESS is leaner CSS}
   s.email = %q{self@cloudhead.net}
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
      "lib/less/engine/nodes/function.rb",
      "lib/less/engine/nodes/literal.rb",
      "lib/less/engine/nodes/property.rb",
+     "lib/less/engine/nodes/ruleset.rb",
      "lib/less/engine/nodes/selector.rb",
      "lib/less/engine/parser.rb",
      "lib/vendor/treetop/.gitignore",
@@ -127,43 +128,49 @@ Gem::Specification.new do |s|
      "lib/vendor/treetop/spec/spec_suite.rb",
      "lib/vendor/treetop/treetop.gemspec",
      "spec/command_spec.rb",
-     "spec/css/accessors-1.0.css",
-     "spec/css/big-1.0.css",
-     "spec/css/colors-1.0.css",
-     "spec/css/comments-1.0.css",
-     "spec/css/css-1.0.css",
-     "spec/css/css3-1.0.css",
-     "spec/css/functions-1.0.css",
-     "spec/css/import-1.0.css",
-     "spec/css/mixins-1.0.css",
-     "spec/css/operations-1.0.css",
-     "spec/css/rulesets-1.0.css",
-     "spec/css/scope-1.0.css",
-     "spec/css/strings-1.0.css",
-     "spec/css/variables-1.0.css",
-     "spec/css/whitespace-1.0.css",
+     "spec/css/accessors.css",
+     "spec/css/big.css",
+     "spec/css/colors.css",
+     "spec/css/comments.css",
+     "spec/css/css-3.css",
+     "spec/css/css.css",
+     "spec/css/functions.css",
+     "spec/css/import.css",
+     "spec/css/lazy-eval.css",
+     "spec/css/mixins-args.css",
+     "spec/css/mixins.css",
+     "spec/css/operations.css",
+     "spec/css/rulesets.css",
+     "spec/css/scope.css",
+     "spec/css/selectors.css",
+     "spec/css/strings.css",
+     "spec/css/variables.css",
+     "spec/css/whitespace.css",
      "spec/engine_spec.rb",
-     "spec/less/accessors-1.0.less",
-     "spec/less/big-1.0.less",
-     "spec/less/colors-1.0.less",
-     "spec/less/comments-1.0.less",
-     "spec/less/css-1.0.less",
-     "spec/less/css3-1.0.less",
+     "spec/less/accessors.less",
+     "spec/less/big.less",
+     "spec/less/colors.less",
+     "spec/less/comments.less",
+     "spec/less/css-3.less",
+     "spec/less/css.less",
      "spec/less/exceptions/mixed-units-error.less",
      "spec/less/exceptions/name-error-1.0.less",
      "spec/less/exceptions/syntax-error-1.0.less",
-     "spec/less/functions-1.0.less",
-     "spec/less/import-1.0.less",
+     "spec/less/functions.less",
+     "spec/less/import.less",
      "spec/less/import/import-test-a.less",
      "spec/less/import/import-test-b.less",
      "spec/less/import/import-test-c.less",
-     "spec/less/mixins-1.0.less",
-     "spec/less/operations-1.0.less",
-     "spec/less/rulesets-1.0.less",
-     "spec/less/scope-1.0.less",
-     "spec/less/strings-1.0.less",
-     "spec/less/variables-1.0.less",
-     "spec/less/whitespace-1.0.less",
+     "spec/less/lazy-eval.less",
+     "spec/less/mixins-args.less",
+     "spec/less/mixins.less",
+     "spec/less/operations.less",
+     "spec/less/rulesets.less",
+     "spec/less/scope.less",
+     "spec/less/selectors.less",
+     "spec/less/strings.less",
+     "spec/less/variables.less",
+     "spec/less/whitespace.less",
      "spec/spec.css",
      "spec/spec.less",
      "spec/spec_helper.rb"

data/lib/less/engine/less.tt

@@ -14,13 +14,13 @@ grammar Less
     selectors "{" ws primary ws "}" ws {
       def build env
         # Build the ruleset for each selector
-        selectors.build(env, :tree).each do |sel|
+        selectors.build(env, :ruleset).each do |sel|
           primary.build sel
         end
       end
     } / ws selectors ';' ws {
       def build env        
-        selectors.build(env, :path).each do |path|
+        selectors.build(env, :mixin).each do |path|
           rules = path.inject(env.root) do |current, node|
             current.descend(node.selector, node) or raise MixinNameError, path.join
           end.rules
@@ -79,15 +79,15 @@ grammar Less
   # div > p a {...}
   #
   rule selector
-    (s select element s)+ {
-      def tree env
+    (s select element s)+ arguments? {
+      def ruleset env
         elements.inject(env) do |node, e|
           node << Node::Element.new(e.element.text_value, e.select.text_value)
           node.last
         end
       end
       
-      def path env
+      def mixin env
         elements.map do |e|
           Node::Element.new(e.element.text_value, e.select.text_value)
         end
@@ -102,7 +102,7 @@ grammar Less
   rule declaration
     ws name:(ident / variable) s ':' s expression s (';'/ ws &'}') ws {
       def build env
-        env << (name.text_value =~ /^@/ ? Node::Variable : Node::Property).new(name.text_value)
+        env << (name.text_value =~ /^@/ ? Node::Variable : Node::Property).new(name.text_value, [])
         expression.build env
       end
     # Empty rule
@@ -156,7 +156,7 @@ grammar Less
   rule variable
     '@' [-a-zA-Z0-9_]+  {
       def build env
-        env.identifiers.last << env.nearest(text_value)
+        env.identifiers.last << Node::Variable.new(text_value)
       end
     }
   end
@@ -294,10 +294,9 @@ grammar Less
       def build env
         env.identifiers.last << Node::Color.new(*rgb.build)
       end
-    } / fn:(('hsl'/'rgb') 'a'?) '(' arguments ')' {
+    } / fn:(('hsl'/'rgb') 'a'?) arguments {
       def build env
-        args = arguments.build env
-        env.identifiers.last << Node::Function.new(fn.text_value, args.flatten)
+        env.identifiers.last << Node::Function.new(fn.text_value, arguments.build.flatten)
       end
     }
   end
@@ -325,43 +324,46 @@ grammar Less
   # Functions and arguments
   #
   rule function
-    name:([-a-zA-Z_]+) '(' arguments ')' {
+    name:([-a-zA-Z_]+) arguments {
       def build env
-        args = arguments.build env
-        env.identifiers.last << Node::Function.new(name.text_value, [args].flatten)
+        env.identifiers.last << Node::Function.new(name.text_value, [arguments.build].flatten)
       end
     }
   end
   
   rule arguments
-    argument s ',' s arguments {
-      def build env
-        elements.map do |e|
-          e.build env if e.respond_to? :build
+    '(' s argument s tail:(',' s argument s)* ')' {
+      def build
+        all.map do |e|
+          e.build if e.respond_to? :build
         end.compact
       end
-    } / argument
+    
+      def all
+        [argument] + tail.elements.map {|e| e.argument }
+      end
+    }
   end
   
   rule argument
     color {
-      def build env
+      def build
         Node::Color.new text_value
       end
     } / number unit {
-      def build env
+      def build
         Node::Number.new number.text_value, unit.text_value
       end
     } / string {
-      def build env
+      def build
         Node::String.new text_value
       end
     } / [a-zA-Z]+ '=' dimension {
-      def build env
+      def build
         Node::Anonymous.new text_value
       end
     } / [-a-zA-Z0-9_%$/.&=:;#+?]+ {
-      def build env
+      def build
         Node::String.new text_value
       end
     }

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

@@ -12,12 +12,12 @@ module Less
       include Enumerable
       include Entity
   
-      attr_accessor :rules, :selector, :partial, :file
+      attr_accessor :rules, :selector, :partial, :file, :set
   
       def initialize name = "", selector = ''
-        super name
-      
-        @partial = false
+        super name   
+        
+        @set = []
         @rules = [] # Holds all the nodes under this element's hierarchy
         @selector = Selector[selector.strip].new  # descendant | child | adjacent
       end
@@ -32,7 +32,7 @@ module Less
   
       # Top-most node?
       def root?
-        self == '' && parent.nil?
+        parent.nil?
       end
     
       def empty?
@@ -42,6 +42,43 @@ module Less
       def leaf?
         elements.empty?
       end
+      
+      # Group similar rulesets together
+      # This is horrible, horrible code,
+      # but it'll have to do until I find
+      # a proper way to do it.
+      def group
+        matched = false
+        stack, result = elements.dup, []
+        return self unless elements.size > 1
+        
+        elements.each do
+          e = stack.first
+          result << e unless matched
+          
+          matched = stack[1..-1].each do |ee|
+            if e.rules.size == ee.rules.size and 
+               e.elements.size == 0 and
+              !e.rules.zip(ee.rules).map {|a, b| 
+                a.to_css == b.to_css
+              }.include?(false)
+              
+              # Add to set unless it's a duplicate
+              if e == ee
+                # Do something with dups
+              else
+                self[e].set << ee
+              end
+              stack.shift
+            else
+              stack.shift
+              break false
+            end
+          end if stack.size > 1
+        end
+        @rules -= (elements - result)
+        self
+      end
   
       #
       # Accessors for the different nodes in @rules
@@ -84,7 +121,7 @@ module Less
     
       def last;  elements.last  end
       def first; elements.first end
-      def to_s; super end
+      def to_s; root?? '*' : super end
       
       #
       # Entry point for the css conversion
@@ -95,15 +132,15 @@ module Less
         content = properties.map do |i|
           ' ' * 2 + i.to_css
         end.compact.reject(&:empty?) * "\n"
-    
+        
         content = content.include?("\n") ? 
           "\n#{content}\n" : " #{content.strip} "
         ruleset = !content.strip.empty?? 
-          "#{path.reject(&:empty?).join.strip} {#{content}}\n" : ""
-    
+          "#{[path.reject(&:empty?).join.strip, *@set] * ', '} {#{content}}\n" : ""
+      
         css = ruleset + elements.map do |i|
           i.to_css(path)
-        end.reject(&:empty?).join
+        end.reject(&:empty?).join        
         path.pop; path.pop
         css
       end
@@ -132,7 +169,6 @@ module Less
         end
         self
       end
-      alias :traverse :each
   
       def inspect depth = 0
         indent = lambda {|i| '.  ' * i }

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

@@ -7,12 +7,13 @@ module Less
       
       def initialize key, value = nil
         super key
-        @value = Expression.new(value ? [value] : [])
+        @value = Expression.new(value ? [value].flatten : [])
         @eval = false # Store the first evaluation in here
       end
   
       def << token
         token = Node::Anonymous.new(*token) unless token.is_a? Entity or token.is_a? Operator
+        token.parent = self if token.respond_to? :parent
         @value << token
       end
   
@@ -27,9 +28,13 @@ module Less
         super
       end
       
+      def nearest node
+        parent.nearest node
+      end
+        
       # TODO: @eval and @value should be merged
       def evaluate    
-        @eval || @eval = value.evaluate
+        @eval ||= value.evaluate
       end
           
       def to_css
@@ -37,8 +42,11 @@ module Less
       end
     end
 
-    class Variable < Property      
-      def initialize key, value = nil      
+    class Variable < Property
+      attr_reader :declaration
+        
+      def initialize key, value = nil   
+        @declaration = value ? true : false 
         super key.delete('@'), value
       end
   
@@ -50,16 +58,28 @@ module Less
         "@#{super}"
       end
     
+      def evaluate
+        if declaration
+          @eval ||= value.evaluate
+        else          
+          @eval ||= self.parent.nearest(to_s).evaluate
+        end
+      end
+       
       def to_ruby
-        value.evaluate.to_ruby
+        evaluate.to_ruby
       end
     
       def to_css
-        value.evaluate.to_css
+        evaluate.to_css
       end
     end
   
     class Expression < Array
+      def initialize ary
+        super [ary].flatten
+      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

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

@@ -0,0 +1,12 @@
+module Less
+  module Node
+    class Ruleset < Array
+      def initialize elements = []
+        super elements
+      end
+      
+      def to_css
+      end
+    end
+  end
+end

data/lib/less/engine/nodes.rb

@@ -2,6 +2,7 @@ $:.unshift File.dirname(__FILE__)
 
 require 'engine/nodes/entity'
 require 'engine/nodes/function'
+require 'engine/nodes/ruleset'
 require 'engine/nodes/element'
 require 'engine/nodes/property'
 require 'engine/nodes/literal'

data/lib/less/engine/parser.rb

@@ -1029,7 +1029,7 @@ module Less
 
   module Declaration2
     def build env
-      env << (name.text_value =~ /^@/ ? Node::Variable : Node::Property).new(name.text_value)
+      env << (name.text_value =~ /^@/ ? Node::Variable : Node::Property).new(name.text_value, [])
       expression.build env
     end
   # Empty rule
@@ -1601,7 +1601,8 @@ module Less
 
   module Variable1
     def build env
-      env.identifiers.last << env.nearest(text_value)
+      #env.identifiers.last << env.nearest(text_value)
+      env.identifiers.last << Node::Variable.new(text_value)
     end
   end
 

data/lib/less/engine.rb

@@ -34,13 +34,13 @@ module Less
       else
         raise SyntaxError, @parser.failure_message
       end
-                  
+
       @tree
     end
     alias :to_tree :parse
     
     def to_css
-      @css || @css = self.parse.to_css
+      @css || @css = self.parse.group.to_css
     end
     
     def prepare

data/spec/css/css-3.css

@@ -0,0 +1,2 @@
+p:not([class*="lead"]) { color: black; }
+a[href^="http://"], a[href$="http://"] { color: black; }

data/spec/css/lazy-eval.css

@@ -0,0 +1 @@
+.lazy-eval { width: 100%; }

data/spec/css/{scope-1.0.css → scope.css}

@@ -1,7 +1,4 @@
-.tiny-scope {
-  color: none;
-  border-color: #998899;
-}
+.tiny-scope { color: #998899; }
 .scope1 {
   color: blue;
   border-color: black;

data/spec/css/selectors.css

@@ -0,0 +1,8 @@
+h1 a:hover { color: red; }
+h1 p:hover { color: red; }
+h2 a:hover { color: red; }
+h2 p:hover { color: red; }
+h3 a:hover { color: red; }
+h3 p:hover { color: red; }
+#all, #the, #same { color: blue; }
+ul, li, div, q, blockquote, textarea { margin: 0; }

data/spec/css/{whitespace-1.0.css → whitespace.css}

@@ -1,11 +1,8 @@
+.whitespace, .white, .space, .mania, .no-semi-column { color: white; }
 .whitespace { color: white; }
 .whitespace { color: white; }
 .whitespace { color: white; }
 .whitespace { color: white; }
-.whitespace { color: white; }
-.white { color: white; }
-.space { color: white; }
-.mania { color: white; }
 .no-semi-column { color: white; }
 .no-semi-column {
   color: white;

data/spec/engine_spec.rb

@@ -5,12 +5,12 @@ module LessEngineSpecHelper
     if arg.is_a? String or arg.is_a? File
       return Less::Engine.new(arg).to_css
     else
-      lessify File.new("spec/less/#{arg}-1.0.less")
+      lessify File.new("spec/less/#{arg.to_s.gsub('_', '-')}.less")
     end
   end
   
   def css file
-    File.read("spec/css/#{file}-1.0.css")
+    File.read("spec/css/#{file.to_s.gsub('_', '-')}.css")
   end
 end
 
@@ -22,8 +22,12 @@ describe Less::Engine do
       lessify(:css).should == css(:css)
     end
     
+    it "should group selectors when it can" do
+      lessify(:selectors).should == css(:selectors)
+    end
+    
     it "should parse css 3" do
-      lessify(:css3).should == css(:css3)
+      lessify(:css_3).should == css(:css_3)
     end
     
     it "should parse comments" do
@@ -65,6 +69,14 @@ describe Less::Engine do
     it "should parse mixins" do
       lessify(:mixins).should == css(:mixins)
     end
+    
+    it "should parse mixins with arguments" do
+      lessify(:mixins_args).should == css(:mixins_args)
+    end
+    
+    it "should evaluate variables lazily" do
+      lessify(:lazy_eval).should == css(:lazy_eval)
+    end
 
     it "should handle custom functions" do
       module Less::Functions

data/spec/less/lazy-eval.less

@@ -0,0 +1,6 @@
+@var: @a;
+@a: 100%;
+
+.lazy-eval {
+  width: @var;
+}

data/spec/less/{scope-1.0.less → scope.less}

@@ -7,9 +7,8 @@
 }
 
 .tiny-scope {
-  color: @mix; // none
+  color: @mix; // #989
   .mixin;
-  border-color: @mix; // #989
 }
 
 .scope1 {

data/spec/less/selectors.less

@@ -0,0 +1,15 @@
+h1, h2, h3 {
+  a, p {
+    :hover {
+      color: red;
+    }
+  }
+}
+
+#all { color: blue; }
+#the { color: blue; }
+#same { color: blue; }
+
+ul, li, div, q, blockquote, textarea {
+  margin: 0;
+}

data/spec/spec.css

@@ -40,9 +40,7 @@ body {
   colorc: #777777;
 }
 #operations div { width: 80px; }
-td { border-width: 88px; }
-tr { border-width: 88px; }
-table { border-width: 88px; }
+td, tr, table { border-width: 88px; }
 blockquote:before { content: ""; }
 blockquote:after { content: ""; }
 q:before { content: ""; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: less
 version: !ruby/object:Gem::Version 
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-17 00:00:00 -04:00
+date: 2009-07-20 00:00:00 -04:00
 default_executable: lessc
 dependencies: []
 
@@ -41,6 +41,7 @@ files:
 - lib/less/engine/nodes/function.rb
 - lib/less/engine/nodes/literal.rb
 - lib/less/engine/nodes/property.rb
+- lib/less/engine/nodes/ruleset.rb
 - lib/less/engine/nodes/selector.rb
 - lib/less/engine/parser.rb
 - lib/vendor/treetop/.gitignore
@@ -134,43 +135,49 @@ files:
 - lib/vendor/treetop/spec/spec_suite.rb
 - lib/vendor/treetop/treetop.gemspec
 - spec/command_spec.rb
-- spec/css/accessors-1.0.css
-- spec/css/big-1.0.css
-- spec/css/colors-1.0.css
-- spec/css/comments-1.0.css
-- spec/css/css-1.0.css
-- spec/css/css3-1.0.css
-- spec/css/functions-1.0.css
-- spec/css/import-1.0.css
-- spec/css/mixins-1.0.css
-- spec/css/operations-1.0.css
-- spec/css/rulesets-1.0.css
-- spec/css/scope-1.0.css
-- spec/css/strings-1.0.css
-- spec/css/variables-1.0.css
-- spec/css/whitespace-1.0.css
+- spec/css/accessors.css
+- spec/css/big.css
+- spec/css/colors.css
+- spec/css/comments.css
+- spec/css/css-3.css
+- spec/css/css.css
+- spec/css/functions.css
+- spec/css/import.css
+- spec/css/lazy-eval.css
+- spec/css/mixins-args.css
+- spec/css/mixins.css
+- spec/css/operations.css
+- spec/css/rulesets.css
+- spec/css/scope.css
+- spec/css/selectors.css
+- spec/css/strings.css
+- spec/css/variables.css
+- spec/css/whitespace.css
 - spec/engine_spec.rb
-- spec/less/accessors-1.0.less
-- spec/less/big-1.0.less
-- spec/less/colors-1.0.less
-- spec/less/comments-1.0.less
-- spec/less/css-1.0.less
-- spec/less/css3-1.0.less
+- spec/less/accessors.less
+- spec/less/big.less
+- spec/less/colors.less
+- spec/less/comments.less
+- spec/less/css-3.less
+- spec/less/css.less
 - spec/less/exceptions/mixed-units-error.less
 - spec/less/exceptions/name-error-1.0.less
 - spec/less/exceptions/syntax-error-1.0.less
-- spec/less/functions-1.0.less
-- spec/less/import-1.0.less
+- spec/less/functions.less
+- spec/less/import.less
 - spec/less/import/import-test-a.less
 - spec/less/import/import-test-b.less
 - spec/less/import/import-test-c.less
-- spec/less/mixins-1.0.less
-- spec/less/operations-1.0.less
-- spec/less/rulesets-1.0.less
-- spec/less/scope-1.0.less
-- spec/less/strings-1.0.less
-- spec/less/variables-1.0.less
-- spec/less/whitespace-1.0.less
+- spec/less/lazy-eval.less
+- spec/less/mixins-args.less
+- spec/less/mixins.less
+- spec/less/operations.less
+- spec/less/rulesets.less
+- spec/less/scope.less
+- spec/less/selectors.less
+- spec/less/strings.less
+- spec/less/variables.less
+- spec/less/whitespace.less
 - spec/spec.css
 - spec/spec.less
 - spec/spec_helper.rb

data/spec/css/css3-1.0.css

@@ -1,3 +0,0 @@
-p:not([class*="lead"]) { color: black; }
-a[href^="http://"] { color: black; }
-a[href$="http://"] { color: black; }