sprockets-sass 0.6.1 → 0.7.0

data/lib/sprockets/sass.rb

@@ -5,7 +5,8 @@ require "sprockets/engines"
 
 module Sprockets
   module Sass
-    autoload :Importer, "sprockets/sass/importer"
+    autoload :CacheStore, "sprockets/sass/cache_store"
+    autoload :Importer,   "sprockets/sass/importer"
     
     class << self
       # Global configuration for `Sass::Engine` instances.

data/lib/sprockets/sass/cache_store.rb

@@ -0,0 +1,27 @@
+require "sass"
+
+module Sprockets
+  module Sass
+    class CacheStore < ::Sass::CacheStores::Base
+      attr_reader :environment
+  
+      def initialize(environment)
+        @environment = environment
+      end
+  
+      def _store(key, version, sha, contents)
+        environment.send :cache_set, "sass/#{key}", { :version => version, :sha => sha, :contents => contents }
+      end
+  
+      def _retrieve(key, version, sha)
+        if obj = environment.send(:cache_get, "sass/#{key}")
+          return unless obj[:version] == version
+          return unless obj[:sha] == sha
+          obj[:obj]
+        else
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/sprockets/sass/sass_template.rb

@@ -8,9 +8,9 @@ module Sprockets
       # A reference to the current Sprockets context
       attr_reader :context
       
-      # Templates are initialized once the 
+      # Templates are initialized once the functions are added.
       def self.engine_initialized?
-        super && defined?(@@sass_functions_added)
+        super && (!Sass.add_sass_functions || defined?(Functions))
       end
       
       # Add the Sass functions if they haven't already been added.
@@ -19,9 +19,6 @@ module Sprockets
         
         if Sass.add_sass_functions
           require "sprockets/sass/functions"
-          @@sass_functions_added = true
-        else
-          @@sass_functions_added = false
         end
       end
       
@@ -46,6 +43,17 @@ module Sprockets
 
       protected
       
+      # Returns a Sprockets-aware cache store for Sass::Engine.
+      def cache_store
+        return nil if context.environment.cache.nil?
+        
+        if defined?(Sprockets::SassCacheStore)
+          Sprockets::SassCacheStore.new context.environment
+        else
+          CacheStore.new context.environment
+        end
+      end
+      
       # A reference to the custom Sass importer, `Sprockets::Sass::Importer`.
       def importer
         Importer.new context
@@ -54,10 +62,11 @@ module Sprockets
       # Assemble the options for the `Sass::Engine`
       def sass_options
         merge_sass_options(default_sass_options, options).merge(
-          :filename => eval_file,
-          :line     => line,
-          :syntax   => syntax,
-          :importer => importer
+          :filename    => eval_file,
+          :line        => line,
+          :syntax      => syntax,
+          :cache_store => cache_store,
+          :importer    => importer
         )
       end
       

data/lib/sprockets/sass/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Sass
-    VERSION = "0.6.1"
+    VERSION = "0.7.0"
   end
 end

data/spec/sprockets-sass_spec.rb

@@ -181,6 +181,17 @@ describe Sprockets::Sass do
     asset.should_not be_fresh(@env)
   end
   
+  it "uses the environment's cache" do
+    cache = {}
+    @env.cache = cache
+    
+    @assets.file "main.css.scss", %($color: blue;\nbody { color: $color; })
+    
+    @env['main.css'].to_s
+    sass_cache = cache.keys.detect { |key| key =~ /main\.css\.scss/ }
+    sass_cache.should_not be_nil
+  end
+  
   it "adds the #asset_path helper" do
     @assets.file "asset_path.css.scss", %(body { background: url(asset-path("image.jpg")); })
     @assets.file "asset_url.css.scss", %(body { background: asset-url("image.jpg"); })

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: sprockets-sass
 version: !ruby/object:Gem::Version 
-  hash: 5
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 1
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors: 
 - Pete Browne
@@ -15,141 +10,106 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-23 00:00:00 Z
+date: 2012-03-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  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
   prerelease: false
-  name: sprockets
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: tilt
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
         version: "1.1"
+  type: :runtime
   prerelease: false
-  name: tilt
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: appraisal
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
         version: "0.4"
+  type: :development
   prerelease: false
-  name: appraisal
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rspec
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
         version: "2.6"
+  type: :development
   prerelease: false
-  name: rspec
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: test-construct
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
         version: "1.2"
+  type: :development
   prerelease: false
-  name: test-construct
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: sprockets-helpers
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
         version: "0.3"
+  type: :development
   prerelease: false
-  name: sprockets-helpers
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  type: :development
+  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
   prerelease: false
-  name: sass
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  type: :development
+  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
   prerelease: false
-  name: compass
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rake
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
+  type: :development
   prerelease: false
-  name: rake
   version_requirements: *id009
 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: 
@@ -175,6 +135,7 @@ files:
 - gemfiles/sprockets-2.3.gemfile
 - lib/sprockets-sass.rb
 - lib/sprockets/sass.rb
+- lib/sprockets/sass/cache_store.rb
 - lib/sprockets/sass/functions.rb
 - lib/sprockets/sass/importer.rb
 - lib/sprockets/sass/sass_template.rb
@@ -198,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -4611660647593714781
       segments: 
       - 0
       version: "0"
@@ -207,14 +168,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -4611660647593714781
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: sprockets-sass
-rubygems_version: 1.8.11
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Better Sass integration with Sprockets 2.0