less-rails 2.4.0 → 2.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODA4ZTRlODRjZDcwZTkyNjg4OWFkYzFlYzI2NDIwM2NkNDUwZGRkNQ==
+    ZTBiNWI5NzczYTlhNzc2MTMxZDcxYjQ3N2RhMmQ2OTgwNjM5MjVmNQ==
   data.tar.gz: !binary |-
-    ODFiY2M4ZjQ0ODkwNjc4OTkzMDZkNWMyNjUwMGEzOWVmMDE2NjMwYQ==
+    NzYxZWIzZDBkZmIxZTNlMWUwY2E4MGMzZGY3OTk1ZDdjMzYzZTAzYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzQ5NGQwZDA1MDQ5ZTFlOWVlZGYwNzI1MDE4ZDg3ZWRkZDYyNjMwNDE3NmM5
-    NTM0ZDQzZGQ2YTE3ZjBiZWRiMzUxM2E2YmI3OGE0ZDVhMzYzZGIzOTJlNmQw
-    YmFlMWNhNTUwY2QzNGUwZGFhOGE4ZmI4MDQwNWExZmM5MGM1MmE=
+    MzIyZTMyYmY3NjMyYmRmN2RhY2YwZTk5ODZiZjgwMGJlMTIxY2NkOTk4ZjE2
+    ZmExOTc1NWY5MWQxZDJmNzUyZTU2MmE5MzU0OWM2MGMzODE5ZDMxZTg1YzQ5
+    NTlkNGQ2OWY2ZWQ5Y2I3NzExZjM3ODRkMjUxZmZiMzU1Mzc3MmQ=
   data.tar.gz: !binary |-
-    ZWY0YjhkYTkwY2QwNzY3YmU0MGY4NTNhZDdhNmM0ZTRjZTA5Yzk4Zjg0N2Zh
-    YzA4MjBkNDE5ZTg0ZGNiMzAwZDY2ZjQwOTBlYmJiYTY0OGEzZDM1ODg1MTgx
-    MGY4NmJlYjk2NjNkODQzZjYxNjcyZDIxNmM5YWY1NzE5N2UyZWE=
+    ZTc3NzA2MTg1MjNiOTZkMTBhYzNmNDI0MDZlNzEyOTA1MzZhMzcxMzliMjgy
+    MDUxMzk5ZWRhYTVkNjRlMTljNDBjOGU3MDA2NzI1ZWQ4ZThlOTIxMjljNzk0
+    OGFiNzY0MDJhOGE4ZTM1NTAwN2RjYjA1ZjliOTlkODM1NjY2NDQ=

data/.gitignore

