spritely 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90447c2da39a04f55744534835e457eb6ccef146
-  data.tar.gz: b7e5df3bc4fc4133124b4ba24ca73c7bf015320b
+  metadata.gz: 547b537b0bb23044c585abf41002bf689d94d3af
+  data.tar.gz: dede178e411e13338852a0e331fab4ca7da38049
 SHA512:
-  metadata.gz: 7b62886dded040842efeabc170544813946e89d7fb5664f432bacde4919ae1f9f1495dcedd6e8d59a390821bebc84e1be8052bd71306a98a5c35588a9294515d
-  data.tar.gz: 42cfd290b76bbab9092ea2a646718d4d16e9319c0b92c2f5695c5b2199fafc471b7f0d1eda8d5c1b5c7444509e13327a69a36a4b599ca4b0d4ae8ee6f43ba367
+  metadata.gz: bd3f6cb6c50ef2404ac88f22ce1ac523388d0ab5a20b2d36923c3a958a44f02a6cc8ebca4b3b0d260345afe7efa999baecfa227d143fd09cbc6dd877baabc457
+  data.tar.gz: cd38facbc1ac5ce4a817300633b8a80ad8e193e08e8597ce65eb88d51894ffd51d502aa379952c1c3f795966f47bbc367a5c7bfe1013176404c7c8e3eaf104b1

data/lib/spritely/sass_functions.rb

@@ -4,7 +4,7 @@ module Spritely
   module SassFunctions
     def spritely_map(glob, kwargs = {})
       SpriteMap.create(glob.value, kwargs).tap do |sprite_map|
-        reset_sprockets_directory_cache!
+        reset_sprockets_caches!(sprite_map)
         sprockets_context.depend_on(Spritely.directory)
         sprite_map.files.each do |file|
           sprockets_context.depend_on(file)
@@ -60,8 +60,12 @@ module Spritely
       sprite_map.find(image_name.value) || raise(Sass::SyntaxError, "No image '#{image_name.value}' found in sprite map '#{sprite_map.name}'.")
     end
 
-    def reset_sprockets_directory_cache!
-      sprockets_context.environment.send(:trail).instance_variable_get(:@entries).delete(Spritely.directory.to_s)
+    def reset_sprockets_caches!(sprite_map)
+      sprockets_environment.instance_variable_get(:@assets).delete_if { |_, asset| asset.pathname == sprite_map.filename }
+      sprockets_environment.send(:trail).tap do |trail|
+        trail.instance_variable_get(:@entries).delete(Spritely.directory.to_s)
+        trail.instance_variable_get(:@stats).delete(sprite_map.filename.to_s)
+      end
     end
   end
 end

data/lib/spritely/sprockets/manifest.rb

@@ -9,7 +9,7 @@ module Sprockets
   class Manifest
     def compile_with_sprites(*args)
       compile_without_sprites(*args)
-      Dir.glob(Spritely.directory.join('*.png')).each(&method(:compile_without_sprites))
+      compile_without_sprites(*Dir.glob(Spritely.directory.join('*.png')))
     end
 
     alias_method_chain :compile, :sprites

data/lib/spritely/version.rb

@@ -1,3 +1,3 @@
 module Spritely
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/spec/fixtures/rails-app-changes/app/assets/stylesheets/sprites.css.scss

@@ -0,0 +1,26 @@
+$application-sprite: spritely-map("application/*.png",
+  $background-repeat: true,
+  $football-spacing: 100px,
+  $mario-spacing: 10px,
+  $mario-position: right,
+  $spacing: 5px
+);
+
+body {
+  background-image: spritely-url($application-sprite);
+  background-position: spritely-position($application-sprite, "background");
+}
+
+#mario {
+  background-image: spritely-url($application-sprite);
+  background-position: spritely-position($application-sprite, "mario");
+  width: spritely-width($application-sprite, "mario");
+  height: spritely-height($application-sprite, "mario");
+}
+
+#arrow {
+  background-image: spritely-url($application-sprite);
+  background-position: spritely-position($application-sprite, "dropdown-arrow");
+  width: spritely-width($application-sprite, "dropdown-arrow");
+  height: spritely-height($application-sprite, "dropdown-arrow");
+}

data/spec/integration/precompilation_spec.rb

@@ -34,4 +34,12 @@ describe 'Precompilation', :integration do
     expect(File).to exist(File.join('app', 'assets', 'images', 'sprites', 'application.png'))
     expect(File).to exist(File.join('app', 'assets', 'images', 'sprites', 'foo.png'))
   end
+
+  it 'should correctly compile a new sprite image and CSS when files change' do
+    compile_assets
+    FileUtils.cp_r "#{__dir__}/../fixtures/rails-app-changes/.", "."
+    compile_assets
+    sprite_files = Dir.glob(File.join('public', 'assets', 'sprites', 'application-*.png'))
+    expect(sprite_files.length).to eq(2)
+  end
 end

data/spec/spritely/sass_functions_spec.rb

@@ -1,9 +1,11 @@
 require 'spec_helper'
 require 'sprockets'
