spritely 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d722c5631f45aecb25c733b67c27477cabb3087b
-  data.tar.gz: cacdcf82d6ec8c69a7916443c076ec2cb3f6471d
+  metadata.gz: f9409fd4cb51f3dc5d07f61de99861f9b9dbb12f
+  data.tar.gz: 9390ecc20122b1106bed57f394e0f93fd6a60040
 SHA512:
-  metadata.gz: 47639393b85c3b0a5bf61103de2d2ccbfd68fc9facae1a21e97b1c492f71edb6e3374e2379cf5af5f48e03605475da54f2caea7500ff001c5039d1bdbf413bdd
-  data.tar.gz: d2e6d843569997d59e82ee7228dea3cd494b2f7e0ad2dba5d2313c6ff34026dd30e3fe97154224a95d9c6f4cd0b10306e1e3482b9ea44b5403d2535038cf20f0
+  metadata.gz: e639ea7030383d04cd530f4cfcef3e454ff764ebf7f5b625916ba03a99273ae05100473f5ca6e70ef20b3d161fed72d5d4f0c233a70cf6b39dfd37e99c571007
+  data.tar.gz: 2634ff4658e0d9d62a4d307ce7a89ba4e0f1fd53cb0190db39c7e2a91adb4f63dc260e7f8f7523497292795fdf6d9a8589e5bcc0caa53c2723c1db7be846ef18

data/lib/spritely/collection.rb

@@ -0,0 +1,58 @@
+require 'spritely/image_set'
+
+module Spritely
+  class Collection < Struct.new(:files, :options)
+    def self.create(*args)
+      new(*args).tap do |collection|
+        collection.position!
+      end
+    end
+
+    def images
+      image_sets.flat_map(&:images)
+    end
+
+    def find(name)
+      image_sets.find { |image_set| image_set.name == name }
+    end
+
+    def last_modification_time
+      files.collect { |file| Spritely.modification_time(file) }.max
+    end
+
+    def width
+      return @width if @width
+
+      max_width = image_sets.collect(&:width).max
+      if image_sets.none?(&:repeated?)
+        @width = max_width
+      else
+        @width = lcm = image_sets.select(&:repeated?).collect(&:width).reduce(:lcm)
+        @width += lcm while @width < max_width
+      end
+
+      @width
+    end
+
+    def height
+      heights.reduce(:+)
+    end
+
+    def position!
+      image_sets.each_with_index do |image_set, index|
+        image_set.top = heights[0..index].reduce(:+) - image_set.height
+        image_set.position_in!(width)
+      end
+    end
+
+    private
+
+    def image_sets
+      @image_sets ||= files.collect { |file| ImageSet.new(file, options[File.basename(file, ".png")]) }.sort_by(&:width).reverse
+    end
+
+    def heights
+      image_sets.collect(&:height)
+    end
+  end
+end

data/lib/spritely/generators/chunky_png.rb

@@ -18,7 +18,7 @@ module Spritely
       private
 
       def canvas
-        @canvas ||= ::ChunkyPNG::Image.new(sprite_map.images.max_width, sprite_map.images.total_height)
+        @canvas ||= ::ChunkyPNG::Image.new(sprite_map.width, sprite_map.height)
       end
     end
   end

data/lib/spritely/image.rb

@@ -1,20 +1,5 @@
 module Spritely
-  class Image
-    attr_accessor :top
-    attr_reader :path, :data, :width, :height
-
-    def initialize(path)
-      @path = path
-      @data = File.read(path)
-      @width, @height = data[0x10..0x18].unpack('NN')
-    end
-
-    def left
-      0
-    end
-
-    def name
-      File.basename(path, ".png")
-    end
+  class Image < Struct.new(:data)
+    attr_accessor :top, :left
   end
 end

data/lib/spritely/image_set.rb

@@ -0,0 +1,52 @@
+require 'spritely/image'
+
+module Spritely
+  class ImageSet
+    attr_accessor :top
+    attr_reader :path, :options, :data, :width, :height
+
+    def initialize(path, options)
+      @path = path
+      @options = options
+      @data = File.read(path)
+      @width, @height = data[0x10..0x18].unpack('NN')
+    end
+
+    def name
+      File.basename(path, ".png")
+    end
+
+    def images
+      @images ||= []
+    end
+
+    def left
+      0
+    end
+
+    def repeated?
+      !!options[:repeat]
+    end
+
+    def position_in!(collection_width)
+      if repeated?
+        left = 0
+        while left < collection_width
+          add_image!(left)
+          left += width
+        end
+      else
+        add_image!(0)
+      end
+    end
+
+    private
+
+    def add_image!(left)
+      images << Image.new(data).tap do |image|
+        image.top = top
+        image.left = left
+      end
+    end
+  end
+end

