cloudhead-less 0.5.2 → 0.7.0

data/Rakefile

@@ -6,8 +6,36 @@ begin
     s.email       = "alexis@cloudhead.net"
     s.summary     = "LESS compiler"
     s.homepage    = "http://www.lesscss.org"
-    s.description = "Compiles LESS files into CSS"
+    s.description = "LESS is leaner CSS"
+    s.rubyforge_project = 'less'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+
+# rubyforge
+begin
+  require 'rake/contrib/sshpublisher'
+  namespace :rubyforge do
+
+    desc "Release gem and RDoc documentation to RubyForge"
+    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
+
+    namespace :release do
+      desc "Publish RDoc to RubyForge."
+      task :docs => [:rdoc] do
+        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'
+
+        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
+      end
+    end
+  end
+rescue LoadError
+  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
 end

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.7.0

data/bin/lessc

@@ -38,7 +38,7 @@ opts = OptionParser.new do |o|
 
   # 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,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "0.5.2"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2009-05-19}
+  s.date = %q{2009-05-20}
   s.default_executable = %q{lessc}
-  s.description = %q{Compiles LESS files into CSS}
+  s.description = %q{LESS is leaner CSS}
   s.email = %q{alexis@cloudhead.net}
   s.executables = ["lessc"]
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://www.lesscss.org}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
+  s.rubyforge_project = %q{less}
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{LESS compiler}
 

data/lib/less.rb

@@ -3,7 +3,12 @@ require 'less/engine'
 require 'less/tree'
 
 module Less
-  VERSION = '0.1'
+  class MixedUnitsError < Exception 
+  end
+  
+  def self.version
+    File.read( File.join( File.dirname(__FILE__), '..', 'VERSION') )
+  end
 end
 
 class Hash

data/lib/less/command.rb

@@ -33,16 +33,9 @@ module Less
             # Error loop
             #
             loop do
-              begin
-                compile
-              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"
+              unless compile
                 log "Press [enter] to continue..."
-                watch do
-                  $stdin.gets
-                  print "} "
-                end
+                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
@@ -59,12 +52,20 @@ module Less
         # Create a new Less object with the contents of a file
         css = Less::Engine.new( File.read( @source ) ).to_css
         css = css.delete " \n" if compress?
+        
         File.open( @destination, "w" ) do |file|
           file.write css
         end
         puts "#{@destination.split('/').last} was updated!" 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"
+      else
+        true
       end
     end
     

data/lib/less/engine.rb

@@ -3,7 +3,7 @@ module Less
     REGEXP = {
       :path => /([#.][->#.\w]+)?( ?> ?)?@([\w\-]+)/, # #header > .title > @var
       :selector => /[-\w #.>*_:]/,                   # .cow .milk > a
-      :values => /[-\w @>\/*+#%.,'"]/,               # 10px solid #fff
+      :values => /[-\w \(\)@>\/*+#%.,'"]/,           # 10px solid #fff
       :variable => /^@([\w\-]+)/                     # @milk-white
     }
     
@@ -45,24 +45,24 @@ module Less
       end
       
       #
-      # Evaluate the variables
+      # Evaluate variables
       #
       @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        
+        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
+              node.var( var ) || @tree.var( var )          # Try local first, then global
             else
-              @tree.find :var, var.split('>')           # Try finding it in a specific namespace
+              @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
+              node[ key ] = value.gsub REGEXP[:path], var  # Substitute variable with value
             else
-              node.delete key # discard the declaration if the variable wasn't found
+              node.delete key                              # Discard the declaration if the variable wasn't found
             end
           end
         end
@@ -76,7 +76,34 @@ module Less
             convert.call key, value, node
           end
         end
-      end            
+      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 )
+                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
+          else
+            raise MixedUnitsError
+          end
+        end
+      end
+      
     end
     alias render compile
     
@@ -84,10 +111,6 @@ module Less
       self.compile.to_css
     end
     
-    def evaluate s
-      eval( s )
-    end
-    
     def hashify
     #
     # Parse the LESS structure into a hash

data/spec/spec.less

@@ -14,18 +14,6 @@
     color: @fa;
     line-height: 1999px;
 }
-.ccc {
-  color: black;
-}
-.ddd {
-  color: black;
-}
-.bbb {
-  color: black;
-}
-.aaa {
-  color: red;
-}
 .alt {
     @base-color: green;
     @darker-color: @base-color / 2;
@@ -33,13 +21,15 @@
 }
 .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: #ffffff * 2;    
+        font-size: #222 / 2;    
     }
     #main-page {
         #content > .small;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudhead-less
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.7.0
 platform: ruby
 authors: 
 - cloudhead
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-19 00:00:00 -07:00
+date: 2009-05-20 00:00:00 -07:00
 default_executable: lessc
 dependencies: []
 
-description: Compiles LESS files into CSS
+description: LESS is leaner CSS
 email: alexis@cloudhead.net
 executables: 
 - lessc
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: less
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2