sprockets-sass 0.5.0 → 0.5.1

data/lib/sprockets/sass/functions.rb

@@ -14,7 +14,19 @@ module Sprockets
       #   background: url(asset-path("image.jpg", $digest: true)); // background: url("/assets/image-27a8f1f96afd8d4c67a59eb9447f45bd.jpg");
       #
       def asset_path(source, options = {})
-        ::Sass::Script::String.new context.asset_path(source.value, map_options(options)), :string
+        # Check for the Sass::Rails' #asset_path API,
+        # and work with it. We want to make Rails assets work
+        # just fine with Machined.
+        if options.respond_to? :value
+          kind = options.value
+          options = {}
+        end
+        
+        if kind && context.respond_to?("#{kind}_path")
+          ::Sass::Script::String.new context.send("#{kind}_path", source.value), :string
+        else
+          ::Sass::Script::String.new context.asset_path(source.value, map_options(options)), :string
+        end
       end
       
       # Using Sprockets::Helpers#asset_path, return the url CSS
@@ -89,11 +101,18 @@ end
 module Sass::Script::Functions
   include Sprockets::Sass::Functions
   
-  # Hack to ensure the Compass API signatures don't take precedence
-  @signatures[:image_url] = []
+  # Hack to ensure previous API declarations (by Compass or whatever)
+  # don't take precedence.
+  [:asset_path, :asset_url, :image_path, :image_url].each do |method|
+    defined?(@signatures) && @signatures.delete(method)
+  end
   
   declare :asset_path, [:source], :var_kwargs => true
+  declare :asset_path, [:source, :kind]
   declare :asset_url,  [:source], :var_kwargs => true
+  declare :asset_url,  [:source, :kind]
   declare :image_path, [:source], :var_kwargs => true
-  declare :image_url,  [:source], :var_kwargs => true, :var_args => true
+  declare :image_url,  [:source], :var_kwargs => true
+  declare :image_url,  [:source, :only_path]
+  declare :image_url,  [:source, :only_path, :cache_buster]
 end

data/lib/sprockets/sass/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Sass
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/spec/sprockets-sass_spec.rb

@@ -207,7 +207,7 @@ describe Sprockets::Sass do
     @env["image_url_options.css"].to_s.should =~ %r(body \{\n  background: url\("/themes/image-[0-9a-f]+.jpg"\); \}\n)
   end
   
-  it "doesn't break Compass's #image_url helper" do
+  it "mirrors Compass's #image_url helper" do
     @assets.file "image_path.css.scss", %(body { background: url(image-url("image.jpg", true)); })
     @assets.file "image_url.css.scss", %(body { background: image-url("image.jpg", false); })
     @assets.file "cache_buster.css.scss", %(body { background: image-url("image.jpg", false, true); })
@@ -217,4 +217,13 @@ describe Sprockets::Sass do
     @env["image_url.css"].to_s.should == %(body {\n  background: url("/assets/image.jpg"); }\n)
     @env["cache_buster.css"].to_s.should == %(body {\n  background: url("/assets/image.jpg"); }\n)
   end
+  
+  it "mirrors Sass::Rails's #asset_path helpers" do
+    @assets.file "asset_path.css.scss", %(body { background: url(asset-path("image.jpg", image)); })
+    @assets.file "asset_url.css.scss", %(body { background: asset-url("icon.jpg", image); })
+    @assets.file "image.jpg"
+    
+    @env["asset_path.css"].to_s.should == %(body {\n  background: url("/assets/image.jpg"); }\n)
+    @env["asset_url.css"].to_s.should == %(body {\n  background: url("/images/icon.jpg"); }\n)
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sprockets-sass
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Pete Browne
@@ -15,9 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-29 00:00:00 Z
+date: 2011-12-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -28,11 +29,11 @@ dependencies:
         - 2
         - 0
         version: "2.0"
-  name: sprockets
   prerelease: false
+  name: sprockets
   version_requirements: *id001
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -43,11 +44,11 @@ dependencies:
         - 1
         - 1
         version: "1.1"
-  name: tilt
   prerelease: false
+  name: tilt
   version_requirements: *id002
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -58,11 +59,11 @@ dependencies:
         - 0
         - 4
         version: "0.4"
-  name: appraisal
   prerelease: false
+  name: appraisal
   version_requirements: *id003
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -73,11 +74,11 @@ dependencies:
         - 2
         - 6
         version: "2.6"
-  name: rspec
   prerelease: false
+  name: rspec
   version_requirements: *id004
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -88,11 +89,11 @@ dependencies:
         - 1
         - 2
         version: "1.2"
-  name: test-construct
   prerelease: false
+  name: test-construct
   version_requirements: *id005
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -103,11 +104,11 @@ dependencies:
         - 0
         - 2
         version: "0.2"
-  name: sprockets-helpers
   prerelease: false
+  name: sprockets-helpers
   version_requirements: *id006
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -118,11 +119,11 @@ dependencies:
         - 3
         - 1
         version: "3.1"
-  name: sass
   prerelease: false
+  name: sass
   version_requirements: *id007
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -133,11 +134,11 @@ dependencies:
         - 0
         - 11
         version: "0.11"
-  name: compass
   prerelease: false
+  name: compass
   version_requirements: *id008
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -147,10 +148,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rake
   prerelease: false
+  name: rake
   version_requirements: *id009
-  type: :development
 description: When using Sprockets 2.0 with Sass you will eventually run into a pretty big issue. `//= require` directives will not allow Sass mixins, variables, etc. to be shared between files. So you'll try to use `@import`, and that'll also blow up in your face. `sprockets-sass` fixes all of this by creating a Sass::Importer that is Sprockets aware.
 email: 
 - me@petebrowne.com
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sprockets-sass
-rubygems_version: 1.8.5
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Better Sass integration with Sprockets 2.0