less 1.0.16 → 1.1.3

data/Rakefile

@@ -61,19 +61,30 @@ 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
-    print "benchmarking... "
-    less = File.read("spec/less/big.less")
-    start = Time.now.to_f
-    Less::Engine.new(less).parse
-    total = Time.now.to_f - start
-    puts "#{total}s"
+    #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"
   end
 end
 

data/VERSION

@@ -1 +1 @@
-1.0.16
+1.1.3

data/bin/lessc

@@ -3,13 +3,23 @@
 $:.unshift File.dirname(__FILE__) + "/../lib"
 
 require 'optparse'
+require 'rubygems'
 require 'less'
 
+begin
+  require 'growl'
+rescue LoadError
+  Less::GROWL = false
+else
+  Less::GROWL = true
+end
+
 # Argument defaults
 options = {
   :watch => false,
   :compress => false,
   :debug => false,
+  :growl => false
 }
 
 # Get arguments
@@ -22,6 +32,18 @@ opts = OptionParser.new do |o|
     options[:watch] = true
   end
   
+  # Growl
+  o.on("-g", "--growl", "growl notifications") do
+    if Less::GROWL && (Growl.installed? rescue false)
+      options[:growl] = true
+    elsif Less::GROWL
+      abort "Growl or 'growlnotify' wasn't found on your system."
+    else
+      abort "Growl gem not found, please install with: " +
+            "`sudo gem install visionmedia-growl -s http://gems.github.com`"
+    end
+  end
+  
   # Compression needs a proper algorithm
   #
   #  o.on("-x", "--compress", "compress css file") do

data/less.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "1.0.16"
+  s.version = "1.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2009-07-23}
+  s.date = %q{2009-07-27}
   s.default_executable = %q{lessc}
   s.description = %q{LESS is leaner CSS}
   s.email = %q{self@cloudhead.net}
@@ -23,11 +23,14 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/lessc",
      "less.gemspec",
+     "lib/ext.rb",
      "lib/less.rb",
      "lib/less/command.rb",
      "lib/less/engine.rb",
      "lib/less/engine/builder.rb",
-     "lib/less/engine/less.tt",
+     "lib/less/engine/grammar/common.tt",
+     "lib/less/engine/grammar/entity.tt",
+     "lib/less/engine/grammar/less.tt",
      "lib/less/engine/nodes.rb",
      "lib/less/engine/nodes/element.rb",
      "lib/less/engine/nodes/entity.rb",
@@ -36,7 +39,6 @@ Gem::Specification.new do |s|
      "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",
      "lib/vendor/treetop/LICENSE",
      "lib/vendor/treetop/README",

data/lib/ext.rb

@@ -0,0 +1,62 @@
+module Treetop
+  module Runtime
+    class CompiledParser
+      def failure_message
+        return nil unless (tf = terminal_failures) && tf.size > 0
+        "on line #{failure_line}: expected " + (
+          tf.size == 1 ? 
+            tf[0].expected_string : 
+            "one of #{Less::YELLOW[tf.map {|f| f.expected_string }.uniq * ' ']}"
+        ) +
+        " got #{Less::YELLOW[input[failure_index]]}" +
+        " after:\n\n#{input[index...failure_index]}\n"
+      end
+    end
+  end
+end
+
+class Object
+  def verbose
+    $verbose = true
+    yield
+  ensure
+    $verbose = false
+  end
+  
+  def tap
+    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
+  def dissolve
+    ary = flatten.compact
+    case ary.size
+      when 0 then []
+      when 1 then first
+      else ary
+    end
+  end
+  
+  def one?
+    size == 1
+  end
+end
+
+class Class
+  def to_sym
+    self.to_s.to_sym
+  end
+end
+
+class Symbol
+  def to_proc
+    proc {|obj, *args| obj.send(self, *args) }
+  end
+end

data/lib/less.rb

