less 0.7.0 → 0.8.7

data/README.md

@@ -20,8 +20,8 @@ LESS allows you to write CSS the way (I think) it was meant to, that is: with *v
 ### And the CSS output it produces:
 	
 	.outline { border: 1px solid black }
-	.article > a { text-decoration: none }
-	.article > p { color: #110011 }
+	.article a { text-decoration: none }
+	.article p { color: #110011 }
 	.article { border: 1px solid black }
 	
 If you have CSS nightmares, just 

data/Rakefile

@@ -27,7 +27,7 @@ begin
         config = YAML.load(
             File.read(File.expand_path('~/.rubyforge/user-config.yml'))
         )
-
+        options << '--line-numbers' << '--inline-source'
         host = "#{config['username']}@rubyforge.org"
         remote_dir = "/var/www/gforge-projects/the-perfect-gem/"
         local_dir = 'rdoc'

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.7

data/bin/lessc

@@ -10,7 +10,9 @@ CSS = '.css'
 # Argument defaults
 options = {
   :watch => false,
-  :compress => false
+  :compress => false,
+  :debug => false,
+  :inheritance => :desc
 }
 
 # Get arguments
@@ -23,11 +25,17 @@ opts = OptionParser.new do |o|
     options[:watch] = true
   end
   
-  # Compress
-  o.on("-c", "--compress", "compress css file") do
-    options[:compress] = true
+  # Child-type inheritance
+  o.on("-c", "--child", "nesting uses child-type inheritance") do
+    options[:chain] = :child
   end
   
+  # Compression needs a proper algorithm
+  #
+  #  o.on("-x", "--compress", "compress css file") do
+  #    options[:compress] = true
+  #  end
+  
   o.separator ""
 
   # Help
@@ -35,10 +43,14 @@ opts = OptionParser.new do |o|
     puts opts
     exit
   end
+  
+  o.on_tail("-d", "--debug", "show full error messages") do
+    options[:debug] = true
+  end
 
   # Version
   o.on_tail("-v", "--version", "show version") do
-    puts "Less Compiler " + Less::VERSION
+    puts "lessc " + Less.version
     exit
   end
 end

data/less.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "0.7.0"
+  s.version = "0.8.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2009-05-20}
+  s.date = %q{2009-06-15}
   s.default_executable = %q{lessc}
   s.description = %q{LESS is leaner CSS}
   s.email = %q{alexis@cloudhead.net}

data/lib/less/command.rb

@@ -4,10 +4,13 @@ module Less
       @source, @destination = options[:source], options[:destination]
       @options = options
     end
-    def watch?() @options[:watch] end
+    
+    def watch?()    @options[:watch]    end
     def compress?() @options[:compress] end
+    def debug?()    @options[:debug]    end
     
-    # little function which allows us to Ctrl-C exit inside the passed block
+    # little function which allows us to 
+    # Ctrl-C exit inside the passed block
     def watch &block
       begin
         block.call
@@ -16,54 +19,54 @@ module Less
         exit 0
       end
     end
-      
+
     def run!
+      compile(true) unless File.exist? @destination
+      
       if watch?
         log "Watching for changes in #@source ...Ctrl-C to abort.\n"
-        #
+  
         # Main watch loop
-        #
         loop do
           watch { sleep 1 }
           
           # File has changed
           if File.stat( @source ).mtime > File.stat( @destination ).mtime
             log "Change detected... "
-            #
-            # Error loop
-            #
-            loop do
-              unless compile
-                log "Press [enter] to continue..."
-                watch { $stdin.gets }
-                next # continue within the error loop, until the error is fixed
-              end
-              break # break to main loop, as no errors were encountered
+            
+            # Loop until error is fixed
+            until compile
+              log "Press [enter] to continue..."
+              watch { $stdin.gets }
             end
-          end # if
-        end # loop
+          end
+        end
       else
         compile
       end
     end
     
-    def compile
+    def compile new = false
       begin
         # Create a new Less object with the contents of a file
-        css = Less::Engine.new( File.read( @source ) ).to_css
+        css = Less::Engine.new( File.read( @source ) ).to_css @options[:inheritance]
         css = css.delete " \n" if compress?
         
         File.open( @destination, "w" ) do |file|
           file.write css
         end
-        puts "#{@destination.split('/').last} was updated!" if watch?
+        puts "#{new ? '* [Created]' : ' [Updated]'} #{@destination.split('/').last}" if watch?
       rescue Errno::ENOENT => e
         abort "#{e}"
       rescue SyntaxError
-        error = $!.message.split("\n")[1..-1].collect {|e| e.gsub(/\(eval\)\:\d+\:\s/, '') } * "\n"
-        log " !! errors were found in the .less file! \n#{error}\n"
-      rescue MixedUnitsError
-        log "!! You're  mixing units together! what do you expect?\n"
+        error = debug?? $! : $!.message.split("\n")[1..-1].collect {|e| 
+          e.gsub(/\(eval\)\:(\d+)\:\s/, 'line \1: ') 
+        } * "\n"
+        err "errors were found in the .less file! \n#{error}\n"
+      rescue MixedUnitsError => e
+        err "`#{e}` you're  mixing units together! What do you expect?\n"
+      rescue PathError => e
+        err "`#{e}` was not found.\n"
       else
         true
       end
@@ -71,7 +74,11 @@ module Less
     
     # Just a logging function to avoid typing '}'
     def log s = ''
-      print '} ' + s.to_s
+      print '* ' + s.to_s
+    end
+    
+    def err s = ''
+      print "!! #{s}"
     end
   end
 end

data/lib/less/engine.rb

@@ -1,17 +1,22 @@
 module Less  
   class Engine < String
-    REGEXP = {
-      :path => /([#.][->#.\w]+)?( ?> ?)?@([\w\-]+)/, # #header > .title > @var
-      :selector => /[-\w #.>*_:]/,                   # .cow .milk > a
-      :values => /[-\w \(\)@>\/*+#%.,'"]/,           # 10px solid #fff
-      :variable => /^@([\w\-]+)/                     # @milk-white
+    REGEX = {
+      :path     => /([#.][->#.\w ]+)?( ?> ?)?@([-\w]+)/,     # #header > .title > @var
+      :selector => /[-\w #.,>*:\(\)]/,                       # .cow .milk > a
+      :variable => /@([-\w]+)/,                              # @milk-white
+      :property => /@[-\w]+|[-a-z]+/,                        # font-size
+      :color    => /#([a-zA-Z0-9]{3,6})\b/,                  # #f0f0f0
+      :number   => /\d+(?>\.\d+)?/,                          # 24.8
+      :unit     => /px|em|pt|cm|mm|%/                        # em
     }
+    REGEX[:numeric] = /#{REGEX[:number]}(#{REGEX[:unit]})?/
+    REGEX[:operand] = /#{REGEX[:color]}|#{REGEX[:numeric]}/
     
     def initialize s
       super
       @tree = Tree.new self.hashify
     end
-  
+
     def compile     
       #
       # Parse the variables and mixins
@@ -23,8 +28,8 @@ module Less
       # can then be deleted.
       #
       @tree = @tree.traverse :leaf do |key, value, path, node|
-        matched = if match = key.match( REGEXP[:variable] )
-          node[:variables] ||= {}
+        matched = if match = key.match( REGEX[:variable] )          
+          node[:variables] ||= Tree.new
           node[:variables][ match.captures.first ] = value
         elsif value == :mixin
           node[:mixins] ||= []          
@@ -44,71 +49,73 @@ module Less
         end
       end
       
-      #
-      # Evaluate variables
-      #
+      # Call `evaluate` on variables, such as '@dark: @light / 2'
+      @tree = @tree.traverse :branch do |path, node|
+        node.vars.each do |key, value|
+          evaluate key, value, path, node.vars
+        end if node.vars?
+      end
+      
+      # Call `evaluate` on css properties, such as 'font-size: @big'
       @tree = @tree.traverse :leaf do |key, value, path, node|
-        convert = lambda do |key, value, node|             # We declare this as a lambda, for re-use
-          if value.is_a?(String) && value.include?('@')    # There's a var to evaluate        
-            
-            # Find its value
-            var = value.delete(' ').match( REGEXP[:path] ).captures.join  
-            var = unless var.include? '>'
-              node.var( var ) || @tree.var( var )          # Try local first, then global
-            else
-              @tree.find :var, var.split('>')              # Try finding it in a specific namespace
-            end
-          
-            if var
-              node[ key ] = value.gsub REGEXP[:path], var  # Substitute variable with value
-            else
-              node.delete key                              # Discard the declaration if the variable wasn't found
-            end
-          end
-        end
-        
-        # Call `convert` on css properties, such as 'font-size: @big'
-        convert.call key, value, node
-        
-        # Call `convert` on variables, such as '@dark: @light / 2'
-        if node.vars? 
-          node.vars.each do |key, value|
-            convert.call key, value, node
-          end
-        end
+        evaluate key, value, path, node
       end
       
       #
       # Evaluate operations (2+2)
       #
       # Units are: 1px, 1em, 1%, #111
-      @tree = @tree.traverse :leaf do |key, value, path, node|
-        if value.match /[-+\/*]/
-          if (unit = value.scan(/(%)|\d+(px)|\d+(em)|(#)/i).flatten.compact.uniq).size <= 1
-            unit = unit.join
-            value = if unit == '#'
-              value.gsub(/#([a-z0-9]+)/i) do
-                hex = $1 * ( $1.size == 3 ? 2 : 1 )
+      @tree = @tree.traverse :leaf do |key, value, path, node| 
+        node[ key ] = value.gsub /(#{REGEX[:operand]}(\s?)[-+\/*](\4))+(#{REGEX[:operand]})/ do |operation|
+          if (unit = operation.scan(/#{REGEX[:numeric]}|(#)/i).flatten.compact.uniq).size <= 1
+            unit = unit.join            
+            operation = if unit == '#'
+              evaluate = lambda do |v| 
+                result = eval v
+                unit + ( result.zero?? '000' : result.to_s(16) )
+              end
+              operation.gsub REGEX[:color] do
+                hex = $1 * ( $1.size < 6 ? 6 / $1.size : 1 )
                 hex.to_i(16)
               end.delete unit
-              evaluate = lambda {|v| unit + eval( v ).to_s(16) }
             else
-              value.gsub(/px|em|%/, '')
               evaluate = lambda {|v| eval( v ).to_s + unit }
-            end.to_s    
-            next if value.match /[a-z]/i            
-            node[ key ] = evaluate.call value
+              operation.gsub REGEX[:unit], ''
+            end.to_s                
+            next if operation.match /[a-z]/i
+            evaluate.call operation
           else
-            raise MixedUnitsError
+            raise MixedUnitsError, value
           end
         end
       end
-      
     end
     alias render compile
     
-    def to_css
-      self.compile.to_css
+    #
+    # Evaluate variables
+    #
+    def evaluate key, value, path, node               
+      if value.is_a? String and value.include? '@'      # There's a var to evaluate    
+        value.scan REGEX[:path] do |var|
+          var = var.join.delete ' '
+          var = if var.include? '>'
+            @tree.find :var, var.split('>')             # Try finding it in a specific namespace
+          else            
+           node.var( var ) or @tree.nearest var, path   # Try local first, then nearest scope            
+          end
+
+          if var
+            node[ key ] = value.gsub REGEX[:path], var  # Substitute variable with value
+          else
+            node.delete key                             # Discard the declaration if the variable wasn't found
+          end
+        end    
+      end
+    end
+    
+    def to_css chain
+      self.compile.to_css chain
     end
     
     def hashify
@@ -119,13 +126,16 @@ module Less
       #   less:     color: black;
       #   hashify: "color" => "black"
       #
-      hash = self.gsub(/"/, "'").                                                         # ""
-                  gsub(/([@a-z\-]+):[ \t]*(#{ REGEXP[:values] }+);/, '"\\1" => "\\2",').  # Properties
+      hash = self.gsub(/\t+/, ' ').                                                       # Tabs
+                  gsub(/\r\n/, "\n").                                                     # m$
+                  gsub(/\/\/.*/, '').                                                     # Comments //
+                  gsub(/\/\*.*?\*\//m, '').                                               # Comments /*
+                  gsub(/"/, "'").                                                         # " => '
+                  gsub(/("|')(.+?)(\1)/) { $1 + CGI.escape( $2 ) + $1 }.                  # Escape string values
+                  gsub(/(#{REGEX[:property]}):\s*(.+?)\s*(;|(?=\}))/,'"\1"=>"\2",').      # Rules
                   gsub(/\}/, "},").                                                       # Closing }
-                  gsub(/([ \t]*)(#{ REGEXP[:selector] }+?)[ \t\n]*\{/m, '\\1"\\2" => {'). # Selectors
-                  gsub(/([.#][->\w .#]+);/, '"\\1" => :mixin,').                          # Mixins
-                  gsub("\n\n", "\n").                                                     # New-lines
-                  gsub(/\/\/.*\n/, '')                                                    # Comments
+                  gsub(/( *)(#{REGEX[:selector]}+?)[ \n]*(?=\{)/m, '\1"\2"=>').           # Selectors
+                  gsub(/([.#][->\w .#]+);/, '"\\1" => :mixin,')                           # Mixins
       eval "{" + hash + "}"                                                               # Return {hash}
     end
   end

data/lib/less/tree.rb

@@ -16,50 +16,65 @@ module Less
       self[:variables] ? self[:variables] : nil
     end
     
+    #
+    # Find a variable or mixin from a specific path
+    #
     def find what = :var, path = []
       path.inject(self) do |branch, k|        
         if what == :var && k == path.last
           branch[:variables][ k ]
         else
-          branch = branch[ k ]
+          branch = branch[ k ] or raise PathError, path.join(' > ')
         end
       end
     end
     
+    #
+    # Find the nearest variable in the hierarchy
+    #
+    def nearest var, path
+      values = []
+      path.inject(self) do |branch, k|
+        values << branch.var( var )
+        branch[ k ]
+      end
+      values.compact.last
+    end
+    
     def traverse by = :leaf, path = [], &blk
     #
     # Traverse the whole tree, returning each leaf or branch (recursive)
     #
     ###
-      #   Aside from the key & value, 
-      #   we yield the full path of the leaf, aswell as
-      #   the branch which contains it (self).
+      #   Aside from the key & value, we yield the full path of the leaf,  
+      #   aswell as the branch which contains it (self).
+      #   Note that in :branch mode, we only return 'twigs', branches which contain leaves.
       #
       self.each do |key, value|                        # `self` is the current node, starting with the trunk
         if value.is_a? Hash and key != :variables      # If the node is a branch, we can go deeper
           path << key                                  # Add the current branch to the path
           self[ key ] = value.to_tree.                 # Make sure any change is saved to the main tree
-                        traverse by, path, &blk        # Recurse, with the current node becoming `self`
-          if by == :branch             
-            yield path, self[ key ]                    # The node is a branch, yield it to the block
-            path.pop
-          end
+                        traverse by, path, &blk        # Recurse, with the current node becoming `self`                       
+          yield path, self[ key ] if by == :branch     # The node is a branch, yield it to the block
+          path.pop                                     # We're returning from a branch, pop the last path element
         elsif by == :leaf and key.is_a? String
           yield key, value, path, self                 # The node is a leaf, yield it to the block
-          path.pop
         else
           next
         end
       end
       self
     end
-
-    def to_css css = []
+    
+    #
+    # Convert the tree to css, using full paths
+    #
+    def to_css chain = :desc, css = []
       self.traverse :branch do |path, node|
         properties = node.inject("") do |s, (k, v)|          
-          v.is_a?(String) ? (s + "#{k}: #{v}; ") : s   # Add the property to the list
+          v.is_a?(String) ? (s + "#{k}: #{CGI.unescape(v)}; ") : s                # Add the property to the list
         end
-        css << path * ' > ' + " { " + properties + "}" # Add the rule-set to the CSS
+        css << path * ( chain == :desc ? ' ' : ' > ') + " { " + properties + "}"  # Add the rule-set to the CSS
       end
       css.join "\n"
     end

data/lib/less.rb

@@ -1,10 +1,15 @@
+require 'cgi'
+
 require 'less/command'
 require 'less/engine'
 require 'less/tree'
 
-module Less
-  VERSION = '0.5.2'
-  class MixedUnitsError < Exception
+module Less    
+  MixedUnitsError = Class.new(Exception)
+  PathError = Class.new(Exception)
+  
+  def self.version
+    File.read( File.join( File.dirname(__FILE__), '..', 'VERSION') )
   end
 end
 

data/spec/spec.less

@@ -1,57 +1,124 @@
-// LESS
-// the main color
-@base-color: #fff;
-@darker-color: @base-color / 2;
-
-.dookoo a {
-  color: black;
-}
-.dookoo a {
-  font-family: "Verdana", 'Baka', serif;
-}
-.dookoo {
-    @fa: grey;
-    color: @fa;
-    line-height: 1999px;
-}
-.alt {
-    @base-color: green;
-    @darker-color: @base-color / 2;
-    @another-color: * > @base-color;
-}
-.altfoo { color: .alt > @base-color; }
-.foo { border: 1px solid black; color: @base-color; }
-.foo2 {
-  width: 10px * 2;
-}
-#content {    
-    font-size: 12px;
-    @some-color: blue;    
-    #header {        
-        .foo;
-        font-size: #222 / 2;    
+// ------------------------------------------------
+//                 LESS Spec
+//                 www.lesscss.org
+// ------------------------------------------------
+
+// Global vars
+@main-color: #444;
+@dark-color: #111;
+@between-color: @main-color - @dark-color;
+
+// Mixins
+.theme {
+    color: #ccc;
+    background-color: #aaa;
+}
+.extra {
+    @main: #888;
+    .dark-borders {
+        border-color: .extra > @main / 2;    
     }
-    #main-page {
-        #content > .small;
-    }    
-    .small {       
-         color: @base-color;        
-         font-size: 12 / 2;    
-         .hover_controls {
-            line-height: 16px;
-             display: none;
-             color: #content > @some-color;
-             border: 1px solid #fff;
-         }
+    .light-borders {
+        border-color: .extra > @main;
     }
-    .small:hover {
-        background-color: #eee + #content > @some-color;
-        .hover_controls {
-            .dookoo;
-            display: inline-block;
-        }
+}
+
+// Namespaces
+.borders {
+    @thick: 4px;
+    @thin: 2px;    
+}
+
+// Hierarchy
+.root {
+    a { 
+        color: blue;
+        display: none;
+    }
+    a:hover, a:focus {
+        color: orange;
     }
+    .first {
+        @size: 8px;
+        @dark-color: green;
+        @main-color: red;
+        color: @dark-color; // 'green'
+        .second {
+            @color: blue;
+            .third {
+                background-color: @color; // blue
+                font-size: @size; // 8px
+                color: @main-color; // red
+                border-color: .root > .first > .second > @color; // 'blue'
+            }
+        }
+    }    
+}
+.root:hover a {
+    display: block;
+}
+
+// Standard CSS properties and shorthand
+body {
+    font-size: 10px;
+    font-family: "Lucida Grande", 'Helvetica', Verdana, sans-serif;
+    margin: -5px 0 5px 10px;
+    border: solid 1px #000;
+    text-shadow: #333 -1px 1px 2px;
+    -moz-border-radius: 3px; /* CSS3 for older Firefox */
+    .theme;
+    .extra > .light-borders;
 }
-.sidebar {
-    #content > .small;
-}
+
+// Operations
+.operations {
+    @ten: 10;
+    @dark: #111;
+    border-width: .borders > @thick * 5 - 4px; // 16px
+    font-size: 10 - 4 + 6 * @ten; // 66
+    line-height: @ten - .operations > @ten + .root > .first > @size - 1; // 7px
+    color: #fff - #111; // #eeeeee
+    colorb: #111 + #222222; // #333333
+    colorc: @dark + #222 * 3; // #777777 
+}
+
+td, tr, table {
+    border-width: .borders > @thick;   
+}
+
+// More complex CSS selectors
+ul li:first-child {
+    border-top: none;
+}
+ul li:first-child, ul li:last-child {
+    background-color: #333;
+}
+.p:first-letter { 
+    color: red; 
+}
+:focus {
+    outline: 0;
+    content: "*}#f~ ";
+}
+q:lang(no) { 
+    quotes: "~" "~"; 
+}
+blockquote:before {
+  color: red;
+}
+
+/*input[type="text"] { 
+    background-color: blue; 
+}*/
+.transparent_box {
+    background-color:#FFF;
+    filter:alpha(opacity=60); /* for IE */
+    opacity:0.6; /* CSS3 standard */
+}
+
+// Spacing
+.space    
+{    color:  purple ;font-color:yellow;   }
+
+// No semi-column
+.no-semi-column { color: orange }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: less
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.8.7
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-20 00:00:00 -04:00
+date: 2009-06-15 00:00:00 -04:00
 default_executable: lessc
 dependencies: []