less 0.8.7 → 0.8.8

data/README.md

@@ -27,3 +27,4 @@ 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

data/Rakefile

@@ -38,4 +38,24 @@ begin
   end
 rescue LoadError
   puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+end
+
+begin
+  require 'spec/rake/spectask'
+
+  Spec::Rake::SpecTask.new("spec") do |t|
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.spec_opts = ['--color', '--format=specdoc']
+  end
+
+  task :test do
+    Rake::Task['spec'].invoke
+  end
+
+  Spec::Rake::SpecTask.new("rcov_spec") do |t|
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.spec_opts = ['--color']
+    t.rcov = true
+    t.rcov_opts = ['--exclude', '^spec,/gems/']
+  end
 end

data/VERSION

@@ -1 +1 @@
-0.8.7
+0.8.8

data/bin/lessc

@@ -68,6 +68,5 @@ case ARGV.size
     puts opts
     exit
 end
-options[:destination] = (options[:destination] || options[:source]).gsub /\.(less|lss)/, CSS
 
 Less::Command.new( options ).run!

data/less.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "0.8.7"
+  s.version = "0.8.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2009-06-15}
+  s.date = %q{2009-06-17}
   s.default_executable = %q{lessc}
   s.description = %q{LESS is leaner CSS}
   s.email = %q{alexis@cloudhead.net}
@@ -27,7 +27,16 @@ Gem::Specification.new do |s|
      "lib/less/command.rb",
      "lib/less/engine.rb",
      "lib/less/tree.rb",