@@ -7,8 +7,9 @@ require 'delegate'
 
 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', 'less.tt')
+LESS_GRAMMAR = File.join(LESS_ROOT, 'less', 'engine', 'grammar')
 
+require 'ext'
 require 'less/command'
 require 'less/engine'
 
@@ -30,66 +31,3 @@ module Less
     Engine.new(less).to_css
   end
 end
-
-module Treetop
-  module Runtime
-    class CompiledParser
-      def failure_message
-        return nil unless (tf = terminal_failures) && tf.size > 0
-        "on line #{failure_line}: expected " + (
-          tf.size == 1 ? 
-            tf[0].expected_string : 
-            "one of #{tf.map {|f| f.expected_string }.uniq * ' '}"
-        ) +
-        " got `#{input[failure_index]}`" +
-        " after:\n\n#{input[index...failure_index]}\n"
-      end
-    end
-  end
-end
-
-class Object
-  def verbose
-    $verbose = true
-    yield
-  ensure
-    $verbose = false
-  end
-  
-  def tap
-    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
-  def dissolve
-    ary = flatten.compact
-    case ary.size
-      when 0 then []
-      when 1 then first
-      else ary
-    end
-  end
-  
-  def one?
-    size == 1
-  end
-end
-
-class Class
-  def to_sym
-    self.to_s.to_sym
-  end
-end
-
-class Symbol
-  def to_proc
-    proc {|obj, *args| obj.send(self, *args) }
-  end
-end

data/lib/less/command.rb

@@ -1,4 +1,12 @@
 module Less
+  ESC = "\033"
+  RESET   = "#{ESC}[0m"
+  
+  GREEN  = lambda {|s| "#{ESC}[1;32m#{s}#{RESET}"}
+  RED    = lambda {|s| "#{ESC}[1;31m#{s}#{RESET}"}
+  YELLOW = lambda {|s| "#{ESC}[1;33m#{s}#{RESET}"}
+  BOLD   = lambda {|s| "#{ESC}[1m#{s}#{RESET}"}
+  
   class Command
     attr_accessor :source, :destination, :options
 
@@ -59,19 +67,20 @@ module Less
         File.open( @destination, "w" ) do |file|
           file.write css
         end
-        print "#{new ? '* [Created]' : '* [Updated]'} #{@destination.split('/').last}\n: " if watch?
+        print "#{GREEN['* ' + (new ? 'Created'  : 'Updated')]} " + 
+              "#{@destination.split('/').last}\n: " if watch?
       rescue Errno::ENOENT => e
         abort "#{e}"
       rescue SyntaxError => e
-        err "#{e}\n", "Parse"
+        err "#{e}\n", "Syntax"
       rescue MixedUnitsError => e
         err "`#{e}` you're  mixing units together! What do you expect?\n"
       rescue PathError => e
         err "`#{e}` was not found.\n", "Path"
       rescue VariableNameError => e
-        err "`#{e}` is undefined.\n", "Name"
+        err "#{YELLOW[e]} is undefined.\n", "Name"
       rescue MixinNameError => e
-        err "`#{e}` is undefined.\n", "Name"
+        err "#{YELLOW[e]} is undefined.\n", "Name"
       else
         true
       end
@@ -84,7 +93,14 @@ module Less
 
     def err s = '', type = ''
       type = type.strip + ' ' unless type.empty?
-      print "! [#{type}Error] #{s}"
+      print "#{RED["! #{type}Error"]}: #{s}"
+      if @options[:growl]
+        growl = Growl.new
+        growl.title = "LESS"
+        growl.message = "#{type}Error in #@source!"
+        growl.run
+        false
+      end
     end
   end
-end
+end

data/lib/less/engine.rb

@@ -6,7 +6,9 @@ require 'engine/nodes'
 begin
   require 'engine/parser'
 rescue LoadError
-  Treetop.load LESS_GRAMMAR
+  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
@@ -23,12 +25,14 @@ module Less
         raise ArgumentError, "argument must be an instance of File or String!"
       end
       
