less 2.4.0 → 2.5.0

data/lib/less/js/test/less/selectors.less

@@ -131,6 +131,7 @@ a {
   }
 }
 [prop],
+[prop=10%],
 [prop="value@{num}"],
 [prop*="val@{num}"],
 [|prop~="val@{num}"],
@@ -140,4 +141,16 @@ a {
 [@{num}=@{num}],
 [@{num}] {
   attributes: yes;
+}
+
+/*
+Large comment means chunk will be emitted after } which means chunk will begin with whitespace...
+blank blank blank blank blank blank blank blank blank blank blank blank blank blank blank blank
+blank blank blank blank blank blank blank blank blank blank blank blank blank blank blank blank
+blank blank blank blank blank blank blank blank blank blank blank blank blank blank blank blank
+blank blank blank blank blank blank blank blank blank blank blank blank blank blank blank blank
+blank blank blank blank blank blank blank blank blank blank blank blank blank blank blank blank
+*/
+@{selector} {
+  color: red;
 }

data/lib/less/js/test/less/sourcemaps/basic.json

@@ -0,0 +1,3 @@
+{
+	"my-color": "red"
+}

data/lib/less/js/test/less/sourcemaps/basic.less

@@ -0,0 +1,27 @@
+@var: black;
+
+.a() {
+  color: red;
+}
+
+.b {
+  color: green;
+  .a();
+  color: blue;
+  background: @var;
+}
+
+.a, .b {
+  background: green;
+  .c, .d {
+    background: gray;
+    & + & {
+      color: red;
+    }
+  }
+}
+
+.extend:extend(.a all) {
+  color: pink;
+}
+@import (inline) "imported.css";

data/lib/less/js/test/less/sourcemaps/imported.css

@@ -0,0 +1,7 @@
+/*comments*/
+.unused-css {
+    color: white;
+}
+.imported {
+    color: black;
+}

data/lib/less/js/test/less/strings.less

@@ -49,3 +49,9 @@
     .mix-mul(black);
     .mix-mul(orange);
 }
+
+@test: Arial, Verdana, San-Serif;
+.watermark {
+  @family: ~"Univers, @{test}";
+  family: @family;
+}

data/lib/less/js/test/less/url-args/urls.less

@@ -0,0 +1,63 @@
+@font-face {
+  src: url("/fonts/garamond-pro.ttf");
+  src: local(Futura-Medium),
+       url(fonts.svg#MyGeometricModern) format("svg");
+}
+#shorthands {
+  background: url("http://www.lesscss.org/spec.html") no-repeat 0 4px;
+  background: url("img.jpg") center / 100px;
+  background: #fff url(image.png) center / 1px 100px repeat-x scroll content-box padding-box;
+}
+#misc {
+  background-image: url(images/image.jpg);
+}
+#data-uri {
+  background: url(data:image/png;charset=utf-8;base64,
+    kiVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD/
+    k//+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4U
+    kg9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC);
+  background-image: url(data:image/x-png,f9difSSFIIGFIFJD1f982FSDKAA9==);
+  background-image: url(http://fonts.googleapis.com/css?family=\"Rokkitt\":\(400\),700);
+  background-image: url("http://fonts.googleapis.com/css?family=\"Rokkitt\":\(400\),700");
+}
+
+#svg-data-uri {
+  background: transparent url('data:image/svg+xml, <svg version="1.1"><g></g></svg>');
+}
+
+.comma-delimited {
+  background: url(bg.jpg) no-repeat, url(bg.png) repeat-x top left, url(bg);
+}
+.values {
+    @a: 'Trebuchet';
+    url: url(@a);
+}
+
+@import "../import/imports/font";
+
+#data-uri {
+  uri: data-uri('image/jpeg;base64', '../../data/image.jpg');
+}
+
+#data-uri-guess {
+  uri: data-uri('../../data/image.jpg');
+}
+
+#data-uri-ascii {
+  uri-1: data-uri('text/html', '../../data/page.html');
+  uri-2: data-uri('../../data/page.html');
+}
+
+#svg-functions {
+  background-image: svg-gradient(to bottom, black, white);
+  background-image: svg-gradient(to bottom, black, orange 3%, white);
+  @green_5: green 5%;
+  @orange_percentage: 3%;
+  @orange_color: orange;
+  background-image: svg-gradient(to bottom, (mix(black, white) + #444) 1%, @orange_color @orange_percentage, ((@green_5)), white 95%);
+}
+
+#data-uri-with-spaces {
+  background-image: url( data:image/x-png,f9difSSFIIGFIFJD1f982FSDKAA9==);
+  background-image: url( ' data:image/x-png,f9difSSFIIGFIFJD1f982FSDKAA9==');
+}

