sprockets-sass 0.4.3 → 0.5.0

data/README.md

@@ -1,9 +1,9 @@
 sprockets-sass
 ==============
 
-**Better Sass integration with [Sprockets 2.0](http://github.com/sstephenson/sprockets)**
+**Better Sass integration with [Sprockets 2.x](http://github.com/sstephenson/sprockets)**
 
-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.
+When using Sprockets 2.x 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.
 
 _Note: This works in Rails 3.1, thanks to the [sass-rails gem](http://github.com/rails/sass-rails). But if you want to use Sprockets and Sass anywhere else, like Sinatra, use `sprockets-sass`._
 
@@ -131,7 +131,15 @@ button {
 Asset Path Sass Functions
 -------------------------
 
-As of version 0.4.0, asset path helpers have been added. Here's a quick guide to using them in your application (look at [sprockets-helpers](https://github.com/petebrowne/sprockets-helpers) for more information):
+As of version 0.4.0, asset path helpers have been added. In order to use them you must add [sprockets-helpers](https://github.com/petebrowne/sprockets-helpers) to your Gemfile:
+
+``` ruby
+gem "sprockets-sass",    "~> 0.5"
+gem "sprockets-helpers", "~> 0.2"
+# etc...
+```
+
+Here's a quick guide to setting up sprockets-helpers in your application (look at the project's [README](https://github.com/petebrowne/sprockets-helpers/blob/master/README.md) for more information):
 
 ``` ruby
 map "/assets" do

data/lib/sprockets/sass/functions.rb

@@ -1,8 +1,8 @@
 require "sass"
 require "sprockets-helpers"
 
-module Sass
-  module Script
+module Sprockets
+  module Sass
     module Functions
       # Using Sprockets::Helpers#asset_path, return the full path
       # for the given +source+ as a Sass String. This supports keyword
@@ -14,9 +14,8 @@ module Sass
       #   background: url(asset-path("image.jpg", $digest: true)); // background: url("/assets/image-27a8f1f96afd8d4c67a59eb9447f45bd.jpg");
       #
       def asset_path(source, options = {})
-        Script::String.new context.asset_path(source.value, map_options(options)), :string
+        ::Sass::Script::String.new context.asset_path(source.value, map_options(options)), :string
       end
-      declare :asset_path, [:source], :var_kwargs => true
       
       # Using Sprockets::Helpers#asset_path, return the url CSS
       # for the given +source+ as a Sass String. This supports keyword
@@ -28,9 +27,8 @@ module Sass
       #   background: asset-url("image.jpg", $digest: true); // background: url("/assets/image-27a8f1f96afd8d4c67a59eb9447f45bd.jpg");
       #
       def asset_url(source, options = {})
-        Script::String.new "url(#{asset_path(source, options)})"
+        ::Sass::Script::String.new "url(#{asset_path(source, options)})"
       end
-      declare :asset_url, [:source], :var_kwargs => true
       
       # Using Sprockets::Helpers#image_path, return the full path
       # for the given +source+ as a Sass String. This supports keyword
@@ -42,9 +40,8 @@ module Sass
       #   background: url(image-path("image.jpg", $digest: true)); // background: url("/assets/image-27a8f1f96afd8d4c67a59eb9447f45bd.jpg");
       #
       def image_path(source, options = {})
-        Script::String.new context.image_path(source.value, map_options(options)), :string
+        ::Sass::Script::String.new context.image_path(source.value, map_options(options)), :string
       end
-      declare :image_path, [:source], :var_kwargs => true
       
       # Using Sprockets::Helpers#image_path, return the url CSS
       # for the given +source+ as a Sass String. This supports keyword
@@ -67,12 +64,8 @@ module Sass
             options = {}
           end
         end
-        Script::String.new "url(#{image_path(source, options)})"
+        ::Sass::Script::String.new "url(#{image_path(source, options)})"
       end
-      declare :image_url, [:source], :var_kwargs => true
-      declare :image_url, [:path]
-      declare :image_url, [:path, :only_path]
-      declare :image_url, [:path, :only_path, :cache_buster]
       
       protected
       
@@ -85,10 +78,22 @@ module Sass
       # Returns an options hash where the keys are symbolized
       # and the values are unwrapped Sass literals.
       def map_options(options = {}) # :nodoc:
-        Sass::Util.map_hash(options) do |key, value|
+        ::Sass::Util.map_hash(options) do |key, value|
           [key.to_sym, value.respond_to?(:value) ? value.value : value]
         end
       end
     end
   end
 end
+
+module Sass::Script::Functions
+  include Sprockets::Sass::Functions
+  
+  # Hack to ensure the Compass API signatures don't take precedence
+  @signatures[:image_url] = []
+  
+  declare :asset_path, [:source], :var_kwargs => true
+  declare :asset_url,  [:source], :var_kwargs => true
+  declare :image_path, [:source], :var_kwargs => true
+  declare :image_url,  [:source], :var_kwargs => true, :var_args => true
+end

data/lib/sprockets/sass/sass_template.rb

@@ -8,10 +8,27 @@ module Sprockets
       # A reference to the current Sprockets context
       attr_reader :context
       
+      # Templates are initialized once the 
+      def self.engine_initialized?
+        super && defined?(@@sass_functions_added)
+      end
+      
       # Add the Sass functions if they haven't already been added.
       def initialize_engine
         super
-        require_template_library "sprockets/sass/functions"
+        
+        if Sass.add_sass_functions
+          begin
+            require "sprockets/sass/functions"
+          rescue LoadError
+            # Safely ignore load issues, because
+            # sprockets-helpers may not be available.
+            @@sass_functions_added = false
+          end
+          @@sass_functions_added = true
+        else
+          @@sass_functions_added = false
+        end
       end
       
       # Define the expected syntax for the template

data/lib/sprockets/sass/version.rb

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

data/lib/sprockets/sass.rb

@@ -7,23 +7,20 @@ module Sprockets
   module Sass
     autoload :Importer, "sprockets/sass/importer"
     
-    # Global configuration for `Sass::Engine` instances.
-    def self.options
-      @options ||= {}
+    class << self
+      # Global configuration for `Sass::Engine` instances.
+      attr_accessor :options
+      
+      # When false, the asset path helpers provided by
+      # sprockets-helpers will not be added as Sass functions.
+      # `true` by default.
+      attr_accessor :add_sass_functions
     end
+    
+    @options = {}
+    @add_sass_functions = true
   end
   
-  # Register the new templates
   register_engine ".sass", Sass::SassTemplate
   register_engine ".scss", Sass::ScssTemplate
-  
-  # Attempt to add the Sass Functions
-  begin
-    require "sass"
-    require "sprockets/sass/functions"
-  rescue LoadError
-    # fail silently...
-  end
 end
-
-

data/sprockets-sass.gemspec

@@ -18,13 +18,13 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency "sprockets",                  "~> 2.0"
-  s.add_dependency "sprockets-helpers",          "~> 0.2"
-  s.add_dependency "tilt",                       "~> 1.1"
-  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 "sass",           "~> 3.1"
-  s.add_development_dependency "compass",        "~> 0.11"
+  s.add_dependency "sprockets",                     "~> 2.0"
+  s.add_dependency "tilt",                          "~> 1.1"
+  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.2"
+  s.add_development_dependency "sass",              "~> 3.1"
+  s.add_development_dependency "compass",           "~> 0.11"
   s.add_development_dependency "rake"
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sprockets-sass
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
-  version: 0.4.3
+  segments: 
+  - 0
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Pete Browne
@@ -10,107 +15,142 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-26 00:00:00 Z
+date: 2011-11-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sprockets
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
         version: "2.0"
-  type: :runtime
+  name: sprockets
   prerelease: false
   version_requirements: *id001
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: sprockets-helpers
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.2"
-  type: :runtime
+        hash: 13
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
+  name: tilt
   prerelease: false
   version_requirements: *id002
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: tilt
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.1"
-  type: :runtime
+        hash: 3
+        segments: 
+        - 0
+        - 4
+        version: "0.4"
+  name: appraisal
   prerelease: false
   version_requirements: *id003
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: appraisal
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.4"
-  type: :development
+        hash: 15
+        segments: 
+        - 2
+        - 6
+        version: "2.6"
+  name: rspec
   prerelease: false
   version_requirements: *id004
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: rspec
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.6"
-  type: :development
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
+  name: test-construct
   prerelease: false
   version_requirements: *id005
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: test-construct
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.2"
-  type: :development
+        hash: 15
+        segments: 
+        - 0
+        - 2
+        version: "0.2"
+  name: sprockets-helpers
   prerelease: false
   version_requirements: *id006
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: sass
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 1
         version: "3.1"
-  type: :development
+  name: sass
   prerelease: false
   version_requirements: *id007
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: compass
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 11
         version: "0.11"
-  type: :development
+  name: compass
   prerelease: false
   version_requirements: *id008
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: rake
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :development
+  name: rake
   prerelease: false
   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
@@ -155,7 +195,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1064993997988452043
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -164,14 +204,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1064993997988452043
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: sprockets-sass
-rubygems_version: 1.8.8
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Better Sass integration with Sprockets 2.0