cloudhead-less 0.7.0 → 0.8.0

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.1

data/bin/lessc

@@ -23,10 +23,11 @@ opts = OptionParser.new do |o|
     options[:watch] = true
   end
   
-  # Compress
-  o.on("-c", "--compress", "compress css file") do
-    options[:compress] = true
-  end
+  # Compression needs a proper algorithm
+  #
+  #  o.on("-c", "--compress", "compress css file") do
+  #    options[:compress] = true
+  #  end
   
   o.separator ""
 

data/less.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "0.7.0"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]

data/lib/less.rb

@@ -1,3 +1,5 @@
+require 'cgi'
+
 require 'less/command'
 require 'less/engine'
 require 'less/tree'

data/lib/less/command.rb

@@ -4,10 +4,12 @@ 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
     
-    # 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
@@ -20,28 +22,22 @@ module Less
     def run!
       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
+            while not compile
+              log "Press [enter] to continue..."
+              watch { $stdin.gets }
             end
-          end # if
-        end # loop
+          end
+        end
       else
         compile
       end
@@ -56,7 +52,7 @@ module Less
         File.open( @destination, "w" ) do |file|
           file.write css
         end
-        puts "#{@destination.split('/').last} was updated!" if watch?
+        puts " [Updated] #{@destination.split('/').last}" if watch?
       rescue Errno::ENOENT => e
         abort "#{e}"
       rescue SyntaxError

data/lib/less/engine.rb

@@ -1,10 +1,10 @@
 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
+      :path     => /([#.][->#.\w ]+)?( ?> ?)?@([-\w]+)/,     # #header > .title > @var
+      :selector => /[-\w #.>*:]/,                            # .cow .milk > a
+      :variable => /@([-\w]+)/,                              # @milk-white
+      :property => /@[-\w]+|[-a-z]+/                         # font-size
     }
     
     def initialize s
@@ -23,8 +23,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( REGEXP[:variable] )          
+          node[:variables] ||= Tree.new
           node[:variables][ match.captures.first ] = value
         elsif value == :mixin
           node[:mixins] ||= []          
@@ -44,38 +44,16 @@ 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, 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, node
       end
       
       #
@@ -85,28 +63,52 @@ module Less
       @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
+            unit = unit.join            
             value = if unit == '#'
+              evaluate = lambda do |v| 
+                result = eval v
+                unit + ( result.zero?? '000' : result.to_s(16) )
+              end
               value.gsub(/#([a-z0-9]+)/i) do
-                hex = $1 * ( $1.size == 3 ? 2 : 1 )
+                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            
+              value.gsub(/px|em|%/, '')
+            end.to_s                
+            next if value.match /[a-z]/i
             node[ key ] = evaluate.call value
           else
             raise MixedUnitsError
           end
         end
       end
-      
     end
     alias render compile
     
+    #
+    # Evaluate variables
+    #
+    def evaluate key, value, node               
+      if value.is_a? String and value.include? '@'       # There's a var to evaluate    
+        value.scan REGEXP[:path] do |p|
+          p = p.join.delete ' '
+          var = if p.include? '>'
+            @tree.find :var, p.split('>')                # Try finding it in a specific namespace
+          else
+            node.var( p ) || @tree.var( p )              # Try local first, then global
+          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
+    end
+    
     def to_css
       self.compile.to_css
     end
@@ -119,13 +121,14 @@ module Less
       #   less:     color: black;
       #   hashify: "color" => "black"
       #
-      hash = self.gsub(/"/, "'").                                                         # ""
-                  gsub(/([@a-z\-]+):[ \t]*(#{ REGEXP[:values] }+);/, '"\\1" => "\\2",').  # Properties
+      hash = self.gsub(/\/\/.*\n/, '').                                                   # Comments //
+                  gsub(/\/\*.*?\//m, '').                                                 # Comments /*
+                  gsub(/"/, "'").                                                         # " => '
+                  gsub(/("|')(.+?)(\1)/) { $1 + CGI.escape( $2 ) + $1 }.                  # Escape string values
+                  gsub(/(#{REGEXP[:property]}):[ \t]*(.+?);/, '"\\1" => "\\2",').         # Declarations
                   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(/([ \t]*)(#{REGEXP[:selector]}+?)[ \t\n]*\{/m, '\\1"\\2" => {').   # Selectors
+                  gsub(/([.#][->\w .#]+);/, '"\\1" => :mixin,')                           # Mixins
       eval "{" + hash + "}"                                                               # Return {hash}
     end
   end

data/lib/less/tree.rb

@@ -57,7 +57,7 @@ module Less
     def to_css 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
       end

data/spec/spec.less

@@ -2,7 +2,11 @@
 // the main color
 @base-color: #fff;
 @darker-color: @base-color / 2;
+/*
 
+lala
+
+*/
 .dookoo a {
   color: black;
 }
@@ -10,14 +14,23 @@
   font-family: "Verdana", 'Baka', serif;
 }
 .dookoo {
+    @fi: @fa;
     @fa: grey;
-    color: @fa;
+    color: .alt > @base-color - .alt > @base-color;
     line-height: 1999px;
+    .blah {
+      .bloop {
+        @supernested: iceberg;
+      }
+    }
 }
 .alt {
-    @base-color: green;
-    @darker-color: @base-color / 2;
-    @another-color: * > @base-color;
+    @base-color: #876956 - #111;
+    @darker-color: @base-color - @base-color;
+    @another-color: @base-color;
+}
+#kelkoo {
+  color: .dookoo > .blah > .bloop > @supernested;
 }
 .altfoo { color: .alt > @base-color; }
 .foo { border: 1px solid black; color: @base-color; }
@@ -25,7 +38,7 @@
   width: 10px * 2;
 }
 #content {    
-    font-size: 12px;
+    font-size: "};(*#)";
     @some-color: blue;    
     #header {        
         .foo;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudhead-less
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - cloudhead