stylus 0.5.0 → 0.5.1

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 ## Changelog
 
-### 0.5.0 (Master)
+### 0.5.1 (2012-05-07)
+[Compare view](https://github.com/lucasmazza/ruby-stylus/compare/v0.5.0...v.0.5.1)
+
+* Fixes the `ImportProcessor` so it doesn't evaluates the stylesheets.
+
+### 0.5.0 (2012-03-26)
 [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;

data/lib/stylus/import_processor.rb

@@ -11,9 +11,10 @@ module Stylus
       dependencies = data.scan(IMPORT_SCANNER).flatten.compact.uniq
 
       dependencies.each do |path|
-        asset = context.environment[path]
+        asset = context.resolve(path, :content_type => 'text/css')
+
         if asset
-          context.depend_on_asset(asset.pathname)
+          context.depend_on(asset)
         end
       end
       data

data/lib/stylus/version.rb

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

data/spec/cases/variables.css

@@ -0,0 +1,3 @@
+body {
+  color: #8a0000;
+}

data/spec/import_processor_spec.rb

@@ -1,19 +1,13 @@
 require 'spec_helper'
 
 describe Stylus::ImportProcessor do
-
-  let(:app) { create_app }
-  let(:env) { app.assets }
-  let(:context) { double(:environment => env) }
-
   it 'adds an imported stylesheet as a dependency' do
-    source = fixture(:import).first
-    asset = env['import']
-    template = Stylus::ImportProcessor.new { source }
+    source     = fixture(:import).first
+    template   = Stylus::ImportProcessor.new { source }
     dependency = Pathname.new(fixture_path('mixins/vendor'))
+    sprockets  = double(:resolve => dependency)
 
-    context.should_receive(:depend_on_asset).with(dependency)
-    template.render(context)
+    sprockets.should_receive(:depend_on).with(dependency)
+    template.render(sprockets)
   end
-
 end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'active_support/railtie'
 require 'action_controller/railtie'
 require 'sprockets/railtie'
 require 'stylus/railtie'
+require 'stylus'
 
 require 'active_support/core_ext/class/attribute_accessors'
 

data/spec/sprockets_spec.rb

@@ -41,6 +41,12 @@ describe 'Sprockets and Rails integration' do
     app.assets['compressed'].to_s.should == result
   end
 
+  it "share variables between imported stylesheets" do
+    result = fixture(:variables).last
+
+    app = create_app
+    app.assets['variables'].to_s.should == result
+  end
   it 'loads the app normally even when the asset pipeline is disabled' do
     expect {
       create_app(:enabled => false)

data/spec/stylesheets/variables.styl

@@ -0,0 +1,2 @@
+@import 'variables_definition'
+@import 'variables_usage'

data/spec/stylesheets/variables_definition.styl

@@ -0,0 +1 @@
+the_color = #990000

data/spec/stylesheets/variables_usage.styl

@@ -0,0 +1,2 @@
+body
+  color darken(the_color, 10%)

data/spec/stylus_spec.rb

@@ -1,4 +1,3 @@
-require 'stylus'
 require 'spec_helper'
 
 describe Stylus do
@@ -70,6 +69,13 @@ describe Stylus do
     Stylus.compile(input).should == output
   end
 
+  it "share variables between imported stylesheets" do
+    input, output = fixture :variables
+    path = fixture_root
+
+    Stylus.compile(input, :paths => path).should == output
+  end
+
   describe "The debug flag" do
 
     let(:path) { fixture_path(:debug) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stylus
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-26 00:00:00.000000000 Z
+date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70111340797160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111340797160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: stylus-source
-  requirement: &70111340796740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111340796740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70111340796200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70111340796200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70111340795660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: '3.2'
   type: :development
   prerelease: false
-  version_requirements: *70111340795660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70111340795280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70111340795280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70111340794820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70111340794820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Bridge library to compile .styl stylesheets from ruby code.
 email:
 - luc4smazza@gmail.com
@@ -109,6 +139,7 @@ files:
 - spec/cases/plugin.css
 - spec/cases/simple.css
 - spec/cases/stylesheet.css
+- spec/cases/variables.css
 - spec/generators/assets_generator_spec.rb
 - spec/generators/controller_generator_spec.rb
 - spec/generators/scaffold_generator_spec.rb
@@ -124,6 +155,9 @@ files:
 - spec/stylesheets/plugin.styl
 - spec/stylesheets/simple.styl
 - spec/stylesheets/stylesheet.styl
+- spec/stylesheets/variables.styl
+- spec/stylesheets/variables_definition.styl
+- spec/stylesheets/variables_usage.styl
 - spec/stylus_spec.rb
 - spec/support/generators/test_case.rb
 - spec/support/helpers.rb
@@ -150,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby Stylus Compiler
@@ -162,6 +196,7 @@ test_files:
 - spec/cases/plugin.css
 - spec/cases/simple.css
 - spec/cases/stylesheet.css
+- spec/cases/variables.css
 - spec/generators/assets_generator_spec.rb
 - spec/generators/controller_generator_spec.rb
 - spec/generators/scaffold_generator_spec.rb
@@ -177,6 +212,9 @@ test_files:
 - spec/stylesheets/plugin.styl
 - spec/stylesheets/simple.styl
 - spec/stylesheets/stylesheet.styl
+- spec/stylesheets/variables.styl
+- spec/stylesheets/variables_definition.styl
+- spec/stylesheets/variables_usage.styl
 - spec/stylus_spec.rb
 - spec/support/generators/test_case.rb
 - spec/support/helpers.rb