less 2.2.0 → 2.2.1

data/lib/less/errors.rb

@@ -30,9 +30,12 @@ module Less
     end
 
     # function LessError(e, env) { ... }
-    %w{ type filename index line stack column extract }.each do |key|
+    %w{ type filename stack extract }.each do |key|
       class_eval "def #{key}; @value && @value['#{key}']; end"
     end
+    %w{ index line column }.each do |key|
+      class_eval "def #{key}; @value && @value['#{key}'].to_i; end"
+    end
     
   end
   

data/lib/less/java_script/rhino_context.rb

@@ -71,8 +71,8 @@ module Less
       private
       
         def handle_js_error(e)
-          if e.value && e.value['type'] # LessError
-            raise Less::ParseError.new(e, e.value)
+          if e.value && ( e.value['message'] || e.value['type'].is_a?(String) )
+            raise Less::ParseError.new(e, e.value) # LessError
           end
           if e.unwrap.to_s == "missing closing `}`"
             raise Less::ParseError.new(e.unwrap.to_s)

data/lib/less/java_script/v8_context.rb

@@ -59,11 +59,28 @@ module Less
         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)
+          if e.in_javascript?
+            js_value = e.value.respond_to?(:'[]')
+            name = js_value && e.value["name"]
+            constructor = js_value && e.value['constructor']
+            if name == "SyntaxError" || 
+                ( constructor && constructor.name == "LessError" )
+              raise Less::ParseError.new(e, js_value ? e.value : nil)
+            end
+          # NOTE: less/parser.js :
+          # 
+          #   error = new(LessError)({
+          #      index: i,
+          #      type: 'Parse',
+          #      message: "missing closing `}`",
+          #      filename: env.filename
+          #   }, env);
+          # 
+          # comes back as value: RuntimeError !
+          elsif e.value.to_s == "missing closing `}`"
+            raise Less::ParseError.new(e.value.to_s)
           end
+          raise Less::Error.new(e)
         end
       
         def do_lock

data/lib/less/parser.rb

@@ -26,6 +26,9 @@ module Less
           # v8 >= 0.10 passes this as first arg :
           if args.size > 2
             error, tree = args[-2], args[-1]
+          elsif args.last.respond_to?(:message) && args.last.message
+            # might get invoked as callback(error)
+            error = args.last
           else
             error, tree = *args
           end

data/lib/less/version.rb

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

data/spec/less/parser_spec.rb

@@ -19,6 +19,10 @@ describe Less::Parser do
     end
   end
 
+  it "throws a ParseError if the lesscss is bogus" do
+    expect { subject.parse('{^)') }.should raise_error(Less::ParseError, /missing closing `\}`/)
+  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/)
   end
@@ -35,6 +39,19 @@ describe Less::Parser do
       expect { subject.parse('@import "faulty.less";').to_css }.should raise_error(Less::ParseError, /variable @a is undefined/)
     end
 
+    it "reports type, line, column and filename of (parse) error" do
+      begin
+        subject.parse('@import "faulty.less";').to_css
+      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
+      else
+        fail "parse error not raised"
+      end
+    end
+    
   end
 
   describe "when load paths are specified in as default options" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: less
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commonjs
-  requirement: &2151889720 !ruby/object:Gem::Requirement
+  requirement: &2152447520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *2151889720
+  version_requirements: *2152447520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151888660 !ruby/object:Gem::Requirement
+  requirement: &2160076840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151888660
+  version_requirements: *2160076840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151887500 !ruby/object:Gem::Requirement
+  requirement: &2160074640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2151887500
+  version_requirements: *2160074640
 description: Invoke the Less CSS compiler from Ruby
 email:
 - cowboyd@thefrontside.net
@@ -349,7 +349,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2145882749298948818
+      hash: 1291247618380618562
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -358,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2145882749298948818
+      hash: 1291247618380618562
 requirements: []
 rubyforge_project: less
 rubygems_version: 1.8.17