stylus 0.4.2 → 0.5.0

data/.gitignore

@@ -1,6 +1,7 @@
 *.gem
 node_modules
 .bundle
+gemfiles/*.lock
 Gemfile.lock
 pkg/*
 docs

data/.travis.yml

@@ -1,5 +1,9 @@
 before_script: "npm install nib"
 before_install: gem update --system
+language: ruby
+gemfile:
+  - gemfiles/Gemfile-rails.3.1.x
+  - Gemfile
 rvm:
   - ree
   - 1.9.3

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Changelog
 
+### 0.5.0 (Master)
+[Compare view](https://github.com/lucasmazza/ruby-stylus/compare/v0.4.2...v.0.5.0)
+
+* Rewrite of the Railtie initializers to match 3.2 loading order;
+* Only folders ending with `stylesheets` will be copied over to `Stylus.paths`.
+
 ### 0.4.2 (2012-03-24)
 [Compare view](https://github.com/lucasmazza/ruby-stylus/compare/v0.4.1...v.0.4.2)
 

data/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2011 Lucas Mazza <luc4smazza@gmail.com>
+Copyright (c) 2012 Lucas Mazza <luc4smazza@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -41,7 +41,7 @@ Stylus.use :nib
 # a `:filename` option so Stylus can locate your stylesheet for proper inspection.
 Stylus.debug = true
 ```
-### With the Rails 3.1 Asset Pipeline.
+### With Rails 3 and the Asset Pipeline.
 
 First of all, remember to add `gem 'stylus'` to your Gemfile inside the `:assets` group, So Rails will require the gem according to your current environment - on production you should serve precompiled versions of your assets instead of compiling on the fly.
 
@@ -89,7 +89,7 @@ For more info about the [Stylus](https://github.com/LearnBoost/stylus) syntax an
 
 (The MIT License)
 
-Copyright (c) 2011 Lucas Mazza <luc4smazza@gmail.com>
+Copyright (c) 2012 Lucas Mazza <luc4smazza@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,25 +1,8 @@
-require 'fileutils'
 require 'bundler'
 require 'rspec/core/rake_task'
-require 'rocco/tasks'
 Bundler::GemHelper.install_tasks
 
 desc "Run specs"
-RSpec::Core::RakeTask.new do |task|
-  task.rspec_opts = ["-c -b"]
-end
+RSpec::Core::RakeTask.new
 
-task :default => :spec
-
-Rocco::make 'docs/'
-
-desc 'Builds Rocco docs'
-task :docs => :rocco do
-  Dir['docs/lib/**/*.html'].each do |file|
-    path = file.gsub(/lib/,'')
-    FileUtils.mkdir_p(File.dirname(path))
-    FileUtils.mv(file, path)
-  end
-  cp 'docs/stylus.html', 'docs/index.html', :preserve => true
-end
-directory 'docs/'
+task :default => :spec

data/gemfiles/Gemfile-rails.3.1.x

@@ -0,0 +1,7 @@
+source :rubygems
+
+gem 'railties', '~> 3.1.0'
+gem 'tzinfo'
+gem 'rspec', '~> 2.0'
+gem 'execjs'
+gem 'stylus-source'

data/lib/stylus/railtie.rb

@@ -9,22 +9,24 @@ module Stylus
 
     config.app_generators.stylesheet_engine :stylus
 
-    initializer :setup_stylus, :after => 'sprockets.environment', :group => :all do |app|
+    initializer 'stylus.register', :after => 'sprockets.environment', :group => :all do |app|
       if app.config.assets.enabled
         app.assets.register_engine '.styl', Tilt::StylusTemplate
         app.assets.register_preprocessor 'text/css', Stylus::ImportProcessor
       end
     end
 
-    # After initialization block to inspect the `Sprockets` configuration
+    # Initializer block to inspect the `Sprockets` configuration
     # And reflect it on the `Stylus` module;
     # It also includes the `Rails` asset load path into `Stylus` so any
     # `.styl` file inside it can be imported by the `Stylus` API.
-    config.after_initialize do |app|
-      if app.config.assets.enabled
-        Stylus.compress = app.config.assets.compress
-        Stylus.debug = app.config.assets.debug
-        Stylus.paths.concat app.assets.paths
+    initializer 'stylus.config', :after => :append_assets_path, :group => :all do |app|
+      sprockets = app.config.assets
+      paths     = sprockets.paths.select { |dir| dir.to_s.ends_with?('stylesheets') }
+      if sprockets.enabled
+        Stylus.compress = sprockets.compress
+        Stylus.debug    = sprockets.debug
+        Stylus.paths.concat paths
       end
     end
   end

data/lib/stylus/version.rb

@@ -1,3 +1,3 @@
 module Stylus
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/spec/sprockets_spec.rb

@@ -2,9 +2,10 @@ require 'spec_helper'
 
 describe 'Sprockets and Rails integration' do
 
-  it 'copies the asset paths into the Stylus load path' do
+  it "copies the folders ending with 'stylesheets' from the Sprockets load path" do
     app = create_app
-    Stylus.paths.should =~ app.assets.paths
+    Stylus.paths.should == [fixture_root]
+    Stylus.paths.should_not == app.assets.paths
   end
 
   it 'process .styl files with the asset pipeline' do

data/spec/support/helpers.rb

@@ -16,13 +16,14 @@ module Helpers
       assets.compress = true if options[:compress]
       assets.debug    = true if options[:debug]
       assets.paths << fixture_root
+      assets.paths << File.expand_path('javascripts')
       app.config.active_support.deprecation = :log
       app.initialize!
     end
   end
 
   def fixture_root
-    File.expand_path('../../fixtures', __FILE__)
+    File.expand_path('../../stylesheets', __FILE__)
   end
 
   def output_root

data/stylus.gemspec

@@ -15,10 +15,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'execjs'
   s.add_dependency 'stylus-source'
   s.add_development_dependency 'rspec',       '~> 2.0'
-  s.add_development_dependency 'railties',    '~> 3.0'
+  s.add_development_dependency 'railties',    '~> 3.2'
   s.add_development_dependency 'tzinfo'
   s.add_development_dependency 'yajl-ruby'
-  s.add_development_dependency 'rocco'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stylus
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-24 00:00:00.000000000 Z
+date: 2012-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70186296838480 !ruby/object:Gem::Requirement
+  requirement: &70111340797160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70186296838480
+  version_requirements: *70111340797160
 - !ruby/object:Gem::Dependency
   name: stylus-source
-  requirement: &70186296851920 !ruby/object:Gem::Requirement
+  requirement: &70111340796740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70186296851920
+  version_requirements: *70111340796740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70186296850680 !ruby/object:Gem::Requirement
+  requirement: &70111340796200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,21 +43,21 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70186296850680
+  version_requirements: *70111340796200
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70186296849620 !ruby/object:Gem::Requirement
+  requirement: &70111340795660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :development
   prerelease: false
-  version_requirements: *70186296849620
+  version_requirements: *70111340795660
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70186296848740 !ruby/object:Gem::Requirement
+  requirement: &70111340795280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70186296848740
+  version_requirements: *70111340795280
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70186296847340 !ruby/object:Gem::Requirement
+  requirement: &70111340794820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,18 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70186296847340
-- !ruby/object:Gem::Dependency
-  name: rocco
-  requirement: &70186296845660 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70186296845660
+  version_requirements: *70111340794820
 description: Bridge library to compile .styl stylesheets from ruby code.
 email:
 - luc4smazza@gmail.com
@@ -102,6 +91,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/Gemfile-rails.3.1.x
 - lib/rails/generators/stylus/assets/assets_generator.rb
 - lib/rails/generators/stylus/assets/templates/stylesheet.css.styl
 - lib/rails/generators/stylus/scaffold/scaffold_generator.rb
@@ -119,21 +109,21 @@ files:
 - spec/cases/plugin.css
 - spec/cases/simple.css
 - spec/cases/stylesheet.css
-- spec/fixtures/compressed.styl
-- spec/fixtures/debug.styl
-- spec/fixtures/implicit.styl
-- spec/fixtures/import.styl
-- spec/fixtures/mixins/vendor.styl
-- spec/fixtures/nib.styl
-- spec/fixtures/plugin.styl
-- spec/fixtures/simple.styl
-- spec/fixtures/stylesheet.styl
 - spec/generators/assets_generator_spec.rb
 - spec/generators/controller_generator_spec.rb
 - spec/generators/scaffold_generator_spec.rb
 - spec/import_processor_spec.rb
 - spec/spec_helper.rb
 - spec/sprockets_spec.rb
+- spec/stylesheets/compressed.styl
+- spec/stylesheets/debug.styl
+- spec/stylesheets/implicit.styl
+- spec/stylesheets/import.styl
+- spec/stylesheets/mixins/vendor.styl
+- spec/stylesheets/nib.styl
+- spec/stylesheets/plugin.styl
+- spec/stylesheets/simple.styl
+- spec/stylesheets/stylesheet.styl
 - spec/stylus_spec.rb
 - spec/support/generators/test_case.rb
 - spec/support/helpers.rb
@@ -172,21 +162,21 @@ test_files:
 - spec/cases/plugin.css
 - spec/cases/simple.css
 - spec/cases/stylesheet.css
-- spec/fixtures/compressed.styl
-- spec/fixtures/debug.styl
-- spec/fixtures/implicit.styl
-- spec/fixtures/import.styl
-- spec/fixtures/mixins/vendor.styl
-- spec/fixtures/nib.styl
-- spec/fixtures/plugin.styl
-- spec/fixtures/simple.styl
-- spec/fixtures/stylesheet.styl
 - spec/generators/assets_generator_spec.rb
 - spec/generators/controller_generator_spec.rb
 - spec/generators/scaffold_generator_spec.rb
 - spec/import_processor_spec.rb
 - spec/spec_helper.rb
 - spec/sprockets_spec.rb
+- spec/stylesheets/compressed.styl
+- spec/stylesheets/debug.styl
+- spec/stylesheets/implicit.styl
+- spec/stylesheets/import.styl
+- spec/stylesheets/mixins/vendor.styl
+- spec/stylesheets/nib.styl
+- spec/stylesheets/plugin.styl
+- spec/stylesheets/simple.styl
+- spec/stylesheets/stylesheet.styl
 - spec/stylus_spec.rb
 - spec/support/generators/test_case.rb
 - spec/support/helpers.rb