less 1.2.19 → 1.2.20

data/VERSION

@@ -1 +1 @@
-1.2.19
+1.2.20

data/less.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "1.2.19"
+  s.version = "1.2.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2009-12-02}
+  s.date = %q{2009-12-14}
   s.default_executable = %q{lessc}
   s.description = %q{LESS is leaner CSS}
   s.email = %q{self@cloudhead.net}
@@ -51,6 +51,8 @@ Gem::Specification.new do |s|
      "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",
@@ -74,8 +76,12 @@ Gem::Specification.new do |s|
      "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",

data/lib/less.rb

@@ -7,6 +7,8 @@ LESS_ROOT = File.expand_path(File.dirname(__FILE__))
 LESS_PARSER = File.join(LESS_ROOT, 'less', 'engine', 'parser.rb')
 LESS_GRAMMAR = File.join(LESS_ROOT, 'less', 'engine', 'grammar')
 
+$LESS_LOAD_PATH = []
+
 $:.unshift File.dirname(__FILE__)
 
 require 'less/ext'

data/lib/less/engine/grammar/less.tt

@@ -123,16 +123,27 @@ module Less
     rule import
       ws "@import" S url:(string / url) medias? s ';' ws {
         def build env
-          path = File.join(env.root.file || Dir.pwd, url.value)
-          path += '.less' unless path =~ /\.(le|c)ss$/
-          if File.exist? path
+          standard_path = File.join(env.root.file || Dir.pwd, url.value)
+
+          # Compile a list of possible paths for this file
+          paths = $LESS_LOAD_PATH.map { |p| File.join(p, url.value) } + [standard_path]
+          # Standardize and make uniq
+          paths = paths.map do |p|
+            p = File.expand_path(p)
+            p += '.less' unless p =~ /\.(le|c)ss$/
+            p
+          end.uniq
+
+          # Use the first that exists if any
+          if path = paths.detect {|p| File.exists?(p)}
             unless env.root.imported.include?(path)
               env.root.imported << path
               env.rules += Less::Engine.new(File.new(path)).to_tree.rules
             end
           else
-            raise ImportError, path
+            raise ImportError, standard_path
           end
+
         end
       }
     end

data/spec/css/import-with-extra-paths.css

@@ -0,0 +1,8 @@
+#css { color: yellow; }
+#import { color: red; }
+.mixin {
+  height: 10px;
+  color: red;
+}
+body { font-size: 0.75em; }
+h2 { font-size: 2em; }

data/spec/css/import-with-partial-in-extra-path.css

@@ -0,0 +1,6 @@
+.mixin { font-size: 0.75em; }
+#import-test {
+  font-size: 0.75em;
+  width: 10px;
+  height: 30%;
+}

data/spec/engine_spec.rb

@@ -107,6 +107,17 @@ describe Less::Engine do
     it "should work with import" do
       lessify(:import).should == css(:import)
     end
+
+    it "should work tih import using extra paths" do
+      lambda {
+        lessify(:import_with_extra_paths).should == css(:import_with_extra_paths)
+      }.should raise_error(Less::ImportError)
+      # finding a partial in another location
+      $LESS_LOAD_PATH = ["spec/less/extra_import_path"]
+      lessify(:import_with_extra_paths).should == css(:import_with_extra_paths)
+      # overriding a partial in another location so this takes priority over the same named partial in the same directory
+      lessify(:import).should == css(:import_with_partial_in_extra_path)
+    end
     
     it "should parse a big file"
     it "should handle complex color operations"

data/spec/less/extra_import_path/extra.less

@@ -0,0 +1 @@
+body { font-size: 0.75em; }

data/spec/less/extra_import_path/import/import-test-a.css

@@ -0,0 +1 @@
+.mixin { font-size: 0.75em; }

data/spec/less/extra_import_path/import/import-test-a.less

@@ -0,0 +1,4 @@
+@a: 20%;
+.mixin {
+  font-size: 0.75em;
+}

data/spec/less/import-with-extra-paths.less

@@ -0,0 +1,4 @@
+@import url("import/import-test-b.less");
+@import url("extra.less");
+
+h2 { font-size: 2em; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: less
 version: !ruby/object:Gem::Version 
-  version: 1.2.19
+  version: 1.2.20
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-02 00:00:00 -05:00
+date: 2009-12-14 00:00:00 -05:00
 default_executable: lessc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,6 +74,8 @@ files:
 - 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
@@ -97,8 +99,12 @@ files:
 - 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