sprockets-sass 0.8.0 → 0.9.0

data/lib/sprockets/sass/functions.rb

@@ -3,6 +3,17 @@ require 'sass'
 module Sprockets
   module Sass
     module Functions
+      # Using Sprockets::Context#asset_data_uri return a Base64-encoded `data:`
+      # URI with the contents of the asset at the specified path.
+      #
+      # === Examples
+      # 
+      #   background: asset-data-uri("image.jpg"); // background: url(data:image/jpeg;base64,...);
+      #
+      def asset_data_uri(source)
+        ::Sass::Script::String.new "url(#{sprockets_context.asset_data_uri(source.value)})"
+      end
+      
       # Using Sprockets::Helpers#asset_path, return the full path
       # for the given +source+ as a Sass String. This supports keyword
       # arguments that mirror the +options+.
@@ -73,16 +84,40 @@ module Sprockets
         end
         ::Sass::Script::String.new "url(#{image_path(source, options)})"
       end
+
+      # Using Sprockets::Helpers#font_path, return the full path
+      # for the given +source+ as a Sass String. This supports keyword
+      # arguments that mirror the +options+.
+      #
+      # === Examples
+      #
+      #   src: url(font-path("font.ttf"));                // src: url("/assets/font.ttf");
+      #   src: url(font-path("font.ttf", $digest: true)); // src: url("/assets/font-27a8f1f96afd8d4c67a59eb9447f45bd.ttf");
+      #
+      def font_path(source, options = {})
+        ::Sass::Script::String.new sprockets_context.font_path(source.value, map_options(options)).to_s, :string
+      end
       
-      # Using Sprockets::Context#asset_data_uri return a Base64-encoded `data:`
-      # URI with the contents of the asset at the specified path.
+      # Using Sprockets::Helpers#font_path, return the url CSS
+      # for the given +source+ as a Sass String. This supports keyword
+      # arguments that mirror the +options+.
       #
       # === Examples
-      # 
-      #   background: asset-data-uri("image.jpg"); // background: url(data:image/jpeg;base64,...);
       #
-      def asset_data_uri(source)
-        ::Sass::Script::String.new "url(#{sprockets_context.asset_data_uri(source.value)})"
+      #   src: font-url("font.ttf");                  // src: url("/assets/font.ttf");
+      #   src: font-url("image.jpg", $digest: true);  // src: url("/assets/font-27a8f1f96afd8d4c67a59eb9447f45bd.ttf");
+      #
+      def font_url(source, options = {})
+        # Work with the Compass #font_url API
+        if options.respond_to? :value
+          case options.value
+          when true
+            return font_path source
+          else
+            options = {}
+          end
+        end
+        ::Sass::Script::String.new "url(#{font_path(source, options)})"
       end
       
       protected
@@ -109,7 +144,7 @@ module Sass::Script::Functions
   
   # Hack to ensure previous API declarations (by Compass or whatever)
   # don't take precedence.
-  [:asset_path, :asset_url, :image_path, :image_url, :asset_data_uri].each do |method|
+  [:asset_path, :asset_url, :image_path, :image_url, :font_path, :font_url, :asset_data_uri].each do |method|
     defined?(@signatures) && @signatures.delete(method)
   end
   
@@ -121,5 +156,8 @@ module Sass::Script::Functions
   declare :image_url,      [:source], :var_kwargs => true
   declare :image_url,      [:source, :only_path]
   declare :image_url,      [:source, :only_path, :cache_buster]
+  declare :font_path,      [:source], :var_kwargs => true
+  declare :font_url,       [:source], :var_kwargs => true
+  declare :font_url,       [:source, :only_path]
   declare :asset_data_uri, [:source]
 end

data/lib/sprockets/sass/sass_template.rb

@@ -15,7 +15,7 @@ module Sprockets
       
       # Add the Sass functions if they haven't already been added.
       def initialize_engine
-        super
+        super unless self.class.superclass.engine_initialized?
         
         if Sass.add_sass_functions
           require 'sprockets/sass/functions'

data/lib/sprockets/sass/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Sass
-    VERSION = '0.8.0'
+    VERSION = '0.9.0'
   end
 end

data/spec/sprockets-sass_spec.rb

@@ -249,6 +249,19 @@ 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 'adds the #font_path helper' do
+    @assets.file 'font_path.css.scss', %(@font-face { src: url(font-path("font.ttf")); })
+    @assets.file 'font_url.css.scss', %(@font-face { src: font-url("font.ttf"); })
+    @assets.file 'font_path_options.css.scss', %(@font-face { src: url(font-path("font.ttf", $digest: true, $prefix: "/themes")); })
+    @assets.file 'font_url_options.css.scss', %(@font-face { src: font-url("font.ttf", $digest: true, $prefix: "/themes"); })
+    @assets.file 'font.ttf'
+    
+    @env['font_path.css'].to_s.should == %(@font-face {\n  src: url("/assets/font.ttf"); }\n)
+    @env['font_url.css'].to_s.should == %(@font-face {\n  src: url("/assets/font.ttf"); }\n)
+    @env['font_path_options.css'].to_s.should =~ %r(@font-face \{\n  src: url\("/themes/font-[0-9a-f]+.ttf"\); \}\n)
+    @env['font_url_options.css'].to_s.should =~ %r(@font-face \{\n  src: url\("/themes/font-[0-9a-f]+.ttf"\); \}\n)
+  end
   
   it 'adds the #asset_data_uri helper' do
     @assets.file 'asset_data_uri.css.scss', %(body { background: asset-data-uri("image.jpg"); })
