Skip to content

Commit

Permalink
All app asset stylesheet paths are added to less paths.
Browse files Browse the repository at this point in the history
  • Loading branch information
metaskills committed Nov 25, 2011
1 parent 883bd8b commit 067da39
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 8 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
CHANGELOG
=========

2.1.1 - 11/24/2011
------------------

* All app asset stylesheet paths are added to less paths.


2.1.0 - 11/18/2011
------------------
* Remove our basic CssCompressor since it can not handle real world general purpose JS
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This gem was made for other gems to properly hook into one place to provide path

```ruby
MyProject::Application.configure do
config.less.paths << "#{Rails.root}/lib/less/stylesheets"
config.less.paths << "#{Rails.root}/lib/less/protractor/stylesheets"
config.less.compress = true
end
```
Expand Down
2 changes: 1 addition & 1 deletion less-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ Gem::Specification.new do |s|
s.add_runtime_dependency 'actionpack', '~> 3.1.1'
s.add_development_dependency 'minitest'
s.add_development_dependency 'guard-minitest'
s.add_development_dependency 'rails', '~> 3.1.1'
s.add_development_dependency 'rails', '~> 3.1.3'
end
11 changes: 9 additions & 2 deletions lib/less/rails/railtie.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,23 @@ module LessContext
Sprockets.register_engine '.less', Less::Rails::LessTemplate
end

initializer 'less-rails.before.load_config_initializers', :before => 'load_config_initializers', :group => :all do |app|
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|
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
end

initializer 'less-rails.after.append_assets_path', :after => :append_assets_path, :group => :all do |app|
# raise paths["app/assets"].existent_directories.inspect
# raise app.config.assets.paths.inspect
assets_stylesheet_paths = app.config.assets.paths.select { |p| p.ends_with?('stylesheets') }
app.config.less.paths.unshift(*assets_stylesheet_paths)
end

initializer 'less-rails.setup_compression', :group => :all do |app|
config.less.compress = app.config.assets.compress
end
Expand Down
2 changes: 1 addition & 1 deletion lib/less/rails/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Less
module Rails
VERSION = "2.1.0"
VERSION = "2.1.1"
end
end
8 changes: 6 additions & 2 deletions test/cases/railtie_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ class RailtieSpec < Less::Rails::Spec
dummy_config.less.must_be_instance_of ActiveSupport::OrderedOptions
end

it 'must have an empty array for paths' do
dummy_config.less.paths.must_equal Array.new
it 'must have an array for paths' do
dummy_config.less.paths.must_be_kind_of Array
end

it 'must have an options hash passed down to the #to_css method' do
Expand Down Expand Up @@ -38,6 +38,10 @@ class RailtieSpec < Less::Rails::Spec
dummy_assets.preprocessors['text/css'].must_include Less::Rails::ImportProcessor
end

it 'must include the asset pipelines stylesheet paths to less paths' do
dummy_app.config.less.paths.must_include "#{dummy_app.root}/app/assets/stylesheets"
end

end


Expand Down
1 change: 0 additions & 1 deletion test/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ def dummy_asset(name)
end

def reset_config_options
dummy_config.less.paths = []
dummy_config.less.compress = true
end

Expand Down

0 comments on commit 067da39

Please sign in to comment.