spritely 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab534f8d3de68e48fe062b507a94502cc9f7ab5d
-  data.tar.gz: ff98e8e98cf0bf235bf0d2c09087d3682c54876b
+  metadata.gz: 55045aef9a86227f8a36323391b7e3e310feb6ef
+  data.tar.gz: c0fca28f4f25ad8010743f7ac402d42582101d1d
 SHA512:
-  metadata.gz: 849dcbfe7926d77b285eb087a0adabb641e423c25f1583c755a025d5d60b7a7f94337591ac119a928cfbec4ecf0d31a998f10656771c11fc18abe0b548004d33
-  data.tar.gz: 550db56989efc700924c785c6846673968e9c3b777d128c889f400a081f54af2a9838a8c6970d9a72108e8b4f2280f7b63191b3489edda126566f662046d3bbe
+  metadata.gz: a842ca5a5e5b4fea18f01b5e389bff09fa1666d3a86a7c284fdf8f62143eb36ad60031b593d16b5f97dfd2d0c58485262993eb358771818cf1a3359622dee89c
+  data.tar.gz: f964e9e738031bb14e61d516cb836a152812002ca0d396809ac4d772f31d1343c763c457f174ccc9dad065865a3838e578d0b5edaf345cb3e26f3d1797b623d0

data/lib/spritely/sprite_map.rb

@@ -9,17 +9,18 @@ module Spritely
 
     def_delegators :collection, :find, :width, :height, :images
 
-    attr_reader :name, :glob, :environment, :options
+    attr_reader :name, :environment, :options, :directory, :glob
 
     def initialize(name, environment, options)
       @name = name
-      @glob = [name, "*.png"].join("/")
       @environment = environment
-      @options = options
+      @options = options.dup
+      @directory = @options.delete(:directory) || name
+      @glob = [directory, "*.png"].join("/")
     end
 
     def inspect
-      "#<Spritely::SpriteMap name=#{name} options=#{options}>"
+      "#<Spritely::SpriteMap name=#{name} directory=#{directory} options=#{options}>"
     end
 
     def cache_key

data/lib/spritely/sprockets/preprocessor.rb

@@ -4,6 +4,7 @@ module Spritely
   module Sprockets
     # Converts Sprockets directives from this:
     #
+    #   //= directory foo/bar
     #   //= repeat arrow true
     #   //= spacing arrow 10
     #   //= position another-image right
@@ -12,6 +13,7 @@ module Spritely
     # To this:
     #
     #   {
+    #     directory: 'foo/bar',
     #     global: { spacing: 5 },
     #     images: {
     #       'arrow' => { repeat: 'true', spacing: '10' },
@@ -23,7 +25,7 @@ module Spritely
       IMAGE_DIRECTIVES = %w(repeat position spacing).freeze
 
       def _call(input)
-        @sprite_directives = { global: {}, images: {} }
+        @sprite_directives = { directory: nil, global: {}, images: {} }
 
         super.tap do
           merge_global_options!
@@ -32,6 +34,10 @@ module Spritely
         end
       end
 
+      def process_directory_directive(value)
+        @sprite_directives[:directory] = value
+      end
+
       (GLOBAL_DIRECTIVES + IMAGE_DIRECTIVES).uniq.each do |directive|
         define_method("process_#{directive}_directive") do |image_or_value, value_or_nil = nil|
           if value_or_nil

data/lib/spritely/version.rb

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

data/spec/fixtures/rails-app/app/assets/images/sprites/weird.png.sprite

@@ -0,0 +1 @@
+//= directory weird/sprite-images

data/spec/integration/precompilation_spec.rb

@@ -15,6 +15,20 @@ describe 'Precompilation', :integration do
     expect(sprite_files.length).to eq(1)
   end
 
+  it 'should compile a sprite that has no directives' do
+    runner %~Rails.application.assets["sprites/empty.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-empty-sprite.png'))
+    expect(compiled_sprite).to eq(correct_sprite)
+  end
+
+  it 'should compile all of the assets from a custom directory' do
+    runner %~Rails.application.assets["sprites/weird.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-weird-sprite.png'))
+    expect(compiled_sprite).to eq(correct_sprite)
+  end
+
   it 'should compile all of the assets necessary when sprites have been pre-generated' do
     render_asset('sprites.css')
     compile_assets

data/spec/spritely/sprite_map_spec.rb

@@ -1,16 +1,25 @@
 require 'spec_helper'
+require 'active_support/core_ext/hash/except'
 
 describe Spritely::SpriteMap do
-  let(:options) { { global: {}, images: { 'some-new-image' => { x: '123', y: '456' }, 'another-image' => { repeat: 'true' } } } }
+  let(:directory) { nil }
+  let(:options) { { directory: directory, global: {}, images: { 'some-new-image' => { x: '123', y: '456' }, 'another-image' => { repeat: 'true' } } } }
   let(:environment) { double(paths: ["#{__dir__}/../fixtures"]) }
 
   subject { Spritely::SpriteMap.new('test', environment, options) }
 
   its(:name) { should eq('test') }
-  its(:glob) { should eq('test/*.png') }
   its(:environment) { should eq(environment) }
-  its(:options) { should eq(options) }
-  its(:inspect) { should eq("#<Spritely::SpriteMap name=test options=#{options}>") }
+  its(:options) { should eq(options.except(:directory)) }
+  its(:directory) { should eq('test') }
+  its(:glob) { should eq('test/*.png') }
+  its(:inspect) { should eq("#<Spritely::SpriteMap name=test directory=test options=#{options.except(:directory)}>") }
+
+  context 'the directory is set' do
+    let(:directory) { 'test/sprite-images' }
+
+    its(:directory) { should eq('test/sprite-images') }
+  end
 
   describe '#cache_key' do
     before { allow(subject).to receive(:collection).and_return(double(to_s: 'collection cache value')) }
@@ -21,7 +30,7 @@ describe Spritely::SpriteMap do
   describe '#collection' do
     let(:collection) { double(find: 'find value', width: 'width value', height: 'height value', images: 'images value') }
 
-    before { allow(Spritely::Collection).to receive(:create).with(["#{__dir__}/../fixtures/test/foo.png"], options).and_return(collection) }
+    before { allow(Spritely::Collection).to receive(:create).with(["#{__dir__}/../fixtures/test/foo.png"], options.except(:directory)).and_return(collection) }
 
     its(:collection) { should eq(collection) }
 

data/spec/spritely/sprockets/preprocessor_spec.rb

@@ -14,6 +14,7 @@ describe Spritely::Sprockets::Preprocessor do
     preprocessor._call(input)
 
     expect(input[:metadata][:sprite_directives]).to eq(
+      directory: nil,
       global: { spacing: '901', position: 'left' },
       images: {
         "some-new-image" => { spacing: '789', position: 'right' },
@@ -23,6 +24,25 @@ describe Spritely::Sprockets::Preprocessor do
     )
   end
 
+  describe 'overriding the directory' do
+    let(:data) { "//= directory foo/sprites" }
+    let(:input) { {
+      data: data,
+      filename: "sprites/foo.png.sprite",
+      metadata: {}
+    } }
+
+    it 'saves the processed options as part of the metadata' do
+      preprocessor._call(input)
+
+      expect(input[:metadata][:sprite_directives]).to eq(
+        directory: 'foo/sprites',
+        global: {},
+        images: {}
+      )
+    end
+  end
+
   describe 'invalid global option' do
     let(:data) { "//= repeat true" }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spritely
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Alex Robbin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -183,16 +183,22 @@ files:
 - lib/spritely/sprockets/preprocessor.rb
 - lib/spritely/sprockets/transformer.rb
 - lib/spritely/version.rb
+- spec/fixtures/correct-empty-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
 - 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
 - spec/fixtures/rails-app/app/assets/images/application/mario.png
+- spec/fixtures/rails-app/app/assets/images/empty/fool.png
 - spec/fixtures/rails-app/app/assets/images/foo/fool.png
 - spec/fixtures/rails-app/app/assets/images/sprites/application.png.sprite
+- spec/fixtures/rails-app/app/assets/images/sprites/empty.png.sprite
 - spec/fixtures/rails-app/app/assets/images/sprites/foo.png.sprite
+- spec/fixtures/rails-app/app/assets/images/sprites/weird.png.sprite
+- spec/fixtures/rails-app/app/assets/images/weird/sprite-images/mario.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/config/initializers/assets.rb
@@ -234,14 +240,20 @@ 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-sprite.png
+- spec/fixtures/correct-weird-sprite.png
 - 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
 - spec/fixtures/rails-app/app/assets/images/application/mario.png
+- spec/fixtures/rails-app/app/assets/images/empty/fool.png
 - spec/fixtures/rails-app/app/assets/images/foo/fool.png
 - spec/fixtures/rails-app/app/assets/images/sprites/application.png.sprite
+- spec/fixtures/rails-app/app/assets/images/sprites/empty.png.sprite
 - spec/fixtures/rails-app/app/assets/images/sprites/foo.png.sprite
+- spec/fixtures/rails-app/app/assets/images/sprites/weird.png.sprite
+- spec/fixtures/rails-app/app/assets/images/weird/sprite-images/mario.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/config/initializers/assets.rb