+require 'ostruct'
 
 describe Spritely::SassFunctions do
   class SpriteMapDouble < Sass::Script::Literal
     def name; 'test'; end
+    def filename; 'test.png'; end
     def files; []; end
   end
 
@@ -25,17 +27,19 @@ describe Spritely::SassFunctions do
     end
   end
 
-  shared_examples "a sprite function that resets the sprockets directory cache" do
-    it 'should clear out the trail entries' do
+  shared_examples "a sprite function that resets the sprockets directory caches" do
+    it 'should clear out the trail caches' do
       subject
+      expect(environment.instance_variable_get(:@assets).length).to eq(0)
       expect(environment.send(:trail).instance_variable_get(:@entries)).to_not have_key(directory)
+      expect(environment.send(:trail).instance_variable_get(:@stats)).to_not have_key('test.png')
     end
   end
 
   describe '#spritely_url' do
     subject { evaluate(".background-image { background-image: spritely-url(spritely-map('test/*.png')); }") }
 
-    it_should_behave_like "a sprite function that resets the sprockets directory cache"
+    it_should_behave_like "a sprite function that resets the sprockets directory caches"
 
     it { should eq(".background-image {\n  background-image: url(sprites/test.png); }\n") }
   end
@@ -44,7 +48,7 @@ describe Spritely::SassFunctions do
     subject { evaluate(".background-position { background-position: spritely-position(spritely-map('test/*.png'), 'bar'); }") }
 
     it_should_behave_like "a sprite function that checks image existence"
-    it_should_behave_like "a sprite function that resets the sprockets directory cache"
+    it_should_behave_like "a sprite function that resets the sprockets directory caches"
 
     it { should eq(".background-position {\n  background-position: -10px -12px; }\n") }
 
@@ -59,7 +63,7 @@ describe Spritely::SassFunctions do
     subject { evaluate(".background { background: spritely-background(spritely-map('test/*.png'), 'bar'); }") }
 
     it_should_behave_like "a sprite function that checks image existence"
-    it_should_behave_like "a sprite function that resets the sprockets directory cache"
+    it_should_behave_like "a sprite function that resets the sprockets directory caches"
 
     it { should eq(".background {\n  background: url(sprites/test.png) -10px -12px; }\n") }
   end
@@ -68,7 +72,7 @@ describe Spritely::SassFunctions do
     subject { evaluate(".width { width: spritely-width(spritely-map('test/*.png'), 'bar'); }") }
 
     it_should_behave_like "a sprite function that checks image existence"
-    it_should_behave_like "a sprite function that resets the sprockets directory cache"
+    it_should_behave_like "a sprite function that resets the sprockets directory caches"
 
     it { should eq(".width {\n  width: 25px; }\n") }
   end
@@ -77,7 +81,7 @@ describe Spritely::SassFunctions do
     subject { evaluate(".height { height: spritely-height(spritely-map('test/*.png'), 'bar'); }") }
 
     it_should_behave_like "a sprite function that checks image existence"
-    it_should_behave_like "a sprite function that resets the sprockets directory cache"
+    it_should_behave_like "a sprite function that resets the sprockets directory caches"
 
     it { should eq(".height {\n  height: 50px; }\n") }
   end
@@ -88,7 +92,9 @@ describe Spritely::SassFunctions do
 
   def environment
     @environment ||= Sprockets::Environment.new.tap do |environment|
+      environment.instance_variable_set(:@assets, {'test' => OpenStruct.new(pathname: 'test.png')})
       environment.send(:trail).instance_variable_set(:@entries, {'spritely-directory' => 'blah'})
+      environment.send(:trail).instance_variable_set(:@stats, {'test.png' => 'blah'})
       environment.context_class.class_eval do
         def asset_path(path, options = {})
           path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spritely
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Alex Robbin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -177,6 +177,8 @@ files:
 - lib/spritely/sprockets/manifest.rb
 - lib/spritely/version.rb
 - spec/fixtures/correct-sprite.png
+- spec/fixtures/rails-app-changes/app/assets/images/application/dropdown-arrow.png
+- spec/fixtures/rails-app-changes/app/assets/stylesheets/sprites.css.scss
 - spec/fixtures/rails-app/app/assets/images/application/background.png
 - spec/fixtures/rails-app/app/assets/images/application/fool.png
 - spec/fixtures/rails-app/app/assets/images/application/football.png
@@ -234,6 +236,8 @@ test_files:
 - spec/fixtures/rails-app/app/assets/images/foo/fool.png
 - spec/fixtures/rails-app/app/assets/stylesheets/sprites.css.scss
 - spec/fixtures/rails-app/app/assets/stylesheets/sprites_2.css.scss
+- spec/fixtures/rails-app-changes/app/assets/images/application/dropdown-arrow.png
+- spec/fixtures/rails-app-changes/app/assets/stylesheets/sprites.css.scss
 - spec/fixtures/test/foo.png
 - spec/generators/spritely/install_generator_spec.rb
 - spec/integration/precompilation_spec.rb