stylus 1.0.0.beta → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80a0a2eb1e730afce9c0d8550d6f054bcf527bf2
-  data.tar.gz: b9e7866ea1cd4d1a9c35fe0f538e7735d698a00c
+  metadata.gz: aae79b1819cdb41d494c214ff4dcce6fc309b2b5
+  data.tar.gz: dd62bd41cf976f92c2e6a5a18948e9e306da3f53
 SHA512:
-  metadata.gz: 8047e3c4724c6034a517b311d0162f5dbb2dbb13d4c7f3f8566c9efcb02a5804e754b27a78c7891c0272cdd9ac7a3d3a082666ba0908c2d094161f61e5b6176b
-  data.tar.gz: a54f418ebd95c9e2d8d8dc0a89230abff8783cb265177fe3512534e79fd17a443f2e93868644b4dad6f2140224291fd3b80b229ff403ee0d6933987f7fa1d1b4
+  metadata.gz: 2df912f5de8d59046f46cb1c3c2aeb32829f17e145f08bb5f8c70b6da51ce83d0cd0d47ca2c31207d22d33c563bee6a3ebae2df805e91a0cbf29ee7397a5607b
+  data.tar.gz: 04a96508add2597861566cabfe481d7e0f6b953a290cfb89e547bbe0fd9e46370f81a928aab3205a3546446c52772c0d8fb06f425b52b0bd653678102771208e

data/CHANGELOG.md

@@ -1,5 +1,6 @@
 ### HEAD - 1.0.0
 
 * Rails 4+ and Ruby 1.9.x/2.0.0 support.
