sprockets-sass 0.4.1 → 0.4.2

data/lib/sprockets/sass/functions.rb

@@ -55,7 +55,18 @@ module Sass
       #   background: asset-url("image.jpg");                // background: url("/assets/image.jpg");
       #   background: asset-url("image.jpg", $digest: true); // background: url("/assets/image-27a8f1f96afd8d4c67a59eb9447f45bd.jpg");
       #
-      def image_url(source, options = {})
+      def image_url(source, options = {}, cache_buster = nil)
+        # Check for the Compass #image_url API,
+        # and work with it. We don't want to break
+        # the Compass mixins that expect it.
+        if options.respond_to? :value
+          case options.value
+          when true
+            return image_path source
+          else
+            options = {}
+          end
+        end
         Script::String.new "url(#{image_path(source, options)})"
       end
       declare :image_url, [:source], :var_kwargs => true

data/lib/sprockets/sass/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Sass
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end

data/spec/sprockets-sass_spec.rb

@@ -206,4 +206,15 @@ describe Sprockets::Sass do
     @env["image_path_options.css"].to_s.should =~ %r(body \{\n  background: url\("/themes/image-[0-9a-f]+.jpg"\); \}\n)
     @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
+    @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); })
+    @assets.file "image.jpg"
+    
+    @env["image_path.css"].to_s.should == %(body {\n  background: url("/assets/image.jpg"); }\n)
+    @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
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sprockets-sass
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Pete Browne
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-02 00:00:00 Z
+date: 2011-11-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -29,8 +29,8 @@ dependencies:
         - 0
         version: "2.0"
   name: sprockets
-  version_requirements: *id001
   prerelease: false
+  version_requirements: *id001
   type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
@@ -44,8 +44,8 @@ dependencies:
         - 1
         version: "0.1"
   name: sprockets-helpers
-  version_requirements: *id002
   prerelease: false
+  version_requirements: *id002
   type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
@@ -59,8 +59,8 @@ dependencies:
         - 1
         version: "1.1"
   name: tilt
-  version_requirements: *id003
   prerelease: false
+  version_requirements: *id003
   type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
@@ -74,8 +74,8 @@ dependencies:
         - 6
         version: "2.6"
   name: rspec
-  version_requirements: *id004
   prerelease: false
+  version_requirements: *id004
   type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
@@ -89,8 +89,8 @@ dependencies:
         - 2
         version: "1.2"
   name: test-construct
-  version_requirements: *id005
   prerelease: false
+  version_requirements: *id005
   type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
@@ -104,8 +104,8 @@ dependencies:
         - 1
         version: "3.1"
   name: sass
-  version_requirements: *id006
   prerelease: false
+  version_requirements: *id006
   type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
@@ -119,8 +119,8 @@ dependencies:
         - 11
         version: "0.11"
   name: compass
-  version_requirements: *id007
   prerelease: false
+  version_requirements: *id007
   type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id008 !ruby/object:Gem::Requirement 
@@ -133,8 +133,8 @@ dependencies:
         - 0
         version: "0"
   name: rake
-  version_requirements: *id008
   prerelease: false
+  version_requirements: *id008
   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: