less-rails 2.1.5 → 2.1.6

data/.travis.yml

@@ -3,6 +3,8 @@ rvm:
   - 1.9.2
   - 1.9.3
   - ree
+before_install:
+  - gem update --system
 gemfile:
   - Gemfile.rails-3.1
   - Gemfile.rails-3.2

data/CHANGELOG.md

@@ -1,7 +1,12 @@
 CHANGELOG
 =========
 
-2.1.4, 2.1.5 - =01/31/2012
+2.1.6 - 02/16/2012
+
+* Nested imports recursively declare sprockets dependencies. Fixes #26.
+
+
+2.1.4, 2.1.5 - 01/31/2012
 
 * More friendly import processor with missing files. Fixes #13.
 

data/lib/less/rails/import_processor.rb

@@ -7,15 +7,21 @@ module Less
       def prepare
       end
       
-      def evaluate(context, locals, &block)
+      def evaluate(scope, locals, &block)
+        depend_on scope, data
+        data
+      end
+      
+      def depend_on(scope, data)
         import_paths = data.scan(IMPORT_SCANNER).flatten.compact.uniq
         import_paths.each do |path|
           pathname = begin
-                       context.resolve(path)
+                       scope.resolve(path)
                      rescue Sprockets::FileNotFound
                        nil
                      end
-          context.depend_on(path) if pathname && pathname.to_s.ends_with?('.less')
+          scope.depend_on(path) if pathname && pathname.to_s.ends_with?('.less')
+          depend_on scope, File.read(pathname) if pathname
         end
         data
       end

data/lib/less/rails/version.rb

@@ -1,5 +1,5 @@
 module Less
   module Rails
-    VERSION = "2.1.5"
+    VERSION = "2.1.6"
   end
 end

data/test/cases/basics_spec.rb

@@ -13,14 +13,27 @@ class BasicsSpec < Less::Rails::Spec
   it 'must be able to use vendored less files' do
     basics.must_match %r{#test-vendored\{border-radius:10px;\}}
   end
-
-  it 'must hook into less import so that imported paths are declared as sprocket dependencies of the source file' do
-    basics.must_match %r{#test-radiused\{border-radius:5px;\}}, 'default is 5px'
-    safely_edit_mixins do |d|
-      d.gsub! '5px', '10px'
-      File.open(mixins_asset.pathname,'w') { |f| f.write(d) }
-      basics.must_match %r{#test-radiused\{border-radius:10px;\}}, 'mixins.less should be a sprockets context dependency'
+  
+  describe 'less import dependency hooks' do
+    
+    it 'must update when imported file changes' do
+      basics.must_match %r{#test-radiused\{border-radius:5px;\}}, 'default is 5px'
+      safely_edit(:mixins) do |data, asset|
+        data.gsub! '5px', '10px'
+        File.open(asset.pathname,'w') { |f| f.write(data) }
+        basics.must_match %r{#test-radiused\{border-radius:10px;\}}, 'mixins.less should be a sprockets context dependency'
+      end
+    end
+    
+    it 'must update when an imported file of another imported file changes' do
+      basics.must_match %r{#test-variable-colored\{color:#424242;\}}, 'default is #424242'
+      safely_edit(:variables) do |data, asset|
+        data.gsub! '424242', '666666'
+        File.open(asset.pathname,'w') { |f| f.write(data) }
+        basics.must_match %r{#test-variable-colored\{color:#666666;\}}, 'variables.less should be a sprockets context dependency'
+      end
     end
+    
   end
 
   protected
@@ -33,12 +46,17 @@ class BasicsSpec < Less::Rails::Spec
     dummy_assets['frameworks/bootstrap/mixins.less']
   end
   
-  def safely_edit_mixins
-    data = File.read(mixins_asset.pathname)
+  def variables_asset
+    dummy_assets['frameworks/bootstrap/variables.less']
+  end
+  
+  def safely_edit(name)
+    asset = send :"#{name}_asset"
+    data = File.read(asset.pathname)
     begin
-      yield data.dup
+      yield data.dup, asset
     ensure
-      File.open(mixins_asset.pathname,'w') { |f| f.write(data) }
+      File.open(asset.pathname,'w') { |f| f.write(data) }
     end
   end
 end

data/test/dummy_app/app/assets/stylesheets/basics.css.less

@@ -1,17 +1,16 @@
 
 // Variables
-
 @color: #4D926F;
 #test-variable { color: @color; }
 
 // Mixins
-
 .bordered { border: 1px solid black; }
 #test-mixin span { .bordered; }
 
 // Frameworks
 @import "frameworks/bootstrap/mixins";
 #test-radiused { .radiused; }
+#test-variable-colored { .variableColored; }
 
 // Vendored
 @import "vendored";

data/test/dummy_app/app/assets/stylesheets/frameworks/bootstrap/mixins.less

@@ -1,4 +1,10 @@
 
+@import "frameworks/bootstrap/variables";
+
 .radiused(@radius: 5px) {
   border-radius: @radius;
 }
+
+.variableColored() {
+  color: @variableColor;
+}

data/test/dummy_app/app/assets/stylesheets/frameworks/bootstrap/variables.less

@@ -0,0 +1,4 @@
+
+@variableColor: #424242;
+
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: less-rails
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 2
   - 1
-  - 5
-  version: 2.1.5
+  - 6
+  version: 2.1.6
 platform: ruby
 authors: 
 - Ken Collins
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-31 00:00:00 Z
+date: 2012-02-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: less
@@ -130,6 +130,7 @@ files:
 - test/dummy_app/app/assets/images/rails.png
 - test/dummy_app/app/assets/stylesheets/basics.css.less
 - test/dummy_app/app/assets/stylesheets/frameworks/bootstrap/mixins.less
+- test/dummy_app/app/assets/stylesheets/frameworks/bootstrap/variables.less
 - test/dummy_app/app/assets/stylesheets/helpers.css.less
 - test/dummy_app/init.rb
 - test/dummy_app/tmp/.gitkeep
@@ -165,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: The dynamic stylesheet language for the Rails asset pipeline.
@@ -178,10 +179,10 @@ test_files:
 - test/dummy_app/app/assets/images/rails.png
 - test/dummy_app/app/assets/stylesheets/basics.css.less
 - test/dummy_app/app/assets/stylesheets/frameworks/bootstrap/mixins.less
+- test/dummy_app/app/assets/stylesheets/frameworks/bootstrap/variables.less
 - test/dummy_app/app/assets/stylesheets/helpers.css.less
 - test/dummy_app/init.rb
 - test/dummy_app/tmp/.gitkeep
 - test/dummy_app/tmp/cache/.gitkeep
 - test/dummy_app/vendor/assets/stylesheets/vendored.less
 - test/spec_helper.rb
-has_rdoc: