less 2.1.0 → 2.2.0

data/.gitignore

@@ -4,3 +4,4 @@
 *.rbc
 .yardoc
 Gemfile.lock
+nbproject

data/.travis.yml

@@ -3,6 +3,8 @@ rvm:
   - 1.9.2
   - 1.9.3
   - ree
+  - jruby-18mode
+  - jruby-19mode
 notifications:
   recipients:
     - cowboyd@thefrontside.net

data/Gemfile

@@ -1,3 +1,7 @@
 source :rubygems
 
-gemspec
+gemspec
+
+
+gem "therubyracer", "~> 0.10.0", :require => nil, :platforms => :ruby
+gem "therubyrhino", "~> 1.73.3", :require => nil, :platforms => :jruby

data/less.gemspec

@@ -22,10 +22,9 @@ 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.10.0"
-  s.add_dependency "commonjs", "~> 0.2.0"
-
+  s.add_dependency "commonjs", "~> 0.2.6"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 2.0"
+
 end
 

data/lib/less/defaults.rb

@@ -1,13 +1,13 @@
-
 module Less
   module Defaults
 
     def defaults
-      @defaults ||= {:paths => []}
+      @defaults ||= { :paths => [] }
     end
 
     def paths
       defaults[:paths]
     end
+    
   end
 end

data/lib/less/errors.rb

@@ -0,0 +1,41 @@
+module Less
+  
+  class Error < ::StandardError
+    
+    def initialize(cause, value = nil)
+      @value = value
+      message = nil
+      if @value # 2 args passed
+        message = @value['message']
+      else # allow passing only value as first arg cause :
+        if cause.respond_to?(:'[]') && message = cause['message']
+          @value = cause
+        end
+      end
+      
+      if cause.is_a?(::Exception)
+        @cause = cause
+        super(message || cause.message)
+      else
+        super(message || cause)
+      end
+    end
+    
+    def cause
+      @cause
+    end
+    
+    def backtrace
+      @cause ? @cause.backtrace : super
+    end
+
+    # function LessError(e, env) { ... }
+    %w{ type filename index line stack column extract }.each do |key|
+      class_eval "def #{key}; @value && @value['#{key}']; end"
+    end
+    
+  end
+  
+  class ParseError < Error; end
+  
+end

data/lib/less/java_script/rhino_context.rb

@@ -0,0 +1,110 @@
+begin
+  require 'rhino' unless defined?(Rhino)
+rescue LoadError => e
+  warn "[WARNING] Please install gem 'therubyrhino' to use Less under JRuby."
+  raise e
+end
+
+require 'rhino/version'
+if Rhino::VERSION < '1.73.3'
+  raise LoadError, "expected gem 'therubyrhino' '>= 1.73.3' but got '#{Rhino::VERSION}'"
+end
+
+module Less
+  module JavaScript
+    class RhinoContext
+      
+      def self.instance
+        return new # NOTE: for Rhino a context should be kept open per thread !
+      end
+      
+      def initialize(globals = nil)
+        @rhino_context = Rhino::Context.new :java => true
+        if @rhino_context.respond_to?(:version)
+          @rhino_context.version = '1.8'
+          apply_1_8_compatibility! if @rhino_context.version.to_s != '1.8'
+        else
+          apply_1_8_compatibility!
+        end
+        fix_memory_limit! @rhino_context
+        globals.each { |key, val| @rhino_context[key] = val } if globals
+      end
+
+      def unwrap
+        @rhino_context
+      end
+      
+      def exec(&block)
+        @rhino_context.open(&block)
+      rescue Rhino::JSError => e
+        handle_js_error(e)
+      end
+
+      def eval(source, options = {})
+        source = source.encode('UTF-8') if source.respond_to?(:encode)
+        
+        source_name = options[:source_name] || "<eval>"
+        line_number = options[:line_number] || 1
+        @rhino_context.eval("(#{source})", source_name, line_number)
+      rescue Rhino::JSError => e
+        handle_js_error(e)
+      end
+
+      def call(properties, *args)
+        options = args.last.is_a?(::Hash) ? args.pop : {} # extract_option!
+        
+        source_name = options[:source_name] || "<eval>"
+        line_number = options[:line_number] || 1
+        @rhino_context.eval(properties, source_name, line_number).call(*args)
+      rescue Rhino::JSError => e
+        handle_js_error(e)
+      end
+      
+      def method_missing(symbol, *args)
+        if @rhino_context.respond_to?(symbol)
+          @rhino_context.send(symbol, *args)
+        else
+          super
+        end
+      end
+      
+      private
+      
+        def handle_js_error(e)
+          if e.value && e.value['type'] # LessError
+            raise Less::ParseError.new(e, e.value)
+          end
+          if e.unwrap.to_s == "missing closing `}`"
+            raise Less::ParseError.new(e.unwrap.to_s)
+          end
+          if e.message && e.message[0, 12] == "Syntax Error"
+            raise Less::ParseError.new(e)
+          else
+            raise Less::Error.new(e)
+          end          
+        end
+      
+        # Disables bytecode compiling which limits you to 64K scripts
+        def fix_memory_limit!(context)
+          if context.respond_to?(:optimization_level=)
+            context.optimization_level = -1
+          else
+            context.instance_eval { @native.setOptimizationLevel(-1) }
+          end
+        end
+        
+        def apply_1_8_compatibility!
+          # TODO rather load ecma-5.js ...
+          @rhino_context.eval("
+            // String
+            if ( ! String.prototype.trim ) {  
+              String.prototype.trim = function () {  
+                return this.replace(/^\s+|\s+$/g,'');  
+              };  
+            }
+          ")
+        end
+        
+    end
+  end
+end

data/lib/less/java_script/v8_context.rb

@@ -0,0 +1,88 @@
+begin
+  require 'v8' unless defined?(V8)
+rescue LoadError => e
+  warn "[WARNING] Please install gem 'therubyracer' to use Less."
+  raise e
+end
+
+require 'pathname'
+
+module Less
+  module JavaScript
+    class V8Context
+
+      def self.instance
+        return new
+      end
+      
+      def initialize(globals = nil)
+        lock do
+          @v8_context = V8::Context.new
+          globals.each { |key, val| @v8_context[key] = val } if globals
+        end
+      end
+
+      def unwrap
+        @v8_context
+      end
+      
+      def exec(&block)
+        lock(&block)
+      end
+
+      def eval(source, options = nil) # passing options not supported
+        source = source.encode('UTF-8') if source.respond_to?(:encode)
+
+        lock do
+          @v8_context.eval("(#{source})")
+        end
+      end
+
+      def call(properties, *args)
+        args.last.is_a?(::Hash) ? args.pop : nil # extract_options!
+
+        lock do
+          @v8_context.eval(properties).call(*args)
+        end
+      end
+
+      def method_missing(symbol, *args)
+        if @v8_context.respond_to?(symbol)
+          @v8_context.send(symbol, *args)
+        else
+          super
+        end
+      end
+      
+      private
+      
+        def lock(&block)
+          do_lock(&block)
+        rescue V8::JSError => e
+          if e.value["name"] == "SyntaxError" || e.in_javascript?
+            raise Less::ParseError.new(e)
+          else
+            raise Less::Error.new(e)
+          end
+        end
+      
+        def do_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
+  end
+end

data/lib/less/java_script.rb

@@ -0,0 +1,34 @@
+module Less
+  module JavaScript
+    
+    def self.default_context_wrapper
+      if defined?(JRUBY_VERSION)
+        require 'less/java_script/rhino_context'
+        RhinoContext
+      else
+        require 'less/java_script/v8_context'
+        V8Context
+      end
+    end
+    
+    @@context_wrapper = nil
+    
+    def self.context_wrapper
+      @@context_wrapper ||= default_context_wrapper
+    end
+    
+    def self.context_wrapper=(klass)
+      @@context_wrapper = klass
+    end
+    
+    # execute a block as JS
+    def self.exec(&block)
+      context_wrapper.instance.exec(&block)
+    end
+    
+    def self.eval(source)
+      context_wrapper.instance.eval(source)
+    end
+    
+  end
+end

data/lib/less/loader.rb

@@ -1,26 +1,29 @@
+require 'pathname'
 require 'commonjs'
 
 module Less
   class Loader
-    include CallJS
-
+    
     attr_reader :environment
-
+    
     def initialize
-      @cxt = V8::Context.new
-      @environment = CommonJS::Environment.new(@cxt, :path => Pathname(__FILE__).dirname.join('js','lib').to_s)
+      context_wrapper = Less::JavaScript.context_wrapper.instance
+      @context = context_wrapper.unwrap
+      @context['process'] = Process.new
+      @context['console'] = Console.new
+      path = Pathname(__FILE__).dirname.join('js', 'lib')
+      @environment = CommonJS::Environment.new(@context, :path => path.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(module_id)
       @environment.require(module_id)
     end
-
+    
+    # stubbed JS modules required by less.js
+    
     class Path
       def join(*components)
         File.join(*components)
@@ -34,7 +37,7 @@ module Less
         File.basename(path)
       end
     end
-
+    
     class Sys
       def error(*errors)
         raise errors.join(' ')
@@ -49,7 +52,6 @@ module Less
       def readFile(path, encoding, callback)
         callback.call(nil, File.read(path))
       end
-
     end
 
     class Process
@@ -58,9 +60,10 @@ module Less
     end
 
     class Console
-      def log(*msgs)
-        puts msgs.join(',')
+      def self.log(*msgs)
+        puts msgs.join(', ')
       end
     end
+    
   end
 end

data/lib/less/parser.rb

@@ -1,45 +1,7 @@
-
 module Less
-
-  # Utility for calling into the JavaScript runtime.
-  module CallJS
-
-    # @private
-    # Wrap JavaScript invocations with uniform error handling
-    #
-    # @yield code to wrap
-    def calljs
-      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
   class Parser
-    include CallJS
 
     # Construct and configure new Less::Parser
     #
@@ -51,62 +13,49 @@ module Less
       Less.defaults.merge(options).each do |k,v|
         stringy[k.to_s] = v.is_a?(Array) ? v.map(&:to_s) : v.to_s
       end
-      lock do
-        @parser = Less.Parser.new(stringy)
-      end
+      @parser = Less::JavaScript.exec { Less['Parser'].new(stringy) }
     end
 
     # Convert `less` source into a abstract syntaxt tree
     # @param [String] less the source to parse
     # @return [Less::Tree] the parsed tree
     def parse(less)
-      calljs do
-        tree = nil
-        @parser.parse(less, lambda {|*args|
-          this, e, t = *args
-          fail e.message unless e.nil?
-          tree = t
+      error, tree = nil, nil
+      Less::JavaScript.exec do
+        @parser.parse(less, lambda { |*args| # (error, tree)
+          # v8 >= 0.10 passes this as first arg :
+          if args.size > 2
+            error, tree = args[-2], args[-1]
+          else
+            error, tree = *args
+          end
+          fail error.message unless error.nil?
         })
-        Tree.new(tree) if tree
       end
-    end
-  end
-
-  # Abstract LessCSS syntax tree Less. Mainly used to emit CSS
-  class Tree
-    include CallJS
-    # Create a tree from a native javascript object.
-    # @param [V8::Object] tree the native less.js tree
-    def initialize(tree)
-      @tree = tree
-    end
-
-    # Serialize this tree into CSS.
-    # By default this will be in pretty-printed form.
-    # @param [Hash] opts modifications to the output
-    # @option opts [Boolean] :compress minify output instead of pretty-printing
-    def to_css(options = {})
-      calljs do
-        @tree.toCSS(options)
+      Tree.new(tree) if tree
+    end
+    
+    private
+    
+    # Abstract LessCSS syntax tree Less. Mainly used to emit CSS
+    class Tree
+
+      # Create a tree from a native javascript object.
+      # @param [V8::Object] tree the native less.js tree
+      def initialize(tree)
+        @tree = tree
       end
-    end
-  end
-
-  # Thrown whenever an error occurs parsing
-  # and/or serializing less source. It is intended
-  # to wrap a native V8::JSError
-  class ParseError < StandardError
 
-    # Copies over `error`'s message and backtrace
-    # @param [V8::JSError] error native error
-    def initialize(error)
-      super(error.message)
-      @backtrace = error.backtrace
-    end
-
-    # @return [Array] the backtrace frames
-    def backtrace
-      @backtrace
+      # Serialize this tree into CSS.
+      # By default this will be in pretty-printed form.
+      # @param [Hash] opts modifications to the output
+      # @option opts [Boolean] :compress minify output instead of pretty-printing
+      def to_css(options = {})
+        Less::JavaScript.exec { @tree.toCSS(options) }
+      end
+      
     end
+    
   end
+  
 end

data/lib/less/version.rb

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

data/lib/less.rb

@@ -1,18 +1,25 @@
-require 'v8'
-require 'pathname'
-require 'less/parser'
+
+require 'less/defaults'
+require 'less/errors'
 require 'less/loader'
+require 'less/parser'
 require 'less/version'
-require 'less/defaults'
+require 'less/java_script'
 
 module Less
   extend Less::Defaults
-
+  
+  # NOTE: keep the @loader as less-rails depends on 
+  # it as it overrides some less/tree.js functions!
   @loader = Less::Loader.new
   @less = @loader.require('less/index')
 
+  def self.[](name)
+    @less[name]
+  end
+  
   def self.Parser
-    @less['Parser']
+    self['Parser']
   end
 
 end

data/spec/less/parser_spec.rb

@@ -3,7 +3,11 @@ require 'spec_helper'
 describe Less::Parser do
 
   cwd = Pathname(__FILE__).dirname
-
+  
+  it "instantiates" do
+    expect { Less::Parser.new }.should_not raise_error
+  end
+  
   describe "simple usage" do
     it "parse less into a tree" do
       root = subject.parse(".class {width: 1+1}")
@@ -15,16 +19,12 @@ describe Less::Parser do
     end
   end
 
-  it "throws a ParseError if the lesscss is bogus" do
-    expect {subject.parse('{^)')}.should raise_error(Less::ParseError)
-  end
-
   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/)
+    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')]}
+    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;}"
@@ -32,7 +32,7 @@ describe Less::Parser do
     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/)
+      expect { subject.parse('@import "faulty.less";').to_css }.should raise_error(Less::ParseError, /variable @a is undefined/)
     end
 
   end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
-$:.unshift Pathname(__FILE__).dirname.join('..','lib')
+require 'pathname'
 
-require 'less'
+$:.unshift Pathname(__FILE__).dirname.join('..', 'lib').to_s
+
+require 'less'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: less
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-29 00:00:00.000000000 Z
+date: 2012-04-25 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: therubyracer
-  requirement: &2158173480 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *2158173480
 - !ruby/object:Gem::Dependency
   name: commonjs
-  requirement: &2158172980 !ruby/object:Gem::Requirement
+  requirement: &2151889720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *2158172980
+  version_requirements: *2151889720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2158172600 !ruby/object:Gem::Requirement
+  requirement: &2151888660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158172600
+  version_requirements: *2151888660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2158172000 !ruby/object:Gem::Requirement
+  requirement: &2151887500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +43,7 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2158172000
+  version_requirements: *2151887500
 description: Invoke the Less CSS compiler from Ruby
 email:
 - cowboyd@thefrontside.net
@@ -73,6 +62,10 @@ files:
 - less.gemspec
 - lib/less.rb
 - lib/less/defaults.rb
+- lib/less/errors.rb
+- lib/less/java_script.rb
+- lib/less/java_script/rhino_context.rb
+- lib/less/java_script/v8_context.rb
 - lib/less/loader.rb
 - lib/less/parser.rb
 - lib/less/version.rb
@@ -356,7 +349,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -105846769214785865
+      hash: 2145882749298948818
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -365,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -105846769214785865
+      hash: 2145882749298948818
 requirements: []
 rubyforge_project: less
 rubygems_version: 1.8.17