less 1.2.21 → 2.0.0

data/{spec → lib/less/js/test}/less/mixins.less

@@ -13,19 +13,23 @@
     }
   }
 }
-#theme > .mixin {
-  background-color: grey;
+#theme {
+  > .mixin {
+    background-color: grey;
+  }
 }
 #container {
   color: black;
-  .mixin, .mixout;
+  .mixin;
+  .mixout;
   #theme > .mixin;
 }
 
 #header {
   .milk {
     color: white;
-    .mixin, #theme > .mixin;
+    .mixin;
+    #theme > .mixin;
   }
   #cookie {
     .chips {

data/{spec → lib/less/js/test}/less/operations.less

@@ -6,6 +6,8 @@
     height: 10px / 2px+6px-1px*2;
     width: 2  * 4-5em;
   }
+  substraction: 20 - 10 - 5 - 5; // 0
+  division: 20 / 5 / 4; // 1
 }
 
 @x: 4;
@@ -17,6 +19,12 @@
   size: 5cm - @x; // 1cm
 }
 
+.with-functions {
+  color: rgb(200, 200, 200) / 2;
+  color: 2 * hsl(0, 50%, 50%);
+  color: rgb(10, 10, 10) + hsl(0, 50%, 50%);
+}
+
 @z: -2;
 
 .negative {
@@ -37,3 +45,14 @@
     border-color: #333333 / 3 + #111; // #222222
   }
 }
+
+.negations {
+    @var: 4px;
+    variable: -@var; // 4
+    variable1: -@var + @var; // 0
+    variable2: @var + -@var; // 0
+    variable3: @var - -@var; // 8
+    variable4: -@var - -@var; // 0
+    paren: -(@var); // -4px
+    paren2: -(2 + 2) * -@var; // 16
+}

data/{spec → lib/less/js/test}/less/rulesets.less

@@ -2,7 +2,7 @@
   > #second .two > #deux {
     width: 50%;
     #third {
-      :focus {
+      &:focus {
         color: black;
         #fifth {
           > #sixth {
@@ -27,4 +27,4 @@
     }
   }
   font-size: 2em;
-}
+}

data/{spec → lib/less/js/test}/less/scope.less

@@ -29,4 +29,4 @@
       background-color: @local; // white
     }
   }
-}
+}

data/{spec → lib/less/js/test}/less/selectors.less

@@ -1,6 +1,6 @@
 h1, h2, h3 {
   a, p {
-    :hover {
+    &:hover {
       color: red;
     }
   }

data/lib/less/js/test/less/strings.less

@@ -0,0 +1,49 @@
+#strings {
+  background-image: url("http://son-of-a-banana.com");
+  quotes: "~" "~";
+  content: "#*%:&^,)!.(~*})";
+  empty: "";
+  brackets: "{" "}";
+}
+#comments {
+  content: "/* hello */ // not-so-secret";
+}
+#single-quote {
+  quotes: "'" "'";
+  content: '""#!&""';
+  empty: '';
+  semi-colon: ';';
+}
+#escaped {
+  filter: ~"DX.Transform.MS.BS.filter(opacity=50)";
+}
+#one-line { image: url(http://tooks.com) }
+#crazy { image: url(http://), "}", url("http://}") }
+#interpolation {
+  @var: '/dev';
+  url: "http://lesscss.org@{var}/image.jpg";
+
+  @var2: 256;
+  url2: "http://lesscss.org/image-@{var2}.jpg";
+
+  @var3: #456;
+  url3: "http://lesscss.org@{var3}";
+
+  @var4: hello;
+  url4: "http://lesscss.org/@{var4}";
+
+  @var5: 54.4px;
+  url5: "http://lesscss.org/@{var5}";
+}
+
+// multiple calls with string interpolation
+
+.mix-mul (@a: green) {
+    color: ~"@{a}";
+}
+.mix-mul-class {
+    .mix-mul(blue);
+    .mix-mul(red);
+    .mix-mul(blue);
+    .mix-mul(orange);
+}

data/lib/less/js/test/less/variables.less