data/lib/spritely/options.rb

@@ -0,0 +1,19 @@
+require 'active_support/core_ext/hash/deep_merge'
+
+module Spritely
+  class Options
+    attr_reader :options
+
+    def initialize(hash)
+      @options = hash.inject({}) do |h, (key, value)|
+        split_key = key.split('_')
+        option = {split_key.pop.to_sym => value}
+        h.deep_merge!(split_key.join('-') => option)
+      end
+    end
+
+    def [](key)
+      options[key] || {}
+    end
+  end
+end

data/lib/spritely/sass_functions.rb

@@ -2,11 +2,11 @@ require 'spritely/sprite_map'
 
 module Spritely
   module SassFunctions
-    def sprite_map(glob)
-      SpriteMap.create(glob)
+    def sprite_map(glob, kwargs = {})
+      SpriteMap.create(glob, kwargs)
     end
 
-    ::Sass::Script::Functions.declare :sprite_map, [:glob]
+    ::Sass::Script::Functions.declare :sprite_map, [:glob], var_kwargs: true
 
     def sprite_url(sprite_map)
       asset_url(Sass::Script::String.new("sprites/#{sprite_map.name}.png"))
@@ -15,7 +15,7 @@ module Spritely
     ::Sass::Script::Functions.declare :sprite_url, [:sprite_map]
 
     def sprite_position(sprite_map, image_name)
-      image = sprite_map.images.find(image_name.value)
+      image = sprite_map.find(image_name.value)
 
       x = Sass::Script::Number.new(image.left, image.left == 0 ? [] : ['px'])
       y = Sass::Script::Number.new(-image.top, image.top == 0 ? [] : ['px'])
@@ -26,7 +26,7 @@ module Spritely
     ::Sass::Script::Functions.declare :sprite_position, [:sprite_map, :image_name]
 
     def sprite_width(sprite_map, image_name)
-      image = sprite_map.images.find(image_name.value)
+      image = sprite_map.find(image_name.value)
 
       Sass::Script::Number.new(image.width, ['px'])
     end
@@ -34,7 +34,7 @@ module Spritely
     ::Sass::Script::Functions.declare :sprite_width, [:sprite_map, :image_name]
 
     def sprite_height(sprite_map, image_name)
-      image = sprite_map.images.find(image_name.value)
+      image = sprite_map.find(image_name.value)
 
       Sass::Script::Number.new(image.height, ['px'])
     end
@@ -42,3 +42,5 @@ module Spritely
     ::Sass::Script::Functions.declare :sprite_height, [:sprite_map, :image_name]
   end
 end
+
+::Sass::Script::Functions.send(:include, Spritely::SassFunctions)

data/lib/spritely/sprite_map.rb

@@ -1,10 +1,14 @@
-require 'spritely/images_set'
+require 'spritely/options'
+require 'spritely/collection'
 require 'spritely/generators/chunky_png'
 
 module Spritely
-  class SpriteMap
-    attr_accessor :options # Sass expects an object returned from a script function to have an #options accessor
-    attr_reader :glob
+  class SpriteMap < Sass::Script::Literal
+    extend Forwardable
+
+    def_delegators :collection, :find, :width, :height, :images
+
+    attr_reader :glob, :options
 
     def self.create(*args)
       new(*args).tap do |sprite_map|
@@ -12,12 +16,17 @@ module Spritely
       end
     end
 
-    def initialize(glob)
+    def initialize(glob, options = {})
       @glob = glob.value
+      @options = Options.new(options)
+    end
+
+    def inspect
+      "#<Spritely::SpriteMap name=#{name} filename=#{filename}>"
     end
 
-    def images
-      @images ||= ImagesSet.new(files)
+    def collection
+      @collection ||= Collection.create(files, options)
     end
 
     def generate!
@@ -43,11 +52,7 @@ module Spritely
     end
 
     def outdated?
