less 1.2.13 → 1.2.14

data/Rakefile

@@ -9,7 +9,7 @@ begin
     s.description = "LESS is leaner CSS"
     s.rubyforge_project = 'less'
     s.add_dependency('treetop', '>= 1.4.2')
-    s.add_dependency('mutter', '>= 0.3.7')
+    s.add_dependency('mutter', '>= 0.4.2')
   end
   Jeweler::GemcutterTasks.new
   Jeweler::RubyforgeTasks.new

data/VERSION

@@ -1 +1 @@
-1.2.13
+1.2.14

data/bin/lessc

@@ -20,6 +20,7 @@ options = {
   :compress => false,
   :debug => false,
   :growl => false,
+  :timestamps => false,
   :color => $stdout.tty?
 }
 
@@ -27,12 +28,12 @@ options = {
 opts = OptionParser.new do |o|
   o.banner = "usage: lessc source [destination] [--watch]"
   o.separator ""
-  
+
   # Watch mode
   o.on("-w", "--watch", "watch for changes") do
     options[:watch] = true
   end
-  
+
   # Growl
   o.on("-g", "--growl", "growl notifications") do
     if Less::GROWL && (Growl.installed? rescue false)
@@ -44,7 +45,12 @@ opts = OptionParser.new do |o|
             "`sudo gem install visionmedia-growl -s http://gems.github.com`"
     end
   end
-  
+
+  # Timestamps
+  o.on("-t", "--timestamps", "show timestamps in watch mode") do
+    options[:timestamps] = true
+  end
+
   # No color in output
   o.on("--no-color", "suppress color in output") do
     options[:color] = false
@@ -53,13 +59,13 @@ opts = OptionParser.new do |o|
   o.on('--verbose', 'show success messages when using growl') do
     options[:verbose] = true
   end
-  
+
   # Compression needs a proper algorithm
   #
   #  o.on("-x", "--compress", "compress css file") do
   #    options[:compress] = true
   #  end
-  
+
   o.separator ""
 
   # Help
@@ -67,7 +73,7 @@ opts = OptionParser.new do |o|
     puts opts
     exit
   end
-  
+
   o.on_tail("-d", "--debug", "show full error messages") do
     options[:debug] = true
   end

data/less.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "1.2.13"
+  s.version = "1.2.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2009-11-19}
+  s.date = %q{2009-11-20}
   s.default_executable = %q{lessc}
   s.description = %q{LESS is leaner CSS}
   s.email = %q{self@cloudhead.net}
@@ -112,14 +112,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<treetop>, [">= 1.4.2"])
-      s.add_runtime_dependency(%q<mutter>, [">= 0.3.7"])
+      s.add_runtime_dependency(%q<mutter>, [">= 0.4.2"])
     else
       s.add_dependency(%q<treetop>, [">= 1.4.2"])
-      s.add_dependency(%q<mutter>, [">= 0.3.7"])
+      s.add_dependency(%q<mutter>, [">= 0.4.2"])
     end
   else
     s.add_dependency(%q<treetop>, [">= 1.4.2"])
-    s.add_dependency(%q<mutter>, [">= 0.3.7"])
+    s.add_dependency(%q<mutter>, [">= 0.4.2"])
   end
 end
 

data/lib/less.rb

@@ -13,20 +13,21 @@ require 'ext'
 require 'less/command'
 require 'less/engine'
 
-module Less  
+module Less
   MixedUnitsError   = Class.new(RuntimeError)
   PathError         = Class.new(RuntimeError)
   VariableNameError = Class.new(NameError)
   MixinNameError    = Class.new(NameError)
   SyntaxError       = Class.new(RuntimeError)
   ImportError       = Class.new(RuntimeError)
-  
+  CompileError      = Class.new(RuntimeError)
+
   $verbose = false
 
   def self.version
     File.read( File.join( File.dirname(__FILE__), '..', 'VERSION') ).strip
   end
-  
+
   def self.parse less
     Engine.new(less).to_css
   end

data/lib/less/command.rb

@@ -37,6 +37,7 @@ module Less
 
           # File has changed
           if File.stat( @source ).mtime > File.stat( @destination ).mtime
+            print Time.now.strftime("%H:%M:%S -- ") if @options[:timestamps]
             print "Change detected... "
 
             # Loop until error is fixed
@@ -68,6 +69,8 @@ module Less
         abort "#{e}"
       rescue SyntaxError => e
         err "#{e}\n", "Syntax"
+      rescue CompileError => e
+        err "#{e}\n", "Compile"
       rescue MixedUnitsError => e
         err "`#{e}` you're  mixing units together! What do you expect?\n", "Mixed Units"
       rescue PathError => e
@@ -97,9 +100,9 @@ module Less
         false
       end
     end
-    
-    private
-    
+
+  private
+
     def o ex, *styles
       @mutter.process(ex.to_s, *(@options[:color] ? styles : []))
     end

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