@@ -0,0 +1,50 @@
+@a: 2;
+@x: @a * @a;
+@y: @x + 1;
+@z: @x * 2 + @y;
+
+.variables {
+  width: @z + 1cm; // 14cm
+}
+
+@b: @a * 10;
+@c: #888;
+
+@fonts: "Trebuchet MS", Verdana, sans-serif;
+@f: @fonts;
+
+@quotes: "~" "~";
+@q: @quotes;
+
+.variables {
+  height: @b + @x + 0px; // 24px
+  color: @c;
+  font-family: @f;
+  quotes: @q;
+}
+
+.redefinition {
+    @var: 4;
+    @var: 2;
+    @var: 3;
+    three: @var;
+}
+
+.values {
+    @a: 'Trebuchet';
+    @multi: 'A', B, C;
+    font-family: @a, @a, @a;
+    color: @c !important;
+    url: url(@a);
+    multi: something @multi, @a;
+}
+
+.variable-names {
+    @var: 'hello';
+    @name: 'var';
+    name: @@name;
+}
+.alpha {
+    @var: 42;
+    filter: alpha(opacity=@var);
+}

data/{spec → lib/less/js/test}/less/whitespace.less

@@ -25,6 +25,9 @@
 }
 .no-semi-column {border: 2px solid white}
 .newlines {
+  background: the,
+              great,
+              wall;
   border: 2px
           solid
           black;

data/lib/less/loader.rb

@@ -0,0 +1,67 @@
+
+module Less
+  class Loader
+    
+    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
+    end
+    
+    def require(path)
+      unless exports = @exports[path]
+        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)
+      end
+      return exports
+    end
+    
+    class Path
+      def join(*components)
+        File.join(*components)
+      end
+      
+      def dirname(path)
+        File.dirname(path)
+      end
+    end
+    
+    class Sys
+      def error(*errors)
+        raise errors.join(' ')
+      end
+    end
+
+    class Fs
+      def statSync(path)
+        File.stat(path)
+      end
+      
+      def 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
+  end
+end

data/lib/less/parser.rb

@@ -0,0 +1,46 @@
+
+require 'v8'
+
+module Less
+  class Parser
+
+    def initialize(options = {})
+      stringy = {}
+      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)
+    end
+
+    def parse(less)
+      error,tree = nil
+      @parser.parse(less, lambda {|e, t| error = e; tree = t})
+      return Tree.new(tree) if tree
+    rescue V8::JSError => e
+      raise ParseError.new(e)
+    end
+
+  end
+
+  class Tree
+    def initialize(tree)
+      @tree = tree
+    end
+
+    def to_css(options = {})
+      @tree.toCSS(options)
+    end
+  end
+  
+  class ParseError < StandardError
+    
+    def initialize(error)
+      super(error.message)
+      @backtrace = error.backtrace
+    end
+  
+    def backtrace
+      @backtrace
+    end
+  end
+end

data/lib/less/version.rb

@@ -0,0 +1,3 @@
+module Less
+  VERSION = '2.0.0'
+end

data/spec/less/one/one.less

@@ -0,0 +1 @@
+.one {width: 1;}

data/spec/less/parser_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Less::Parser do
+
+  cwd = Pathname(__FILE__).dirname
+
+  describe "simple usage" do
+    it "parse less into a tree" do
+      root = subject.parse(".class {width: 1+1}")
+      root.to_css.gsub(/\n/,'').should eql ".class {  width: 2;}"
+    end
+
+    it "accepts options when assembling the parse tree" do
+      subject.parse(".class {width: 1+1}").to_css(:compress => true).strip.should eql ".class{width:2;}"
+    end
+  end
+  it "throws a ParseError if the lesscss is bogus" do
+    expect {subject.parse('{^)')}.should raise_error(Less::ParseError)
+  end
+
+  describe "when configured with mulitple load paths" do
+    before {@parser = Less::Parser.new :paths => [cwd.join('one'), cwd.join('two')]}
+
+    it "will load files from both paths" do
+      @parser.parse('@import "one.less";').to_css.gsub(/\n/,'').strip.should eql ".one {  width: 1;}"
+      @parser.parse('@import "two.less";').to_css.gsub(/\n/,'').strip.should eql ".two {  width: 1;}"
+    end
+  end
+
+end

data/spec/less/two/two.less

@@ -0,0 +1 @@
+.two {width: 1;}

data/spec/spec_helper.rb

@@ -1,8 +1,3 @@
-require 'rubygems'
-require 'spec'
-
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift File.dirname(__FILE__)
-
-require 'less'
+$:.unshift Pathname(__FILE__).dirname.join('..','lib')
 
+require 'less'

metadata

@@ -1,158 +1,208 @@
 --- !ruby/object:Gem::Specification 
 name: less
 version: !ruby/object:Gem::Version 
