spritely 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55045aef9a86227f8a36323391b7e3e310feb6ef
-  data.tar.gz: c0fca28f4f25ad8010743f7ac402d42582101d1d
+  metadata.gz: a0ea70f1bb477a8c0c5e1e2def759600d00ef83c
+  data.tar.gz: e10782b4a0356ed81a5976856c3661c6b2e4e42f
 SHA512:
-  metadata.gz: a842ca5a5e5b4fea18f01b5e389bff09fa1666d3a86a7c284fdf8f62143eb36ad60031b593d16b5f97dfd2d0c58485262993eb358771818cf1a3359622dee89c
-  data.tar.gz: f964e9e738031bb14e61d516cb836a152812002ca0d396809ac4d772f31d1343c763c457f174ccc9dad065865a3838e578d0b5edaf345cb3e26f3d1797b623d0
+  metadata.gz: e0c772fc0b8a55757dab249c179f6070493d85065a96924193453b5648a7a544717a04ca49c3fcc3e20dd169374ceafa92e591056dfa85cf05198c5d1bea28ce
+  data.tar.gz: 770515f3cc9b52726adde50e09f62cf1230e250ab4476d2dfa7cc05d8c6a9f5114c85fb2d1002d1e4c719640a0fd3af9261ffc64bb9366508e49b76dce404806

data/lib/spritely/collection.rb

@@ -19,7 +19,7 @@ module Spritely
     end
 
     def cache_key
-      files.collect { |file| Digest::MD5.file(file) }.join
+      files.flat_map { |file_path| [Digest::MD5.hexdigest(file_path), Digest::MD5.file(file_path)] }.join
     end
     alias_method :to_s, :cache_key
 

data/lib/spritely/version.rb

@@ -1,3 +1,3 @@
 module Spritely
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/integration/precompilation_spec.rb

@@ -43,4 +43,26 @@ describe 'Precompilation', :integration do
     sprite_files = Dir.glob(File.join('public', 'assets', 'sprites', 'application-*.png'))
     expect(sprite_files.length).to eq(2)
   end
+
+  context 'a file is renamed multiple times' do
+    before do
+      compile_assets
+      FileUtils.mv 'app/assets/images/application/fool.png', 'app/assets/images/application/ffool.png'
+      compile_assets
+      FileUtils.mv 'app/assets/images/application/ffool.png', 'app/assets/images/application/afool.png'
+      compile_assets
+    end
+
+    it 'should end up with 2 different versions of the sprite' do
+      sprite_files = Dir.glob(File.join('public', 'assets', 'sprites', 'application-*.png'))
+      expect(sprite_files.length).to eq(2)
+    end
+
+    it 'should generate the correct sprite after all of the file-moving' do
+      runner %~Rails.application.assets["sprites/application.png"].write_to("compiled-sprite.png")~
+      compiled_sprite = ChunkyPNG::Image.from_file('compiled-sprite.png')
+      correct_sprite = ChunkyPNG::Image.from_file(File.join(__dir__, '..', 'fixtures', 'correct-renamed-sprite.png'))
+      expect(compiled_sprite).to eq(correct_sprite)
+    end
+  end
 end

data/spec/spritely/collection_spec.rb

@@ -72,12 +72,14 @@ describe Spritely::Collection do
 
   describe '#cache_key' do
     before do
-      allow(Digest::MD5).to receive(:file).with('file-1.png').and_return('foo')
-      allow(Digest::MD5).to receive(:file).with('file-2.png').and_return('bar')
+      allow(Digest::MD5).to receive(:hexdigest).with('file-1.png').and_return('foo1')
+      allow(Digest::MD5).to receive(:hexdigest).with('file-2.png').and_return('bar1')
+      allow(Digest::MD5).to receive(:file).with('file-1.png').and_return('foo2')
+      allow(Digest::MD5).to receive(:file).with('file-2.png').and_return('bar2')
     end
 
-    its(:cache_key) { should eq('foobar') }
-    its(:to_s) { should eq('foobar') }
+    its(:cache_key) { should eq('foo1foo2bar1bar2') }
+    its(:to_s) { should eq('foo1foo2bar1bar2') }
   end
 
   describe '#position!' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spritely
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Alex Robbin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -184,6 +184,7 @@ files:
 - lib/spritely/sprockets/transformer.rb
 - lib/spritely/version.rb
 - spec/fixtures/correct-empty-sprite.png
+- spec/fixtures/correct-renamed-sprite.png
 - spec/fixtures/correct-sprite.png
 - spec/fixtures/correct-weird-sprite.png
 - spec/fixtures/rails-app-changes/app/assets/images/application/dropdown-arrow.png
@@ -234,13 +235,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Hooks into the Sprockets asset packaging system to allow you to easily generate
   sprite maps
 test_files:
 - spec/fixtures/correct-empty-sprite.png
+- spec/fixtures/correct-renamed-sprite.png
 - spec/fixtures/correct-sprite.png
 - spec/fixtures/correct-weird-sprite.png
 - spec/fixtures/rails-app/app/assets/images/application/background.png