compass-rails 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d3ea3227955811ea299dc8f915573ae37ee90f5
-  data.tar.gz: 24816da0d21eeef9ba77e4ddeb9e5d5deeda2f4a
+  metadata.gz: aea54e61ee5ba66c77fb1551ac1d84e80f223873
+  data.tar.gz: d7f0097bac198b698810651cb965368961f229b6
 SHA512:
-  metadata.gz: 5a20909a5341932b4e5b88067d3dcbba5eaec2e7e9ed5b4c166fc55772b73e377e5363e8e6f80fcfe25b1e9bd6a7613deb12973b5200b197a31ac072a11bd387
-  data.tar.gz: f85fc30a47c2a9f77774ecdab8bfab905acb73366d0f9e58f1485b8de03b7c488031bab426c08067795e358eeff5ddd163de6e4bff61029996693659ef541645
+  metadata.gz: 98f86f7f3febe3e167f2d61f5d76637c685a30cc1b640a5b89df9d13ddf29b54f3d4b6859ee2664e96f90380cb05d6d2ee431eef84bcb71da93236e484e3d3a8
+  data.tar.gz: 3cb173724d727cd77c63294d28cedf7f87260866a4fc3891bc0dab725d10d0d65c9071769b6252c2e5f24382e0da29d4943807ffb6110e96a566815bdf1f82c2

data/lib/compass-rails/patches/sass_importer.rb

@@ -14,7 +14,7 @@ klass.class_eval do
         Sprockets::SassProcessor::CacheStore.new(sprockets_cache_store, context.environment)
       end
 
-    paths  = context.environment.paths.map { |path| CompassRails::SpriteImporter.new(context, path) }
+    paths  = context.environment.paths.map { |path| CompassRails::SpriteImporter.new(path) }
     paths += context.environment.paths.map { |path| sass_importer(context, path) }
     paths += ::Rails.application.config.sass.load_paths
 

data/lib/compass-rails/patches/sprite_importer.rb

@@ -3,15 +3,15 @@ require 'compass/sprite_importer'
 
 module CompassRails
   class SpriteImporter < Compass::SpriteImporter
-    attr_reader :context, :root
+    attr_reader :root
 
-    def initialize(context, root)
-      @context = context
+    def initialize(root)
       @root = root
     end
 
     def find(uri, options)
       if old = super(uri, options)
+        context = options[:sprockets][:context]
         self.class.files(uri).each do |file|
           relative_path = Pathname.new(file).relative_path_from(Pathname.new(root))
           begin

data/lib/compass-rails/railties/4_0.rb

@@ -23,6 +23,12 @@ module CompassRails
               caller.grep(%r{/sprockets/rails/task.rb}).any? && #OMG HAX - check if we're being precompiled
               Compass.configuration.generated_images_path[Compass.configuration.images_path.to_s] # if the generated images path is not in the assets images directory, we don't have to do these backflips
 
+            # Clear entries in Hike::Index for this sprite's directory.
+            # This makes sure the asset can be found by find_assets
+            index = Rails.application.assets.send(:trail).index
+            index.instance_variable_get(:@entries).delete(File.dirname(filename))
+            index.instance_variable_get(:@stats).delete(filename)
+
             pathname      = Pathname.new(filename)
             logical_path  = pathname.relative_path_from(Pathname.new(Compass.configuration.images_path))
             asset         = Rails.application.assets.find_asset(logical_path)

data/lib/compass-rails/version.rb

@@ -1,5 +1,5 @@
 module CompassRails
   unless defined?(::CompassRails::VERSION)
-    VERSION = "2.0.3"
+    VERSION = "2.0.4"
   end
 end

data/test/compass_rails_spec.rb

@@ -18,6 +18,8 @@ describe CompassRails do
         assert_match "-moz-border-radius", css
         assert_match '.numbers-sprite-1', css
         assert_match '.numbers-sprite-2', css
+        assert_match '.letters-a', css
+        assert_match '.letters-a', css
       end
     end
   end

data/test/fixtures/assets/stylesheets/application.css.scss

@@ -4,7 +4,11 @@
 // Glob import SCSS partials
 @import "partials/*";
 
-// Import Sprites and Inline them to save
+// Import Sprites
+@import "letters/*.png";
+@include all-letters-sprites;
+
+// Inline Sprites
 $numbers-inline: true;
 @import "numbers/sprite-*.png";
 @include all-numbers-sprites;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Scott Davis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
@@ -94,6 +94,8 @@ files:
 - sache.json
 - test/compass_rails_spec.rb
 - test/fixtures/.gitkeep
+- test/fixtures/assets/images/letters/a.png
+- test/fixtures/assets/images/letters/b.png
 - test/fixtures/assets/images/numbers/sprite-1.png
 - test/fixtures/assets/images/numbers/sprite-2.png
 - test/fixtures/assets/stylesheets/application.css.scss
@@ -132,6 +134,8 @@ summary: Integrate Compass into Rails 3.0 and up.
 test_files:
 - test/compass_rails_spec.rb
 - test/fixtures/.gitkeep
+- test/fixtures/assets/images/letters/a.png
+- test/fixtures/assets/images/letters/b.png
 - test/fixtures/assets/images/numbers/sprite-1.png
 - test/fixtures/assets/images/numbers/sprite-2.png
 - test/fixtures/assets/stylesheets/application.css.scss