-  version: 1.2.21
+  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors: 
-- cloudhead
+- Charles Lowell
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-01-13 00:00:00 -05:00
-default_executable: lessc
+date: 2011-06-02 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: treetop
+  name: therubyracer
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.9.0beta6
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.4.2
-    version: 
+        version: 0.9.1
+  type: :development
+  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mutter
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: rspec
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.2
-    version: 
-description: LESS is leaner CSS
-email: self@cloudhead.net
+        version: "2.0"
+  type: :development
+  prerelease: false
+  version_requirements: *id003
+description: Invoke the Less CSS compiler from Ruby (http://lesscss.org)
+email: 
+- cowboyd@thefrontside.net
 executables: 
 - lessc
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.md
+extra_rdoc_files: []
+
 files: 
 - .gitignore
-- CHANGELOG
-- LICENSE
+- .gitmodules
+- Gemfile
 - README.md
 - Rakefile
-- VERSION
 - bin/lessc
 - less.gemspec
 - lib/less.rb
-- lib/less/command.rb
-- lib/less/engine.rb
-- lib/less/engine/grammar/common.tt
-- lib/less/engine/grammar/entity.tt
-- lib/less/engine/grammar/less.tt
-- lib/less/engine/nodes.rb
-- lib/less/engine/nodes/element.rb
-- lib/less/engine/nodes/entity.rb
-- lib/less/engine/nodes/function.rb
-- lib/less/engine/nodes/literal.rb
-- lib/less/engine/nodes/property.rb
-- lib/less/engine/nodes/ruleset.rb
-- lib/less/engine/nodes/selector.rb
-- lib/less/ext.rb
-- spec/command_spec.rb
-- spec/css/accessors.css
-- spec/css/big.css
-- spec/css/colors.css
-- spec/css/comments.css
-- spec/css/css-3.css
-- spec/css/css.css
-- spec/css/dash-prefix.css
-- spec/css/functions.css
-- spec/css/import-with-extra-paths.css
-- spec/css/import-with-partial-in-extra-path.css
-- spec/css/import.css
-- spec/css/lazy-eval.css
-- spec/css/mixins-args.css
-- spec/css/mixins.css
-- spec/css/operations.css
-- spec/css/parens.css
-- spec/css/rulesets.css
-- spec/css/scope.css
-- spec/css/selectors.css
-- spec/css/strings.css
-- spec/css/variables.css
-- spec/css/whitespace.css
-- spec/engine_spec.rb
-- spec/less/accessors.less
-- spec/less/big.less
-- spec/less/colors.less
-- spec/less/comments.less
-- spec/less/css-3.less
-- spec/less/css.less
-- spec/less/dash-prefix.less
-- spec/less/exceptions/mixed-units-error.less
-- spec/less/exceptions/name-error-1.0.less
-- spec/less/exceptions/syntax-error-1.0.less
-- spec/less/extra_import_path/extra.less
-- spec/less/extra_import_path/import/import-test-a.css
-- spec/less/extra_import_path/import/import-test-a.less
-- spec/less/functions.less
-- spec/less/hidden.less
-- spec/less/import-with-extra-paths.less
-- spec/less/import.less
-- spec/less/import/import-test-a.less
-- spec/less/import/import-test-b.less
-- spec/less/import/import-test-c.less
-- spec/less/import/import-test-d.css
-- spec/less/lazy-eval.less
-- spec/less/literal-css.less
-- spec/less/mixins-args.less
-- spec/less/mixins.less
-- spec/less/operations.less
-- spec/less/parens.less
-- spec/less/rulesets.less
-- spec/less/scope.less
-- spec/less/selectors.less
-- spec/less/strings.less
-- spec/less/variables.less
-- spec/less/whitespace.less
-- spec/spec.css
+- lib/less/loader.rb
+- lib/less/parser.rb
+- lib/less/version.rb
+- spec/less/one/one.less
+- spec/less/parser_spec.rb
+- spec/less/two/two.less
 - spec/spec_helper.rb
+- lib/less/js/LICENSE
+- lib/less/js/Makefile
+- lib/less/js/README.md
+- lib/less/js/benchmark/benchmark.less
+- lib/less/js/benchmark/less-benchmark.js
+- lib/less/js/bin/lessc
+- lib/less/js/build/ecma-5.js
+- lib/less/js/build/header.js
+- lib/less/js/build/require.js
+- lib/less/js/dist/less-1.0.44.js
+- lib/less/js/dist/less-1.1.0.js
+- lib/less/js/dist/less-1.1.0.min.js
+- lib/less/js/dist/less-1.1.1.js
+- lib/less/js/dist/less-1.1.1.min.js
+- lib/less/js/dist/less-1.1.2.js
+- lib/less/js/dist/less-1.1.2.min.js
+- lib/less/js/dist/less-1.1.3.js
+- lib/less/js/dist/less-1.1.3.min.js
+- lib/less/js/lib/less/browser.js
+- lib/less/js/lib/less/functions.js
+- lib/less/js/lib/less/index.js
+- lib/less/js/lib/less/parser.js
+- lib/less/js/lib/less/tree.js
+- lib/less/js/lib/less/tree/alpha.js
+- lib/less/js/lib/less/tree/anonymous.js
+- lib/less/js/lib/less/tree/call.js
+- lib/less/js/lib/less/tree/color.js
+- lib/less/js/lib/less/tree/comment.js
+- lib/less/js/lib/less/tree/dimension.js
+- lib/less/js/lib/less/tree/directive.js
+- lib/less/js/lib/less/tree/element.js
+- lib/less/js/lib/less/tree/expression.js
+- lib/less/js/lib/less/tree/import.js
+- lib/less/js/lib/less/tree/javascript.js
+- lib/less/js/lib/less/tree/keyword.js
+- lib/less/js/lib/less/tree/mixin.js
+- lib/less/js/lib/less/tree/operation.js
+- lib/less/js/lib/less/tree/quoted.js
+- lib/less/js/lib/less/tree/rule.js
+- lib/less/js/lib/less/tree/ruleset.js
+- lib/less/js/lib/less/tree/selector.js
+- lib/less/js/lib/less/tree/url.js
+- lib/less/js/lib/less/tree/value.js
+- lib/less/js/lib/less/tree/variable.js
+- lib/less/js/package.json
+- lib/less/js/test/css/colors.css
+- lib/less/js/test/css/comments.css
+- lib/less/js/test/css/css-3.css
+- lib/less/js/test/css/css-escapes.css
+- lib/less/js/test/css/css.css
+- lib/less/js/test/css/functions.css
+- lib/less/js/test/css/import.css
+- lib/less/js/test/css/javascript.css
+- lib/less/js/test/css/lazy-eval.css
+- lib/less/js/test/css/media.css
+- lib/less/js/test/css/mixins-args.css
+- lib/less/js/test/css/mixins-closure.css
+- lib/less/js/test/css/mixins-nested.css
+- lib/less/js/test/css/mixins-pattern.css
+- lib/less/js/test/css/mixins.css
+- lib/less/js/test/css/operations.css
+- lib/less/js/test/css/parens.css
+- lib/less/js/test/css/rulesets.css
+- lib/less/js/test/css/scope.css
+- lib/less/js/test/css/selectors.css
+- lib/less/js/test/css/strings.css
+- lib/less/js/test/css/variables.css
+- lib/less/js/test/css/whitespace.css
+- lib/less/js/test/less-test.js
+- lib/less/js/test/less/colors.less
+- lib/less/js/test/less/comments.less
+- lib/less/js/test/less/css-3.less
+- lib/less/js/test/less/css-escapes.less
+- lib/less/js/test/less/css.less
+- lib/less/js/test/less/functions.less
+- lib/less/js/test/less/import.less
+- lib/less/js/test/less/import/import-test-a.less
+- lib/less/js/test/less/import/import-test-b.less
+- lib/less/js/test/less/import/import-test-c.less
+- lib/less/js/test/less/import/import-test-d.css
+- lib/less/js/test/less/javascript.less
+- lib/less/js/test/less/lazy-eval.less
+- lib/less/js/test/less/media.less
+- lib/less/js/test/less/mixins-args.less
+- lib/less/js/test/less/mixins-closure.less
+- lib/less/js/test/less/mixins-nested.less
+- lib/less/js/test/less/mixins-pattern.less
+- lib/less/js/test/less/mixins.less
+- lib/less/js/test/less/operations.less
+- lib/less/js/test/less/parens.less
+- lib/less/js/test/less/rulesets.less
+- lib/less/js/test/less/scope.less
+- lib/less/js/test/less/selectors.less
+- lib/less/js/test/less/strings.less
+- lib/less/js/test/less/variables.less
+- lib/less/js/test/less/whitespace.less
 has_rdoc: true
-homepage: http://www.lesscss.org
+homepage: http://github.com/cowboyd/less.rb
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -771420708619393644
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -771420708619393644
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: less
-rubygems_version: 1.3.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: LESS compiler
+summary: Leaner CSS, in your browser or Ruby (via less.js)
 test_files: 
-- spec/command_spec.rb
-- spec/engine_spec.rb
+- spec/less/one/one.less
+- spec/less/parser_spec.rb
+- spec/less/two/two.less
 - spec/spec_helper.rb