less-rails 3.0.0 → 4.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a5a9bb17b24c9e112ac835768320e84beb41b31f
-  data.tar.gz: 81848fe2b108c8a135ffe4faa6c20d9b4f4c94e8
+SHA256:
+  metadata.gz: f7462e71d3003a08493070bdf07ae17173f1fcc4f6c63b34d5485cd677ac435e
+  data.tar.gz: 8166ded508b910756336c5870bd08e8ae5bab723f6b0ec5d203d2f8719a48790
 SHA512:
-  metadata.gz: 22858f553f73f72e4156adeeb0ff08a6d06ab0d2101ae255530383a89df83f9989f0c41c9050d3d899b0ff5a57c683b4e9158e0e16407e55237bfaf1fa82fa24
-  data.tar.gz: 2450a2536ea9e4178a28b2de71a671cf64641a34dcc652c248dddf76bcbb1dd04a7cd3e4a593d778526be2c42cf1e9f9d52099ac2fd96a6dba3d1b6bd1813565
+  metadata.gz: c9e0f1df16be8a892a67e3737e034a8bf9af9dc49cf70ab476b4ebe8ae10fd451d7afd7b282b546926cc0efc6e70d8599ba24634c7b519a6a0e2654d3e5ff4e4
+  data.tar.gz: 81165f7e7baf698ba2dc1c1059358e63f08d762cd905a11226d0e4b607c516ed18333633737115aaa43c76f75b2f8aa2e18abb4eaf26deb5a2b43a3c153eb729

data/.travis.yml

@@ -5,13 +5,15 @@ rvm:
   - 1.9.3-p551
   - 2.0.0-p648
   - 2.1.10
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
   - jruby-9.1.9.0
 before_install:
   - gem install bundler
 gemfile:
+  - gemfiles/sprockets2.gemfile
   - gemfiles/rails40.gemfile
   - gemfiles/rails41.gemfile
   - gemfiles/rails42.gemfile
@@ -31,7 +33,15 @@ matrix:
       gemfile: gemfiles/rails50.gemfile
     - rvm: 2.1.10
       gemfile: gemfiles/rails51.gemfile
-    - rvm: 2.4.1
+    - rvm: 2.4.3
+      gemfile: gemfiles/sprockets2.gemfile
+    - rvm: 2.4.3
       gemfile: gemfiles/rails40.gemfile
-    - rvm: 2.4.1
+    - rvm: 2.4.3
+      gemfile: gemfiles/rails41.gemfile
+    - rvm: 2.5.0
+      gemfile: gemfiles/sprockets2.gemfile
+    - rvm: 2.5.0
+      gemfile: gemfiles/rails40.gemfile
+    - rvm: 2.5.0
       gemfile: gemfiles/rails41.gemfile

data/Appraisals

@@ -1,19 +1,24 @@
+appraise 'sprockets2' do
+	gem 'rails', '~> 4.0.0'
+	gem 'sprockets', '~> 2.0'
+end
+
 appraise 'rails40' do
-  gem 'rails', '~> 4.0.13'
+  gem 'rails', '~> 4.0.0'
 end
 
 appraise 'rails41' do
-  gem 'rails', '~> 4.1.16'
+  gem 'rails', '~> 4.1.0'
 end
 
 appraise 'rails42' do
-  gem 'rails', '~> 4.2.8'
+  gem 'rails', '~> 4.2.0'
 end
 
 appraise 'rails50' do
-  gem 'rails', '~> 5.0.3'
+  gem 'rails', '~> 5.0.0'
 end
 
 appraise 'rails51' do