-      images.last_modification_time > modification_time
-    end
-
-    def modification_time
-      Spritely.modification_time(filename)
+      collection.last_modification_time > Spritely.modification_time(filename)
     end
   end
 end

data/lib/spritely/sprockets/manifest.rb

@@ -0,0 +1,13 @@
+require 'sprockets/manifest'
+require 'active_support/core_ext/module/aliasing'
+
+module Sprockets
+  class Manifest
+    def compile_with_sprites(*args)
+      compile_without_sprites(*args)
+      Dir.glob(Spritely.directory.join('*.png')).each(&method(:compile_without_sprites))
+    end
+
+    alias_method_chain :compile, :sprites
+  end
+end

data/lib/spritely/version.rb

@@ -1,3 +1,3 @@
 module Spritely
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/spritely.rb

@@ -1,5 +1,6 @@
 require 'sass'
 require 'spritely/sass_functions'
+require 'spritely/sprockets/manifest'
 
 raise LoadError, "Spritely cannot be used in conjunction with Compass. Hope you choose Spritely!" if defined?(::Compass)
 
@@ -16,5 +17,3 @@ module Spritely
     File.mtime(filename).to_i
   end
 end
-
-::Sass::Script::Functions.send(:include, Spritely::SassFunctions)

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

@@ -0,0 +1,13 @@
+$application-sprite: sprite-map("application/*.png", $background-repeat: true);
+
+body {
+  background-image: sprite-url($application-sprite);
+  background-position: sprite-position($application-sprite, "background");
+}
+
+#mario {
+  background-image: sprite-url($application-sprite);
+  background-position: sprite-position($application-sprite, "mario");
+  width: sprite-width($application-sprite, "mario");
+  height: sprite-height($application-sprite, "mario");
+}

data/spec/integration/precompilation_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'active_support/core_ext/string'
+
+describe 'Precompilation', :integration do
+  it 'should create the sprite in the right location' do
+    render_asset('sprites.css')
+    expect(File.exist?(File.join('app', 'assets', 'images', 'sprites', 'application.png'))).to be_true
+  end
+
+  it 'should compile the correct-looking sprite file' do
+    render_asset('sprites.css')
+    compiled_sprite = ChunkyPNG::Image.from_file(File.join('app', 'assets', 'images', 'sprites', 'application.png'))
+    correct_sprite = ChunkyPNG::Image.from_file(File.join(__dir__, '..', 'fixtures', 'correct-sprite.png'))
+    expect(compiled_sprite).to eq(correct_sprite)
+  end
+
+  it 'should compile all of the assets necessary' do
+    compile_assets
+    sprite_files = Dir.glob(File.join('public', 'assets', 'sprites', 'application-*.png'))
+    expect(sprite_files).to have(1).item
+  end
+
+  it 'should compile all of the assets necessary when sprites have been pre-generated' do
+    render_asset('sprites.css')
+    compile_assets
+    sprite_files = Dir.glob(File.join('public', 'assets', 'sprites', 'application-*.png'))
+    expect(sprite_files).to have(1).item
+  end
+end

data/spec/integration/stylesheet_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+require 'active_support/core_ext/string/strip'
+
+describe 'Stylesheet generation', :integration do
+  subject(:stylesheet) { render_asset('sprites.css') }
+
+  describe 'body CSS with repetition' do
+    it { should include(<<-CSS.strip_heredoc
+      body {
+        background-image: url(/assets/sprites/application.png);
+        background-position: 0 -837px;
+      }
+    CSS
+    ) }
+  end
+
+  describe '#mario CSS with no repetition' do
+    it { should include(<<-CSS.strip_heredoc
+      #mario {
+        background-image: url(/assets/sprites/application.png);
+        background-position: 0 -623px;
+        width: 200px;
+        height: 214px;
+      }
+    CSS
+    ) }
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,16 @@
 require 'rspec'
-require 'pry-byebug'
 require 'spritely'
 
-Dir["./spec/support/**/*.rb"].sort.each {|f| require f}
+require 'pry-byebug'
+
+Dir["./spec/support/**/*.rb"].sort.each { |f| require f }
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+
+  config.include RailsAppHelpers, :integration
+  config.around(:each, :integration) { |example| within_rails_app(&example) }
+end

data/spec/spritely/collection_spec.rb