@@ -267,6 +280,15 @@ 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 Compass's #font_url helper" do
+    @assets.file 'font_path.css.scss', %(@font-face { src: url(font-url("font.ttf", true)); })
+    @assets.file 'font_url.css.scss', %(@font-face { src: font-url("font.ttf", false); })
+    @assets.file 'font.ttf'
+    
+    @env['font_path.css'].to_s.should == %(@font-face {\n  src: url("/assets/font.ttf"); }\n)
+    @env['font_url.css'].to_s.should == %(@font-face {\n  src: url("/assets/font.ttf"); }\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)); })
@@ -277,13 +299,26 @@ describe Sprockets::Sass do
     @env['asset_url.css'].to_s.should == %(body {\n  background: url("/images/icon.jpg"); }\n)
   end
 
-  it "compresses css" do
-    css = <<-CSS
-      div {
-        color: red;
-      }
-    CSS
-
+  it 'compresses css' do
+    css = "div {\n  color: red;\n}\n"
     Sprockets::Sass::Compressor.new.compress(css).should == "div{color:red}\n"
   end
+
+  describe Sprockets::Sass::SassTemplate do
+    describe 'initialize_engine' do
+      it 'initializes super if super is uninitinalized' do
+        Tilt::SassTemplate.stub(:engine_initialized?).and_return false
+        template = Sprockets::Sass::SassTemplate.new {}
+        template.should_receive(:require_template_library) # called from Tilt::SassTemplate.initialize
+        template.initialize_engine
+      end
+
+      it "does not initializes super if super is initinalized to silence warnings" do
+        Tilt::SassTemplate.stub(:engine_initialized?).and_return true
+        template = Sprockets::Sass::SassTemplate.new {}
+        template.should_not_receive(:require_template_library) # called from Tilt::SassTemplate.initialize
+        template.initialize_engine
+      end
+    end
+  end
 end

data/sprockets-sass.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'appraisal',         '~> 0.4'
   s.add_development_dependency 'rspec',             '~> 2.6'
   s.add_development_dependency 'test-construct',    '~> 1.2'
-  s.add_development_dependency 'sprockets-helpers', '~> 0.3'
+  s.add_development_dependency 'sprockets-helpers', '~> 0.6'
   s.add_development_dependency 'sass',              '~> 3.1'
   s.add_development_dependency 'compass',           '~> 0.11'
   s.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-sass
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000 Z
+date: 2012-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &-1072935398 !ruby/object:Gem::Requirement
+  requirement: &70201732598340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *-1072935398
+  version_requirements: *70201732598340
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &-1072935738 !ruby/object:Gem::Requirement
+  requirement: &70201732597840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *-1072935738
+  version_requirements: *70201732597840
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &-1072936198 !ruby/object:Gem::Requirement
+  requirement: &70201732597360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *-1072936198
+  version_requirements: *70201732597360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &-1072936978 !ruby/object:Gem::Requirement
+  requirement: &70201732596900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *-1072936978
+  version_requirements: *70201732596900
 - !ruby/object:Gem::Dependency
   name: test-construct
-  requirement: &-1072937558 !ruby/object:Gem::Requirement
+  requirement: &70201732596440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,21 +65,21 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *-1072937558
+  version_requirements: *70201732596440
 - !ruby/object:Gem::Dependency
   name: sprockets-helpers
-  requirement: &-1072938048 !ruby/object:Gem::Requirement
+  requirement: &70201732595980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *-1072938048
+  version_requirements: *70201732595980
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &-1072938558 !ruby/object:Gem::Requirement
+  requirement: &70201731818520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *-1072938558
+  version_requirements: *70201731818520
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &-1072939588 !ruby/object:Gem::Requirement
+  requirement: &70201731818060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.11'
   type: :development
   prerelease: false
-  version_requirements: *-1072939588
+  version_requirements: *70201731818060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &-1072796628 !ruby/object:Gem::Requirement
+  requirement: &70201731817680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *-1072796628
+  version_requirements: *70201731817680
 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
@@ -162,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 393589807
+      hash: 1670006435570534219
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 393589807
+      hash: 1670006435570534219
 requirements: []
 rubyforge_project: sprockets-sass
 rubygems_version: 1.8.11