less 2.3.1 → 2.3.2

data/Gemfile

@@ -3,7 +3,9 @@ source 'https://rubygems.org'
 gemspec
 
 gem "therubyracer", "~> 0.11.0", :require => nil, :platforms => :ruby
-gem "therubyrhino", "~> 1.73.3", :require => nil, :platforms => :jruby
+gem "therubyrhino", ">= 2.0.2",  :require => nil, :platforms => :jruby
 
-gem "rake"
-gem "rspec", "~> 2.0"
+group :development do
+  gem "rake", :require => nil
+  gem "rspec", "~> 2.0"
+end

data/README.md

@@ -1,37 +1,41 @@
-less.rb
-=======
+# less.rb
 
 The **dynamic** stylesheet language.
 
 <http://lesscss.org>
 
-about
------
+[![Build Status](https://secure.travis-ci.org/cowboyd/less.rb.png)](http://travis-ci.org/cowboyd/less.rb)
+
+## About
 
 These are Ruby bindings for the next generation LESS, which is implemented in JavaScript
 
 For more information, visit <http://lesscss.org>.
 
-usage
-------
+## Usage
 
 less.rb exposes the `less.Parser` constructor to ruby code via `Less::Parser`. You can instate it
 context free:
 
-    parser = Less::Parser.new
+```ruby
+parser = Less::Parser.new
+```
 
 or with configuration options:
 
-    parser = Less::Parser.new :paths => ['./lib', 'other/lib'], :filename => 'mystyles.less'
+```ruby
+parser = Less::Parser.new :paths => ['./lib', 'other/lib'], :filename => 'mystyles.less'
+```
 
 Once you have a parser instantiated, you can parse code to get your AST !
 
-    tree = parser.parse(".class {width: 1+1}") # => Less::Tree
-    tree.to_css #=> .class {\n  width: 2;\n}\n
-    tree.to_css(:compress => true) #=> .class{width:2;}
+```ruby
+tree = parser.parse(".class {width: 1+1}") # => Less::Tree
+tree.to_css #=> .class {\n  width: 2;\n}\n
+tree.to_css(:compress => true) #=> .class{width:2;}
+```
 
-license
--------
+## License
 
 less.rb is licensed under the same terms as less.js
 

data/lib/less/java_script/rhino_context.rb

@@ -6,8 +6,8 @@ rescue LoadError => e
 end
 
 require 'rhino/version'
-if Rhino::VERSION < '1.73.3'
-  raise LoadError, "expected gem 'therubyrhino' '>= 1.73.3' but got '#{Rhino::VERSION}'"
+if Rhino::VERSION < '2.0.2'
+  raise LoadError, "expected gem 'therubyrhino' '>= 2.0.2' but got '#{Rhino::VERSION}'"
 end
 
 module Less
@@ -26,7 +26,6 @@ module Less
         else
           apply_1_8_compatibility!
         end
-        fix_memory_limit! @rhino_context
         globals.each { |key, val| @rhino_context[key] = val } if globals
       end
 
@@ -74,7 +73,7 @@ module Less
           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 `}`/
+          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"
@@ -83,15 +82,6 @@ module Less
             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 ...

data/lib/less/java_script/v8_context.rb

@@ -77,7 +77,7 @@ module Less
           #   }, env);
           #
           # comes back as value: RuntimeError !
-          elsif e.value.to_s =~ /missing closing `}`/
+          elsif e.value.to_s =~ /missing closing `\}`/
             raise Less::ParseError.new(e.value.to_s)
           end
           raise Less::Error.new(e)

data/lib/less/loader.rb

@@ -15,68 +15,84 @@ module Less
       @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('url', Url.new)
-      @environment.native('http', Http.new)
-      @environment.native('fs', Fs.new)
-
+      @environment.native('path', Path)
+      @environment.native('util', Util)
+      @environment.native('fs', FS)
+      @environment.native('url', Url)
+      @environment.native('http', Http)
     end
     
     def require(module_id)
       @environment.require(module_id)
     end
     
-    # stubbed JS modules required by less.js
+    # JS exports (required by less.js) :
+    
+    class Process # :nodoc:
+      def exit(*args)
+        warn("JS process.exit(#{args.first}) called from: \n#{caller.join("\n")}")
+      end
+    end
+
+    class Console # :nodoc:
+      def log(*msgs)
+        puts msgs.join(', ')
+      end
+    end
+    
+    # stubbed JS modules (required by less.js) :
     
-    class Path
-      def join(*components)
+    module Path # :nodoc:
+      def self.join(*components)
         # node.js expands path on join
         File.expand_path(File.join(*components))
       end
 
-      def dirname(path)
+      def self.dirname(path)
         File.dirname(path)
       end
 
-      def basename(path)
+      def self.basename(path)
         File.basename(path)
       end
+      
+      def self.resolve(path)
+        File.basename(path)
+      end
+      
     end
     
-    class Sys
-      def error(*errors)
+    module Util # :nodoc:
+      
+      def self.error(*errors)
         raise errors.join(' ')
       end
+      
+      def self.puts(*args)
+        args.each { |arg| STDOUT.puts(arg) }
+      end
+      
     end
 
-    class Fs
-      def statSync(path)
+    module FS # :nodoc:
+      
+      def self.statSync(path)
         File.stat(path)
       end
 
-      def readFile(path, encoding, callback)
+      def self.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(', ')
-      end
-    end
-
-    class Url
-      def resolve(*args)
+    module Url # :nodoc:
+      
+      def self.resolve(*args)
         URI.join(*args)
       end
 
-      def parse(url_string)
+      def self.parse(url_string)
         u = URI.parse(url_string)
         result = {}
         result['protocol'] = u.scheme  + ':' if u.scheme
@@ -88,10 +104,12 @@ module Less
         result['hash']     = '#' + u.fragment if u.fragment
         result
       end
+      
     end
     
-    class Http
-      def get(options, callback)
+    module Http # :nodoc:
+      
+      def self.get(options, callback)
         err = nil
         begin
           #less always sends options as an object, so no need to check for string
@@ -123,51 +141,52 @@ module Less
           http.start do |req|
             response = req.get(uri.to_s)
           end
-          sr = ServerResponse.new(response.read_body, response.code.to_i)
-          callback.call(sr)
+          callback.call ServerResponse.new(response.read_body, response.code.to_i)
         rescue => e
           err = e.message
         ensure
-          ret = HttpNodeObj.new(err)
+          ret = HttpGetResult.new(err)
         end
         ret
       end
-    end
-
-    class HttpNodeObj
-      attr_accessor :err
+      
+      class HttpGetResult
+        attr_accessor :err
 
-      def initialize(err)
-        @err = err
-      end
+        def initialize(err)
+          @err = err
+        end
 
-      def on(event, callback)
-        case event
-        when 'error'
-          callback.call(@err) if @err  #only call when error exists
-        else
-          callback.call()
+        def on(event, callback)
+          case event
+          when 'error'
+            callback.call(@err) if @err  #only call when error exists
+          else
+            callback.call()
+          end
         end
       end
-    end
 
-    class ServerResponse
-      attr_accessor :statusCode
-      attr_accessor :data   #faked because ServerResponse acutally implements WriteableStream
+      class ServerResponse
+        attr_accessor :statusCode
+        attr_accessor :data   #faked because ServerResponse acutally implements WriteableStream
 
-      def initialize(data, status_code)
-        @data = data
-        @statusCode = status_code
-      end
+        def initialize(data, status_code)
+          @data = data
+          @statusCode = status_code
+        end
 
-      def on(event, callback)
-        case event
-        when 'data'
-          callback.call(@data)
-        else
-          callback.call()
+        def on(event, callback)
+          case event
+          when 'data'
+            callback.call(@data)
+          else
+            callback.call()
+          end
         end
       end
+      
     end
+    
   end
 end

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.3.1'
+  VERSION = '2.3.2'
 end

data/spec/less/loader_spec.rb

@@ -0,0 +1,46 @@
+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 = double("process")
+      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

@@ -27,6 +27,15 @@ describe Less::Parser 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') ] }
 
@@ -78,6 +87,22 @@ 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
     

data/spec/less/some/some.less

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

metadata

@@ -1,39 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: less
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
+  prerelease: 
 platform: ruby
 authors:
 - Charles Lowell
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBADANBgkqhkiG9w0BAQUFADBFMRAwDgYDVQQDDAdjb3di
-  b3lkMRwwGgYKCZImiZPyLGQBGRYMdGhlZnJvbnRzaWRlMRMwEQYKCZImiZPyLGQB
-  GRYDbmV0MB4XDTEzMDEzMDIxMDYwNFoXDTE0MDEzMDIxMDYwNFowRTEQMA4GA1UE
-  AwwHY293Ym95ZDEcMBoGCgmSJomT8ixkARkWDHRoZWZyb250c2lkZTETMBEGCgmS
-  JomT8ixkARkWA25ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO45
-  CUxpETDGYXjCCy2dMg/aIrdrTqBqQW5ZrzhHxF9EkcdmWFr0z/qMz0JSpZ3pF11Z
-  KYaj5PaQQpjZfLPwbuiGGkuSWi+UAac//V18xo6S4lzRBjO+gpzG9f2AOzt9b+SR
-  Uc8UhO7QBZ5edUDxMxw9QstD+U0YBAlzsPJbHuUOqdtxXmNQCds3ZnqTgZaIpdUy
-  CSejtrukSmlthxFzwgMezYQhcYxmkl+Q475JUodnI6Pjc6nja/Or8Y6cEWiLgeUa
-  a+efcPGLDEbwJC7TGRrvk8yassMByBEJ3XueTMzeqWFd+665ptciojYo6BvIAR0N
-  iLwks0x567FZyS8SqTcCAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4EFgQUxVgR
-  5TUqf7Hd24ICb3g4FNbM7oYwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEBBQUAA4IB
-  AQDdJj+NzZhiYXA56z0wzRUA/Fcf6CYqKB+RFRlPssDEcHTor5SnwdWgQof/gNLi
-  Qel1Om4zO0Shcp89jxaUqtvEdYVhmyfc0vycHmemKttNBT734yMrEJtF8Hhy+Dnz
-  9CzixXLvgGaRH+mf3M0+l+zIDJJr2L+39L8cyTSSRnp/srfI8aSmJKhGshudBKoC
-  Ty6Gi071pwoJXvdMaE/6iPy7bUzlndYdHyYuWSKaO9N47HqQ62oEnBraglw6ghoi
-  UgImJlChAzCoDP9zi9tdm6jAr7ttF25R9PPYr11ILb7dYe3qUzlNlM6zJx/nb31b
-  IhdyRVup4qLcqYSTPsm6u7VA
-  -----END CERTIFICATE-----
-date: 2013-03-06 00:00:00.000000000 Z
+cert_chain: []
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commonjs
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -71,8 +53,11 @@ files:
 - lib/less/parser.rb
 - lib/less/version.rb
 - spec/less/faulty/faulty.less
+- spec/less/loader_spec.rb
 - spec/less/one/one.less
 - spec/less/parser_spec.rb
+- spec/less/some/some.css
+- spec/less/some/some.less
 - spec/less/two/two.less
 - spec/spec_helper.rb
 - lib/less/js/.gitignore
@@ -302,30 +287,40 @@ files:
 - lib/less/js/test/less/whitespace.less
 homepage: http://lesscss.org
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -993011360193130515
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -993011360193130515
 requirements: []
 rubyforge_project: less
-rubygems_version: 2.0.0
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Leaner CSS, in your browser or Ruby (via less.js)
 test_files:
 - spec/less/faulty/faulty.less
+- spec/less/loader_spec.rb
 - spec/less/one/one.less
 - spec/less/parser_spec.rb
+- spec/less/some/some.css
+- spec/less/some/some.less
 - spec/less/two/two.less
 - spec/spec_helper.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: adb48547dd24e2ed229ba0f5213d69d47bc62b0f
-  data.tar.gz: 3ddf770c160c85f2674b385613036210a7755362
-SHA512:
-  metadata.gz: 09be273542eed8947fd1fdd5ad408fb6507649ac1e52ec80de0fdd3629165a56fee71acd08688d6a74d28ad81354ecce65c92e36e3fa102326ff1eb4219141f4
-  data.tar.gz: 2bde14ee364b7dcf7585a8be0f10d739df566fb18b6c0bb46dd2042933ffb9e82764904601bfc1445cb352c185a9e545f4e14df548f67c5049e83e55f2a02ae7