+* Support for the `asset-path` and `asset-url` mixins, thanks to [@spilin](https://github.com/spilin).
 
 Please check [0-7-stable](https://github.com/lucasmazza/ruby-stylus/blob/0-7-stable/CHANGELOG.md) for previous changes.

data/README.md

@@ -2,10 +2,22 @@
 
 [![Build Status](https://secure.travis-ci.org/lucasmazza/ruby-stylus.png)](http://travis-ci.org/lucasmazza/ruby-stylus)
 
-`stylus` is a bridge between your Ruby code and the [Stylus](https://github.com/LearnBoost/stylus) library that runs on [node.js](http://nodejs.org). It has support for the Rails 3.1 asset pipeline (thanks to a [Tilt](https://github.com/rtomayko/tilt) Template) and it's backed by the [ExecJS](https://github.com/sstephenson/execjs) gem.
+`stylus` is a bridge between your Ruby code and the [Stylus](https://github.com/LearnBoost/stylus) library that runs on [node.js](http://nodejs.org). It has support for Rails 4 applications. (if you are working with Rails 3, check the [0-7-stable](https://github.com/lucasmazza/ruby-stylus/tree/0-7-stable) branch.)
 
 ## Installation
 
+If you have a `Gemfile`:
+
+```
+gem 'stylus'
+```
+
+or if you don't have a Gemfile, install it in your system:
+
+```
+gem install stylus
+```
+
 Since version 0.3.0, the [stylus-source](https://github.com/railsjedi/ruby-stylus-source) packages the Stylus source into a Rubygem, so it will be available after installing this gem. The `ruby-source` version will follow the Stylus releases and their versions.
 
 You can replace the Stylus code by placing another version of Stylus on `./node_modules/stylus`, and it will be used instead of the version bundled inside the gem.
@@ -23,7 +35,7 @@ require 'stylus'
 Stylus.compile(File.new('application.styl')) # returns the compiled stylesheet.
 
 # Use the :compress option, removing most newlines from the code.
-Stylus.compile(File.read('application.styl'), :compress => true)
+Stylus.compile(File.read('application.styl'), compress: true)
 
 # Or use the global compress flag
 Stylus.compress = true
@@ -40,9 +52,7 @@ Stylus.use :nib
 # a `:filename` option so Stylus can locate your stylesheet for proper inspection.
 Stylus.debug = true
 ```
-### 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.
+### With Rails and the Asset Pipeline.
 
 Adding `stylus` to your Gemfile should let you work with `.styl` files with the Rails 3.1 Pipeline. Any asset generated with `rails generate` will be created with a `.css.styl` extension.
 
@@ -116,7 +126,7 @@ map('/assets') { run assets.index }
 [Stylus](https://github.com/LearnBoost/stylus) exposes a nice API to create plugins written on [node.js](http://nodejs.org), like [nib](https://github.com/visionmedia/nib). The installation process should be the same as described above for [Stylus](https://github.com/LearnBoost/stylus) (since they're all npm packages after all). You can hook them up on your Ruby code with `Stylus.use`:
 
 ```ruby
-Stylus.use :fingerprint, :literal => 'caa8c262e23268d2a7062c6217202343b84f472b'
+Stylus.use :fingerprint, literal: 'caa8c262e23268d2a7062c6217202343b84f472b'
 ```
 
 Will run something like this in JavaScript:
@@ -138,7 +148,7 @@ For more info about the [Stylus](https://github.com/LearnBoost/stylus) syntax an
 
 (The MIT License)
 
-Copyright (c) 2012 Lucas Mazza <luc4smazza@gmail.com>
+Copyright (c) 2012-2013 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/lib/rails/generators/stylus/assets/assets_generator.rb

@@ -1,13 +1,13 @@
-require "rails/generators/named_base"
+require 'rails/generators/named_base'
 
 module Stylus
   module Generators
     class AssetsGenerator < ::Rails::Generators::NamedBase
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path('../templates', __FILE__)
 
       def copy_stylus
-        template "stylesheet.css.styl", File.join('app/assets/stylesheets', class_path, "#{file_name}.css.styl")
+        template 'stylesheet.css.styl', File.join('app/assets/stylesheets', class_path, "#{file_name}.css.styl")
       end
     end
   end
-end
+end

data/lib/rails/generators/stylus/assets/templates/stylesheet.css.styl

@@ -1,3 +1,3 @@
 // Place all the styles related to the matching controller here.
 // They will automatically be included in application.css.
-// You can use Stylus syntax here: http://learnboost.github.com/stylus
+// You can use Stylus syntax here: http://learnboost.github.io/stylus

data/lib/stylus.rb

@@ -130,13 +130,13 @@ module Stylus
     # Returns the default `Hash` of options:
     # the compress flag and the global load path.
     def defaults
-      { :compress => self.compress?, :paths => self.paths }
+      { compress: self.compress?, paths: self.paths }
     end
 
     # Returns a Hash with the debug options to pass to
     # Stylus.
     def debug_options
-      { :linenos => self.debug?, :firebug => self.debug? }
+      { linenos: self.debug?, firebug: self.debug? }
     end
 
     # Return the gem version alongside with the current `Stylus` version of your system.

data/lib/stylus/import_processor.rb

@@ -22,12 +22,20 @@ module Stylus
     #
     # Returns the stylesheet content, unmodified.
     def evaluate(context, locals, &block)
+      return data unless stylus_file?(context)
+
       depend_on(context, data)
       data
     end
 
     private
 
+    # Internal: Returns true if the file being processed counts as a
+    # Stylus file (That is, it has a .styl extension).
+    def stylus_file?(context)
+      File.fnmatch('*.styl', file) || File.fnmatch('*.styl.*', file)
+    end
+
     # Internal: Scan the stylesheet body, looking for '@import' calls to
     # declare them as a dependency on the context using 'depend_on' method.
     # This method will recursively scans all dependency to ensure that
@@ -51,10 +59,10 @@ module Stylus
     #
     # Returns the resolved 'Asset' or nil if it can't be found.
     def resolve(context, path)
-      context.resolve(path, :content_type => 'text/css')
+      context.resolve(path, content_type: 'text/css')
     rescue ::Sprockets::FileNotFound
       begin
-        context.resolve(path + '/index', :content_type => 'text/css')
+        context.resolve(path + '/index', content_type: 'text/css')
       rescue
         nil
       end

data/lib/stylus/railtie.rb

@@ -3,7 +3,7 @@ require 'stylus/sprockets'
 
 module Stylus
   # Internal: The Railtie responsible for integrate the Stylus library with
-  # a Rails 3.2 (or 3.1) application.
+  # a Rails application.
   #
   # Some of the customizations of using Stylus alongside Rails:
   #
@@ -24,13 +24,9 @@ module Stylus
     # both Stylus and the Sprockets instance that lives on 'app.assets'. The entire
     # configuration object will be passed along.
     #
-    # If you don't have the Asset Pipeline enabled on your application - done by
-    # setting the 'config.assets.enabled' flag to false, this setup process will be
-    # skipped.
-    #
     # Returns nothing.
     config.assets.configure do |env|
-      Stylus.setup(env, config.assets)
+      Stylus.setup(env, config.assets.merge(rails: true))
     end
   end
-end
+end

data/lib/stylus/runtime.rb

@@ -8,8 +8,7 @@ module Stylus
     # Internal: Calls a specific function on the Node.JS context.
     #
     # Example
-    #  exec('version', 2)
-    #  # => "2"
+    #  exec('version', 2) # => '2'
     #
     # Returns The function returned value.
     def exec(*arguments)
@@ -22,8 +21,8 @@ module Stylus
     # if the runtime isn't available. Otherwise, this is a noop.
     def check_availability!
       unless runtime.available?
-        message = "The Node.JS runtime isn't available to Stylus."
-        message << "Ensure that the 'node' (or 'nodejs') executable is present in your $PATH."
+        message = 'The Node.JS runtime is not available to Stylus.'
+        message << 'Ensure that the "node" (or "nodejs") executable is present in your $PATH.'
         raise RuntimeError, message
       end
     end
@@ -46,10 +45,10 @@ module Stylus
     # any Node.JS program.
     def runtime
       @runtime ||= ExecJS::ExternalRuntime.new(
-        :name        => 'Node.js (V8)',
-        :command     => ["nodejs", "node"],
-        :runner_path => File.expand_path("../runtime/runner.js", __FILE__)
+        name:        'Node.js (V8)',
+        command:     ['nodejs', 'node'],
+        runner_path: File.expand_path('../runtime/runner.js', __FILE__)
         )
     end
   end
-end
+end

data/lib/stylus/sprockets.rb

@@ -1,5 +1,6 @@
 require 'stylus'
-require 'stylus/tilt'
+require 'stylus/tilt/stylus'
+require 'stylus/tilt/rails'
 require 'stylus/import_processor'
 # Public: The setup logic to configure both Stylus and Sprockets on any
 # kind of application - Rails, Sinatra or Rack.
@@ -18,27 +19,40 @@ module Stylus
   #
   # environment - A instance of Sprockets::Environment.
   # options     - The configuration Hash (default: {})
+  #             :rails - a flag to inform that the current application is a Rails app.
   #             :paths - An Array of paths to use the '@import' directive, defaults
   #                      to the `paths` attribute on the environment object.
-  #              :debug - The Boolean value for the debug flag.
-  #              :compress - The Boolean value for the debug compress.
+  #             :debug - The Boolean value for the debug flag.
+  #             :compress - The Boolean value for the debug compress.
   #
   # Example
   #
   #  assets = Sprockets::Environment.new
-  #  Stylus.setup(assets, :compress => settings.production?)
+  #  Stylus.setup(assets, compress: settings.production?)
   #
   # Returns nothing.
   def self.setup(environment, options = {})
     paths = options[:paths] || environment.paths
-    directories = paths.select { |dir| dir.to_s =~ /stylesheets$/ }
 
-    Stylus.paths.concat(directories)
+    Stylus.paths.concat(paths)
 
     Stylus.debug = options.fetch(:debug, Stylus.debug)
     Stylus.compress = options.fetch(:compress, Stylus.compress)
-
-    environment.register_engine('.styl', Tilt::StylusTemplate)
+    template = detect_template_hander(options)
+    environment.register_engine('.styl', template)
     environment.register_preprocessor('text/css', Stylus::ImportProcessor)
   end
-end
+
+  # Internal: Gets the desired Tilt template handler to the current configuration.
+  # If a 'rails' option is present then the Rails specific template will be
+  # returned instead of the default Stylus Tilt template.
+  #
+  # Returns a Tilt::Template children class.
+  def self.detect_template_hander(options = {})
+    if options[:rails]
+      Stylus::Rails::StylusTemplate
+    else
+      Tilt::StylusTemplate
+    end
+  end
+end

data/lib/stylus/tilt.rb

@@ -1,54 +1,2 @@
-require 'tilt'
-# Public: A Tilt template to compile Stylus stylesheets.
-#
-# Examples
-#
-#  template = Tilt::StylusTemplate.new { |t| File.read('app.styl') }
-#  template.render
-#  # => the compiled CSS from the app.styl file.
-#
-#  Options should assigned on the template constructor.
-#  template = Tilt::StylusTemplate.new(:compress => true) { |t| File.read('app.styl') }
-#  template.render
-#  # => the compiled CSS with compression enabled.
-module Tilt
-  class StylusTemplate < Template
-
-    # Public: The default mime type for stylesheets.
-    self.default_mime_type = 'text/css'
-
-    # Internal: Checks if the Stylus module has been properly defined.
-    #
-    # Returns true if the 'Stylus' module is present.
-    def self.engine_initialized?
-      defined? ::Stylus
-    end
-
-    # Internal: Require the 'stylus' file to load the Stylus module.
-    #
-    # Returns nothing.
-    def initialize_engine
-      require_template_library 'stylus'
-    end
-
-    # Internal: Caches the filename as an option entry if it's present.
-    #
-    # Returns nothing.
-    def prepare
-      if self.file
-        options[:filename] ||= self.file
-      end
-    end
-
-    # Internal: Compile the template Stylus using this instance options.
-    # The current 'scope' and given 'locals' are ignored and the output
-    # is cached.
-    #
-    # Returns the compiled stylesheet with CSS syntax.
-    def evaluate(scope, locals, &block)
-      @output ||= Stylus.compile(data, options)
-    end
-  end
-end
-
-Tilt.register Tilt::StylusTemplate, 'styl'
+# require compatibility with older versions.
+require 'stylus/tilt/stylus'

data/lib/stylus/tilt/rails.rb

@@ -0,0 +1,51 @@
+require 'stylus/tilt/stylus'
+# Public: A Tilt template to compile Stylus stylesheets with asset helpers.
+module Stylus
+  module Rails
+    class StylusTemplate < ::Tilt::StylusTemplate
+
+      # Public: The default mime type for stylesheets.
+      self.default_mime_type = 'text/css'
+
+      # Internal: Appends stylus mixin for asset_url and asset_path support
+      def evaluate(scope, locals, &block)
+        @data = build_mixin_body(scope) + data
+        super
+      end
+
+      protected
+
+      # Internal: Builds body of a mixin
+      #
+      # Returns string representation of a mixin with asset helper functions
+      def build_mixin_body(scope)
+        @mixin_body ||= if assets_hash(scope).values.all? {|value| value != '' }
+                          <<-STYL
+asset-url(key)
+  return pair[1] if pair[0] == key for pair in #{assets_hash(scope)[:url]} ()
+asset-path(key)
+  return pair[1] if pair[0] == key for pair in #{assets_hash(scope)[:path]} ()
+                          STYL
+                        else
+                          ''
+                        end
+      end
+
+      # Internal: Construct Hash with absolute/relative paths in stylus syntax.
+      #
+      # Returns string representations of hash in Stylus syntax
+      def assets_hash(scope)
+        @assets_hash ||= scope.environment.each_logical_path.each_with_object({ :url => '', :path => '' }) do |logical_path, assets_hash|
+          unless logical_path =~/.*\.(css|js)$/
+            path_to_asset = scope.path_to_asset(logical_path)
+            assets_hash[:url] << "('#{logical_path}' url(\"#{path_to_asset}\")) "
+            assets_hash[:path] << "('#{logical_path}' \"#{path_to_asset}\") "
+          end
+        end
+      end
+
+    end
+  end
+end
+
+Tilt.register ::Stylus::Rails::StylusTemplate, 'styl'

data/lib/stylus/tilt/stylus.rb

@@ -0,0 +1,52 @@
+require 'tilt'
+# Public: A Tilt template to compile Stylus stylesheets.
+#
+# Examples
+#
+#  template = Tilt::StylusTemplate.new { |t| File.read('app.styl') }
+#  template.render # => the compiled CSS from the app.styl file.
+#
+#  Options should assigned on the template constructor.
+#  template = Tilt::StylusTemplate.new(compress: true) { |t| File.read('app.styl') }
+#  template.render # => the compiled CSS with compression enabled.
+module Tilt
+  class StylusTemplate < Template
+
+    # Public: The default mime type for stylesheets.
+    self.default_mime_type = 'text/css'
+
+    # Internal: Checks if the Stylus module has been properly defined.
+    #
+    # Returns true if the 'Stylus' module is present.
+    def self.engine_initialized?
+      defined? ::Stylus
+    end
+
+    # Internal: Require the 'stylus' file to load the Stylus module.
+    #
+    # Returns nothing.
+    def initialize_engine
+      require_template_library 'stylus'
+    end
+
+    # Internal: Caches the filename as an option entry if it's present.
+    #
+    # Returns nothing.
+    def prepare
+      if self.file
+        options[:filename] ||= self.file
+      end
+    end
+
+    # Internal: Compile the template Stylus using this instance options.
+    # The current 'scope' and given 'locals' are ignored and the output
+    # is cached.
+    #
+    # Returns a String with the compiled stylesheet with CSS syntax.
+    def evaluate(scope, locals, &block)
+      @output ||= Stylus.compile(data, options)
+    end
+  end
+end
+
+Tilt.register Tilt::StylusTemplate, 'styl'

data/lib/stylus/version.rb

@@ -1,3 +1,3 @@
 module Stylus
-  VERSION = '1.0.0.beta'
+  VERSION = '1.0.0'
 end

data/spec/generators/assets_generator_spec.rb

@@ -6,6 +6,6 @@ describe Stylus::Generators::AssetsGenerator do
   arguments  %w(posts)
 
   it 'generates a .styl file' do
-    file('app/assets/stylesheets/posts.css.styl').should exist
+    expect(file('app/assets/stylesheets/posts.css.styl')).to exist
   end
 end

data/spec/generators/controller_generator_spec.rb

@@ -7,6 +7,6 @@ describe Rails::Generators::ControllerGenerator do
   arguments  %w(posts --stylesheet-engine=stylus)
 
   it 'generates a .styl file' do
-    file('app/assets/stylesheets/posts.css.styl').should exist
+    expect(file('app/assets/stylesheets/posts.css.styl')).to exist
   end
-end
+end

data/spec/generators/scaffold_generator_spec.rb

@@ -8,10 +8,10 @@ describe Rails::Generators::ScaffoldGenerator do
   arguments  %w(posts --stylesheet-engine=stylus --orm=false)
 
   it 'generates the default scaffold stylesheet' do
-    file('app/assets/stylesheets/scaffold.css').should exist
+    expect(file('app/assets/stylesheets/scaffold.css')).to exist
   end
 
   it 'generates a named .styl file' do
-    file('app/assets/stylesheets/posts.css.styl').should exist
+    expect(file('app/assets/stylesheets/posts.css.styl')).to exist
   end
-end
+end

data/spec/import_processor_spec.rb

@@ -12,43 +12,53 @@ describe Stylus::ImportProcessor do
     asset = env['import']
     dependencies = dependencies_on(asset)
 
-    dependencies.should include(fixture_path('mixins/vendor'))
+    expect(dependencies).to include(fixture_path('mixins/vendor'))
   end
 
-  context "nested dependencies" do
+  context 'nested dependencies' do
     it 'walks the dependency chain of imported files' do
       asset = env['nested_import']
       dependencies = dependencies_on(asset)
 
-      dependencies.should include(fixture_path('mixins/nested'))
-      dependencies.should include(fixture_path('mixins/vendor'))
+      expect(dependencies).to include(fixture_path('mixins/nested'))
+      expect(dependencies).to include(fixture_path('mixins/vendor'))
     end
 
     it "adds files referenced in a directory's index file" do
       asset = env['indexed_nested_import']
       dependencies = dependencies_on(asset)
 
-      dependencies.should include(fixture_path('indexed/index'))
-      dependencies.should include(fixture_path('indexed/first_dep'))
-      dependencies.should include(fixture_path('indexed/second_dep'))
+      expect(dependencies).to include(fixture_path('indexed/index'))
+      expect(dependencies).to include(fixture_path('indexed/first_dep'))
+      expect(dependencies).to include(fixture_path('indexed/second_dep'))
     end
 
-    it "walks dependency chains through indexes" do
+    it 'walks dependency chains through indexes' do
       asset = env['indexed_recursive_import']
       dependencies = dependencies_on(asset)
 
-      dependencies.should include(fixture_path('indexed_nested_import'))
-      dependencies.should include(fixture_path('indexed/index'))
-      dependencies.should include(fixture_path('indexed/first_dep'))
-      dependencies.should include(fixture_path('indexed/second_dep'))
+      expect(dependencies).to include(fixture_path('indexed_nested_import'))
+      expect(dependencies).to include(fixture_path('indexed/index'))
+      expect(dependencies).to include(fixture_path('indexed/first_dep'))
+      expect(dependencies).to include(fixture_path('indexed/second_dep'))
     end
   end
 
-  it "swallows errors from files outside the Sprockets paths" do
-    source = "@import 'nib'"
+  it 'does not process non-stylus files' do
+    source = '@import "nib"'
+    template = Stylus::ImportProcessor.new('stylesheet.scss') { source }
+    context = double
+
+    expect(context).to_not receive(:depend_on)
+    template.render(context)
+  end
+
+  it 'swallows errors from files outside the Sprockets paths' do
+    source = '@import "nib"'
     template = Stylus::ImportProcessor.new { source }
-    sprockets = double()
-    sprockets.should_receive(:resolve).twice.and_raise(::Sprockets::FileNotFound)
+    sprockets = double
+    expect(sprockets).to receive(:resolve).twice.and_raise(::Sprockets::FileNotFound)
+    expect(template).to receive(:stylus_file?).and_return(true)
 
     expect {
       template.render(sprockets)

data/spec/rails_spec.rb

@@ -1,11 +1,10 @@
 require 'spec_helper'
 
 describe 'Rails integration' do
-
-  it "copies the folders ending with 'stylesheets' from the Sprockets load path" do
+  it "copies all folders from the Sprockets load path" do
     app = create_app
-    Stylus.paths.should == [fixture_root]
-    Stylus.paths.should_not == app.assets.paths
+    Stylus.paths.should include fixture_root
+    Stylus.paths.should == app.assets.paths
   end
 
   it 'process .styl files with the asset pipeline' do
@@ -44,4 +43,4 @@ describe 'Rails integration' do
   it 'loads the app normally even when the asset pipeline is disabled' do
     pending "TODO: supress the sprockets-rails railtie to test this."
   end
-end
+end

data/spec/runtime_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 describe Stylus::Runtime do
-  it "raises an error if the runtime isn't available" do
-    Stylus.stub(:runtime) { double("An unavailable Runtime", :available? => false) }
+  it 'raises an error if the runtime is not available' do
+    allow(Stylus).to receive(:runtime) { double('An unavailable Runtime', available?: false) }
 
     expect {
       Stylus.version
-    }.to raise_error RuntimeError, %r[The Node.JS runtime isn't available to Stylus.]
+    }.to raise_error RuntimeError, %r[The Node.JS runtime is not available to Stylus.]
   end
 end

data/spec/sprockets_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Sprockets setup" do
+describe 'Sprockets setup' do
   let(:env) do
     Sprockets::Environment.new do |assets|
       assets.append_path fixture_root
@@ -8,24 +8,29 @@ describe "Sprockets setup" do
     end
   end
 
-  it "register the Tilt engine" do
-    env.should_receive(:register_engine).with('.styl', Tilt::StylusTemplate)
+  it 'register the default Tilt template' do
+    expect(env).to receive(:register_engine).with('.styl', Tilt::StylusTemplate)
     Stylus.setup(env)
   end
 
-  it "register the import processor" do
-    env.should_receive(:register_preprocessor).with('text/css', Stylus::ImportProcessor)
+  it 'register a Rails specific Tilt template' do
+    expect(env).to receive(:register_engine).with('.styl', Stylus::Rails::StylusTemplate)
+    Stylus.setup(env, rails: true)
+  end
+
+  it 'register the import processor' do
+    expect(env).to receive(:register_preprocessor).with('text/css', Stylus::ImportProcessor)
     Stylus.setup(env)
   end
 
-  it "copies the 'stylesheets' paths" do
+  it 'copies the asset paths' do
     Stylus.setup(env)
-    Stylus.paths.should == [fixture_root]
+    expect(Stylus.paths).to eq(env.paths)
   end
 
-  it "configure the debug and compress flags" do
-    Stylus.setup(env, :debug => true, :compress => true)
-    Stylus.debug.should == true
-    Stylus.compress.should == true
+  it 'configure the debug and compress flags' do
+    Stylus.setup(env, debug: true, compress: true)
+    expect(Stylus.debug).to be_true
+    expect(Stylus.compress).to be_true
   end
-end
+end

data/spec/stylus_spec.rb

@@ -1,103 +1,101 @@
 require 'spec_helper'
 
 describe Stylus do
-
-  it "compiles the given source" do
-    input, output = fixture :simple
-    Stylus.compile(input).should == output
+  it 'compiles the given source' do
+    input, output = fixture(:simple)
+    expect(Stylus.compile(input)).to eq(output)
   end
 
-  it "accepts an IO object" do
-    input, output = fixture :simple
+  it 'accepts an IO object' do
+    input, output = fixture(:simple)
     input = StringIO.new(input)
-    Stylus.compile(input).should == output
+    expect(Stylus.compile(input)).to eq(output)
   end
 
-  it "compress the file when the 'compress' flag is given" do
-    input, output = fixture :compressed
-    Stylus.compile(input, :compress => true).should == output
+  it 'compress the file when the "compress" flag is given' do
+    input, output = fixture(:compressed)
+    expect(Stylus.compile(input, compress: true)).to eq(output)
   end
 
-  it "handles the compress flag globally" do
+  it 'handles the compress flag globally' do
     Stylus.compress = true
-    input, output = fixture :compressed
-    Stylus.compile(input).should == output
+    input, output = fixture(:compressed)
+    expect(Stylus.compile(input)).to eq(output)
   end
 
-  it "imports the given paths" do
+  it 'imports the given paths' do
     path = fixture_root
-    input, output = fixture :import
-    Stylus.compile(input, :paths => path).should == output
+    input, output = fixture(:import)
+    expect(Stylus.compile(input, paths: path)).to eq(output)
   end
 
-  it "handles the import paths globally" do
+  it 'handles the import paths globally' do
     Stylus.paths << fixture_root
-    input, output = fixture :import
-    Stylus.compile(input).should == output
+    input, output = fixture(:import)
+    expect(Stylus.compile(input)).to eq(output)
   end
 
   it 'implicit imports the given paths' do
     path = File.expand_path('mixins/vendor.styl', fixture_root)
-    input, output = fixture :implicit
+    input, output = fixture(:implicit)
     Stylus.import path
-    Stylus.compile(input).should == output
+    expect(Stylus.compile(input)).to eq(output)
   end
 
-  it "outputs both gem and library version" do
-    Stylus.version.should =~ /Stylus - gem .+ library .+/
+  it 'outputs both gem and library version' do
+    expect(Stylus.version).to match(/Stylus - gem .+ library .+/)
   end
 
-  it "converts CSS to Stylus" do
-    stylus, css = fixture :stylesheet
-    Stylus.convert(css).should == stylus
+  it 'converts CSS to Stylus' do
+    stylus, css = fixture(:stylesheet)
+    expect(Stylus.convert(css)).to eq(stylus)
   end
 
-  it "stores the given plugins" do
-    Stylus.use :one, :two, :argument => true
-    Stylus.should have(2).plugins
+  it 'stores the given plugins' do
+    Stylus.use :one, :two, argument: true
+    expect(Stylus).to have(2).plugins
   end
 
-  it "includes the given plugins" do
+  it 'includes the given plugins' do
     Stylus.use :nib
-    input, output = fixture :plugin
-    Stylus.compile(input).should == output
+    input, output = fixture(:plugin)
+    expect(Stylus.compile(input)).to eq(output)
   end
 
-  it "includes and imports 'nib' automatically" do
+  it 'includes and imports "nib" automatically' do
     Stylus.nib = true
-    input, output = fixture :nib
-    Stylus.compile(input).should == output
+    input, output = fixture(:nib)
+    expect(Stylus.compile(input)).to eq(output)
   end
 
-  it "share variables between imported stylesheets" do
-    input, output = fixture :variables
+  it 'share variables between imported stylesheets' do
+    input, output = fixture(:variables)
     path = fixture_root
 
-    Stylus.compile(input, :paths => path).should == output
+    expect(Stylus.compile(input, paths: path)).to eq(output)
   end
 
-  describe "The debug flag" do
-
+  describe 'The debug flag' do
     let(:path) { fixture_path(:debug) }
     let(:fixture) { File.read(path) }
     let(:file) { File.new(path) }
 
     before { Stylus.debug = true }
 
-    it "turns the 'linenos' option on" do
-      Stylus.compile(file).should match(/line 1 : #{path}/)
+    it 'turns the "linenos" option on' do
+      expect(Stylus.compile(file)).to match(/line 1 : #{path}/)
     end
 
-    it "skips the 'linenos' option if no filename is given" do
-      Stylus.compile(fixture).should_not match(/line 1 : #{path}/)
+    it 'skips the "linenos" option if no filename is given' do
+      expect(Stylus.compile(fixture)).to_not match(/line 1 : #{path}/)
     end
 
-    it "turns the 'firebug' option on" do
-      Stylus.compile(file).should match(/@media -stylus-debug-info/)
+    it 'turns the "firebug" option on' do
+      expect(Stylus.compile(file)).to match(/@media -stylus-debug-info/)
     end
 
-    it "skips the 'firebug' option if no filename is given" do
-      Stylus.compile(fixture).should_not match(/@media -stylus-debug-info/)
+    it 'skips the "firebug" option if no filename is given' do
+      expect(Stylus.compile(fixture)).to_not match(/@media -stylus-debug-info/)
     end
   end
-end
+end

data/spec/support/generators/test_case.rb

@@ -23,7 +23,7 @@ module Generators
         run_generator
       end
 
-      destination File.expand_path("../tmp", __FILE__)
+      destination File.expand_path('../tmp', __FILE__)
     end
 
     module ClassMethods
@@ -56,4 +56,4 @@ module Generators
       end
     end
   end
-end
+end

data/spec/support/helpers.rb

@@ -1,6 +1,6 @@
 module Helpers
   def create_routes
-    destination = File.join(destination_root, "config")
+    destination = File.join(destination_root, 'config')
 
     FileUtils.mkdir_p(destination)
     FileUtils.touch File.join(destination, 'routes.rb')
@@ -19,6 +19,7 @@ module Helpers
       config.debug    = options[:debug]
       config.paths << fixture_root
       config.paths << File.expand_path('javascripts')
+      yield(app) if block_given?
 
       app.config.eager_load = false
       app.config.active_support.deprecation = :log
@@ -30,6 +31,10 @@ module Helpers
     File.expand_path('../../stylesheets', __FILE__)
   end
 
+  def images_root
+    File.expand_path('../../images', __FILE__)
+  end
+
   def output_root
     File.expand_path('../../cases', __FILE__)
   end

data/spec/tilt/rails_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+require 'stylus/tilt/rails'
+
+describe Stylus::Rails::StylusTemplate do
+  it 'registers the template for .styl files' do
+    expect(Tilt['application.styl']).to eq(Stylus::Rails::StylusTemplate)
+  end
+
+  it 'has a content-type' do
+    expect(Stylus::Rails::StylusTemplate.default_mime_type).to eq('text/css')
+  end
+
+  context 'when no resources other then css found' do
+    it 'compiles the given source without changes' do
+      result = fixture(:simple).last
+
+      app = create_app
+      expect(app.assets['simple'].to_s).to eq(result)
+    end
+  end
+
+
+  it 'substitutes asset_path with path' do
+    app = create_app do |app|
+      app.config.assets.paths << images_root
+      app.config.asset_host = 'http://localhost'
+    end
+    result = fixture(:asset_path).last
+    expect(app.assets['asset_path'].to_s).to eq(result)
+  end
+
+  it 'substitutes asset_url with url' do
+    app = create_app do |app|
+      app.config.assets.paths << images_root
+      app.config.asset_host = 'http://localhost'
+    end
+    result = fixture(:asset_url).last
+    expect(app.assets['asset_url'].to_s).to eq(result)
+  end
+
+  context 'when config.assets.digest = true' do
+    let(:app) do
+      create_app do |app|
+        app.config.assets.paths << images_root
+        app.config.asset_host = 'http://localhost'
+        app.config.assets.digest = true
+      end
+    end
+
+    it 'appends fingerprint to asset path' do
+      digested_image_path = app.assets['rails.png'].digest_path
+      expect(digested_image_path).to match(/^rails-(\w+)\.png$/)
+      asset = app.assets['digested_asset_path']
+      expect(asset.to_s).to eq("body {\n  background-image: url(\"http://localhost/assets/#{digested_image_path}\");\n}\n")
+    end
+
+    it 'appends fingerprint to asset url' do
+      digested_image_path = app.assets['rails.png'].digest_path
+      expect(digested_image_path).to match(/^rails-(\w+)\.png$/)
+      asset = app.assets['digested_asset_url']
+      expect(asset.to_s).to eq("body {\n  background-image: url(\"http://localhost/assets/#{digested_image_path}\");\n}\n")
+    end
+  end
+end

data/spec/tilt/stylus_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'stylus/tilt/stylus'
+
+describe Tilt::StylusTemplate do
+  it 'registers the template for .styl files' do
+    expect(Tilt['application.styl']).to eq(Stylus::Rails::StylusTemplate)
+  end
+
+  it 'has a content-type' do
+    expect(Tilt::StylusTemplate.default_mime_type).to eq('text/css')
+  end
+
+  it 'compiles the given source' do
+    input, output = fixture(:simple)
+    template = Tilt::StylusTemplate.new { |_| input }
+    expect(template.render).to eq(output)
+  end
+
+  it 'compiles with the compress option' do
+    input, output = fixture(:compressed)
+    template = Tilt::StylusTemplate.new(compress: true) { |_| input }
+    expect(template.render).to eq(output)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stylus
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta
+  version: 1.0.0
 platform: ruby
 authors:
 - Lucas Mazza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -57,6 +57,8 @@ files:
 - lib/stylus/runtime/runner.js
 - lib/stylus/runtime.rb
 - lib/stylus/sprockets.rb
+- lib/stylus/tilt/rails.rb
+- lib/stylus/tilt/stylus.rb
 - lib/stylus/tilt.rb
 - lib/stylus/version.rb
 - lib/stylus.rb
@@ -70,14 +72,14 @@ files:
 - spec/sprockets_spec.rb
 - spec/stylus_spec.rb
 - spec/support/generators/test_case.rb
-- spec/support/generators/tmp/app/controllers/posts_controller.rb
-- spec/support/generators/tmp/app/helpers/posts_helper.rb
 - spec/support/generators/tmp/config/routes.rb
 - spec/support/helpers.rb
 - spec/support/matchers.rb
-- spec/tilt_spec.rb
+- spec/tilt/rails_spec.rb
+- spec/tilt/stylus_spec.rb
 homepage: https://github.com/lucasmazza/ruby-stylus
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -90,12 +92,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby Stylus Compiler
@@ -110,9 +112,8 @@ test_files:
 - spec/sprockets_spec.rb
 - spec/stylus_spec.rb
 - spec/support/generators/test_case.rb
-- spec/support/generators/tmp/app/controllers/posts_controller.rb
-- spec/support/generators/tmp/app/helpers/posts_helper.rb
 - spec/support/generators/tmp/config/routes.rb
 - spec/support/helpers.rb
 - spec/support/matchers.rb
-- spec/tilt_spec.rb
+- spec/tilt/rails_spec.rb
+- spec/tilt/stylus_spec.rb

data/spec/support/generators/tmp/app/controllers/posts_controller.rb

@@ -1,2 +0,0 @@
-class PostsController < ApplicationController
-end

data/spec/support/generators/tmp/app/helpers/posts_helper.rb

@@ -1,2 +0,0 @@
-module PostsHelper
-end

data/spec/tilt_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-require 'stylus/tilt'
-
-describe Tilt::StylusTemplate do
-
-  it "registers the template for .styl files" do
-    Tilt['application.styl'].should == Tilt::StylusTemplate
-  end
-
-  it "has a content-type" do
-    Tilt::StylusTemplate.default_mime_type.should == 'text/css'
-  end
-
-  it "compiles the given source" do
-    input, output = fixture :simple
-    template = Tilt::StylusTemplate.new { |t| input }
-    template.render.should == output
-  end
-
-  it "compiles with the compress option" do
-    input, output = fixture :compressed
-    template = Tilt::StylusTemplate.new(:compress => true) { |t| input }
-    template.render.should == output
-  end
-
-end