@@ -41,7 +41,7 @@ module Less
     rule mixin
       name:('.' [-a-zA-Z0-9_]+) args:(arguments) s ';' ws {
         def build env
-          definition = env.nearest(name.text_value, :mixin) or raise MixinNameError, name.text_value                        
+          definition = env.nearest(name.text_value, :mixin) or raise MixinNameError, "#{name.text_value}() in #{env}"
           params = args.build.map {|i| Node::Expression.new i } unless args.empty?
           env << Node::Mixin::Call.new(definition, params || [], env)
         end
@@ -49,7 +49,7 @@ module Less
         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, selectors.text_value
+              current.descend(node.selector, node) or raise MixinNameError, "#{selectors.text_value} in #{env}"
             end.rules
             env.rules += rules
           end

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

@@ -121,12 +121,6 @@ module Less
         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
       #
@@ -182,7 +176,7 @@ module Less
         path.map do |node|
           node.send(ary).find {|i| i.to_s == ident }
         end.compact.first.tap do |result|
-          raise VariableNameError, ("#{ident} in #{self.to_s}") unless result
+          raise VariableNameError, ("#{ident} in #{self.to_s}") if result.nil? && type != :mixin
         end
       end
 
@@ -248,6 +242,10 @@ module Less
         end
 
         def call args = []
+          if e = @rules.find {|r| r.is_a? Element }
+            raise CompileError, "#{e} in #{self.inspect}: can't nest selectors inside a dynamic mixin."
+          end
+
           env = Element.new
 
           @params.zip(args).each do |param, val|
@@ -270,6 +268,10 @@ module Less
           '.' + name
         end
 
+        def inspect
+          ".#{name}()"
+        end
+
         def to_css path, env
           super(path, env)
         end

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

@@ -2,9 +2,9 @@ module Less
   module Node
     class Property < String
       include Entity
-      
+
       attr_accessor :value
-      
+
       def initialize key, value = nil, parent = nil
         super key, parent
         value = if value.is_a? Array
@@ -21,44 +21,44 @@ module Less
 #        puts "new property #{to_s}: #{value} => #{@value}, contains: #{@value[0].class}"
 #        puts
       end
-      
+
       def parent= obj
         @parent = obj
         value.parent = self
       end
-      
+
       def copy
         clone.tap {|c| c.value = value.copy }
       end
-      
-      def << token        
+
+      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 inspect
         self + (empty?? "" : ": `#{value.map {|i| i.to_s } * ' | '}`")
       end
-      
+
       def == other
         self.to_s == other.to_s
       end
-      
+
       def eql? other
         self == other and value.eql? other.value
       end
- 
+
       def to_s
         super
       end
-      
+
       def nearest node
         parent.nearest node
       end
-        
+
       def evaluate env = nil
 #        puts "evaluating property `#{to_s}`: #{value.inspect}"
         if value.is_a?(Expression) #Value
@@ -68,10 +68,10 @@ module Less
 #          puts "value is a #{value.class}"
           [value.evaluate(env)]
         end
-        
-        
+
+
       end
-          
+
       def to_css env = nil
 #        puts "property.to_css `#{to_s}` env:#{env ? env.variables : "nil"}"
         val = evaluate(env)
@@ -87,20 +87,20 @@ module Less
 
     class Variable < Property
       attr_reader :declaration
-        
-      def initialize key, value = nil, parent = nil   
-        @declaration = value ? true : false 
+
+      def initialize key, value = nil, parent = nil
+        @declaration = value ? true : false
         super key.delete('@'), value, parent
       end
-  
+
       def inspect
         "@#{super}"
       end
-    
+
       def to_s
         "@#{super}"
       end
-    
+
       def evaluate env = nil
         if declaration
 #          puts "evaluating DEC"
@@ -115,11 +115,11 @@ module Less
           var.evaluate
         end
       end
-       
+
       def to_ruby
         evaluate.to_ruby
       end
-    
+
       def to_css env = nil
         val = evaluate env
         if val.respond_to? :to_css
@@ -132,68 +132,68 @@ module Less
 
     class Expression < Array
       attr_accessor :parent, :delimiter
-      
+
       def initialize ary, parent = nil, delimiter = ' '
         self.parent = parent
         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
-        
+
       def parent= obj
         @parent = obj
         each {|e| e.parent = obj if e.respond_to? :parent }
       end
-      
+
       def inspect
         '[' + map {|i| i.inspect }.join(', ') + ']'
       end
-      
+
       def delimiter= d
         @delimiter = d.strip + ' '
       end
-      
+
       def flatten
         self
       end
-      
+
       def terminal?
         expressions.empty? #&& variables.empty?
       end
-      
+
       def to_css env = nil
 #        puts "TOCSS, delim: |#{@delimiter}|"
-        map do |i| 
+        map do |i|
           i.respond_to?(:to_css) ? i.to_css() : i.to_s
         end * @delimiter
       end
-      
+
       def to_ruby
         map do |i|
           i.respond_to?(:to_ruby) ? i.to_ruby : i.to_s
         end
       end
-    
+
       #
       # 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 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
           evaled = self.class.new(map {|e| e.respond_to?(:evaluate) ? e.evaluate(env) : e }, parent, delimiter) #5
-          
+
 #          puts "======================"
 #          puts "evaled => #{evaled.inspect}"
 
@@ -202,7 +202,7 @@ module Less
           end.compact.uniq.tap do |ary|
             raise MixedUnitsError, evaled * ' ' if ary.size > 1 && !evaled.operators.empty?
           end.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)
 
@@ -226,4 +226,4 @@ module Less
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: less
 version: !ruby/object:Gem::Version 
-  version: 1.2.13
+  version: 1.2.14
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-19 00:00:00 -05:00
+date: 2009-11-20 00:00:00 -05:00
 default_executable: lessc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.7
+        version: 0.4.2
     version: 
 description: LESS is leaner CSS
 email: self@cloudhead.net