data/lib/less/js/test/less/urls.less

@@ -18,6 +18,7 @@
     kg9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC);
   background-image: url(data:image/x-png,f9difSSFIIGFIFJD1f982FSDKAA9==);
   background-image: url(http://fonts.googleapis.com/css?family=\"Rokkitt\":\(400\),700);
+  background-image: url("http://fonts.googleapis.com/css?family=\"Rokkitt\":\(400\),700");
 }
 
 #svg-data-uri {
@@ -34,6 +35,11 @@
 
 @import "import/import-and-relative-paths-test";
 
+#relative-url-import {
+    .unquoted-relative-path-bg;
+    .quoted-relative-path-border-image;
+}
+
 #data-uri {
   uri: data-uri('image/jpeg;base64', '../data/image.jpg');
 }
@@ -55,3 +61,12 @@
 }
 
 .add_an_import("file.css");
+
+#svg-functions {
+  background-image: svg-gradient(to bottom, black, white);
+  background-image: svg-gradient(to bottom, black, orange 3%, white);
+  @green_5: green 5%;
+  @orange_percentage: 3%;
+  @orange_color: orange;
+  background-image: svg-gradient(to bottom, (mix(black, white) + #444) 1%, @orange_color @orange_percentage, ((@green_5)), white 95%);
+}

data/lib/less/js/test/rhino/test-header.js

@@ -0,0 +1,15 @@
+function initRhinoTest() {
+    process = { title: 'dummy' };
+
+    less.tree.functions.add = function (a, b) {
+        return new(less.tree.Dimension)(a.value + b.value);
+    };
+    less.tree.functions.increment = function (a) {
+        return new(less.tree.Dimension)(a.value + 1);
+    };
+    less.tree.functions._color = function (str) {
+        if (str.value === "evil red") { return new(less.tree.Color)("600"); }
+    };
+}
+
+initRhinoTest();

data/lib/less/js/test/sourcemaps/basic.json

@@ -0,0 +1 @@
+{"version":3,"file":"sourcemaps/basic.css","sources":["testweb/sourcemaps/imported.css","testweb/sourcemaps/basic.less"],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;ACAA;EACE,YAAA;EAJA,UAAA;EAWA,iBAAA;EALA,WAAA;EACA,mBAAA;;AAJF,EASE;AATF,EASM;EACF,gBAAA;;AACA,EAFF,GAEI,KAFJ;AAEE,EAFF,GAEI,KAFA;AAEF,EAFE,GAEA,KAFJ;AAEE,EAFE,GAEA,KAFA;EAGA,UAAA;;AALN;AAAI;AAUJ;EATE,iBAAA;;AADF,EAEE;AAFE,EAEF;AAFF,EAEM;AAFF,EAEE;AAQN,OARE;AAQF,OARM;EACF,gBAAA;;AACA,EAFF,GAEI,KAFJ;AAEE,EAFF,GAEI,KAFJ;AAEE,EAFF,GAEI,KAFA;AAEF,EAFF,GAEI,KAFA;AAEF,EAFF,GAEI,KAFJ;AAEE,EAFF,GAEI,KAFJ;AAEE,EAFF,GAEI,KAFA;AAEF,EAFF,GAEI,KAFA;AAEF,EAFE,GAEA,KAFJ;AAEE,EAFE,GAEA,KAFJ;AAEE,EAFE,GAEA,KAFA;AAEF,EAFE,GAEA,KAFA;AAEF,EAFE,GAEA,KAFJ;AAEE,EAFE,GAEA,KAFJ;AAEE,EAFE,GAEA,KAFA;AAEF,EAFE,GAEA,KAFA;AAQN,OARE,GAQF,UARE;AAQF,OARE,GAEI,KAFJ;AAQF,OARE,GAQF,UARM;AAQN,OARE,GAEI,KAFA;AAEF,EAFF,GAQF,UARE;AAEE,EAFF,GAQF,UARM;AAQN,OARM,GAQN,UARE;AAQF,OARM,GAEA,KAFJ;AAQF,OARM,GAQN,UARM;AAQN,OARM,GAEA,KAFA;AAEF,EAFE,GAQN,UARE;AAEE,EAFE,GAQN,UARM;EAGA,UAAA;;AAKN;EACE,WAAA"}

data/lib/less/js/test/sourcemaps/index.html

@@ -0,0 +1,17 @@
+<html>
+   <link type="text/css" rel="stylesheet" media="all" href="import.css">
+   <link type="text/css" rel="stylesheet" media="all" href="basic.css">
+<head>
+</head>
+<body>
+<div id="import-test">id import-test</div>
+<div id="import">id import-test</div>
+<div class="imported inline">class imported inline</div>
+<div id="mixin">class mixin</div>
+<div class="a">class a</div>
+<div class="b">class b</div>
+<div class="b">class b<div class="c">class c</div></div>
+<div class="a">class a<div class="d">class d</div></div>
+<div class="extend">class extend<div class="c">class c</div></div>
+</body>
+</html>

data/lib/less/loader.rb

@@ -6,14 +6,15 @@ require 'base64'
 
 module Less
   class Loader
-    
+
     attr_reader :environment
-    
+
     def initialize
       context_wrapper = Less::JavaScript.context_wrapper.instance
       @context = context_wrapper.unwrap
       @context['process'] = Process.new
       @context['console'] = Console.new
+      @context['Buffer'] = Buffer
       path = Pathname(__FILE__).dirname.join('js', 'lib')
       @environment = CommonJS::Environment.new(@context, :path => path.to_s)
       @environment.native('path', Path)
@@ -22,13 +23,13 @@ module Less
       @environment.native('url', Url)
       @environment.native('http', Http)
     end
-    
+
     def require(module_id)
       @environment.require(module_id)
     end
-    
+
     # JS exports (required by less.js) :
-    
+
     class Process # :nodoc:
       def exit(*args)
         warn("JS process.exit(#{args.first}) called from: \n#{caller.join("\n")}")
@@ -44,9 +45,9 @@ module Less
         $stderr.puts msgs.join(', ')
       end
     end
-    
+
     # stubbed JS modules (required by less.js) :
-    
+
     module Path # :nodoc:
       def self.join(*components)
         # node.js expands path on join
@@ -60,31 +61,31 @@ module Less
       def self.basename(path)
         File.basename(path)
       end
-      
+
       def self.extname(path)
         File.extname(path)
       end
-      
+
       def self.resolve(path)
         File.basename(path)
       end
-      
+
     end
-    
+
     module Util # :nodoc:
-      
+
       def self.error(*errors)
         raise errors.join(' ')
       end
-      
+
       def self.puts(*args)
         args.each { |arg| STDOUT.puts(arg) }
       end
-      
+
     end
 
     module FS # :nodoc:
-      
+
       def self.statSync(path)
         File.stat(path)
       end
@@ -92,35 +93,42 @@ module Less
       def self.readFile(path, encoding, callback)
         callback.call(nil, File.read(path))
       end
-      
-      def self.readFileSync(path, encoding)
-        Buffer.new(path)
+
+      def self.readFileSync(path, encoding = nil)
+        buf = Buffer.new(File.read(path),  encoding)
+        encoding.nil? ? buf : buf.toString(encoding)
       end
 
-      class Buffer
-        attr_accessor :data
+    end
 
-        def initialize(path)
-          @data = File.read(path)
-        end
+    class Buffer # :nodoc:
 
-        def length
-          @data.length
-        end
+      attr_accessor :data
 
-        def toString(*args)
-          if args.last == "base64"
-            Base64.strict_encode64(@data)
-          else
-            @data
-          end
+      def initialize(data, encoding = nil)
+        unless data.is_a? String
+          data = data.to_ruby
         end
+        @data = data
+      end
+
+      def length
+        @data.length
       end
 
+      def toString(encoding = nil, begPos = 0, endPos = length)
+        data = @data[ begPos..endPos ]
+        if encoding == 'base64'
+          data = Base64.encode64(data)
+          data.delete!("\n"); data
+        else # encoding == 'binary'
+          data
+        end
+      end
     end
 
     module Url # :nodoc:
-      
+
       def self.resolve(*args)
         URI.join(*args)
       end
@@ -137,11 +145,11 @@ module Less
         result['hash']     = '#' + u.fragment if u.fragment
         result
       end
-      
+
     end
-    
+
     module Http # :nodoc:
-      
+
       def self.get(options, callback)
         err = nil
         begin
@@ -182,7 +190,7 @@ module Less
         end
         ret
       end
-      
+
       class HttpGetResult
         attr_accessor :err
 
@@ -218,8 +226,8 @@ module Less
           end
         end
       end
-      
+
     end
-    
+
   end
-end
+end

data/lib/less/version.rb

@@ -1,3 +1,3 @@
 module Less
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
 end

data/spec/less/parser_spec.rb

@@ -20,7 +20,7 @@ describe Less::Parser do
   end
 
   it "throws a ParseError if the lesscss is bogus" do
-    lambda { subject.parse('{^)') }.should raise_error(Less::ParseError, /missing closing `\}`/)
+    lambda { subject.parse('{^)') }.should raise_error(Less::ParseError, /missing opening `\(`/)
   end
 
   it "passes exceptions from the less compiler" do
@@ -29,13 +29,13 @@ describe Less::Parser do
 
   describe "when configured with source mapping" do
     subject { Less::Parser.new(:filename => 'one.less', :paths => [ cwd.join('one'), cwd.join('two') ], :dumpLineNumbers => 'mediaquery') }
-    
+
     it "prints source maps" do
       subject.parse('@import "one.less"; @import "two.less";').to_css(:compress => false).gsub(/\n/,'').strip.should eql "@media -sass-debug-info{filename{font-family:file\\:\\/\\/one\\.less}line{font-family:\\000031}}.one {  width: 1;}@media -sass-debug-info{filename{font-family:file\\:\\/\\/two\\.less}line{font-family:\\000031}}.two {  width: 1;}"
     end
-    
+
   end
-  
+
   describe "when configured with multiple load paths" do
     subject { Less::Parser.new :paths => [ cwd.join('one'), cwd.join('two'), cwd.join('faulty') ] }
 
@@ -100,12 +100,12 @@ describe Less::Parser do
       expected = "@import \"some.css\";\nbody {\n  background: url('assets/logo.png');\n}\n"
       expect( parser.parse('@import "some/some.less";').to_css ).to eql expected
     end
-    
+
   end
-  
+
   # NOTE: runs JS tests from less.js it's a replacement for less-test.js
   describe "less-test", :integration => true do
-    
+
     TEST_LESS_DIR = File.expand_path('../../lib/less/js/test/less', File.dirname(__FILE__))
     TEST_CSS_DIR =  File.expand_path('../../lib/less/js/test/css' , File.dirname(__FILE__))
 
@@ -130,19 +130,19 @@ describe Less::Parser do
         end
       end
     end
-    
+
     after :all do
       Less.tree.functions[:add] = nil
       Less.tree.functions[:increment] = nil
       Less.tree.functions[:_color] = nil
     end
-    
+
     Dir.glob(File.join(TEST_LESS_DIR, '*.less')).each do |less_file|
-      
+
       base_name = File.basename(less_file, '.less')
       css_file = File.join(TEST_CSS_DIR, "#{base_name}.css")
       raise "missing css file: #{css_file}" unless File.exists?(css_file)
-      
+
       less_content = File.read(less_file)
       case base_name
         when 'javascript'
@@ -153,15 +153,15 @@ describe Less::Parser do
           # with something that won't fail (since we're not in Node.JS)
           less_content.sub!('process.title', '"node"')
       end
-      
+
       it "#{base_name}.less" do
         parser = Less::Parser.new(:filename => less_file, :paths => [ File.dirname(less_file) ])
         less = parser.parse( less_content )
         less.to_css(:strictMath => true, :silent => true).should == File.read(css_file)
       end
-      
+
     end
-    
+
   end
-  
+
 end