cloudhead-less 1.1.13 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.13
+1.2.0

data/less.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "1.1.13"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2009-08-11}
+  s.date = %q{2009-08-31}
   s.default_executable = %q{lessc}
   s.description = %q{LESS is leaner CSS}
   s.email = %q{self@cloudhead.net}
@@ -160,12 +160,14 @@ Gem::Specification.new do |s|
      "spec/less/exceptions/name-error-1.0.less",
      "spec/less/exceptions/syntax-error-1.0.less",
      "spec/less/functions.less",
+     "spec/less/hidden.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/import/import-test-d.css",
      "spec/less/lazy-eval.less",
+     "spec/less/literal-css.less",
      "spec/less/mixins-args.less",
      "spec/less/mixins.less",
      "spec/less/operations.less",

data/lib/ext.rb

@@ -27,11 +27,6 @@ class Object
     yield self
     self
   end
-  
-  def log(s = '')  puts "* #{s}" if $verbose end
-  def log!(s = '') puts "* #{s}" end
-  def error(s) $stderr.puts s end
-  def error!(s) raise Exception, s end
 end
 
 class Array
@@ -49,16 +44,10 @@ class Array
   end
 end
 
-class Class
-  def to_sym
-    self.to_s.to_sym
-  end
-end
-
 unless :symbol.respond_to?(:to_proc)
   class Symbol
     def to_proc
-      proc {|obj, *args| obj.send(self, *args) }
+      Proc.new {|*args| args.shift.__send__(self, *args) }
     end
   end
 end

data/lib/less/command.rb

@@ -93,7 +93,7 @@ module Less
 
     def err s = '', type = ''
       type = type.strip + ' ' unless type.empty?
-      print "#{RED["! #{type}Error"]}: #{s}"
+      $stderr.print "#{RED["! #{type}Error"]}: #{s}"
       if @options[:growl]
         growl = Growl.new
         growl.title = "LESS"
@@ -101,6 +101,7 @@ module Less
         growl.run
         false
       end
+      return 1
     end
   end
 end

data/lib/less/engine/grammar/common.tt

@@ -22,7 +22,7 @@ module Less
 
       # Non-space char
       rule ns
-        ![ ;\n] .
+        ![ ;,)\n] .
       end
     end
   end

data/lib/less/engine/grammar/entity.tt

@@ -5,7 +5,7 @@ module Less
       # Entity: Any whitespace delimited token
       #
       rule entity
-        function / fonts / keyword / accessor / variable / literal
+        url / function / accessor / keyword / variable / literal / font
       end
 
       rule fonts
@@ -21,13 +21,13 @@ module Less
       end
 
       rule font
-        [a-zA-Z] [-a-zA-Z0-9]* {
+        [a-zA-Z] [-a-zA-Z0-9]* !ns {
           def build
             Node::Keyword.new(text_value)
           end
         } / string {
           def build
-            Node::String.new(text_value)
+            Node::Quoted.new(text_value)
           end
         }
       end
@@ -46,7 +46,7 @@ module Less
           end
         } / string {
           def build
-            Node::String.new(text_value)
+            Node::Quoted.new(text_value)
           end
         }
       end

data/lib/less/engine/grammar/less.tt

@@ -4,7 +4,7 @@ module Less
     include Entity
     
     rule primary