@@ -0,0 +1,91 @@
+require 'spec_helper'
+
+describe Spritely::Collection do
+  let(:first_set) { double(repeated?: true, name: 'foo', width: 1, height: 10, images: [1]) }
+  let(:second_set) { double(repeated?: false, name: 'bar', width: 100, height: 100, images: [2, 3]) }
+
+  subject { Spritely::Collection.new(['file-1.png', 'file-2.png'], {'file-1' => {repeat: true}}) }
+
+  before do
+    allow(Spritely::ImageSet).to receive(:new).with('file-1.png', repeat: true).and_return(first_set)
+    allow(Spritely::ImageSet).to receive(:new).with('file-2.png', nil).and_return(second_set)
+  end
+
+  its(:files) { should eq(['file-1.png', 'file-2.png']) }
+  its(:options) { should eq({'file-1' => {repeat: true}}) }
+  its(:images) { should eq([2, 3, 1]) }
+  its(:height) { should eq(110) }
+
+  describe '.create' do
+    let(:collection) { double }
+
+    it 'should attempt to generate the sprite' do
+      allow(Spritely::Collection).to receive(:new).with('something').and_return(collection)
+      expect(collection).to receive(:position!)
+      Spritely::Collection.create('something')
+    end
+  end
+
+  describe '#width' do
+    let(:third_set) { double(repeated?: false, width: 65, height: 100) }
+
+    subject { Spritely::Collection.new(['file-1.png', 'file-2.png', 'file-3.png'], {}) }
+
+    before do
+      allow(Spritely::ImageSet).to receive(:new).with('file-1.png', nil).and_return(first_set)
+      allow(Spritely::ImageSet).to receive(:new).with('file-2.png', nil).and_return(second_set)
+      allow(Spritely::ImageSet).to receive(:new).with('file-3.png', nil).and_return(third_set)
+    end
+
+    its(:width) { should eq(100) }
+
+    context 'when the repetition will overflow the largest non-repeating image' do
+      let(:first_set) { double(repeated?: true, width: 12, height: 10) }
+      let(:second_set) { double(repeated?: false, width: 100, height: 100) }
+
+      its(:width) { should eq(108) }
+    end
+
+    context 'when there are multiple repeating images, find the lcm' do
+      let(:first_set) { double(repeated?: true, width: 12, height: 10) }
+      let(:second_set) { double(repeated?: true, width: 100, height: 100) }
+      let(:third_set) { double(repeated?: true, width: 65, height: 100) }
+
+      its(:width) { should eq(3900) }
+    end
+
+    context 'when there is a mix of repeating and non-repeating' do
+      let(:first_set) { double(repeated?: true, width: 12, height: 10) }
+      let(:second_set) { double(repeated?: false, width: 100, height: 100) }
+      let(:third_set) { double(repeated?: true, width: 5, height: 100) }
+
+      its(:width) { should eq(120) }
+    end
+  end
+
+  describe '#find' do
+    it 'should find the correct set by name' do
+      expect(subject.find('foo')).to eq(first_set)
+      expect(subject.find('bar')).to eq(second_set)
+    end
+  end
+
+  describe '#last_modification_time' do
+    before do
+      allow(Spritely).to receive(:modification_time).with('file-1.png').and_return(10)
+      allow(Spritely).to receive(:modification_time).with('file-2.png').and_return(100)
+    end
+
+    its(:last_modification_time) { should eq(100) }
+  end
+
+  describe '#position!' do
+    it 'should call out to each image set in turn' do
+      expect(second_set).to receive(:top=).with(0)
+      expect(second_set).to receive(:position_in!).with(100)
+      expect(first_set).to receive(:top=).with(100)
+      expect(first_set).to receive(:position_in!).with(100)
+      subject.position!
+    end
+  end
+end

data/spec/spritely/generators/chunky_png_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'ostruct'
 
 describe Spritely::Generators::ChunkyPng do
   let(:png_canvas) { double }

