stylus 0.6.0 → 0.6.2

data/CHANGELOG.md

@@ -1,7 +1,17 @@
 ## Changelog
 
+### 0.6.2 (2012-06-01)
+[Compare view](https://github.com/lucasmazza/ruby-stylus/compare/v0.6.1...v0.6.2)
+
+* Fixes namespacing clashing between `Stylus::Sprockets` and the `Sprockets` modules.
+
+### 0.6.1 (2012-05-31) (yanked)
+[Compare view](https://github.com/lucasmazza/ruby-stylus/compare/v0.6.0...v0.6.1)
+
+* Skips `Sprockets::FileNotFound` errors on the ImportProcessor.
+
 ### 0.6.0 (2012-05-20)
-[Compare view](https://github.com/lucasmazza/ruby-stylus/compare/v0.5.1...v.0.6.0)
+[Compare view](https://github.com/lucasmazza/ruby-stylus/compare/v0.5.1...v0.6.0)
 
 * Sprockets configuration extracted to `Stylus.setup` - you can use this on a Sinatra or Rack app;
 * When `node` isn't available, Stylus will raise a exception of it's own instead of blowing up inside ExecJS.

data/lib/stylus/import_processor.rb

@@ -23,7 +23,7 @@ module Stylus
       dependencies = data.scan(IMPORT_SCANNER).flatten.compact.uniq
 
       dependencies.each do |path|
-        asset = context.resolve(path, :content_type => 'text/css')
+        asset = resolve(context, path)
 
         if asset
           context.depend_on(asset)
@@ -31,5 +31,16 @@ module Stylus
       end
       data
     end
+
+    # Internal: Resolves the given 'path' with the Sprockets context, but
+    # avoids 'Sprockets::FileNotFound' exceptions since we might be importing
+    # files outside the Sprockets load path - like "nib".
+    #
+    # Returns the resolved 'Asset' or nil if it can't be found.
+    def resolve(context, path)
+      context.resolve(path, :content_type => 'text/css')
+    rescue ::Sprockets::FileNotFound
+      nil
+    end
   end
 end

data/lib/stylus/version.rb

@@ -1,3 +1,3 @@
 module Stylus
-  VERSION = "0.6.0"
+  VERSION = "0.6.2"
 end

data/spec/import_processor_spec.rb

@@ -10,4 +10,15 @@ describe Stylus::ImportProcessor do
     sprockets.should_receive(:depend_on).with(dependency)
     template.render(sprockets)
   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).and_raise(::Sprockets::FileNotFound)
+
+    expect {
+      template.render(sprockets)
+    }.to_not raise_error(::Sprockets::FileNotFound)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stylus
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-20 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs