less 2.0.4 → 2.1.0

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

@@ -1,10 +1,8 @@
 var path = require('path'),
     fs = require('fs'),
-    sys = require('sys');
+    sys = require('util');
 
-require.paths.unshift(__dirname, path.join(__dirname, '..'));
-
-var less = require('lib/less');
+var less = require('../lib/less');
 
 less.tree.functions.add = function (a, b) {
     return new(less.tree.Dimension)(a.value + b.value);
@@ -12,7 +10,7 @@ less.tree.functions.add = function (a, b) {
 less.tree.functions.increment = function (a) {
     return new(less.tree.Dimension)(a.value + 1);
 }
-less.tree.functions.color = function (str) {
+less.tree.functions._color = function (str) {
     if (str.value === "evil red") { return new(less.tree.Color)("600") }
 }
 

data/lib/less/loader.rb

@@ -1,41 +1,40 @@
+require 'commonjs'
 
 module Less
   class Loader
-    
+    include CallJS
+
+    attr_reader :environment
+
     def initialize
       @cxt = V8::Context.new
-      @path = Pathname(__FILE__).dirname.join('js','lib')
-      @exports = {
-        "path" => Path.new,
-        "sys" => Sys.new,
-        "fs" => Fs.new
-      }
-      @process = Process.new
+      @environment = CommonJS::Environment.new(@cxt, :path => Pathname(__FILE__).dirname.join('js','lib').to_s)
+      @environment.native('path', Path.new)
+      @environment.native('util', Sys.new)
+      @environment.native('fs', Fs.new)
+
+      @cxt['process'] = Process.new
       @cxt['console'] = Console.new
     end
-    
-    def require(path)
-      unless exports = @exports[path]
-        filename = path =~ /\.js$/ ? path : "#{path}.js"
-        filepath = @path.join(filename)
-        fail LoadError, "no such file: #{filename}" unless filepath.exist?
-        load = @cxt.eval("(function(process, require, exports, __dirname) {require.paths = [];#{File.read(filepath)}})", filepath.expand_path)
-        @exports[path] = exports = @cxt['Object'].new
-        load.call(@process, method(:require), exports, Dir.pwd)
-      end
-      return exports
+
+    def require(module_id)
+      @environment.require(module_id)
     end
-    
+
     class Path
       def join(*components)
         File.join(*components)
       end
-      
+
       def dirname(path)
         File.dirname(path)
       end
+
+      def basename(path)
+        File.basename(path)
+      end
     end
-    
+
     class Sys
       def error(*errors)
         raise errors.join(' ')
@@ -46,18 +45,18 @@ module Less
       def statSync(path)
         File.stat(path)
       end
-      
+
       def readFile(path, encoding, callback)
         callback.call(nil, File.read(path))
       end
-      
+
     end
 
     class Process
       def exit(*args)
       end
     end
-    
+
     class Console
       def log(*msgs)
         puts msgs.join(',')

data/lib/less/parser.rb

@@ -9,10 +9,32 @@ module Less
     #
     # @yield code to wrap
     def calljs
-      yield
+      lock do
+        yield
+      end
     rescue V8::JSError => e
       raise ParseError.new(e)
     end
+
+    # @private
+    # Ensure proper locking before entering the V8 API
+    #
+    # @yield code to wrap in lock
+    def lock
+      result, exception = nil, nil
+      V8::C::Locker() do
+        begin
+          result = yield
+        rescue Exception => e
+          exception = e
+        end
+      end
+      if exception
+        raise exception
+      else
+        result
+      end
+    end
   end
 
   # Convert lesscss source into an abstract syntax Tree
@@ -26,10 +48,12 @@ module Less
     # @option opts [String] :filename to associate with resulting parse trees (useful for generating errors)
     def initialize(options = {})
       stringy = {}
-      options.each do |k,v|
+      Less.defaults.merge(options).each do |k,v|
         stringy[k.to_s] = v.is_a?(Array) ? v.map(&:to_s) : v.to_s
       end
-      @parser = Less.Parser.new(stringy)
+      lock do
+        @parser = Less.Parser.new(stringy)
+      end
     end
 
     # Convert `less` source into a abstract syntaxt tree
@@ -37,9 +61,11 @@ module Less
     # @return [Less::Tree] the parsed tree
     def parse(less)
       calljs do
-        error,tree = nil
-        @parser.parse(less, lambda {|e, t|
-          error = e; tree = t
+        tree = nil
+        @parser.parse(less, lambda {|*args|
+          this, e, t = *args
+          fail e.message unless e.nil?
+          tree = t
         })
         Tree.new(tree) if tree
       end

data/lib/less/version.rb

@@ -1,3 +1,3 @@
 module Less
-  VERSION = '2.0.4'
+  VERSION = '2.1.0'
 end

data/lib/less.rb

@@ -1,13 +1,12 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+require 'v8'
+require 'pathname'
+require 'less/parser'
+require 'less/loader'
+require 'less/version'
+require 'less/defaults'
 
 module Less
-
-  require 'v8'
-  require 'pathname'
-  require 'less/parser'
-  require 'less/loader'
-  require 'less/version'
+  extend Less::Defaults
 
   @loader = Less::Loader.new
   @less = @loader.require('less/index')

data/spec/less/faulty/faulty.less

@@ -0,0 +1,3 @@
+body {
+  color: @a;
+}

data/spec/less/parser_spec.rb

@@ -14,14 +14,40 @@ describe Less::Parser do
       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
     expect {subject.parse('{^)')}.should raise_error(Less::ParseError)
   end
 
-  describe "when configured with mulitple load paths" do
-    before {@parser = Less::Parser.new :paths => [cwd.join('one'), cwd.join('two')]}
+  it "passes exceptions from the less compiler" do
+    expect {subject.parse('body { color: @a; }').to_css}.should raise_error(Less::ParseError, /variable @a is undefined/)
+  end
+
+  describe "when configured with multiple load paths" do
+    subject {Less::Parser.new :paths => [cwd.join('one'), cwd.join('two'), cwd.join('faulty')]}
 
     it "will load files from both paths" do
+      subject.parse('@import "one.less";').to_css.gsub(/\n/,'').strip.should eql ".one {  width: 1;}"
+      subject.parse('@import "two.less";').to_css.gsub(/\n/,'').strip.should eql ".two {  width: 1;}"
+    end
+
+    it "passes exceptions from less imported less files" do
+      expect {subject.parse('@import "faulty.less";').to_css}.should raise_error(Less::ParseError, /variable @a is undefined/)
+    end
+
+  end
+
+  describe "when load paths are specified in as default options" do
+    before do
+      Less.paths << cwd.join('one')
+      Less.paths << cwd.join('two')
+      @parser = Less::Parser.new
+    end
+    after do
+      Less.paths.clear
+    end
+
+    it "will load files from default load paths" do
       @parser.parse('@import "one.less";').to_css.gsub(/\n/,'').strip.should eql ".one {  width: 1;}"
       @parser.parse('@import "two.less";').to_css.gsub(/\n/,'').strip.should eql ".two {  width: 1;}"
     end