@@ -4,4 +4,5 @@
 pkg/*
 *.log
 tmp/*
-test/dummy_app/tmp/cache/assets/*
+test/dummy_app/tmp/cache/assets/*
+gemfiles/*.gemfile

data/.travis.yml

@@ -1,21 +1,13 @@
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
-  - jruby-18mode
   - jruby-19mode
-gemfile:
-  - gemfiles/rails31.gemfile
-  - gemfiles/rails32.gemfile
-  - gemfiles/rails40.gemfile
 before_install:
   - gem install bundler
   - bundle --version
-matrix:
-  exclude:
-    - rvm: 1.8.7
-      gemfile: gemfiles/rails40.gemfile
-    - rvm: jruby-18mode
-      gemfile: gemfiles/rails40.gemfile
-    - rvm: jruby-19mode
-      gemfile: gemfiles/rails40.gemfile
+install:
+  - bundle install
+before_script:
+  - bundle exec rake appraisal:setup
+script:
+  - bundle exec rake appraisal test

data/Appraisals

@@ -8,5 +8,5 @@ appraise 'rails32' do
 end
 
 appraise 'rails40' do
-  gem 'rails', '~> 4.0.0.beta'
+  gem 'rails', '~> 4.0.0'
 end

data/CHANGELOG.md

@@ -1,138 +1,114 @@
-CHANGELOG
-=========
+# CHANGELOG
 
-2.4.0 - 09/04/2013
+### 2.4.1 - 2013-09-07
 
-* Moving to less.rb 2.4.x which is current v1.4.2 of less.
+* Fix import hooks to allow relative paths to files. Fixes #72 and #64.
+* Use config.(before|after)_initialize for better railtie pattern. Fixed #68.
 
+### 2.4.0 - 2013-09-04
 
-2.3.3 - 04/16/2013
+* Moving to less.rb 2.4.x which is current v### 1.4.2 of less.
 
-* Implement dumpLineNumbers functionality. Thanks @matthew342.
+### 2.3.3 - 2013-04-16
 
+* Implement dumpLineNumbers functionality. Thanks @matthew342.
 
-2.3.2 - 03/06/2013
+### 2.3.2 - 2013-03-06
 
 * Rails 4 compatability. Thanks @zhengjia.
 
+### 2.3.1 - 2013-03-06
 
-2.3.1 - 03/06/2013
-
-* Update to less gem 2.3.1 which really uses less v1.3.3
+* Update to less gem ### 2.3.1 which really uses less v### 1.3.3
 
+### 2.3.0 - 2013-03-06
 
-2.3.0 - 03/06/2013
+* Update to less gem ### 2.3.0 thanks @leifcr
 
-* Update to less gem 2.3.0 thanks @leifcr
-
-
-2.2.6 - 10/31/2012
+### 2.2.6 - 2012-10-31
 
 * Accidental release. Nothing new.
 
-
-2.2.5 - 10/28/2012
+### 2.2.5 - 2012-10-28
 
 * Real Rails 4 compatability thanks to @yalab
 
-
-2.2.4 - 10/20/2012
+### 2.2.4 - 2012-10-20
 
 * Rails 4 compatability with Sprockets vs app.assets.
 
-
-2.2.3 - 05/27/2012
+### 2.2.3 - 2012-05-27
 
 * Add default_mime_type to template class since it does not inherit from Tilt's.
   Should fix https://github.com/metaskills/less-rails/issues/35
 
-
-2.2.2 - 04/25/2012
+### 2.2.2 - 2012-04-25
 
 * Remove explicit dependency on therubyracer
 * Add jruby and jruby --1.9 to travis configuration
 * Officially support JRuby
 
-
-2.2.1 - 04/15/2012
+### 2.2.1 - 2012-04-15
 
 * Make it usable with therubyrhino (and older versions of therubyracer as well). Fixes #36.
 
-
-2.2.0 - 03/29/2012
+### 2.2.0 - 2012-03-29
 
 * Upgrade to therubyracer 0.10.x call semantics. Fixes #34.
 
-
-2.1.8 - 03/15/2012
+### 2.1.8 - 2012-03-15
 
 * Work with edge rails/sprockets. Fixes #31.
 
-
-2.1.7 - 03/07/2012
+### 2.1.7 - 2012-03-07
 
 * More defensive railtie when examing asset paths. Fixes #30.
 
-
-2.1.6 - 02/16/2012
+### 2.1.6 - 2012-02-16
 
 * Nested imports recursively declare sprockets dependencies. Fixes #26.
 
-
-2.1.4, 2.1.5 - 01/31/2012
+### 2.1.4, ### 2.1.5 - 2012-01-31
 
 * More friendly import processor with missing files. Fixes #13.
 
-
-2.1.3 - 01/23/2012
+### 2.1.3 - 2012-01-23
 
 * Make sure vendor/assets/stylesheets .less files work.
 
-
-2.1.2 - 12/20/2011
+### 2.1.2 - 2011-12-20
 
 * No notes.
 
-
-2.1.1 - 11/24/2011
-------------------
+### 2.1.1 - 2011-11-24
 
 * All app asset stylesheet paths are added to less paths.
 
+### 2.1.0 - 2011-11-18
 
-2.1.0 - 11/18/2011
-------------------
 * Remove our basic CssCompressor since it can not handle real world general purpose JS
   compression. Instead set parse compression and recommend final YUI Compressor. Fixes #7.
 * Import preprocessor so @import'ed less files are automatic asset dependencies. Fixes #3.
 
+### 2.0.3 - 2011-11-13
 
-2.0.3 - 11/13/2011
-------------------
 * Add generator support. Fixes #8.
 * Add a Less::Rails::CssCompressor if config.assets.compress is true. Fixes #7.
 
+### 2.0.2 - 2011-10-09
 
-2.0.2 - 10/09/2011
-------------------
 * Extend LESS with Rails asset pipeline helpers.
 * New testing support with MiniTest::Spec and dummy Rails::Application.
 * New config.options hash passed down to the #to_css method.
 
-
-2.0.1 - 09/28/2011
-------------------
+### 2.0.1 - 2011-09-28
 
 * Fix require of less/rails/railtie.rb. Thanks Benoit Bénézech (bbenezech).
 
-
-2.0.0 - 09/25/2011
-------------------
+### 2.0.0 - 2011-09-25
 
 * Initial 2.0 release. Heavily inspired/copied code from sass-rails.
 
-
-1.0.0 - 02/02/2010
-------------------
+### 1.0.0 - 2010-02-02
 
 * Original project at http://github.com/yeastymobs/less-rails

data/lib/less/rails/import_processor.rb

@@ -3,6 +3,13 @@ module Less
     class ImportProcessor < Tilt::Template
       
       IMPORT_SCANNER = /@import\s*['"]([^'"]+)['"]\s*;/.freeze
+      PATHNAME_FINDER = Proc.new { |scope, path| 
+        begin
+          scope.resolve(path)
+        rescue Sprockets::FileNotFound
+          nil
+        end
+      }
       
       def prepare
       end
@@ -11,21 +18,17 @@ module Less
         depend_on scope, data
         data
       end
-      
-      def depend_on(scope, data)
+
+      def depend_on(scope, data, base=File.dirname(scope.logical_path))
         import_paths = data.scan(IMPORT_SCANNER).flatten.compact.uniq
         import_paths.each do |path|
-          pathname = begin
-                       scope.resolve(path)
-                     rescue Sprockets::FileNotFound
-                       nil
-                     end
-          scope.depend_on(path) if pathname && pathname.to_s.ends_with?('.less')
-          depend_on scope, File.read(pathname) if pathname
+          pathname = PATHNAME_FINDER.call(scope,path) || PATHNAME_FINDER.call(scope, File.join(base, path))
+          scope.depend_on(pathname) if pathname && pathname.to_s.ends_with?('.less')
+          depend_on scope, File.read(pathname), File.dirname(path) if pathname
         end
         data
       end
-      
+
     end
   end
 end

data/lib/less/rails/railtie.rb

@@ -10,24 +10,37 @@ module Less
       config.less.paths = []
       config.less.compress = false
       config.app_generators.stylesheet_engine :less
-      
-      config.before_initialize do |app|
-        require 'less'
-        require 'less-rails'
-        Sprockets::Engines #force autoloading
-        Sprockets.register_engine '.less', Less::Rails::LessTemplate
-      end
-      
-      initializer 'less-rails.before.load_config_initializers', :before => :load_config_initializers, :group => :all do |app|
-        if ::Rails::VERSION::MAJOR < 4
-          raise 'The less-rails plugin requires the asset pipeline to be enabled.' unless app.config.assets.enabled
+
+      if ::Rails::VERSION::STRING =~ /\A3.[12]/
+
+        config.before_initialize do |app|
+          require 'less'
+          require 'less-rails'
+          Sprockets::Engines #force autoloading
+          Sprockets.register_engine '.less', LessTemplate
         end
-        (Sprockets.respond_to?('register_preprocessor') ? Sprockets : app.assets).register_preprocessor 'text/css', ImportProcessor
-      end
-      
-      initializer 'less-rails.after.load_config_initializers', :after => :load_config_initializers, :group => :all do |app|
-        app.assets.context_class.extend(LessContext)
-        app.assets.context_class.less_config = app.config.less
+
+        initializer 'less-rails.after.load_config_initializers', :after => :load_config_initializers, :group => :all do |app|
+          (Sprockets.respond_to?('register_preprocessor') ? Sprockets : app.assets).register_preprocessor 'text/css', ImportProcessor
+          app.assets.context_class.extend(LessContext)
+          app.assets.context_class.less_config = app.config.less
+        end
+
+      else
+
+        config.before_initialize do |app|
+          require 'less'
+          require 'less-rails'
+          Sprockets::Engines #force autoloading
+          Sprockets.register_engine '.less', LessTemplate
+          (Sprockets.respond_to?('register_preprocessor') ? Sprockets : app.assets).register_preprocessor 'text/css', ImportProcessor
+        end
+
+        config.after_initialize do |app|
+          app.assets.context_class.extend(LessContext)
+          app.assets.context_class.less_config = app.config.less
+        end
+
       end
       
       initializer 'less-rails.after.append_assets_path', :after => :append_assets_path, :group => :all do |app|

data/lib/less/rails/template_handlers.rb

@@ -24,6 +24,8 @@ module Less
       
       def config_to_less_parser_options(scope)
         paths = config_paths(scope) + scope.environment.paths
+        local_path = scope.pathname.dirname
+        paths += [local_path] unless paths.include? local_path
         {:filename => eval_file, :line => line, :paths => paths, :dumpLineNumbers => config_from_rails(scope).line_numbers}
       end
       

data/lib/less/rails/version.rb

@@ -1,5 +1,5 @@
 module Less
   module Rails
-    VERSION = "2.4.0"
+    VERSION = "2.4.1"
   end
 end

data/test/cases/basics_spec.rb

@@ -33,7 +33,16 @@ class BasicsSpec < Less::Rails::Spec
         basics.must_match %r{#test-variable-colored\{color:#666\}}, 'variables.less should be a sprockets context dependency'
       end
     end
-    
+
+    it 'must update when an imported file of another imported file changes, and that file is imported via a relative path' do
+      basics.must_match %r{#test-variable-relative-path-colored}i, 'default is #BADA55'
+      safely_edit(:variables_via_relative_path) do |data, asset|
+        data.gsub! 'BADA55', 'BA73A2'
+        File.open(asset.pathname,'w') { |f| f.write(data) }
+        basics.must_match %r{#test-variable-relative-path-colored}i, 'variables_via_relative_path.less should be a sprockets context dependency'
+      end
+    end
+
   end
 
   protected
@@ -49,7 +58,11 @@ class BasicsSpec < Less::Rails::Spec
   def variables_asset
     dummy_assets['frameworks/bootstrap/variables.less']
   end
-  
+
+  def variables_via_relative_path_asset
+    dummy_assets['frameworks/bootstrap/variables_via_relative_path.less']
+  end
+
   def safely_edit(name)
     asset = send :"#{name}_asset"
     data = File.read(asset.pathname)

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

@@ -11,6 +11,7 @@
 @import "frameworks/bootstrap/mixins";
 #test-radiused { .radiused; }
 #test-variable-colored { .variableColored; }
+#test-variable-relative-path-colored { .variableRelativePathColored; }
 
 // Vendored
 @import "vendored";

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

@@ -1,5 +1,6 @@
 
 @import "frameworks/bootstrap/variables";
+@import "variables_via_relative_path";
 
 .radiused(@radius: 5px) {
   border-radius: @radius;
@@ -8,3 +9,7 @@
 .variableColored() {
   color: @variableColor;
 }
+
+.variableRelativePathColored() {
+  color: @variableRelativePathColor;
+}

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

@@ -0,0 +1,2 @@
+
+@variableRelativePathColor: #BADA55;

data/test/spec_helper.rb

@@ -3,6 +3,7 @@ require 'bundler'
 Bundler.require
 require 'less/rails'
 require 'minitest/autorun'
+require 'minitest/spec'
 require 'dummy_app/init'
 require 'rails/generators'
 require 'fileutils'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: less-rails
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Ken Collins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -111,9 +111,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails31.gemfile
-- gemfiles/rails32.gemfile
-- gemfiles/rails40.gemfile
+- gemfiles/.keep
 - less-rails.gemspec
 - lib/less-rails.rb
 - lib/less/rails.rb
@@ -134,6 +132,7 @@ files:
 - 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/frameworks/bootstrap/variables_via_relative_path.less
 - test/dummy_app/app/assets/stylesheets/helpers.css.less
 - test/dummy_app/init.rb
 - test/dummy_app/tmp/.gitkeep
@@ -173,6 +172,7 @@ test_files:
 - 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/frameworks/bootstrap/variables_via_relative_path.less
 - test/dummy_app/app/assets/stylesheets/helpers.css.less
 - test/dummy_app/init.rb
 - test/dummy_app/tmp/.gitkeep

data/gemfiles/rails31.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "therubyracer", "~> 0.10.0", :require=>nil, :platforms=>:ruby
-gem "therubyrhino", "~> 2.0.2", :require=>nil, :platforms=>:jruby
-gem "rails", "~> 3.1.0"
-
-gemspec :path=>"../"

data/gemfiles/rails32.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "therubyracer", "~> 0.10.0", :require=>nil, :platforms=>:ruby
-gem "therubyrhino", "~> 2.0.2", :require=>nil, :platforms=>:jruby
-gem "rails", "~> 3.2.0"
-
-gemspec :path=>"../"

data/gemfiles/rails40.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "therubyracer", "~> 0.10.0", :require=>nil, :platforms=>:ruby
-gem "therubyrhino", "~> 2.0.2", :require=>nil, :platforms=>:jruby
-gem "rails", "~> 4.0.0.beta"
-
-gemspec :path=>"../"