unboxed-less 1.2.12 → 1.2.19

data/README.md

@@ -36,7 +36,7 @@ LESS allows you to write CSS the way (I think) it was meant to, that is: with *v
 If you have CSS nightmares, just
 	$ lessc style.less
 
-For more information, see you at [http://lesscss.org]
+For more information, see you at <http://lesscss.org>
 
 People without whom this wouldn't have happened a.k.a *Credits*
 ---------------------------------------------------------------

data/Rakefile

@@ -11,7 +11,6 @@ begin
     s.add_dependency('treetop', '>= 1.4.2')
   end
   Jeweler::GemcutterTasks.new
-  Jeweler::RubyforgeTasks.new
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
@@ -31,29 +30,21 @@ end
 begin
   require 'lib/less'
   require 'benchmark'
-  
+
   task :compile do
     abort "compiling isn't necessary anymore."
     puts "compiling #{LESS_GRAMMAR.split('/').last}..."
     File.open(LESS_PARSER, 'w') {|f| f.write Treetop::Compiler::GrammarCompiler.new.ruby_source(LESS_GRAMMAR) }
   end
-  
+
   task :benchmark do
-    #require 'profile'
-    puts "benchmarking... "
-    less, tree = File.read("spec/less/big.less"), nil
-    
-    parse = Benchmark.measure do
-      tree = Less::Engine.new(less).parse(false)
-    end.total.round(2)
-    
-    build = Benchmark.measure do
-      tree.build(Less::Node::Element.new)
-    end.total.round(2)
-    
-    puts "parse: #{parse}s\nbuild: #{build}s"
-    puts "------------"
-    puts "total: #{parse + build}s"
+    less = File.read("spec/less/big.less")
+    result = nil
+    Benchmark.bmbm do |b|
+      b.report("parse:  ") { result = Less::Engine.new(less).parse(false) }
+      b.report("build:  ") { result = result.build(Less::Node::Element.new) }
+      b.report("compile:") { result.to_css }
+    end
   end
 end
 

data/VERSION

@@ -1 +1 @@
-1.2.12
+1.2.19

data/bin/lessc

@@ -20,19 +20,20 @@ options = {
   :compress => false,
   :debug => false,
   :growl => false,
-  :color => true
+  :timestamps => false,
+  :color => $stdout.tty?
 }
 
 # Get arguments
 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,18 +45,27 @@ 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
   end
-  
+
+  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
@@ -63,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/lib/less.rb

@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'cgi'
 require 'treetop'
 require 'delegate'
@@ -8,24 +6,27 @@ LESS_ROOT = File.expand_path(File.dirname(__FILE__))
 LESS_PARSER = File.join(LESS_ROOT, 'less', 'engine', 'parser.rb')
 LESS_GRAMMAR = File.join(LESS_ROOT, 'less', 'engine', 'grammar')
 
-require 'ext'
+$:.unshift File.dirname(__FILE__)
+
+require 'less/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

@@ -36,6 +36,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
@@ -59,12 +60,16 @@ module Less
         File.open( @destination, "w" ) do |file|
           file.write css
         end
-        print "* #{is_new ? 'Created'  : 'Updated'} " +
-              "#{@destination.split('/').last}\n: " if watch?
+
+        act, file = (is_new ? 'Created' : 'Updated'), @destination.split('/').last
+        print "* #{act} #{file}\n: " if watch?
+        Growl.notify "#{act} #{file}", :title => 'LESS' if @options[:growl] && @options[:verbose]
       rescue Errno::ENOENT => e
         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

data/lib/less/engine.rb

@@ -5,15 +5,13 @@ require 'engine/nodes'
 begin
   require 'engine/parser'
 rescue LoadError
-  Treetop.load File.join(LESS_GRAMMAR, 'common.tt')
-  Treetop.load File.join(LESS_GRAMMAR, 'entity.tt')
   Treetop.load File.join(LESS_GRAMMAR, 'less.tt')
 end
 
 module Less
   class Engine
     attr_reader :css, :less
-    
+
     def initialize obj, options = {}
       @less = if obj.is_a? File
         @path = File.dirname File.expand_path(obj.path)
@@ -23,16 +21,16 @@ module Less
       else
         raise ArgumentError, "argument must be an instance of File or String!"
       end
-      
+
       @options = options
       @parser = StyleSheetParser.new
     end
-    
+
     def parse build = true, env = Node::Element.new
       root = @parser.parse(self.prepare)
-      
+
       return root unless build
-      
+
       if root
         env.file = @path
         @tree = root.build env
@@ -43,13 +41,13 @@ module Less
       @tree
     end
     alias :to_tree :parse
-    
+
     def to_css
       @css || @css = self.parse.group.to_css
     end
-    
+
     def prepare
       @less.gsub(/\r\n/, "\n").gsub(/\t/, '  ')
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+require 'grammar/common'
+
 module Less
   module StyleSheet
     grammar Entity
@@ -5,7 +7,7 @@ module Less
       # Entity: Any whitespace delimited token
       #
       rule entity
-        url / function / accessor / keyword / variable / literal / font
+        url / alpha / function / accessor / keyword / variable / literal / font
       end
 
       rule fonts
@@ -125,6 +127,18 @@ module Less
       rule hex
         [a-fA-F0-9]
       end
+
+      #
+      # Special case for IE alpha filter
+      #
+      rule alpha
+        "alpha" '(' "opacity=" variable ')' {
+          def build env
+            var = variable.text_value
+            Node::Quoted.new(text_value.sub(var, env.nearest(var).evaluate.to_i.to_s))
+          end
+        }
+      end
     end
   end
-end
+end

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

@@ -1,10 +1,13 @@
+require 'grammar/common'
+require 'grammar/entity'
+
 module Less
   grammar StyleSheet
     include Common
     include Entity
-    
+
     rule primary
-      (import / declaration / mixin / ruleset / comment)* {
+      (import / declaration / ruleset / mixin / comment)* {
         def build env = Less::Element.new
           elements.map do |e|
             e.build env if e.respond_to? :build
@@ -30,43 +33,41 @@ module Less
           end
         end
         # Mixin Declaration
-      } / '.' name:[-a-zA-Z0-9_]+ ws parameters ws "{" ws primary ws "}" ws {
+      } / ws '.' name:[-a-zA-Z0-9_]+ ws parameters ws "{" ws primary ws "}" ws {
         def build env
           env << Node::Mixin::Def.new(name.text_value, parameters.build(env))
           primary.build env.last
-          #env.last
         end
       }
     end
-    
+
     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
     } / ws selectors ';' ws {
-        def build env        
+        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
-            #env.mix(rules)
           end
         end
-      } 
+      }
     end
