less 2.0.4 → 2.0.5

data/less.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency "therubyracer", "~> 0.9.1"
-  s.add_development_dependency "rake", "~> 0.9.1"
+  s.add_dependency "therubyracer", "~> 0.9.2"
+  s.add_development_dependency "rake", "~> 0.9.2"
   s.add_development_dependency "rspec", "~> 2.0"
 end
 

data/lib/less/loader.rb

@@ -1,17 +1,20 @@
 
 module Less
   class Loader
-    
+    include CallJS
+
     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
-      @cxt['console'] = Console.new
+      lock do
+        @cxt = V8::Context.new
+        @path = Pathname(__FILE__).dirname.join('js','lib')
+        @exports = {
+          "path" => Path.new,
+          "sys" => Sys.new,
+          "fs" => Fs.new
+        }
+        @process = Process.new
+        @cxt['console'] = Console.new
+      end
     end
     
     def require(path)
@@ -19,9 +22,11 @@ module Less
         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)
+        lock do
+          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
       end
       return exports
     end

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
@@ -29,7 +51,9 @@ module Less
       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

data/lib/less/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: less
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors: 
 - Charles Lowell
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-17 00:00:00 -05:00
+date: 2011-06-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.1
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.1
+        version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: *id002
@@ -181,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2388107400795165815
+      hash: 2860711812237804044
       segments: 
       - 0
       version: "0"
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2388107400795165815
+      hash: 2860711812237804044
       segments: 
       - 0
       version: "0"