-     "spec/spec.less"
+     "spec/command_spec.rb",
+     "spec/css/less-0.8.5.css",
+     "spec/css/less-0.8.6.css",
+     "spec/css/less-0.8.7.css",
+     "spec/css/less-0.8.8.css",
+     "spec/engine_spec.rb",
+     "spec/spec.css",
+     "spec/spec.less",
+     "spec/spec_helper.rb",
+     "spec/tree_spec.rb"
   ]
   s.has_rdoc = true
   s.homepage = %q{http://www.lesscss.org}
@@ -36,6 +45,12 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{less}
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{LESS compiler}
+  s.test_files = [
+    "spec/command_spec.rb",
+     "spec/engine_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/tree_spec.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/less.rb

@@ -1,20 +1,23 @@
+$:.unshift File.dirname(__FILE__)
+
 require 'cgi'
 
 require 'less/command'
 require 'less/engine'
 require 'less/tree'
 
-module Less    
+module Less
   MixedUnitsError = Class.new(Exception)
   PathError = Class.new(Exception)
-  
+  CompoundOperationError = Class.new(Exception)
+
   def self.version
     File.read( File.join( File.dirname(__FILE__), '..', 'VERSION') )
   end
 end
 
 class Hash
-  # Convert a hash into a Tree  
+  # Convert a hash into a Tree
   def to_tree
     Less::Tree.new self
   end

data/lib/less/command.rb

@@ -1,15 +1,20 @@
 module Less
   class Command
+    CSS = '.css'
+
+    attr_accessor :source, :destination, :options
+
     def initialize options
-      @source, @destination = options[:source], options[:destination]
+      @source = options[:source]
+      @destination = (options[:destination] || options[:source]).gsub /\.(less|lss)/, CSS
       @options = options
     end
-    
+
     def watch?()    @options[:watch]    end
     def compress?() @options[:compress] end
     def debug?()    @options[:debug]    end
-    
-    # little function which allows us to 
+
+    # little function which allows us to
     # Ctrl-C exit inside the passed block
     def watch &block
       begin
@@ -22,18 +27,18 @@ module Less
 
     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... "
-            
+
             # Loop until error is fixed
             until compile
               log "Press [enter] to continue..."
@@ -45,13 +50,13 @@ module Less
         compile
       end
     end
-    
+
     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 @options[:inheritance]
         css = css.delete " \n" if compress?
-        
+
         File.open( @destination, "w" ) do |file|
           file.write css
         end
@@ -59,24 +64,26 @@ module Less
       rescue Errno::ENOENT => e
         abort "#{e}"
       rescue SyntaxError
-        error = debug?? $! : $!.message.split("\n")[1..-1].collect {|e| 
-          e.gsub(/\(eval\)\:(\d+)\:\s/, 'line \1: ') 
+        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 CompoundOperationError => e
+        err "`#{e}` operations in compound declarations aren't allowed, sorry!\n"
       rescue PathError => e
         err "`#{e}` was not found.\n"
       else
         true
       end
     end
-    
+
     # Just a logging function to avoid typing '}'
     def log s = ''
       print '* ' + s.to_s
     end
-    
+
     def err s = ''
       print "!! #{s}"
     end

data/lib/less/engine.rb

@@ -1,7 +1,9 @@
 module Less  
   class Engine < String
+    # Compound properties, such as `border: 1px solid black`
+    COMPOUND = ['font', 'background', 'border']
     REGEX = {
-      :path     => /([#.][->#.\w ]+)?( ?> ?)?@([-\w]+)/,     # #header > .title > @var
+      :path     => /([#.][->#.\w ]+)?( ?> ?)?/,              # #header > .title
       :selector => /[-\w #.,>*:\(\)]/,                       # .cow .milk > a
       :variable => /@([-\w]+)/,                              # @milk-white
       :property => /@[-\w]+|[-a-z]+/,                        # font-size
@@ -65,8 +67,9 @@ module Less
       # Evaluate operations (2+2)
       #
       # Units are: 1px, 1em, 1%, #111
-      @tree = @tree.traverse :leaf do |key, value, path, node| 
+      @tree = @tree.traverse :leaf do |key, value, path, node|
         node[ key ] = value.gsub /(#{REGEX[:operand]}(\s?)[-+\/*](\4))+(#{REGEX[:operand]})/ do |operation|
+          raise CompoundOperationError, "#{key}: #{value}" if COMPOUND.include? key # Disallow operations on compound declarations
           if (unit = operation.scan(/#{REGEX[:numeric]}|(#)/i).flatten.compact.uniq).size <= 1
             unit = unit.join            
             operation = if unit == '#'
@@ -95,26 +98,29 @@ module Less
     #
     # 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|
+    def evaluate key, expression, path, node               
+      if expression.is_a? String and expression.include? '@' # There's a var to evaluate  
+        expression.scan /#{REGEX[:path]}#{REGEX[:variable]}/ do |var|
+          name = var.last
           var = var.join.delete ' '
-          var = if var.include? '>'
-            @tree.find :var, var.split('>')             # Try finding it in a specific namespace
+          
+          value = 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            
+           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
+          
+          if value
+            # Substitute variable with value
+            node[ key ] = node[ key ].gsub /#{REGEX[:path]}@#{name}/, 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
     end
     
-    def to_css chain
+    def to_css chain = :desc
       self.compile.to_css chain
     end
     

data/lib/less/tree.rb

@@ -69,7 +69,7 @@ module Less
     #
     # Convert the tree to css, using full paths
     #
-    def to_css chain = :desc, css = []
+    def to_css chain, css = []
       self.traverse :branch do |path, node|
         properties = node.inject("") do |s, (k, v)|          
           v.is_a?(String) ? (s + "#{k}: #{CGI.unescape(v)}; ") : s                # Add the property to the list

data/spec/command_spec.rb

@@ -0,0 +1,106 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+module LessCommandSpecHelper
+  def required_options
+    {:source => File.dirname(__FILE__) + '/spec.less'}
+  end
+
+  def valid_options
+    {:destination => File.dirname(__FILE__) + '/spec.css', :watch => true, :chain => true, :debug => false}.merge(required_options)
+  end
+end
+
+describe Less::Command do
+  include LessCommandSpecHelper
+
+  describe "required options" do
+    before(:each) do
+      @command = Less::Command.new(required_options)
+    end
+
+    it "should set the source" do
+      @command.source.should == required_options[:source]
+    end
+
+    it "should set the destination using a gsub" do
+      @command.destination.should == valid_options[:destination]
+    end
+
+    it "should set the options with what was passed" do
+      @command.options.should == required_options
+    end
+  end
+
+  describe "valid options" do
+    before(:each) do
+      @command = Less::Command.new(valid_options)
+    end
+
+    it "should set the @source" do
+      @command.source.should == required_options[:source]
+    end
+
+    it "should set the @destionation" do
+      @command.destination.should == valid_options[:destination]
+    end
+
+    it "should set the watch" do
+      @command.options[:watch].should == valid_options[:watch]
+    end
+
+    it "should set the chain" do
+      @command.options[:chain].should == valid_options[:chain]
+    end
+
+    it "should set the debug" do
+      @command.options[:debug].should == valid_options[:debug]
+    end
+
+    it "should set the options with what was passed" do
+      @command.options.should == valid_options
+    end
+  end
+
+  describe "executing run!" do
+    before(:each) do
+      @command = Less::Command.new(required_options)
+    end
+    after(:each) do
+      @command.run!
+    end
+
+    describe "when not watching" do
+      describe "and the destination file doesn't exist" do
+        before(:each) do
+          @command.stub!(:watch?).and_return(false)
+        end
+
+        it "should verify if we need to watch the file or not" do
+          @command.should_receive(:watch?).and_return(false)
+        end
+
+        it "should attempt to re-compile" do
+          @command.should_receive(:compile).with().once
+        end
+      end
+
+      describe "and the destination file does exist" do
+        it "should not attempt to create a new file"
+        it "should attempt to re-compile"
+      end
+    end
+
+    describe "when watching" do
+      describe "and the destination file doesn't exist" do
+        it "should attempt to compile to a new file"
+        it "should begin to watch the file"
+      end
+
+      describe "and the destination file does exist" do
+        it "should not attempt to compile to a new file"
+        it "should begin to watch the existing file"
+        it "should re-compile when the existing file changes"
+      end
+    end
+  end
+end

data/spec/css/less-0.8.5.css

@@ -0,0 +1,24 @@
+ul li:first-child { border-top: none; }
+q:lang(no) { quotes: '~' '~'; }
+.no-semi-column { color: orange; }
+body { text-shadow: #333 -1px 1px 2px; border-color: #888; font-size: 10px; margin: -5px 0 5px 10px; background-color: #aaa; border: solid 1px #000; -moz-border-radius: 3px; font-family: 'Lucida Grande', 'Helvetica', Verdana, sans-serif; color: #ccc; }
+td, tr, table { border-width: 4px; }
+.space { color: purple; font-color: yellow; }
+blockquote:before { color: red; }
+.root > a:hover, a:focus { color: orange; }
+.root > a { display: none; color: blue; }
+.root > .first > .second > .third { border-color: blue; font-size: 8px; background-color: blue; color: red; }
+.root > .first > .second { }
+.root > .first { color: green; }
+.root { }
+.p:first-letter { color: red; }
+.extra > .dark-borders { border-color: #444444; }
+.extra > .light-borders { border-color: #888; }
+.extra { }
+ul li:first-child, ul li:last-child { background-color: #333; }
+.borders { }
+.root:hover a { display: block; }
+.operations { colorb: #333333; font-size: 66; colorc: #777777; line-height: 7px; border-width: 16px; color: #eeeeee; }
+:focus { outline: 0; content: '*}#f~ '; }
+.theme { background-color: #aaa; color: #ccc; }
+.transparent_box { opacity: 0.6; background-color: #FFF; filter: alpha(opacity=60); }

data/spec/css/less-0.8.6.css

@@ -0,0 +1,24 @@
+ul li:first-child { border-top: none; }
+q:lang(no) { quotes: '~' '~'; }
+.no-semi-column { color: orange; }
+body { text-shadow: #333 -1px 1px 2px; border-color: #888; font-size: 10px; margin: -5px 0 5px 10px; background-color: #aaa; border: solid 1px #000; -moz-border-radius: 3px; font-family: 'Lucida Grande', 'Helvetica', Verdana, sans-serif; color: #ccc; }
+td, tr, table { border-width: 4px; }
+.space { color: purple; font-color: yellow; }
+blockquote:before { color: red; }
+.root a:hover, a:focus { color: orange; }
+.root a { display: none; color: blue; }
+.root .first .second .third { border-color: blue; font-size: 8px; background-color: blue; color: red; }
+.root .first .second { }
+.root .first { color: green; }
+.root { }
+.p:first-letter { color: red; }
+.extra .dark-borders { border-color: #444444; }
+.extra .light-borders { border-color: #888; }
+.extra { }
+ul li:first-child, ul li:last-child { background-color: #333; }
+.borders { }
+.root:hover a { display: block; }
+.operations { colorb: #333333; font-size: 66; colorc: #777777; line-height: 7px; border-width: 16px; color: #eeeeee; }
+:focus { outline: 0; content: '*}#f~ '; }
+.theme { background-color: #aaa; color: #ccc; }
+.transparent_box { opacity: 0.6; background-color: #FFF; filter: alpha(opacity=60); }

data/spec/css/less-0.8.7.css

@@ -0,0 +1,24 @@
+ul li:first-child { border-top: none; }
+q:lang(no) { quotes: '~' '~'; }
+.no-semi-column { color: orange; }
+body { text-shadow: #333 -1px 1px 2px; border-color: #888; font-size: 10px; margin: -5px 0 5px 10px; background-color: #aaa; border: solid 1px #000; -moz-border-radius: 3px; font-family: 'Lucida Grande', 'Helvetica', Verdana, sans-serif; color: #ccc; }
+td, tr, table { border-width: 4px; }
+.space { color: purple; font-color: yellow; }
+blockquote:before { color: red; }
+.root a:hover, a:focus { color: orange; }
+.root a { display: none; color: blue; }
+.root .first .second .third { border-color: blue; font-size: 8px; background-color: blue; color: red; }
+.root .first .second { }
+.root .first { color: green; }
+.root { }
+.p:first-letter { color: red; }
+.extra .dark-borders { border-color: #444444; }
+.extra .light-borders { border-color: #888; }
+.extra { }
+ul li:first-child, ul li:last-child { background-color: #333; }
+.borders { }
+.root:hover a { display: block; }
+.operations { colorb: #333333; font-size: 66; colorc: #777777; line-height: 7px; border-width: 16px; color: #eeeeee; }
+:focus { outline: 0; content: '*}#f~ '; }
+.theme { background-color: #aaa; color: #ccc; }
+.transparent_box { opacity: 0.6; background-color: #FFF; filter: alpha(opacity=60); }

data/spec/css/less-0.8.8.css

@@ -0,0 +1,25 @@
+ul li:first-child { border-top: none; }
+q:lang(no) { quotes: '~' '~'; }
+.no-semi-column { color: orange; }
+body { text-shadow: #333 -1px 1px 2px; border-color: #888; font-size: 10px; margin: -5px 0 5px 10px; background-color: #aaa; border: solid 1px #000; -moz-border-radius: 3px; font-family: 'Lucida Grande', 'Helvetica', Verdana, sans-serif; color: #ccc; }
+td, tr, table { border-width: 4px; }
+.space { color: purple; font-color: yellow; }
+blockquote:before { color: red; }
+.root a:hover, a:focus { color: orange; }
+.root a { display: none; color: blue; }
+.root .first .second .third { border-color: blue; font-size: 8px; background-color: blue; color: red; }
+.root .first .second { }
+.root .first { color: green; }
+.root { }
+.p:first-letter { color: red; }
+.extra .dark-borders { border-color: #444444; }
+.extra .light-borders { border-color: #888; }
+.extra { }
+ul li:first-child, ul li:last-child { background-color: #333; }
+.borders { }
+.root:hover a { display: block; }
+.operations div { width: 80px; }
+.operations { colorb: #333333; font-size: 66; colorc: #777777; line-height: 7px; border-width: 16px; color: #eeeeee; width: 110px; }
+:focus { outline: 0; content: '*}#f~ '; }
+.theme { background-color: #aaa; color: #ccc; }
+.transparent_box { opacity: 0.6; background-color: #FFF; filter: alpha(opacity=60); }

data/spec/engine_spec.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+module LessEngineSpecHelper
+  def lessify(string)
+    return Less::Engine.new(string).to_css(:desc)
+  end
+end
+
+describe Less::Engine do
+  include LessEngineSpecHelper
+
+  describe "to_css" do
+    it "should return p {} for p {}" do
+      lessify('p {}').should == 'p { }'
+    end
+
+    it "should return css with variable usage" do
+      lessify("@brand_color: #4D926F;\n #header { color: @brand_color; }").should == "#header { color: #4D926F; }"
+    end
+
+    it "should return css as shown on home page" do
+      lessify("#header { \n  color: red;\n  a {\n    font-weight: bold;\n    text-decoration: none;\n  }\n}").should == "#header a { font-weight: bold; text-decoration: none; }\n#header { color: red; }"
+    end
+
+    it "should handle :hover" do
+      lessify("a:hover {\n color: red; }").should == "a:hover { color: red; }"
+    end
+
+    it "should handle instances of double-quotes" do
+      lessify("blockquote:before, blockquote:after, q:before, q:after {\n content: \"\"; }").should == "blockquote:before, blockquote:after, q:before, q:after { content: ''; }"
+    end
+  end
+end
+
+

data/spec/spec.css

@@ -0,0 +1,25 @@
+.theme { color: #ccc; background-color: #aaa; }
+.extra > .dark-borders { border-color: #444444; }
+.extra > .light-borders { border-color: #888; }
+.extra { }
+.borders { }
+.root > a { color: blue; display: none; }
+.root > a:hover, a:focus { color: orange; }
+.root > .first > .second > .third { background-color: blue; font-size: 8px; color: red; border-color: blue; }
+.root > .first > .second { }
+.root > .first { color: green; }
+.root { }
+.root:hover a { display: block; }
+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; color: #ccc; background-color: #aaa; border-color: #888; }
+.operations > div { width: 80px; }
+.operations { width: 110px; border-width: 16px; font-size: 66; line-height: 7px; color: #eeeeee; colorb: #333333; colorc: #777777; }
+td, tr, table { border-width: 4px; }
+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; }
+.transparent_box { background-color: #FFF; filter: alpha(opacity=60); opacity: 0.6; }
+.space { color: purple; font-color: yellow; }
+.no-semi-column { color: orange; }

data/spec/spec.less

@@ -74,6 +74,10 @@ body {
 .operations {
     @ten: 10;
     @dark: #111;
+    @box: 100px; 
+    @border_width: 10px;
+    width: @box + @border_width; // 110px
+    div { width: @box - 2 * @border_width; } // 80px
     border-width: .borders > @thick * 5 - 4px; // 16px
     font-size: 10 - 4 + 6 * @ten; // 66
     line-height: @ten - .operations > @ten + .root > .first > @size - 1; // 7px

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+require 'rubygems'
+require 'spec'
+
+require File.dirname(__FILE__) + '/../lib/less'
+

data/spec/tree_spec.rb

@@ -0,0 +1,5 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Less::Tree do
+  it "should get some specs..."
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: less
 version: !ruby/object:Gem::Version 
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-15 00:00:00 -04:00
+date: 2009-06-17 00:00:00 -04:00
 default_executable: lessc
 dependencies: []
 
@@ -34,7 +34,16 @@ files:
 - lib/less/command.rb
 - lib/less/engine.rb
 - lib/less/tree.rb
+- spec/command_spec.rb
+- spec/css/less-0.8.5.css
+- spec/css/less-0.8.6.css
+- spec/css/less-0.8.7.css
+- spec/css/less-0.8.8.css
+- spec/engine_spec.rb
+- spec/spec.css
 - spec/spec.less
+- spec/spec_helper.rb
+- spec/tree_spec.rb
 has_rdoc: true
 homepage: http://www.lesscss.org
 post_install_message: 
@@ -61,5 +70,8 @@ rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: LESS compiler
-test_files: []
-
+test_files: 
+- spec/command_spec.rb
+- spec/engine_spec.rb
+- spec/spec_helper.rb
+- spec/tree_spec.rb