sprockets-sass 0.2.3 → 0.3.0

data/README.md

@@ -14,7 +14,7 @@ _Note: This works in Rails 3.1, thanks to the [sass-rails gem](http://github.com
 * Imports either Sass syntax, or just regular CSS files.
 * Imported files are preprocessed by Sprockets, so `.css.scss.erb` files can be imported.
   Directives from within imported files also work as expected.
-* Standard Sass load paths are not touched, so Compass extensions will work as expected.
+* Automatic integration with Compass.
 * Supports glob imports, like sass-rails.
 
 
@@ -90,6 +90,42 @@ button {
 ```
 
 
+Compass Integration
+-------------------
+
+As of version 0.3.0, Compass is automatically detected and integrated. All you have to do
+is configure Compass like you normally would:
+
+``` ruby
+require "sprockets"
+require "sprockets-sass"
+require "sass"
+require "compass"
+
+Compass.configuration do |compass|
+  # ...
+end
+
+map "/assets" do
+  environment = Sprockets::Environment.new
+  environment.append_path "assets/stylesheets"
+  run environment
+end
+
+# etc...
+```
+
+The load paths and other options from Compass are automatically used:
+
+``` scss
+// assets/stylesheets/application.css.scss
+@import "compass/css3";
+
+button {
+  @include border-radius(5px);
+}
+```
+
 Copyright
 ---------
 

data/lib/sprockets/sass.rb

@@ -6,6 +6,11 @@ require "sprockets/engines"
 module Sprockets
   module Sass
     autoload :Importer, "sprockets/sass/importer"
+    
+    # Global configuration for `Sass::Engine` instances.
+    def self.options
+      @options ||= {}
+    end
   end
     
   register_engine ".sass", Sass::SassTemplate

data/lib/sprockets/sass/sass_template.rb

@@ -13,11 +13,13 @@ module Sprockets
         :sass
       end
       
+      # See `Tilt::Template#prepare`.
       def prepare
         @context = nil
         @output  = nil
       end
       
+      # See `Tilt::Template#evaluate`.
       def evaluate(context, locals, &block)
         @output ||= begin
           @context = context
@@ -25,10 +27,16 @@ module Sprockets
         end
       end
 
-      private
+      protected
       
+      # A reference to the custom Sass importer, `Sprockets::Sass::Importer`.
+      def importer
+        Importer.new context
+      end
+      
+      # Assemble the options for the `Sass::Engine`
       def sass_options
-        options.merge(
+        merge_sass_options(default_sass_options, options).merge(
           :filename => eval_file,
           :line     => line,
           :syntax   => syntax,
@@ -36,8 +44,23 @@ module Sprockets
         )
       end
       
-      def importer
-        Importer.new context
+      # Get the default, global Sass options. Start with Compass's
+      # options, if it's available.
+      def default_sass_options
+        if defined?(Compass)
+          merge_sass_options Compass.sass_engine_options.dup, Sprockets::Sass.options
+        else
+          Sprockets::Sass.options.dup
+        end
+      end
+      
+      # Merges two sets of `Sass::Engine` options, prepending
+      # the `:load_paths` instead of clobbering them.
+      def merge_sass_options(options, other_options)
+        if (load_paths = options[:load_paths]) && (other_paths = other_options[:load_paths])
+          other_options[:load_paths] = other_paths + load_paths
+        end
+        options.merge other_options
       end
     end
   end

data/lib/sprockets/sass/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Sass
-    VERSION = "0.2.3"
+    VERSION = "0.3.0"
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,13 @@
 require "sprockets"
 require "sprockets-sass"
+require "compass"
 require "construct"
 
+Compass.configuration do |compass|
+  compass.line_comments = false
+  compass.output_style  = :nested
+end
+
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/spec/sprockets-sass_spec.rb

@@ -94,14 +94,31 @@ describe Sprockets::Sass do
     asset.to_s.should == "body {\n  color: blue; }\n"
   end
   
+  it "allows global Sass configuration" do
+    Sprockets::Sass.options[:style] = :compact
+    @assets.file "main.css.scss", "body {\n  color: blue;\n}"
+    
+    asset = @env["main.css"]
+    asset.to_s.should == "body { color: blue; }\n"
+    Sprockets::Sass.options.delete(:style)
+  end
+  
   it "imports files from the Sass load path" do
     vendor = @root.directory "vendor"
-    Sass::Engine::DEFAULT_OPTIONS[:load_paths] << vendor.to_s
+    Sprockets::Sass.options[:load_paths] = [ vendor.to_s ]
     
     @assets.file "main.css.scss", %(@import "dep";\nbody { color: $color; })
     vendor.file "dep.scss", "$color: blue;"
     asset = @env["main.css"]
     asset.to_s.should == "body {\n  color: blue; }\n"
+    Sprockets::Sass.options.delete(:load_paths)
+  end
+  
+  it "works with the Compass framework" do
+    @assets.file "main.css.scss", %(@import "compass/typography/text/nowrap";\np { @include nowrap; })
+    
+    asset = @env["main.css"]
+    asset.to_s.should == "p {\n  white-space: nowrap; }\n"
   end
   
   it "imports globbed files" do

data/sprockets-sass.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |s|
   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"
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: sprockets-sass
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 3
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors: 
 - Pete Browne
@@ -15,82 +10,74 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-29 00:00:00 Z
+date: 2011-10-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: sprockets
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
         version: "2.0"
-  requirement: *id001
-  name: sprockets
-  prerelease: false
   type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: rake
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id002
-  name: rake
-  prerelease: false
   type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
         version: "2.6"
-  requirement: *id003
-  name: rspec
-  prerelease: false
   type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: test-construct
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
         version: "1.2"
-  requirement: *id004
-  name: test-construct
-  prerelease: false
   type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: sass
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
         version: "3.1"
-  requirement: *id005
-  name: sass
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: compass
   prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: "0.11"
   type: :development
+  version_requirements: *id006
 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
@@ -128,23 +115,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: sprockets-sass
-rubygems_version: 1.8.5
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Better Sass integration with Sprockets 2.0