-  gem 'rails', '~> 5.1.1'
+  gem 'rails', '~> 5.1.0'
 end

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+### 4.0.0 - 2018-08-24
+
+* The import scanner now takes into account multiple [import options](http://lesscss.org/features/#import-atrules-feature-import-options).
+* Removed Tilt and Grease as dependencies.
+* **Breaking Change**: If you are requiring your less files using the extension, e.g:
+  `*= require semantic_ui/definitions/modules/accordion.less`
+  you need to remove the extension like so:
+  `*= require semantic_ui/definitions/modules/accordion`
+
 ### 3.0.0 - 2017-10-02
 
 * Solve deprecation warning via Grease adapter!

data/README.md

@@ -10,7 +10,7 @@ This gem provides integration for Rails projects using the Less stylesheet langu
 Just bundle up less-rails in your Gemfile. This will pull in less as a runtime dependency too.
 
 ```ruby
-gem 'less-rails', '~> 3.0.0'
+gem 'less-rails', '~> 4.0.0'
 ```
 
 But be warned, less.rb relies on a JavaScript runtime gem too. Just like ExecJS, it will look for a gem that is appropriate to your system. Typically, this means you will need one of the following.
@@ -125,7 +125,7 @@ We also have a generator for rails scaffold CSS. Just like the Sass gem, we simp
 
 ## Contributing
 
-This gem is fully tested from Rails 4.0 to Rails 5.1. We run our tests on [Travis CI](http://travis-ci.org/metaskills/less-rails) in both Ruby 1.9, 2.0, and JRuby 9000. If you detect a problem, open up a github issue or fork the repo and help out. After you fork or clone the repository, the following commands will get you up and running on the test suite. 
+This gem is fully tested from Rails 4.0 to Rails 5.1. We run our tests on [Travis CI](http://travis-ci.org/metaskills/less-rails) in both Ruby 1.9, 2.x, and JRuby 9000. If you detect a problem, open up a github issue or fork the repo and help out. After you fork or clone the repository, the following commands will get you up and running on the test suite. 
 
 ```shell
 $ bundle

data/gemfiles/rails40.gemfile

@@ -5,6 +5,6 @@ source "https://rubygems.org"
 gem "therubyracer", "~> 0.12.0", require: nil, platforms: :ruby
 gem "therubyrhino", "~> 2.0.2", require: nil, platforms: :jruby
 gem "mime-types", "~> 2.6.2", platforms: [:ruby_19, :jruby]
-gem "rails", "~> 4.0.13"
+gem "rails", "~> 4.0.0"
 
 gemspec path: "../"

data/gemfiles/rails41.gemfile

@@ -5,6 +5,6 @@ source "https://rubygems.org"
 gem "therubyracer", "~> 0.12.0", require: nil, platforms: :ruby
 gem "therubyrhino", "~> 2.0.2", require: nil, platforms: :jruby
 gem "mime-types", "~> 2.6.2", platforms: [:ruby_19, :jruby]
-gem "rails", "~> 4.1.16"
+gem "rails", "~> 4.1.0"
 
 gemspec path: "../"

data/gemfiles/rails42.gemfile

@@ -5,6 +5,6 @@ source "https://rubygems.org"
 gem "therubyracer", "~> 0.12.0", require: nil, platforms: :ruby
 gem "therubyrhino", "~> 2.0.2", require: nil, platforms: :jruby
 gem "mime-types", "~> 2.6.2", platforms: [:ruby_19, :jruby]
-gem "rails", "~> 4.2.8"
+gem "rails", "~> 4.2.0"
 
 gemspec path: "../"

data/gemfiles/rails50.gemfile

@@ -5,6 +5,6 @@ source "https://rubygems.org"
 gem "therubyracer", "~> 0.12.0", require: nil, platforms: :ruby
 gem "therubyrhino", "~> 2.0.2", require: nil, platforms: :jruby
 gem "mime-types", "~> 2.6.2", platforms: [:ruby_19, :jruby]
-gem "rails", "~> 5.0.3"
+gem "rails", "~> 5.0.0"
 
 gemspec path: "../"

data/gemfiles/rails51.gemfile

@@ -5,6 +5,6 @@ source "https://rubygems.org"
 gem "therubyracer", "~> 0.12.0", require: nil, platforms: :ruby
 gem "therubyrhino", "~> 2.0.2", require: nil, platforms: :jruby
 gem "mime-types", "~> 2.6.2", platforms: [:ruby_19, :jruby]
-gem "rails", "~> 5.1.1"
+gem "rails", "~> 5.1.0"
 
 gemspec path: "../"

data/gemfiles/sprockets2.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "therubyracer", "~> 0.12.0", require: nil, platforms: :ruby
+gem "therubyrhino", "~> 2.0.2", require: nil, platforms: :jruby
+gem "mime-types", "~> 2.6.2", platforms: [:ruby_19, :jruby]
+gem "rails", "~> 4.0.0"
+gem "sprockets", "~> 2.0"
+
+gemspec path: "../"

data/less-rails.gemspec

@@ -16,10 +16,8 @@ Gem::Specification.new do |gem|
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ["lib"]
   gem.add_runtime_dependency 'less', '~> 2.6.0'
-  gem.add_runtime_dependency 'actionpack', '>= 4.0'
-  gem.add_runtime_dependency 'tilt'
-  gem.add_runtime_dependency 'grease'
-  gem.add_runtime_dependency 'sprockets', '> 2', '< 4'
+  gem.add_runtime_dependency 'actionpack', '>= 4'
+  gem.add_runtime_dependency 'sprockets', '>= 2'
   gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'minitest'
   gem.add_development_dependency 'guard'

data/lib/less/rails.rb

@@ -5,7 +5,6 @@ end
 
 require 'less'
 require 'rails'
-require 'tilt'
 require 'sprockets'
 begin
  require 'sprockets/railtie'
@@ -15,6 +14,6 @@ end
 
 require 'less/rails/version'
 require 'less/rails/helpers'
-require 'less/rails/template_handlers'
+require 'less/rails/less_transformer'
 require 'less/rails/import_processor'
 require 'less/rails/railtie'

data/lib/less/rails/helpers.rb

@@ -1,9 +1,9 @@
 module Less
-  
+
   def self.less
     @less
   end
-  
+
   def self.register_rails_helper(name, &block)
     tree = @loader.require('less/tree')
     tree.functions[name] = lambda do |*args|
@@ -12,12 +12,12 @@ module Less
       tree[:Anonymous].new block.call(tree, args.last)
     end
   end
-  
+
   module Rails
     module Helpers
-      
+
       extend ActiveSupport::Concern
-      
+
       included do
         Less.register_rails_helper('asset-path')      { |tree, cxt| asset_path       unquote(cxt.toCSS()) }
         Less.register_rails_helper('asset-url')       { |tree, cxt| asset_url        unquote(cxt.toCSS()) }
@@ -35,21 +35,21 @@ module Less
         Less.register_rails_helper('font-url')        { |tree, cxt| font_url         unquote(cxt.toCSS()) }
         Less.register_rails_helper('asset-data-url')  { |tree, cxt| asset_data_url   unquote(cxt.toCSS()) }
       end
-      
+
       module ClassMethods
-        
+
         def asset_data_url(path)
           "url(#{scope.asset_data_uri(path)})"
         end
-        
+
         def asset_path(asset)
           public_path(asset).inspect
         end
-        
+
         def asset_url(asset)
           "url(#{public_path(asset)})"
         end
-        
+
         def image_path(img)
           scope.image_path(img).inspect
         end
@@ -61,31 +61,31 @@ module Less
         def video_path(video)
           scope.video_path(video).inspect
         end
-        
+
         def video_url(video)
           "url(#{scope.video_path(video)})"
         end
-        
+
         def audio_path(audio)
           scope.audio_path(audio).inspect
         end
-        
+
         def audio_url(audio)
           "url(#{scope.audio_path(audio)})"
         end
-        
+
         def javascript_path(javascript)
           scope.javascript_path(javascript).inspect
         end
-        
+
         def javascript_url(javascript)
           "url(#{scope.javascript_path(javascript)})"
         end
-        
+
         def stylesheet_path(stylesheet)
           scope.stylesheet_path(stylesheet).inspect
         end
-        
+
         def stylesheet_url(stylesheet)
           "url(#{scope.stylesheet_path(stylesheet)})"
         end
@@ -97,7 +97,7 @@ module Less
             asset_path(font)
           end
         end
-        
+
         def font_url(font)
           if scope.respond_to?(:font_path)
             "url(#{scope.font_path(font)})"
@@ -105,13 +105,13 @@ module Less
             asset_url(font)
           end
         end
-        
+
         private
-        
+
         def scope
           Less.Parser['scope']
         end
-        
+
         def public_path(asset)
           if scope.respond_to?(:asset_paths)
             scope.asset_paths.compute_public_path asset, ::Rails.application.config.assets.prefix
@@ -119,18 +119,18 @@ module Less
             scope.path_to_asset(asset)
           end
         end
-        
+
         def context_asset_data_uri(path)
-          
+
         end
-        
+
         def unquote(str)
           s = str.to_s.strip
           s =~ /^['"](.*?)['"]$/ ? $1 : s
         end
-        
+
       end
-      
+
     end
   end
 end

data/lib/less/rails/import_processor.rb

@@ -1,32 +1,49 @@
-module Less  
-  module Rails    
-    class ImportProcessor < Tilt::Template
-      
-      IMPORT_SCANNER = /@import\s*['"]([^'"]+)['"]\s*;/.freeze
-      PATHNAME_FINDER = Proc.new { |scope, path| 
+module Less
+  module Rails
+    class ImportProcessor
+
+      # http://lesscss.org/features/#import-options
+      IMPORT_SCANNER = /@import\s*(?:\([a-z, ]+\))*\s*['"]([^'"]+)['"]\s*;/.freeze
+
+      PATHNAME_FINDER = Proc.new do |scope, path|
         begin
           scope.resolve(path)
         rescue Sprockets::FileNotFound
           nil
         end
-      }
-      
-      def prepare
       end
-      
-      def evaluate(scope, locals, &block)
-        depend_on scope, data
-        data
+
+      def initialize(filename, &block)
+        @filename = filename
+        @source   = block.call
+      end
+
+      def render(scope, locals)
+        self.class.evaluate(@filename, @source, scope)
+      end
+
+      def self.evaluate(filename, source, scope)
+        depend_on scope, source
+        source
+      end
+
+      def self.call(input)
+        filename = input[:filename]
+        source   = input[:data]
+        scope  = input[:environment].context_class.new(input)
+
+        result = evaluate(filename, source, scope)
+        scope.metadata.merge(data: result)
       end
 
-      def depend_on(scope, data, base=File.dirname(scope.logical_path))
-        import_paths = data.scan(IMPORT_SCANNER).flatten.compact.uniq
+      def self.depend_on(scope, source, base=File.dirname(scope.logical_path))
+        import_paths = source.scan(IMPORT_SCANNER).flatten.compact.uniq
         import_paths.each do |path|
-          pathname = PATHNAME_FINDER.call(scope,path) || PATHNAME_FINDER.call(scope, File.join(base, path))
+          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
+        source
       end
 
     end

data/lib/less/rails/less_transformer.rb

@@ -0,0 +1,64 @@
+module Less
+  module Rails
+    class LessTransformer
+      include Helpers
+
+      TO_CSS_KEYS = [:compress, :optimization, :silent, :color]
+
+      def initialize(filename, &block)
+        @filename = filename
+        @source   = block.call
+      end
+
+      def render(scope, locals)
+        self.class.evaluate(@filename, @source, scope)
+      end
+
+      def self.evaluate(filename, source, scope)
+        Less.Parser['scope'] = scope
+        parser = ::Less::Parser.new config_to_less_parser_options(filename, scope)
+        engine = parser.parse(source)
+        engine.to_css config_to_css_options(scope)
+      end
+
+      def self.call(input)
+        filename = input[:filename]
+        source   = input[:data]
+        scope  = input[:environment].context_class.new(input)
+
+        result = evaluate(filename, source, scope)
+        scope.metadata.merge(data: result)
+      end
+
+      def self.default_mime_type
+        'text/css'
+      end
+
+      protected
+
+      def self.config_to_less_parser_options(filename, scope)
+        paths = config_paths(scope) + scope.environment.paths
+        local_path = scope.pathname.dirname
+        paths += [local_path] unless paths.include? local_path
+        {:filename => filename, :paths => paths, :dumpLineNumbers => config_from_rails(scope).line_numbers}.merge(config_raw(scope))
+      end
+
+      def self.config_to_css_options(scope)
+        Hash[config_from_rails(scope).each.to_a].slice *TO_CSS_KEYS
+      end
+
+      def self.config_paths(scope)
+        config_from_rails(scope)[:paths]
+      end
+
+      def self.config_raw(scope)
+        config_from_rails(scope)[:raw]
+      end
+
+      def self.config_from_rails(scope)
+        scope.environment.context_class.less_config
+      end
+
+    end
+  end
+end

data/lib/less/rails/railtie.rb

@@ -1,5 +1,4 @@
 require 'less'
-require 'grease'
 require 'sprockets/railtie'
 
 module Less
@@ -14,20 +13,21 @@ module Less
       config.before_initialize do |app|
         sprockets_env = app.assets || Sprockets
         if sprockets_env.respond_to?(:register_engine)
-          args = ['.less', Grease.apply(LessTemplate)]
+          args = ['.less', LessTransformer]
           args << { mime_type: 'text/less', silence_deprecation: true } if Sprockets::VERSION.start_with?("3")
           sprockets_env.register_engine(*args)
         end
 
         if sprockets_env.respond_to?(:register_transformer)
           sprockets_env.register_mime_type 'text/less', extensions: ['.less', '.less.erb', '.less.css'], charset: :css
-          sprockets_env.register_transformer 'text/less', 'text/css', Grease.apply(LessTemplate)
+          sprockets_env.register_preprocessor 'text/less', Sprockets::DirectiveProcessor.new(comments: ["//", ["/*", "*/"]])
+          sprockets_env.register_transformer 'text/less', 'text/css', LessTransformer
         end
       end
 
       initializer 'less-rails.before.load_config_initializers', :before => :load_config_initializers, :group => :all do |app|
         sprockets_env = app.assets || Sprockets
-        sprockets_env.register_preprocessor 'text/css', Grease.apply(ImportProcessor)
+        sprockets_env.register_preprocessor 'text/css', ImportProcessor
 
         config.assets.configure do |env|
           env.context_class.class_eval do

data/lib/less/rails/version.rb

@@ -1,5 +1,5 @@
 module Less
   module Rails
-    VERSION = "3.0.0"
+    VERSION = "4.0.0.rc1"
   end
 end

data/test/cases/basics_spec.rb

@@ -1,36 +1,54 @@
 require 'spec_helper'
 
 class BasicsSpec < Less::Rails::Spec
-  
+
   it 'must render variables' do
     basics.must_match %r{#test-variable\{color:#4d926f\}}
   end
-  
+
   it 'must render mixins' do
     basics.must_match %r{#test-mixin span\{border:1px solid black\}}
   end
-  
+
   it 'must be able to use vendored less files' do
     basics.must_match %r{#test-vendored\{border-radius:10px\}}
   end
-  
+
   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'
+        data.gsub! '5px', '8px'
         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'
+        basics.must_match %r{#test-radiused\{border-radius:8px\}}, 'mixins.less should be a sprockets context dependency'
+
+        data.gsub! '8px', '15px'
+        File.open(asset.pathname,'w') { |f| f.write(data) }
+
+        # Force a recompile
+        # https://github.com/rails/sprockets/blob/master/test/shared_sass_tests.rb#L164
+        mtime = Time.now + 1
+        File.utime(mtime, mtime, asset.pathname)
+
+        basics.must_match %r{#test-radiused\{border-radius:15px\}}, '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:#666\}}, 'variables.less should be a sprockets context dependency'
+
+        data.gsub! '666666', '888888'
+        File.open(asset.pathname,'w') { |f| f.write(data) }
+
+        mtime = Time.now + 1
+        File.utime(mtime, mtime, asset.pathname)
+
+        basics.must_match %r{#test-variable-colored\{color:#888\}}, 'variables.less should be a sprockets context dependency'
       end
     end
 
@@ -61,15 +79,15 @@ class BasicsSpec < Less::Rails::Spec
   end
 
   protected
-  
+
   def basics
     dummy_asset 'basics'
   end
-  
+
   def mixins_asset
     dummy_assets['frameworks/bootstrap/mixins.less']
   end
-  
+
   def variables_asset
     dummy_assets['frameworks/bootstrap/variables.less']
   end

data/test/cases/railtie_spec.rb

@@ -31,7 +31,7 @@ class RailtieSpec < Less::Rails::Spec
   describe 'initialization' do
     
     it 'must register our template engine' do
-      dummy_assets.engines['.less'].must_be_instance_of Grease::Adapter
+      dummy_assets.engines['.less'].must_equal Less::Rails::LessTransformer
     end
     
     it 'must extend the context class with our config' do
@@ -40,9 +40,7 @@ class RailtieSpec < Less::Rails::Spec
     end
     
     it 'must register our import pre processor' do
-      dummy_assets.preprocessors['text/css'].any? do |preprocessor|
-        preprocessor.is_a? Grease::Adapter
-      end.must_equal true
+      dummy_assets.preprocessors['text/css'].must_include Less::Rails::ImportProcessor
     end
     
     it 'must include the asset pipelines stylesheet paths to less paths' do

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

@@ -8,7 +8,7 @@
 #test-mixin span { .bordered; }
 
 // Frameworks
-@import "frameworks/bootstrap/mixins";
+@import (multiple) "frameworks/bootstrap/mixins";
 #test-radiused { .radiused; }
 #test-variable-colored { .variableColored; }
 #test-variable-relative-path-colored { .variableRelativePathColored; }

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

@@ -1,5 +1,5 @@
 
-@import "frameworks/bootstrap/variables";
+@import (less, multiple) "frameworks/bootstrap/variables";
 @import "variables_via_relative_path";
 
 .radiused(@radius: 5px) {

data/test/spec_helper.rb

@@ -8,11 +8,11 @@ require 'fileutils'
 module Less
   module Rails
     class Spec < MiniTest::Spec
-      
+
       include FileUtils
-      
+
       class << self
-        
+
         def dummy_app
           Dummy::Application
         end
@@ -20,35 +20,35 @@ module Less
         def dummy_tmp
           "#{dummy_app.root}/tmp"
         end
-        
+
       end
-      
+
       before do
         prepare_cache_dir
         reset_config_options
         reset_caches
       end
-      
+
       protected
-      
+
       delegate :dummy_app, :dummy_tmp, :to => :'self.class'
 
       def dummy_config
         dummy_app.config
       end
-      
+
       def dummy_assets
         dummy_app.assets
       end
-      
+
       def dummy_asset(name)
         dummy_assets[name].to_s.strip
       end
-      
+
       def reset_config_options
         dummy_config.less.compress = true
       end
-      
+
       def reset_caches
         version = SecureRandom.hex(32)
         dummy_config.assets.version = version
@@ -56,57 +56,59 @@ module Less
         cache = dummy_assets.cache
         cache.respond_to?(:clear) ? cache.clear : rm_rf("#{dummy_tmp}/cache/assets")
       end
-      
+
       def prepare_cache_dir
         mkdir_p "#{dummy_tmp}/cache/assets"
       end
-      
+
     end
-    
+
     # Heavily inspired by Rails::Generators::TestCase.
     class GeneratorSpec < Spec
-      
+
       class_attribute :destination_root, :current_path, :generator_class, :default_arguments
       delegate        :destination_root, :current_path, :generator_class, :default_arguments, :to => :'self.class'
-      
+
       self.current_path      = File.expand_path(Dir.pwd)
       self.default_arguments = []
       self.destination_root  = "#{dummy_tmp}/destination_root"
-      
+
       before { ensure_current_path ; prepare_destination ; no_color! ; setup_generator_class }
       after  { remove_destination ; ensure_current_path }
-      
+
       protected
-      
+
       def no_color!
         Thor::Base.shell = Thor::Shell::Basic
       end
-      
+
       def ensure_current_path
         cd current_path
       end
-      
+
       def prepare_destination
         remove_destination
         mkdir_p destination_root
       end
-      
+
       def remove_destination
         rm_rf destination_root
       end
-      
+
       def setup_generator_class
         self.class.generator_class = Less::Generators.const_get(self.class.name.sub(/Spec$/, ''))
       end
-      
+
       def run_generator(args=default_arguments, config={})
-        generator_class.start(args, config.reverse_merge(:destination_root => destination_root))
+        spec_helper_silence_stdout do
+          generator_class.start(args, config.reverse_merge(:destination_root => destination_root))
+        end
       end
 
       def generator(args=default_arguments, options={}, config={})
         @generator ||= generator_class.new(args, options, config.reverse_merge(:destination_root => destination_root))
       end
-      
+
       def assert_file(relative, *contents)
         absolute = File.expand_path(relative, destination_root)
         assert File.exists?(absolute), "Expected file #{relative.inspect} to exist, but does not"
@@ -122,9 +124,36 @@ module Less
         end
       end
       alias :assert_directory :assert_file
-      
+
+      # Silence +STDOUT+ temporarily.
+      #
+      # &block:: Block of code to call while +STDOUT+ is disabled.
+      #
+      def spec_helper_silence_stdout(&block)
+        spec_helper_silence_stream($stdout, &block)
+      end
+
+      # Back-end to #spec_helper_silence_stdout; silences arbitrary streams.
+      #
+      # +stream+:: The output stream to silence, e.g. <tt>$stdout</tt>
+      # &block::   Block of code to call while output stream is disabled.
+      #
+      def spec_helper_silence_stream(stream, &block)
+        begin
+          old_stream = stream.dup
+          stream.reopen(File::NULL)
+          stream.sync = true
+
+          yield
+
+        ensure
+          stream.reopen(old_stream)
+          old_stream.close
+
+        end
+      end
     end
-    
+
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: less-rails
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0.rc1
 platform: ruby
 authors:
 - Ken Collins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-01 00:00:00.000000000 Z
+date: 2018-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: less
@@ -30,62 +30,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: grease
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -179,13 +145,14 @@ files:
 - gemfiles/rails42.gemfile
 - gemfiles/rails50.gemfile
 - gemfiles/rails51.gemfile
+- gemfiles/sprockets2.gemfile
 - less-rails.gemspec
 - lib/less-rails.rb
 - lib/less/rails.rb
 - lib/less/rails/helpers.rb
 - lib/less/rails/import_processor.rb
+- lib/less/rails/less_transformer.rb
 - lib/less/rails/railtie.rb
-- lib/less/rails/template_handlers.rb
 - lib/less/rails/version.rb
 - lib/rails/generators/less/assets/assets_generator.rb
 - lib/rails/generators/less/assets/templates/stylesheet.css.less
@@ -222,12 +189,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: The dynamic stylesheet language for the Rails asset pipeline.

data/lib/less/rails/template_handlers.rb

@@ -1,50 +0,0 @@
-module Less  
-  module Rails    
-    class LessTemplate < Tilt::LessTemplate
-      
-      self.default_mime_type = 'text/css'
-      
-      include Helpers
-      
-      TO_CSS_KEYS = [:compress, :optimization, :silent, :color]
-      
-      def prepare
-      end
-      
-      def evaluate(scope, locals, &block)
-        @output ||= begin
-          Less.Parser['scope'] = scope
-          parser = ::Less::Parser.new config_to_less_parser_options(scope)
-          engine = parser.parse(data)
-          engine.to_css config_to_css_options(scope)
-        end
-      end
-      
-      protected
-      
-      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}.merge(config_raw(scope))
-      end
-      
-      def config_to_css_options(scope)
-        Hash[config_from_rails(scope).each.to_a].slice *TO_CSS_KEYS
-      end
-      
-      def config_paths(scope)
-        config_from_rails(scope)[:paths]
-      end
-
-      def config_raw(scope)
-        config_from_rails(scope)[:raw]
-      end
-      
-      def config_from_rails(scope)
-        scope.environment.context_class.less_config
-      end
-      
-    end    
-  end
-end