-    
+
     rule selectors
       ws selector tail:(s ',' ws selector)* ws {
-        def build env, method 
+        def build env, method
           all.map do |e|
             e.send(method, env) if e.respond_to? method
           end.compact
         end
-    
+
         def all
           [selector] + tail.elements.map {|e| e.selector }
         end
@@ -84,7 +85,7 @@ module Less
             node.last
           end
         end
-    
+
         def mixin env
           sel.elements.map do |e|
             Node::Element.new(e.element.text_value, e.select.text_value)
@@ -92,7 +93,7 @@ module Less
         end
       }
     end
-    
+
     rule parameters
       '(' s ')' {
         def build env
@@ -104,7 +105,7 @@ module Less
             e.build(env)
           end
         end
-        
+
         def all
           [parameter] + tail.elements.map {|e| e.parameter }
         end
@@ -118,7 +119,7 @@ module Less
         end
       }
     end
-    
+
     rule import
       ws "@import" S url:(string / url) medias? s ';' ws {
         def build env
@@ -141,7 +142,7 @@ module Less
         def build env = nil
           Node::Function.new('url', value)
         end
-    
+
         def value
           Node::Quoted.new CGI.unescape(path.text_value)
         end
@@ -157,10 +158,10 @@ module Less
     # height: 100%;
     #
     rule declaration
-      ws name:(ident / variable) s ':' s expressions tail:(ws ',' ws expressions)* s (';'/ ws &'}') ws {
+      ws name:(ident / variable) s ':' ws 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 =~ /^@/ ? 
+          env << (name.text_value =~ /^@/ ?
             Node::Variable : Node::Property).new(name.text_value, result, env)
         end
 
@@ -190,12 +191,12 @@ module Less
         def build env = nil
           all.map {|e| e.build(env) if e.respond_to? :build }.compact
         end
-        
+
         def all
           [expression] + tail.elements.map {|f| f.expression } + [i]
         end
       # Catch-all rule
-      } / [-a-zA-Z0-9_%*/.&=:,#+? \[\]()]+ {
+      } / [-a-zA-Z0-9_.&*/=:,+? \[\]()#%]+ {
         def build env
           [Node::Anonymous.new(text_value)]
         end
@@ -218,7 +219,7 @@ module Less
         end
       }
     end
-    
+
     # !important
     rule important
       s '!' s 'important' {
@@ -247,7 +248,15 @@ module Less
     # div / .class / #id / input[type="text"] / lang(fr)
     #
     rule element
-      ((class / id / tag / ident) attribute* ('(' (selector / number) ')')?)+ / attribute+ / '@media' / '@font-face'
+      ((class / id / tag / ident) attribute* ('(' ([a-zA-Z]+ / pseudo_exp / selector / [0-9]+) ')')?)+
+      / attribute+ / '@media' / '@font-face'
+    end
+
+    #
+    # 4n+1
+    #
+    rule pseudo_exp
+      '-'? ([0-9]+)? 'n' ([-+] [0-9]+)?
     end
 
     #
@@ -293,7 +302,7 @@ module Less
         end
       }
     end
-    
+
     #
     # Functions and arguments
     #
@@ -312,7 +321,7 @@ module Less
             e.build if e.respond_to? :build
           end.compact
         end
-  
+
         def all
           [expressions] + tail.elements.map {|e| e.expressions }
         end
@@ -323,4 +332,4 @@ module Less
       }
     end
   end
-end
+end