data/spec/spritely/image_set_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+require 'ostruct'
+
+describe Spritely::ImageSet do
+  let(:path) { "#{__dir__}/../fixtures/test/foo.png" }
+  let(:options) { {repeat: true} }
+
+  subject { Spritely::ImageSet.new(path, options) }
+
+  its(:path) { should eq(path) }
+  its(:options) { should eq(options) }
+  its(:data) { should eq(File.read(path)) }
+  its(:width) { should eq(1) }
+  its(:height) { should eq(1) }
+  its(:name) { should eq('foo') }
+  its(:left) { should eq(0) }
+
+  describe '#top' do
+    before { subject.top = 123 }
+
+    its(:top) { should eq(123) }
+  end
+
+  describe '#repeated?' do
+    it { should be_repeated }
+
+    context 'repeat option is passed as truthy' do
+      let(:options) { {repeat: 'repeat'} }
+
+      it { should be_repeated }
+    end
+
+    context 'repeat option is passed as false' do
+      let(:options) { {repeat: false} }
+
+      it { should_not be_repeated }
+    end
+
+    context 'repeat option is not passed' do
+      let(:options) { {} }
+
+      it { should_not be_repeated }
+    end
+  end
+
+  describe '#position_in!' do
+    class ImageDouble
+      attr_accessor :top, :left
+    end
+
+    before { subject.top = 123 }
+
+    context 'the image is repeated' do
+      let(:first_image) { ImageDouble.new }
+      let(:second_image) { ImageDouble.new }
+
+      before do
+        allow(Spritely::Image).to receive(:new).with(File.read(path)).and_return(first_image, second_image)
+        subject.position_in!(2)
+      end
+
+      it 'should set the position of the images' do
+        expect(first_image.top).to eq(123)
+        expect(first_image.left).to eq(0)
+        expect(second_image.top).to eq(123)
+        expect(second_image.left).to eq(1)
+      end
+    end
+
+    context 'the image is not repeated' do
+      let(:options) { {repeat: false} }
+      let(:image) { ImageDouble.new }
+
+      before do
+        allow(Spritely::Image).to receive(:new).with(File.read(path)).and_return(image)
+        subject.position_in!(1)
+      end
+
+      it 'should set the position of the image' do
+        expect(image.top).to eq(123)
+        expect(image.left).to eq(0)
+      end
+    end
+  end
+end

data/spec/spritely/image_spec.rb

@@ -2,19 +2,21 @@ require 'spec_helper'
 
 describe Spritely::Image do
   let(:path) { "#{__dir__}/../fixtures/test/foo.png" }
+  let(:data) { File.read(path) }
 
-  subject { Spritely::Image.new(path) }
+  subject { Spritely::Image.new(data) }
 
-  its(:path) { should eq(path) }
-  its(:data) { should eq(File.read(path)) }
-  its(:width) { should eq(1) }
-  its(:height) { should eq(1) }
-  its(:left) { should eq(0) }
-  its(:name) { should eq('foo') }
+  its(:data) { should eq(data) }
 
   describe '#top' do
     before { subject.top = 123 }
 
     its(:top) { should eq(123) }
   end
+
+  describe '#left' do
+    before { subject.left = 456 }
+
+    its(:left) { should eq(456) }
+  end
 end

data/spec/spritely/options_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Spritely::Options do
+  let(:hash) { {'some_new_image_x' => 123, 'some_new_image_y' => 456, 'another_image_repeat' => true} }
+
+  subject(:options) { Spritely::Options.new(hash) }
+
+  its(['some-new-image']) { should eq({x: 123, y: 456}) }
+  its(['another-image']) { should eq({repeat: true}) }
+
+  describe '#[]' do
+    it 'should fall back to an empty hash' do
+      expect(options[:unknown]).to eq({})
+    end
+  end
+end

data/spec/spritely/sprite_map_spec.rb

@@ -1,13 +1,22 @@
 require 'spec_helper'
 
 describe Spritely::SpriteMap do
-  subject { Spritely::SpriteMap.new(double(value: 'test/*.png')) }
+  let(:options) { {'some_new_image_x' => 123, 'some_new_image_y' => 456, 'another_image_repeat' => true} }
 
-  before { Spritely.stub(:directory).and_return(File) }
+  subject { Spritely::SpriteMap.new(double(value: 'test/*.png'), options) }
+
+  before do
+    Spritely.stub(:directory).and_return(File)
+    allow(Spritely::Options).to receive(:new).with(options).and_return('options')
+  end
+
+  it { should be_a(Sass::Script::Literal) }
 
   its(:glob) { should eq('test/*.png') }
+  its(:options) { should eq('options') }
   its(:name) { should eq('test') }
   its(:filename) { should eq('test.png') }