-      @parser = LessParser.new
+      @parser = StyleSheetParser.new
     end
     
-    def parse env = Node::Element.new
+    def parse build = true, env = Node::Element.new
       root = @parser.parse(self.prepare)
       
+      return root unless build
+      
       if root
         @tree = root.build env.tap {|e| e.file = @path }
       else

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

@@ -0,0 +1,29 @@
+module Less
+  module StyleSheet
+    grammar Common
+      #
+      # Whitespace
+      #
+      rule s
+        [ ]*
+      end
+
+      rule S
+        [ ]+
+      end
+
+      rule ws
+        [\n ]*
+      end
+
+      rule WS
+        [\n ]+
+      end
+
+      # Non-space char
+      rule ns
+        ![ ;\n] .
+      end
+    end
+  end
+end

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

@@ -0,0 +1,139 @@
+module Less
+  module StyleSheet
+    grammar Entity
+      #
+      # Entity: Any whitespace delimited token
+      #
+      rule entity
+        function / fonts / keyword / accessor / variable / literal / important
+      end
+
+      rule fonts
+        font family:(s ',' s font)+ {
+          def build
+            Node::FontFamily.new(all.map(&:build))
+          end
+
+          def all
+            [font] + family.elements.map {|f| f.font }
+          end
+        }
+      end
+
+      rule font
+        [a-zA-Z] [-a-zA-Z0-9]* {
+          def build
+            Node::Keyword.new(text_value)
+          end
+        } / string {
+          def build
+            Node::String.new(text_value)
+          end
+        }
+      end
+      
+      #
+      # Tokens which don't need to be evaluated
+      #
+      rule literal
+        color / (dimension / [-a-z]+) '/' dimension {
+          def build
+            Node::Anonymous.new(text_value)
+          end
+        } / number unit {
+          def build
+            Node::Number.new(number.text_value, unit.text_value)
+          end
+        } / string {
+          def build
+            Node::String.new(text_value)
+          end
+        }
+      end
+
+      # !important
+      rule important
+        '!important' {
+          def build
+            Node::Keyword.new(text_value)
+          end
+        }
+      end
+
+      #
+      # `blue`, `small`, `normal` etc.
+      #
+      rule keyword
+        [-a-zA-Z]+ !ns {
+          def build
+            Node::Keyword.new(text_value)
+          end
+        }
+      end
+
+      #
+      # 'hello world' / "hello world"
+      #
+      rule string
+        "'" content:(!"'" . )* "'" {
+          def value
+            content.text_value
+          end
+        } / ["] content:(!["] . )* ["] {
+          def value
+            content.text_value
+          end
+        }
+      end
+
+      #
+      # Numbers & Units
+      #
+      rule dimension
+        number unit
+      end
+
+      rule number
+        '-'? [0-9]* '.' [0-9]+ / '-'? [0-9]+
+      end
+
+      rule unit
+        ('px'/'em'/'pc'/'%'/'pt'/'cm'/'mm')?
+      end
+
+      #
+      # Color
+      #
+      rule color
+        '#' rgb {
+          def build
+            Node::Color.new(*rgb.build)
+          end
+        } / fn:(('hsl'/'rgb') 'a'?) arguments {
+          def build
+            Node::Function.new(fn.text_value, arguments.build.flatten)
+          end
+        }
+      end
+
+      #
+      # 00ffdd / 0fd
+      #
+      rule rgb
+        r:(hex hex) g:(hex hex) b:(hex hex) {
+          def build
+            [r.text_value, g.text_value, b.text_value]
+          end
+        } / r:hex g:hex b:hex {
+          def build
+            [r.text_value, g.text_value, b.text_value].map {|c| c * 2 }
+          end
+        }
+      end
+
+      rule hex
+        [a-fA-F0-9]
+      end
+    end
+  end
+end