less 2.2.2 → 2.6.0

data/lib/less/parser.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Less
 
   # Convert lesscss source into an abstract syntax Tree
@@ -5,15 +7,52 @@ module Less
 
     # Construct and configure new Less::Parser
     #
-    # @param [Hash] opts configuration options
-    # @option opts [Array] :paths a list of directories to search when handling \@import statements
-    # @option opts [String] :filename to associate with resulting parse trees (useful for generating errors)
+    # @param [Hash] options configuration options
+    # @option options [Array] :paths a list of directories to search when handling \@import statements
+    # @option options [String] :filename to associate with resulting parse trees (useful for generating errors)
+    # @option options [TrueClass, FalseClass] :compress
+    # @option options [TrueClass, FalseClass] :strictImports
+    # @option options [TrueClass, FalseClass] :relativeUrls
+    # @option options [String] :dumpLineNumbers one of 'mediaquery', 'comments', or 'all'
     def initialize(options = {})
-      stringy = {}
-      Less.defaults.merge(options).each do |k,v|
-        stringy[k.to_s] = v.is_a?(Array) ? v.map(&:to_s) : v.to_s
+      # LeSS supported _env_ options :
+      # 
+      # - paths (unmodified) - paths to search for imports on
+      # - optimization - optimization level (for the chunker)
+      # - mime (browser only) mime type for sheet import
+      # - contents (browser only)
+      # - strictImports
+      # - dumpLineNumbers - whether to dump line numbers
+      # - compress - whether to compress
+      # - processImports - whether to process imports. if false then imports will not be imported
+      # - relativeUrls (true/false) whether to adjust URL's to be relative
+      # - errback (error callback function)
+      # - rootpath string
+      # - entryPath string
+      # - files (internal) - list of files that have been imported, used for import-once
+      # - currentFileInfo (internal) - information about the current file - 
+      #   for error reporting and importing and making urls relative etc :
+      #     this.currentFileInfo = {
+      #        filename: filename,
+      #        relativeUrls: this.relativeUrls,
+      #        rootpath: options.rootpath || "",
+      #        currentDirectory: entryPath,
+      #        entryPath: entryPath,
+      #        rootFilename: filename
+      #     };
+      #
+      env = {}
+      Less.defaults.merge(options).each do |key, val|
+        env[key.to_s] = 
+          case val
+          when Symbol, Pathname then val.to_s
+          when Array
+            val.map!(&:to_s) if key.to_sym == :paths # might contain Pathname-s
+            val # keep the original passed Array
+          else val # true/false/String/Method
+          end
       end
-      @parser = Less::JavaScript.exec { Less['Parser'].new(stringy) }
+      @parser = Less::JavaScript.exec { Less['Parser'].new(env) }
     end
 
     # Convert `less` source into a abstract syntaxt tree
@@ -39,7 +78,7 @@ module Less
     end
 
     def imports
-      Less::JavaScript.exec { @parser.imports.files.map{|file, _| file} }
+      Less::JavaScript.exec { @parser.imports.files.map { |file, _| file } }
     end
 
     private

data/lib/less/version.rb

@@ -1,3 +1,3 @@
 module Less
-  VERSION = '2.2.2'
-end
+  VERSION = '2.6.0'
+end

data/spec/less/loader_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+require 'stringio'
+
+describe Less::Loader do
+
+  describe 'eval console.log()' do
+
+    it 'should write message to $stdout' do
+      stdout = $stdout; io_stub = StringIO.new
+      begin
+        $stdout = io_stub
+        subject.environment.runtime.eval("console.log('log much?');")
+      ensure
+        $stdout = stdout
+      end
+      io_stub.string.should == "log much?\n"
+    end
+
+    it 'should write messages to $stdout' do
+      stdout = $stdout; io_stub = StringIO.new
+      begin
+        $stdout = io_stub
+        subject.environment.runtime.eval("console.log('1','2','3');")
+      ensure
+        $stdout = stdout
+      end
+      io_stub.string.should == "1, 2, 3\n"
+    end
+
+  end
+
+  describe 'eval process.exit()' do
+
+    process = Less::Loader::Process
+
+    it 'should not raise an error' do
+      process.any_instance.should_receive(:warn) do |msg|
+        msg.should match(/JS process\.exit\(-2\)/)
+      end
+      subject.environment.runtime.eval("process.exit(-2);")
+    end
+
+  end
+
+end

data/spec/less/parser_spec.rb

@@ -15,18 +15,27 @@ describe Less::Parser do
     end
 
     it "accepts options when assembling the parse tree" do
-      subject.parse(".class {width: 1+1}").to_css(:compress => true).strip.should eql ".class{width:2;}"
+      subject.parse(".class {width: 1+1}").to_css(:compress => true).strip.should eql ".class{width:2}"
     end
   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
     lambda { subject.parse('body { color: @a; }').to_css }.should raise_error(Less::ParseError, /variable @a is undefined/)
   end
 
+  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') ] }
 
@@ -42,8 +51,9 @@ describe Less::Parser do
     it "will track imported files" do
       subject.parse('@import "one.less";')
       subject.parse('@import "two.less";')
-      subject.imports.should include("one.less")
-      subject.imports.should include("two.less")
+      # Parser#imports returns full path names
+      subject.imports.grep(/one\.less$/).should_not be_empty
+      subject.imports.grep(/two\.less$/).should_not be_empty
     end
 
     it "reports type, line, column and filename of (parse) error" do
@@ -52,8 +62,8 @@ describe Less::Parser do
       rescue Less::ParseError => e
         e.type.should == 'Name'
         e.filename.should == cwd.join('faulty/faulty.less').to_s
-        e.line.should == 1
-        e.column.should == 16
+        e.line.should == 2
+        e.column.should == 9
       else
         fail "parse error not raised"
       end
@@ -77,9 +87,25 @@ describe Less::Parser do
     end
   end
 
+  describe "relative urls" do
+
+    it "keeps relative imports when true" do
+      parser = Less::Parser.new :paths => [ cwd ], :relativeUrls => true
+      expected = "@import \"some/some.css\";\nbody {\n  background: url('some/assets/logo.png');\n}\n"
+      expect( parser.parse('@import "some/some.less";').to_css ).to eql expected
+    end
+
+    it "does not keep relative imports when false" do
+      parser = Less::Parser.new :paths => [ cwd ], :relativeUrls => false
+      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__))
 
@@ -104,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'
@@ -127,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(:paths => [ File.dirname(less_file) ])
+        parser = Less::Parser.new(:filename => less_file, :paths => [ File.dirname(less_file) ])
         less = parser.parse( less_content )
-        less.to_css.should == File.read(css_file)
+        less.to_css(:strictMath => true, :silent => true).should == File.read(css_file)
       end
-      
+
     end
-    
+
   end
-  
+
 end

data/spec/less/some/some.less

@@ -0,0 +1,4 @@
+@import "some.css";
+body {
+  background: url('assets/logo.png');
+}