+  its(:inspect) { should eq('#<Spritely::SpriteMap name=test filename=test.png>') }
 
   describe '.create' do
     let(:sprite_map) { double(needs_generation?: true) }
@@ -19,13 +28,22 @@ describe Spritely::SpriteMap do
     end
   end
 
-  describe '#images' do
+  describe '#collection' do
+    let(:collection) { double(find: 'find value', width: 'width value', height: 'height value', images: 'images value') }
+
     before do
       Spritely.stub_chain(:environment, :paths).and_return(["#{__dir__}/../fixtures"])
-      allow(Spritely::ImagesSet).to receive(:new).with(["#{__dir__}/../fixtures/test/foo.png"]).and_return('images set')
+      allow(Spritely::Collection).to receive(:create).with(["#{__dir__}/../fixtures/test/foo.png"], 'options').and_return(collection)
     end
 
-    its(:images) { should eq('images set') }
+    its(:collection) { should eq(collection) }
+
+    describe 'delegated methods' do
+      its(:find) { should eq('find value') }
+      its(:width) { should eq('width value') }
+      its(:height) { should eq('height value') }
+      its(:images) { should eq('images value') }
+    end
   end
 
   describe '#generate!' do
@@ -46,7 +64,7 @@ describe Spritely::SpriteMap do
       let(:file_exists) { true }
 
       before do
-        subject.stub_chain(:images, :last_modification_time).and_return(456)
+        subject.stub_chain(:collection, :last_modification_time).and_return(456)
         allow(Spritely).to receive(:modification_time).and_return(123)
       end
 

data/spec/support/rails_app_helpers.rb

@@ -0,0 +1,33 @@
+module RailsAppHelpers
+  def within_rails_app(&block)
+    Dir.mktmpdir do |tmpdir|
+      Dir.chdir(tmpdir) do
+        %x(rails new dummy --skip-active-record --skip-test-unit --skip-javascript --skip-spring --skip-git)
+        Dir.chdir('dummy') do
+          Bundler.with_clean_env do
+            File.open('Gemfile', 'a') do |f|
+              f.write("gem 'spritely', path: '#{__dir__}/../../'\n")
+            end
+            %x(bundle install)
+            FileUtils.cp_r "#{__dir__}/../fixtures/rails-app/.", "."
+            yield
+          end
+        end
+      end
+    end
+  end
+
+  def render_asset(filename)
+    runner "puts Rails.application.assets[#{filename.inspect}]"
+  end
+
+  def compile_assets
+    %x(RAILS_ENV=production rake assets:precompile)
+  end
+
+  private
+
+  def runner(command)
+    %x(rails runner -e development '#{command}')
+  end
+end

data/spec/support/shared_examples.rb

@@ -1,17 +1,6 @@
 shared_examples "a generator" do
