less 2.2.2 → 2.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f8209d9c3cd23b895c33800822fee9609d0e1fd4
+  data.tar.gz: d7a7070cdd740d5e43b44b4dd9ccd1df943e5322
+SHA512:
+  metadata.gz: 307bb3ad01064e296ee286dbaf18fb19057de032cbbf8984822996167c2017fca57993449ac779135173f689112e9750112675eefa0f16f6d9a8886933f35cbf
+  data.tar.gz: 6f815cc31388eebefec20a27d67d7ba5b835d54f67861dc0b3c6692d0894e19040d0bc12b0bfb2c37e41917e6feb49cc59cd275859d483735ecb221bec6c63c3

data/Gemfile

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

data/bin/lessc

@@ -17,6 +17,8 @@ output = nil
 require 'optparse'
 
 opts = OptionParser.new do |opts|
+  opts.summary_width = 37
+
   opts.banner = 'Usage: lessc [options] [INPUT]'
   
   opts.on('-h', '--help', 'print this help') do
@@ -52,7 +54,7 @@ opts = OptionParser.new do |opts|
   require 'rbconfig'
   is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
   separator = is_windows ? ';' : ':'
-  opts.on('--paths', '--include-path', 
+  opts.on('--paths PATHS', '--include-path PATHS',
     "paths to include separated by '#{separator}'") do |paths|
     paths = paths.split(separator).map do |path|
       path.empty? ? nil : File.expand_path(path)

data/less.gemspec

@@ -23,8 +23,4 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   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

@@ -2,7 +2,7 @@ module Less
   module Defaults
 
     def defaults
-      @defaults ||= { :paths => [] }
+      @defaults ||= { :paths => [], :relativeUrls => true }
     end
 
     def paths

data/lib/less/java_script/rhino_context.rb

@@ -74,7 +74,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"

data/lib/less/java_script/v8_context.rb

@@ -14,7 +14,7 @@ module Less
       def self.instance
         return new
       end
-      
+
       def initialize(globals = nil)
         lock do
           @v8_context = V8::Context.new
@@ -25,7 +25,7 @@ module Less
       def unwrap
         @v8_context
       end
-      
+
       def exec(&block)
         lock(&block)
       end
@@ -53,9 +53,9 @@ module Less
           super
         end
       end
-      
+
       private
-      
+
         def lock(&block)
           do_lock(&block)
         rescue V8::JSError => e
@@ -63,26 +63,26 @@ module Less
             js_value = e.value.respond_to?(:'[]')
             name = js_value && e.value["name"]
             constructor = js_value && e.value['constructor']
-            if name == "SyntaxError" || 
+            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 `}`"
+          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
           result, exception = nil, nil
           V8::C::Locker() do
@@ -99,7 +99,7 @@ module Less
             result
           end
         end
-        
+
     end
   end
-end
+end

data/lib/less/loader.rb

@@ -1,5 +1,7 @@
 require 'pathname'
 require 'commonjs'
+require 'net/http'
+require 'uri'
 
 module Less
   class Loader
@@ -15,7 +17,10 @@ module Less
       @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)
+
     end
     
     def require(module_id)
@@ -26,7 +31,8 @@ module Less
     
     class Path
       def join(*components)
-        File.join(*components)
+        # node.js expands path on join
+        File.expand_path(File.join(*components))
       end
 
       def dirname(path)
@@ -60,10 +66,108 @@ module Less
     end
 
     class Console
-      def self.log(*msgs)
+      def log(*msgs)
         puts msgs.join(', ')
       end
     end
+
+    class Url
+      def resolve(*args)
+        URI.join(*args)
+      end
+
+      def parse(url_string)
+        u = URI.parse(url_string)
+        result = {}
+        result['protocol'] = u.scheme  + ':' if u.scheme
+        result['hostname'] = u.host if u.host
+        result['pathname'] = u.path if u.path
+        result['port']     = u.port if u.port
+        result['query']    = u.query if u.query
+        result['search']   = '?' + u.query if u.query
+        result['hash']     = '#' + u.fragment if u.fragment
+        result
+      end
+    end
     
+    class Http
+      def get(options, callback)
+        err = nil
+        begin
+          #less always sends options as an object, so no need to check for string
+          uri_hash = {}
+          uri_hash[:host]     = options['hostname'] ? options['hostname'] : options['host']
+          path_components = options['path'] ? options['path'].split('?', 2) : ['']  #have to do this because node expects path and query to be combined
+          if path_components.length > 1
+            uri_hash[:path]   = path_components[0]
+            uri_hash[:query]  = path_components[0]
+          else
+            uri_hash[:path]   = path_components[0]
+          end
+          uri_hash[:port]     = options['port'] ? options['port'] : Net::HTTP.http_default_port
+          uri_hash[:scheme]   = uri_hash[:port] == Net::HTTP.https_default_port ? 'https' : 'http'  #have to check this way because of node's http.get
+          case uri_hash[:scheme]
+          when 'http'
+            uri = URI::HTTP.build(uri_hash)
+          when 'https'
+            uri = URI::HTTPS.build(uri_hash)
+          else
+            raise Exception, 'Less import only supports http and https'
+          end
+          http = Net::HTTP.new uri.host, uri.port
+          if uri.scheme == 'https'
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+            http.use_ssl = true
+          end
+          response = nil
+          http.start do |req|
+            response = req.get(uri.to_s)
+          end
+          sr = ServerResponse.new(response.read_body, response.code.to_i)
+          callback.call(sr)
+        rescue => e
+          err = e.message
+        ensure
+          ret = HttpNodeObj.new(err)
+        end
+        ret
+      end
+    end
+
+    class HttpNodeObj
+      attr_accessor :err
+
+      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()
+        end
+      end
+    end
+
+    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 on(event, callback)
+        case event
+        when 'data'
+          callback.call(@data)
+        else
+          callback.call()
+        end
+      end
+    end
   end
 end

data/lib/less/version.rb

@@ -1,3 +1,3 @@
 module Less
-  VERSION = '2.2.2'
-end
+  VERSION = '2.3.0'
+end

data/spec/less/parser_spec.rb

@@ -42,8 +42,9 @@ describe Less::Parser do
     it "will track imported files" do
       subject.parse('@import "one.less";')
       subject.parse('@import "two.less";')
-      subject.imports.should include("one.less")
-      subject.imports.should include("two.less")
+      # Parser#imports returns full path names
+      subject.imports.grep(/one\.less$/).should_not be_empty
+      subject.imports.grep(/two\.less$/).should_not be_empty
     end
 
     it "reports type, line, column and filename of (parse) error" do

metadata

@@ -1,20 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: less
 version: !ruby/object:Gem::Version
-  version: 2.2.2
-  prerelease: 
+  version: 2.3.0
 platform: ruby
 authors:
 - Charles Lowell
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+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-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commonjs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,43 +41,10 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.6
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
 description: Invoke the Less CSS compiler from Ruby
 email:
 - cowboyd@thefrontside.net
@@ -219,33 +205,26 @@ 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: -3584122421188710040
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3584122421188710040
 requirements: []
 rubyforge_project: less
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Leaner CSS, in your browser or Ruby (via less.js)
 test_files:
 - spec/less/faulty/faulty.less