less-rails 2.0.3 → 2.1.0

data/.gitignore

@@ -3,4 +3,5 @@
 Gemfile.lock
 pkg/*
 *.log
-tmp/*
+tmp/*
+test/dummy_app/tmp/cache/assets/*

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+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 - 11/13/2011
 ------------------
 * Add generator support. Fixes #8.

data/README.md

@@ -25,7 +25,7 @@ end
 
 #### About Compression
 
-If `config.assets.compress` is set to true, we will set the `config.assets.css_compressor` to `Less::Rails::CssCompressor.new` for you automatically. Feel free to set the `css_compressor` to something more stronger like `:yui` in your `config/environments/production.rb` file.
+If `config.assets.compress` is set to true, we will set the `config.less.compress` to true as well. Less has real basic compression and it is recommended that you set the rails `config.assets.css_compressor` to something more stronger like `:yui` in your `config/environments/production.rb` file. Note, this requires the [yui-compressor](https://rubygems.org/gems/yui-compressor) gem but does an excellent job of compressing assets.
 
 
 
@@ -82,7 +82,7 @@ We also have a generator for rails scaffold CSS. Just like the Sass gem, we simp
 
 ## Testing
 
-Simply just run `bundle install` and `bundle exec rake` and the tests will will. We also use Travis CI to run our tests too. Current build status is:
+Simple! Just clone the repo, then run `bundle install` and `bundle exec rake`. The tests will begin to run. We also use Travis CI to run our tests too. Current build status is:
 
 [![Build Status](https://secure.travis-ci.org/metaskills/less-rails.png)](http://travis-ci.org/metaskills/less-rails)
 

data/less-rails.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email       = ["ken@metaskills.net"]
   s.homepage    = "http://github.com/metaskills/less-rails"
   s.summary     = %q{The dynamic stylesheet language for the Rails asset pipeline.}
-  s.description = %q{The dynamic stylesheet language for the Rails asset pipeline.}
+  s.description = %q{The dynamic stylesheet language for the Rails asset pipeline. Allows other gems to extend Less load path.}
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/lib/less/rails.rb

@@ -12,5 +12,5 @@ require 'sprockets/railtie'
 require 'less/rails/version'
 require 'less/rails/helpers'
 require 'less/rails/template_handlers'
-require 'less/rails/css_compressor'
+require 'less/rails/import_processor'
 require 'less/rails/railtie'

data/lib/less/rails/import_processor.rb

@@ -0,0 +1,23 @@
+module Less  
+  module Rails    
+    class ImportProcessor < Tilt::Template
+      
+      IMPORT_SCANNER = /@import\s*['"]([^'"]+)['"]\s*;/.freeze
+      
+      def prepare
+      end
+      
+      def evaluate(context, locals, &block)
+        import_paths = data.scan(IMPORT_SCANNER).flatten.compact.uniq
+        import_paths.each do |path|
+          asset = context.environment[path]
+          if asset && asset.pathname.to_s.ends_with?('.less')
+            context.depend_on_asset(asset.pathname)
+          end
+        end
+        data
+      end
+      
+    end
+  end
+end

data/lib/less/rails/railtie.rb

@@ -20,6 +20,7 @@ module Less
       
       initializer 'less-rails.before.load_config_initializers', :before => 'load_config_initializers', :group => :all do |app|
         raise 'The less-rails plugin requires the asset pipeline to be enabled.' unless app.config.assets.enabled
+        app.assets.register_preprocessor 'text/css', ImportProcessor
       end
       
       initializer 'less-rails.after.load_config_initializers', :after => 'load_config_initializers', :group => :all do |app|
@@ -28,9 +29,7 @@ module Less
       end
       
       initializer 'less-rails.setup_compression', :group => :all do |app|
-        if app.config.assets.compress
-          app.config.assets.css_compressor = CssCompressor.new
-        end
+        config.less.compress = app.config.assets.compress
       end
       
     end

data/lib/less/rails/version.rb

@@ -1,5 +1,5 @@
 module Less
   module Rails
-    VERSION = "2.0.3"
+    VERSION = "2.1.0"
   end
 end

data/test/cases/basics_spec.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 
 class BasicsSpec < Less::Rails::Spec
   
-  let(:basics) { dummy_asset('basics') }
-  
   it 'must render variables' do
     basics.must_match %r{#test-variable\{color:#4d926f;\}}
   end
@@ -11,9 +9,32 @@ class BasicsSpec < Less::Rails::Spec
   it 'must render mixins' do
     basics.must_match %r{#test-mixin span\{border:1px solid black;\}}
   end
-  
-  it 'must have a CSSCompressor' do
-    Less::Rails::CssCompressor.new.compress('.class {width: 1+1}').must_equal '.class{width:2;}'
+
+  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'
+    end
   end
 
+  protected
+  
+  def basics
+    dummy_asset 'basics'
+  end
+  
+  def mixins_asset
+    dummy_assets['frameworks/bootstrap/mixins.less']
+  end
+  
+  def safely_edit_mixins
+    data = File.read(mixins_asset.pathname)
+    begin
+      yield data.dup
+    ensure
+      File.open(mixins_asset.pathname,'w') { |f| f.write(data) }
+    end
+  end
 end

data/test/cases/railtie_spec.rb

@@ -34,6 +34,10 @@ class RailtieSpec < Less::Rails::Spec
       dummy_assets.context_class.less_config.must_equal dummy_config.less
     end
     
+    it 'must register our import pre processor' do
+      dummy_assets.preprocessors['text/css'].must_include Less::Rails::ImportProcessor
+    end
+    
   end
 
 

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

@@ -9,3 +9,6 @@
 .bordered { border: 1px solid black; }
 #test-mixin span { .bordered; }
 
+// Frameworks
+@import "frameworks/bootstrap/mixins";
+#test-radiused { .radiused; }

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

@@ -0,0 +1,4 @@
+
+.radiused(@radius: 5px) {
+  border-radius: @radius;
+}

data/test/dummy_app/init.rb

@@ -13,7 +13,7 @@ module Dummy
     config.consider_all_requests_local = true
     
     config.assets.enabled = true
-    config.assets.cache_store = config.cache_store
+    config.assets.cache_store = [:file_store, "#{config.root}/tmp/cache/assets/"]
     
   end
 end

data/test/spec_helper.rb

@@ -12,18 +12,31 @@ module Less
   module Rails
 
     class Spec < MiniTest::Spec
-            
+      
+      include FileUtils
+      
+      class << self
+        
+        def dummy_app
+          Dummy::Application
+        end
+
+        def dummy_tmp
+          "#{dummy_app.root}/tmp"
+        end
+        
+      end
+      
       before do
+        prepare_cache_dir
         reset_config_options
         reset_caches
       end
       
       protected
       
-      def dummy_app
-        Dummy::Application
-      end
-      
+      delegate :dummy_app, :dummy_tmp, :to => :'self.class'
+
       def dummy_config
         dummy_app.config
       end
@@ -46,21 +59,23 @@ module Less
         dummy_assets.cache.clear
       end
       
+      def prepare_cache_dir
+        mkdir_p "#{dummy_tmp}/cache/assets"
+      end
+      
     end
     
     # Heavily inspired by Rails::Generators::TestCase.
     class GeneratorSpec < Spec
       
-      include FileUtils
-      
       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::Application.root}/tmp"
+      self.destination_root  = "#{dummy_tmp}/destination_root"
       
-      before { destination_root_is_set? ; ensure_current_path ; prepare_destination ; no_color! ; setup_generator_class }
+      before { ensure_current_path ; prepare_destination ; no_color! ; setup_generator_class }
       after  { remove_destination ; ensure_current_path }
       
       protected
@@ -69,10 +84,6 @@ module Less
         Thor::Base.shell = Thor::Shell::Basic
       end
       
-      def destination_root_is_set?
-        raise "You need to configure your Less::Rails::GeneratorSpec destination root." unless destination_root
-      end
-      
       def ensure_current_path
         cd current_path
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: less-rails
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 11
   prerelease: 
   segments: 
   - 2
+  - 1
   - 0
-  - 3
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors: 
 - Ken Collins
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-13 00:00:00 -05:00
-default_executable: 
+date: 2011-11-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: less
@@ -94,7 +93,7 @@ dependencies:
         version: 3.1.1
   type: :development
   version_requirements: *id005
-description: The dynamic stylesheet language for the Rails asset pipeline.
+description: The dynamic stylesheet language for the Rails asset pipeline. Allows other gems to extend Less load path.
 email: 
 - ken@metaskills.net
 executables: []
@@ -115,8 +114,8 @@ files:
 - less-rails.gemspec
 - lib/less-rails.rb
 - lib/less/rails.rb
-- lib/less/rails/css_compressor.rb
 - lib/less/rails/helpers.rb
+- lib/less/rails/import_processor.rb
 - lib/less/rails/railtie.rb
 - lib/less/rails/template_handlers.rb
 - lib/less/rails/version.rb
@@ -130,10 +129,12 @@ files:
 - test/dummy_app/app/assets/images/1x1.png
 - 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/helpers.css.less
 - test/dummy_app/init.rb
+- test/dummy_app/tmp/.gitkeep
+- test/dummy_app/tmp/cache/.gitkeep
 - test/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/metaskills/less-rails
 licenses: []
 
@@ -163,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: The dynamic stylesheet language for the Rails asset pipeline.
@@ -175,6 +176,9 @@ test_files:
 - test/dummy_app/app/assets/images/1x1.png
 - 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/helpers.css.less
 - test/dummy_app/init.rb
+- test/dummy_app/tmp/.gitkeep
+- test/dummy_app/tmp/cache/.gitkeep
 - test/spec_helper.rb

data/lib/less/rails/css_compressor.rb

@@ -1,11 +0,0 @@
-module Less  
-  module Rails
-    class CssCompressor
-      
-      def compress(css)
-        ::Less::Parser.new.parse(css).to_css(:compress => true).strip
-      end
-      
-    end 
-  end
-end