-  class ImagesDouble
-    def max_width; 100; end
-    def total_height; 200; end
-
-    def each(&block)
-      [
-        OpenStruct.new(data: 'first image data', left: 1, top: 10),
-        OpenStruct.new(data: 'second image data', left: 2, top: 20)
-      ].each(&block)
-    end
-  end
-
-  let(:sprite_map) { double(images: ImagesDouble.new, filename: 'blah.png') }
+  let(:images) { [OpenStruct.new(data: 'first image data', left: 1, top: 10), OpenStruct.new(data: 'second image data', left: 2, top: 20)] }
+  let(:sprite_map) { double(images: images, width: 100, height: 200, filename: 'blah.png') }
 
   its(:sprite_map) { should eq(sprite_map) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spritely
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alex Robbin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -24,6 +24,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +86,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -102,20 +136,35 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/spritely.rb
+- lib/spritely/collection.rb
 - lib/spritely/generators/base.rb
 - lib/spritely/generators/chunky_png.rb
 - lib/spritely/image.rb
-- lib/spritely/images_set.rb
+- lib/spritely/image_set.rb
+- lib/spritely/options.rb
 - lib/spritely/sass_functions.rb
 - lib/spritely/sprite_map.rb
+- lib/spritely/sprockets/manifest.rb
 - lib/spritely/version.rb
+- spec/fixtures/correct-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/stylesheets/sprites.css.scss
 - spec/fixtures/test/foo.png
+- spec/integration/application.png
+- spec/integration/precompilation_spec.rb
+- spec/integration/stylesheet_spec.rb
 - spec/spec_helper.rb
+- spec/spritely/collection_spec.rb
 - spec/spritely/generators/chunky_png_spec.rb
+- spec/spritely/image_set_spec.rb
 - spec/spritely/image_spec.rb
-- spec/spritely/images_set_spec.rb
+- spec/spritely/options_spec.rb
 - spec/spritely/sprite_map_spec.rb
 - spec/spritely_spec.rb
+- spec/support/rails_app_helpers.rb
 - spec/support/shared_examples.rb
 homepage: http://www.robbinsweb.biz
 licenses:
@@ -143,11 +192,23 @@ specification_version: 4
 summary: Hooks into the Rails asset pipeline to allow you to easily generate sprite
   maps
 test_files:
+- spec/fixtures/correct-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/stylesheets/sprites.css.scss
 - spec/fixtures/test/foo.png
+- spec/integration/application.png
+- spec/integration/precompilation_spec.rb
+- spec/integration/stylesheet_spec.rb
 - spec/spec_helper.rb
+- spec/spritely/collection_spec.rb
 - spec/spritely/generators/chunky_png_spec.rb
+- spec/spritely/image_set_spec.rb
 - spec/spritely/image_spec.rb
-- spec/spritely/images_set_spec.rb
+- spec/spritely/options_spec.rb
 - spec/spritely/sprite_map_spec.rb
 - spec/spritely_spec.rb
+- spec/support/rails_app_helpers.rb
 - spec/support/shared_examples.rb

data/lib/spritely/images_set.rb

@@ -1,41 +0,0 @@
-require 'spritely/image'
-
-module Spritely
-  class ImagesSet
-    extend Forwardable
-
-    def_delegator :@images, :each
-
-    attr_reader :files, :images
-
-    def initialize(files)
-      @files = files
-      @images = files.collect { |file| Image.new(file) }.sort_by(&:width).reverse
-      position!
-    end
-
-    def find(name)
-      images.find { |image| image.name == name }
-    end
-
-    def max_width
-      @max_width ||= images.collect(&:width).max
-    end
-
-    def total_height
-      @total_height ||= images.collect(&:height).reduce(:+)
-    end
-
-    def last_modification_time
-      files.collect { |file| Spritely.modification_time(file) }.max
-    end
-
-    private
-
-    def position!
-      images.each_with_index do |image, index|
-        image.top = images.collect(&:height)[0..index].reduce(:+) - image.height
-      end
-    end
-  end
-end

data/spec/spritely/images_set_spec.rb

@@ -1,54 +0,0 @@
-require 'spec_helper'
-require 'ostruct'
-
-describe Spritely::ImagesSet do
-  class ImageDouble < OpenStruct
-    attr_accessor :top
-  end
-
-  let(:first_image) { ImageDouble.new(name: 'foo', width: 1, height: 10) }
-  let(:second_image) { ImageDouble.new(name: 'bar', width: 100, height: 100) }
-
-  before do
-    allow(Spritely::Image).to receive(:new).with('first').and_return(first_image)
-    allow(Spritely::Image).to receive(:new).with('second').and_return(second_image)
-  end
-
-  subject! { Spritely::ImagesSet.new(['first', 'second']) }
-
-  its(:files) { should eq(['first', 'second']) }
-  its(:images) { should eq([second_image, first_image]) }
-  its(:max_width) { should eq(100) }
-  its(:total_height) { should eq(110) }
-
-  describe 'positioning' do
-    it 'should set the #top position of each image' do
-      expect(first_image.top).to eq(100)
-      expect(second_image.top).to eq(0)
-    end
-  end
-
-  describe '#each delegation' do
-    it 'should pass along the #each method call to the internal #images array' do
-      expect(first_image).to receive(:blah!)
-      expect(second_image).to receive(:blah!)
-      subject.each(&:blah!)
-    end
-  end
-
-  describe '#find' do
-    it 'should find the correct image by name' do
-      expect(subject.find('foo')).to eq(first_image)
-      expect(subject.find('bar')).to eq(second_image)
-    end
-  end
-
-  describe '#last_modification_time' do
-    before do
-      allow(Spritely).to receive(:modification_time).with('first').and_return(10)
-      allow(Spritely).to receive(:modification_time).with('second').and_return(100)
-    end
-
-    its(:last_modification_time) { should eq(100) }
-  end
-end