-      (declaration / ruleset / import / comment)* {
+      (import / declaration / mixin / ruleset / comment)* {
         def build env = Less::Element.new
           elements.map do |e|
             e.build env if e.respond_to? :build
@@ -21,56 +21,47 @@ module Less
     # div, .class, body > p {...}
     #
     rule ruleset
-      selectors "{" ws primary ws "}" ws {
+      selectors "{" ws primary ws "}" s hide:(';'?) ws {
         def build env
           # Build the ruleset for each selector
           selectors.build(env, :ruleset).each do |sel|
+            sel.hide unless hide.empty?
             primary.build sel
           end
         end
-      } / ws selectors ';' ws {
+        # Mixin Declaration
+      } / '@' name:[-a-zA-Z0-9_]+ s parameters ws "{" ws primary ws "}" ws {
+        def build env
+          env << Node::Mixin.new(name.text_value, parameters.build(env))
+          primary.build env.last
+          #env.last
+        end
+      }
+    end
+    
+    rule mixin
+      ws selectors ';' ws {
         def build env        
           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
             env.rules += rules
+            #env.mix(rules)
           end
         end
-      }
-    end
-
-    rule import
-      ws "@import" S url:(string / url) medias? s ';' ws {
+      } / name:('@' [-a-zA-Z0-9_]+) args:(arguments?) s ';' {
         def build env
-          path = File.join(env.root.file || Dir.pwd, url.value)
-          path += '.less' unless path =~ /\.(le|c)ss$/
-          if File.exist? path
-            imported = Less::Engine.new(File.new(path)).to_tree
-            env.rules += imported.rules
-          else
-            raise ImportError, path
-          end
-        end
-      }
-    end
+          mix = env.nearest(name.text_value, :mixin) or raise MixinNameError, name.text_value                        
+          params = args.build.map {|i| Node::Expression.new i } unless args.empty?
 
-    rule url
-      'url(' path:(string / [-a-zA-Z0-9_%$/.&=:;#+?]+) ')' {
-        def build env = nil
-          Node::String.new CGI.unescape(path.text_value)
-        end
-    
-        def value
-          build
+          env.mix ((params.nil? || params.empty?) ?
+              mix.rules + mix.params : 
+              mix.pass(params, env))
         end
       }
     end
-
-    rule medias
-      [-a-z]+ (s ',' s [a-z]+)*
-    end
-
+    
     rule selectors
       ws selector tail:(s ',' ws selector)* ws {
         def build env, method 
@@ -89,7 +80,7 @@ module Less
     # div > p a {...}
     #
     rule selector
-      sel:(s select element s)+ arguments? {
+      sel:(s select element s)+ '' {
         def ruleset env
           sel.elements.inject(env) do |node, e|
             node << Node::Element.new(e.element.text_value, e.select.text_value)
@@ -104,16 +95,78 @@ module Less
         end
       }
     end
+    
+    rule parameters
+      '(' s ')' {
+        def build env
+          []
+        end
+      } / '(' parameter tail:(s ',' s parameter)* ')' {
+        def build env
+          all.map do |e|
+            e.build(env)
+          end
+        end
+        
+        def all
+          [parameter] + tail.elements.map {|e| e.parameter }
+        end
+      }
+    end
+
+    rule parameter
+      variable s ':' s expressions {
+        def build env
+          Node::Variable.new(variable.text_value, expressions.build(env), env)
+        end
+      }
+    end
+    
+    rule import
+      ws "@import" S url:(string / url) medias? s ';' ws {
+        def build env
+          path = File.join(env.root.file || Dir.pwd, url.value)
+          path += '.less' unless path =~ /\.(le|c)ss$/
+          if File.exist? path
+            imported = Less::Engine.new(File.new(path)).to_tree
+            env.rules += imported.rules
+          else
+            raise ImportError, path
+          end
+        end
+      }
+    end
+
+    rule url
+      'url(' path:(string / [-a-zA-Z0-9_%$/.&=:;#+?]+) ')' {
+        def build env = nil
+          Node::Function.new('url', value)
+        end
+    
+        def value
+          Node::Quoted.new CGI.unescape(path.text_value)
+        end
+      }
+    end
+
+    rule medias
+      [-a-z]+ (s ',' s [a-z]+)*
+    end
 
     #
     # @my-var: 12px;
     # height: 100%;
     #
     rule declaration
-      ws name:(ident / variable) s ':' s expressions s (';'/ ws &'}') ws {
+      ws name:(ident / variable) s ':' s expressions tail:(ws ',' ws expressions)* s (';'/ ws &'}') ws {
         def build env
+          result = all.map {|e| e.build(env) if e.respond_to? :build }.compact
           env << (name.text_value =~ /^@/ ? 
-            Node::Variable : Node::Property).new(name.text_value, expressions.build(env), env)
+            Node::Variable : Node::Property).new(name.text_value, result, env)
+        end
+
+        def all
+          [expressions] + tail.elements.map {|f| f.expressions }
         end
       # Empty rule
       } / ws ident s ':' s ';' ws
@@ -125,7 +178,7 @@ module Less
     rule expressions
       # Operation
       expression tail:(operator expression)+ {
-        def build env 
+        def build env = nil          
           all.map {|e| e.build(env) }.dissolve
         end
 
@@ -134,7 +187,7 @@ module Less
         end
       # Space-delimited expressions
       } / expression tail:(WS expression)* i:important? {
-        def build env
+        def build env = nil
           all.map {|e| e.build(env) if e.respond_to? :build }.compact
         end
         
@@ -151,12 +204,13 @@ module Less
 
     rule expression
       '(' s expressions s ')' {
-        def build env
+        def build env = nil
           Node::Expression.new(['('] + expressions.build(env).flatten + [')'])
         end
       } / entity '' {
-        def build env
-          entity.method(:build).arity.zero?? entity.build : entity.build(env)
+        def build env = nil
+          e = entity.method(:build).arity.zero?? entity.build : entity.build(env)
+          e.respond_to?(:dissolve) ? e.dissolve : e
         end
       }
     end
@@ -164,7 +218,7 @@ module Less
     # !important
     rule important
       s '!' s 'important' {
-        def build env
+        def build env = nil
           Node::Keyword.new(text_value.strip)
         end
       }
@@ -246,13 +300,13 @@ module Less
     rule function
       name:([-a-zA-Z_]+) arguments {
         def build
-          Node::Function.new(name.text_value, [arguments.build].flatten)
+          Node::Function.new(name.text_value, arguments.build)
         end
       }
     end
 
     rule arguments
-      '(' s argument s tail:(',' s argument s)* ')' {
+      '(' s expressions s tail:(',' s expressions s)* ')' {
         def build
           all.map do |e|
             e.build if e.respond_to? :build
@@ -260,30 +314,11 @@ module Less
         end
   
         def all
-          [argument] + tail.elements.map {|e| e.argument }
-        end
-      }
-    end
-
-    rule argument
-      color / number unit {
-        def build
-          Node::Number.new number.text_value, unit.text_value
-        end
-      } / string {
-        def build
-          Node::String.new text_value
-        end
-      } / [a-zA-Z]+ '=' dimension {
-        def build
-          Node::Anonymous.new text_value
-        end
-      } / [-a-zA-Z0-9_%$/.&=:;#+?]+ {
-        def build
-          Node::String.new text_value
+          [expressions] + tail.elements.map {|e| e.expressions }
         end
-      } / function / keyword other:(S keyword)* {
+      } / '(' s ')' {
         def build
+          []
         end
       }
     end

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

@@ -76,7 +76,9 @@ module Less
       def identifiers; @rules.select {|r| r.kind_of?     Property } end
       def properties;  @rules.select {|r| r.instance_of? Property } end
       def variables;   @rules.select {|r| r.instance_of? Variable } end
-      def elements;    @rules.select {|r| r.instance_of? Element  } end
+      def elements;    @rules.select {|r| r.kind_of?     Element  } end
+      def mixins;      @rules.select {|r| r.instance_of? Mixin    } end
+      def parameters;  []                                           end
 
       # Select a child element
       # TODO: Implement full selector syntax & merge with descend()
@@ -84,7 +86,7 @@ module Less
         case key
           when Entity
             @rules.find {|i| i.eql? key }
-          when ::String
+          when String
             @rules.find {|i| i.to_s == key }
           else raise ArgumentError
         end
@@ -117,7 +119,13 @@ module Less
           self[element.name] if self[element.name].selector.class == selector.class
         end
       end
-
+      
+      def mix arr = []
+        @rules += arr.map do |r|
+          r.copy.tap {|i| i.parent = self }
+        end
+      end
+      
       #
       # Add an arbitrary node to this element
       #
@@ -158,10 +166,10 @@ module Less
       end
 
       #
-      # Find the nearest variable in the hierarchy or raise a NameError
+      # Find the nearest node in the hierarchy or raise a NameError
       #
-      def nearest ident
-        ary = ident =~ /^[.#]/ ? :elements : :variables
+      def nearest ident, type = nil
+        ary = type || ident =~ /^[.#]/ ? :elements : :variables
         path.map do |node|
           node.send(ary).find {|i| i.to_s == ident }
         end.compact.first.tap do |result|
@@ -188,11 +196,44 @@ module Less
 
         (root?? "\n" : "") + [
           indent[ depth ] + self.to_s,
-          put[ properties ],
           put[ variables ],
+          put[ properties ],
           elements.map {|i| i.inspect( depth + 1 ) } * "\n"
         ].reject(&:empty?).join("\n") + "\n" + indent[ depth ]
       end
     end
+    
+    class Mixin < Element
+      attr_accessor :params
+      
+      def initialize name, params = []
+        super name
+        @params = params.each do |param|
+          param.parent = self
+        end
+      end
+      
+      def variables
+        @params + super
+      end
+      
+      def pass args, parent
+        params.zip(args).map do |a, b|
+          b ? Node::Variable.new(a.to_s, Expression.new([b])) : a
+        end + identifiers + elements
+      end
+      
+      def parameters
+        @params
+      end
+      
+      def to_s
+        '@' + name
+      end
+      
+      def to_css *args
+        ""
+      end
+    end
   end
 end

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,12 +48,17 @@ 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
+          Value.new(args, self)
+        else
+          [args]
+        end
+        
         super name
       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,6 +1,6 @@
 module Less
   module Node
-    class Property < ::String
+    class Property < String
       include Entity
       
       attr_accessor :value
@@ -15,11 +15,20 @@ module Less
         else
           value
         end
-        
-        @value = Expression.new(value, self)
+
+        @value = value.is_a?(Value) ? value : Value.new(value, self)
         @eval = false # Store the first evaluation in here
       end
-  
+      
+      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
@@ -50,12 +59,12 @@ module Less
       end
         
       # TODO: @eval and @value should be merged
-      def evaluate    
-        @eval ||= value.evaluate
+      def evaluate
+        @eval ||= value.is_a?(Value) ? value.map {|e| e.evaluate } : [value.evaluate]
       end
           
       def to_css
-        "#{self}: #{evaluate.to_css};"
+        "#{self}: #{evaluate.map {|i| i.to_css }.join(", ")};"
       end
     end
 
@@ -88,7 +97,42 @@ module Less
       end
     
       def to_css
-        evaluate.to_css
+        evaluate
+        if @eval.respond_to? :to_css
+          @eval.to_css
+        else
+          @eval.map {|i| i.to_css }.join ', '
+        end
+      end
+    end
+    
+    class Value < Array
+      attr_reader :parent
+      
+      def initialize ary, parent = nil
+        @parent = parent
+        if ary.size == 1 && !ary.first.is_a?(Array)
+          super [Expression.new([ary.first])]
+        else
+          super ary.map {|e| e.is_a?(Expression) ? e : Expression.new(e, self) }
+        end
+      end
+      
+      def parent= obj
+        @parent = obj
+        each {|e| e.parent = obj if e.respond_to? :parent }
+      end
+      
+      def evaluate
+        map {|e| e.evaluate }.dissolve
+      end
+      
+      def copy
+        first.copy
+      end
+      
+      def to_css
+        map {|e| e.to_css } * ', '
       end
     end
   
@@ -97,7 +141,7 @@ module Less
       
       def initialize ary, parent = nil
         self.parent = parent
-        super ary
+        super ary.dup
       end
       
       def expressions; select {|i| i.kind_of? Expression } end
@@ -114,10 +158,18 @@ module Less
         '[' + map {|i| i.inspect }.join(', ') + ']'
       end
       
+      def flatten
+        self
+      end
+      
       def terminal?
         expressions.empty?
       end
-    
+      
+      def copy
+        self.class.new(map {|i| i.dup }, parent)
+      end
+      
       def to_css
         map do |i| 
           i.respond_to?(:to_css) ? i.to_css : i.to_s
@@ -145,7 +197,7 @@ module Less
             raise MixedUnitsError, self * ' ' if ary.size > 1 && !operators.empty?
           end.join
           
-          entity = literals.find {|e| e.unit == unit } || entities.first
+          entity = literals.find {|e| e.unit == unit } || literals.first || entities.first
           result = operators.empty?? self : eval(to_ruby.join)
           
           case result

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,12 @@
+.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");
+}
 p:not([class*="lead"]) { color: black; }
 a[href^="http://"], a[href$="http://"] { color: black; }
 p::before { color: black; }

data/spec/css/mixins-args.css

@@ -0,0 +1,17 @@
+.two-args {
+  color: blue;
+  width: 10px;
+  height: 99%;
+}
+.one-arg {
+  width: 15px;
+  height: 49%;
+}
+.no-parens, .no-args {
+  width: 5px;
+  height: 49%;
+}
+.var-args {
+  width: 45;
+  height: 17%;
+}

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,3 +1,15 @@
+.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");
+}
+
 p:not([class*="lead"]) {
   color: black; 
 }

data/spec/less/hidden.less

@@ -0,0 +1,25 @@
+.hidden {
+  color: transparent;
+  .inside {
+    width: 0%;
+  }
+};
+
+.fully-hidden {
+  color: none;
+};
+
+.visible {
+  width: 100%;
+  .hidden {
+    color: black;
+  };
+}
+
+.mix {
+  .hidden;
+}
+
+.mix2 {
+  .visible;
+}

data/spec/less/literal-css.less

@@ -0,0 +1,11 @@
+% {
+  @var: 2px;
+  #literal {
+     width: 2px * 2;
+  }
+  @media {
+    #nested {
+      color: red;
+    }
+  }
+}

data/spec/less/mixins-args.less

@@ -0,0 +1,30 @@
+@mixin (@a: 1px, @b: 50%) {
+  width: @a * 5;
+  height: @b - 1%;
+}
+
+@hidden() {
+  color: transparent;
+}
+
+.two-args {
+  color: blue;
+  @mixin(2px, 100%);
+}
+
+.one-arg {
+  @mixin(3px);
+}
+
+.no-parens {
+  @mixin;
+}
+
+.no-args {
+  @mixin();
+}
+
+.var-args {
+  @var: 9;
+  @mixin(@var, @var * 2);
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudhead-less
 version: !ruby/object:Gem::Version 
-  version: 1.1.13
+  version: 1.2.0
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-11 00:00:00 -07:00
+date: 2009-08-31 00:00:00 -07:00
 default_executable: lessc
 dependencies: []
 
@@ -167,12 +167,14 @@ files:
 - spec/less/exceptions/name-error-1.0.less
 - spec/less/exceptions/syntax-error-1.0.less
 - spec/less/functions.less
+- spec/less/hidden.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/import/import-test-d.css
 - spec/less/lazy-eval.less
+- spec/less/literal-css.less
 - spec/less/mixins-args.less
 - spec/less/mixins.less
 - spec/less/operations.less
@@ -188,7 +190,6 @@ files:
 - spec/spec_helper.rb
 has_rdoc: false
 homepage: http://www.lesscss.org
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -209,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: less
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: LESS compiler