spittle 0.9.1 → 0.9.1.3

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 Colin Harris & Tyler Jennings
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README

@@ -12,14 +12,14 @@ It takes your PNG's, chews them up and spits out sprites!
 
 point bin/spittle at a directory, and watch it sprite away!
 
-INSTALLATION
+INSTALLATION - standalone
 
 We're hosted at gemcutter.  I believe 'sudo gem install gemcutter' then 'gem tumble'.
 Then you can run: 
 
 > sudo gem install spittle
 
-USAGE
+USAGE - standalone
 
 > spittle <directory>
 
@@ -27,25 +27,44 @@ For a full list of options:
 
 > spittle -h
 
+INSTALLATION - Rails plugin
+
+> 
+
+USAGE - Rails plugin
+
+Spittle assumes all of your sprites are located in the directory public/images/sprites.  This directory should contian sub-directories for each sprite you wish to create.  The css class names for an image in a sprite will take the form <directory_name>_<image_nama>.  Here is an example: 
+
+sprites / 
+  cars / 
+    ford.png
+    chevy.png
+  planes /
+    boeing.png
+    cesna.png
+
+Running spittle:generate does all the work. Each sprite directory (cars, planes) will now contain a sprite.png.  Spittle will also generate a sprites.css stylesheet in public/stylesheets/ that you should include in your layout.  If you wished to use the ford image from the cars sprite you would give the 'cars_ford' class to the desired element in the view.  That's it!
+
+Check out examples/sprites if you want to see what spittle can do without doing any work.
+
 LIMITATIONS
 
-- only supports images of the same height and color type.
-- only supports RGB and RGBA color types
+- only supports RGB and RGBA color types (and they must be the same for all images in a sprite)
 - does not support color profiles (can cause a slight change in color from the source image)
 
 FEATURES
 
-- automatically generates PNG sprites from a set of PNG images
+- automatically generates sprites from a set of PNG images
 - automatically generates css classes to access images within the sprite
-- customize the css template for each sprite 
+- customizeble css templates
+- Rails plugin & rake tasks (sprite:generate & sprite:cleanup)
+- Supports varying dimensions in source images
 
 ROADMAP - by priority
 
-- Rails plugin & rake tasks
-- Support varying height in source images
 - Use mtime tracking to prevent regeneration of sprites that have not changed
-- Support color profiles
 - Support global css template override
+- Improve image compression
 
 AUTHORS
 

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.1.3

data/bin/png_info

@@ -0,0 +1,61 @@
+#!/usr/bin/env ruby
+require File.join( File.dirname( __FILE__ ), '..', 'lib', 'spittle' )
+
+module PNG
+  class Parser
+    def go!( file )
+      check_header( file )
+
+      while(! file.eof?) do
+        parse_chunk(file)
+      end
+    end
+
+  private
+    def check_header( file )
+      header = file.read(8)
+      raise "Invalid PNG file header" unless ( header == FileHeader.new.encode)
+    end
+
+    def parse_chunk(f)
+      len = f.read(4).unpack("N")
+      type = f.read(4)
+      data = f.read(len[0])
+      crc = f.read(4)
+      handle(type, len, data )
+    end
+
+    def handle( type, len, data )
+      case type
+      when "IHDR"
+        attrs = data.unpack("N2C5")
+        puts "PNG width: #{attrs[0]}"
+        puts "PNG height: #{attrs[1]}"
+        puts "PNG depth: #{attrs[2]}"
+        puts "PNG color type: #{attrs[3]}"
+        puts "PNG compression method: #{attrs[4]}"
+        puts "PNG filter method: #{attrs[5]}"
+        puts "PNG interlace method: #{attrs[6]}"
+      end
+
+      puts "PNG block #{type}"
+      puts "length: #{len}"
+    end
+  end
+
+
+  class Info
+    def self.open( file_name )
+      @parser = Parser.new
+
+      name = File.basename( file_name, ".png" )
+
+      File.open(file_name, "r") do |f|
+        @parser.go!( f )
+      end
+    end
+  end
+end
+
+
+PNG::Info.open( ARGV[0] )

data/examples/sprites/apple/fragment.css

@@ -1,61 +1,61 @@
-  .apple_iphone {
-    background: transparent url(/tacos/apple/sprite.png) -234px 0px no-repeat;
+  .apple_mac {
+    background: transparent url(/apple/sprite.png) -466px 0px no-repeat;
     width:116;
     height:38;
     text-indent:-5000px;
   }
 
-  .apple_itunes {
-    background: transparent url(/tacos/apple/sprite.png) -350px 0px no-repeat;
-    width:116;
+  .apple_apple {
+    background: transparent url(/apple/sprite.png) 0px 0px no-repeat;
+    width:117;
     height:38;
     text-indent:-5000px;
   }
 
-  .apple_mac {
-    background: transparent url(/tacos/apple/sprite.png) -466px 0px no-repeat;
+  .apple_support {
+    background: transparent url(/apple/sprite.png) -860px 0px no-repeat;
     width:116;
     height:38;
     text-indent:-5000px;
   }
 
-  .apple_apple {
-    background: transparent url(/tacos/apple/sprite.png) 0px 0px no-repeat;
-    width:117;
+  .apple_divider {
+    background: transparent url(/apple/sprite.png) -117px 0px no-repeat;
+    width:1;
     height:38;
     text-indent:-5000px;
   }
 
-  .apple_support {
-    background: transparent url(/tacos/apple/sprite.png) -860px 0px no-repeat;
-    width:116;
+  .apple_search {
+    background: transparent url(/apple/sprite.png) -582px 0px no-repeat;
+    width:162;
     height:38;
     text-indent:-5000px;
   }
 
-  .apple_search {
-    background: transparent url(/tacos/apple/sprite.png) -582px 0px no-repeat;
-    width:162;
+  .apple_downloads {
+    background: transparent url(/apple/sprite.png) -118px 0px no-repeat;
+    width:116;
     height:38;
     text-indent:-5000px;
   }
 
-  .apple_divider {
-    background: transparent url(/tacos/apple/sprite.png) -117px 0px no-repeat;
-    width:1;
+  .apple_iphone {
+    background: transparent url(/apple/sprite.png) -234px 0px no-repeat;
+    width:116;
     height:38;
     text-indent:-5000px;
   }
 
   .apple_store {
-    background: transparent url(/tacos/apple/sprite.png) -744px 0px no-repeat;
+    background: transparent url(/apple/sprite.png) -744px 0px no-repeat;
     width:116;
     height:38;
     text-indent:-5000px;
   }
 
-  .apple_downloads {
-    background: transparent url(/tacos/apple/sprite.png) -118px 0px no-repeat;
+  .apple_itunes {
+    background: transparent url(/apple/sprite.png) -350px 0px no-repeat;
     width:116;
     height:38;
     text-indent:-5000px;

data/examples/sprites/index.html

@@ -7,11 +7,14 @@
     <style>
       .float_left {float:left}
       .menu {height: 100px}
+      .clear {clear:both}
     </style>
-    Hello.  See spittle run:
-    <div class="words_of">of</div>
-    <div class="words_latitude">latitude</div>
-    <div class="words_set">set</div>
+    <div>
+      Hello.  See spittle run:
+      <div class="words_of">of</div>
+      <div class="words_latitude">latitude</div>
+      <div class="words_set">set</div>
+    </div>
 
     Some random menu bar
     <div>
@@ -28,6 +31,13 @@
       <span class="menu float_left apple_support">suport</span>
       <span class="menu float_left apple_divider"></span>
       <span class="menu float_left apple_search">search</span>
+      <div class="clear"/>
+    </div>
+    OMG Cats!!!! (of varying sizes, in one sprite)
+    <div>
+      <div class="many_sized_cats_cat-on-keyboard"></div>
+      <div class="many_sized_cats_darth_cat"></div>
+      <div class="many_sized_cats_music-keyboard-cat"></div>
     </div>
   </body>
 </html>

data/examples/sprites/many_sized_cats/fragment.css

@@ -0,0 +1,21 @@
+  .many_sized_cats_cat-on-keyboard {
+    background: transparent url(/many_sized_cats/sprite.png) 0px 0px no-repeat;
+    width:64;
+    height:48;
+    text-indent:-5000px;
+  }
+
+  .many_sized_cats_music-keyboard-cat {
+    background: transparent url(/many_sized_cats/sprite.png) -304px 0px no-repeat;
+    width:225;
+    height:166;
+    text-indent:-5000px;
+  }
+
+  .many_sized_cats_darth_cat {
+    background: transparent url(/many_sized_cats/sprite.png) -64px 0px no-repeat;
+    width:240;
+    height:320;
+    text-indent:-5000px;
+  }
+

data/examples/sprites/sprite.css

@@ -1,10 +1,3 @@
-  .apple_itunes {
-    background: transparent url(/apple/sprite.png) -350px 0px no-repeat;
-    width:116;
-    height:38;
-    text-indent:-5000px;
-  }
-
   .apple_mac {
     background: transparent url(/apple/sprite.png) -466px 0px no-repeat;
     width:116;
@@ -19,13 +12,20 @@
     text-indent:-5000px;
   }
 
-  .apple_store {
-    background: transparent url(/apple/sprite.png) -744px 0px no-repeat;
+  .apple_support {
+    background: transparent url(/apple/sprite.png) -860px 0px no-repeat;
     width:116;
     height:38;
     text-indent:-5000px;
   }
 
+  .apple_divider {
+    background: transparent url(/apple/sprite.png) -117px 0px no-repeat;
+    width:1;
+    height:38;
+    text-indent:-5000px;
+  }
+
   .apple_search {
     background: transparent url(/apple/sprite.png) -582px 0px no-repeat;
     width:162;
@@ -33,45 +33,52 @@
     text-indent:-5000px;
   }
 
-  .apple_divider {
-    background: transparent url(/apple/sprite.png) -117px 0px no-repeat;
-    width:1;
+  .apple_downloads {
+    background: transparent url(/apple/sprite.png) -118px 0px no-repeat;
+    width:116;
     height:38;
     text-indent:-5000px;
   }
 
-  .apple_support {
-    background: transparent url(/apple/sprite.png) -860px 0px no-repeat;
+  .apple_iphone {
+    background: transparent url(/apple/sprite.png) -234px 0px no-repeat;
     width:116;
     height:38;
     text-indent:-5000px;
   }
 
-  .apple_downloads {
-    background: transparent url(/apple/sprite.png) -118px 0px no-repeat;
+  .apple_store {
+    background: transparent url(/apple/sprite.png) -744px 0px no-repeat;
     width:116;
     height:38;
     text-indent:-5000px;
   }
 
-  .apple_iphone {
-    background: transparent url(/apple/sprite.png) -234px 0px no-repeat;
+  .apple_itunes {
+    background: transparent url(/apple/sprite.png) -350px 0px no-repeat;
     width:116;
     height:38;
     text-indent:-5000px;
   }
 
-  .words_set {
-    background: transparent url(/words/sprite.png) -85px 0px no-repeat;
-    width:26;
-    height:21;
+  .many_sized_cats_cat-on-keyboard {
+    background: transparent url(/many_sized_cats/sprite.png) 0px 0px no-repeat;
+    width:64;
+    height:48;
     text-indent:-5000px;
   }
 
-  .words_specified {
-    background: transparent url(/words/sprite.png) -111px 0px no-repeat;
-    width:70;
-    height:21;
+  .many_sized_cats_music-keyboard-cat {
+    background: transparent url(/many_sized_cats/sprite.png) -304px 0px no-repeat;
+    width:225;
+    height:166;
+    text-indent:-5000px;
+  }
+
+  .many_sized_cats_darth_cat {
+    background: transparent url(/many_sized_cats/sprite.png) -64px 0px no-repeat;
+    width:240;
+    height:320;
     text-indent:-5000px;
   }
 
@@ -89,3 +96,17 @@
     text-indent:-5000px;
   }
 
+  .words_set {
+    background: transparent url(/words/sprite.png) -85px 0px no-repeat;
+    width:26;
+    height:21;
+    text-indent:-5000px;
+  }
+
+  .words_specified {
+    background: transparent url(/words/sprite.png) -111px 0px no-repeat;
+    width:70;
+    height:21;
+    text-indent:-5000px;
+  }
+

data/examples/sprites/words/fragment.css

@@ -1,27 +1,27 @@
-  .words_set {
-    background: transparent url(/words/sprite.png) -85px 0px no-repeat;
-    width:26;
+  .words_latitude {
+    background: transparent url(/words/sprite.png) 0px 0px no-repeat;
+    width:66;
     height:21;
     text-indent:-5000px;
   }
 
-  .words_specified {
-    background: transparent url(/words/sprite.png) -111px 0px no-repeat;
-    width:70;
+  .words_of {
+    background: transparent url(/words/sprite.png) -66px 0px no-repeat;
+    width:19;
     height:21;
     text-indent:-5000px;
   }
 
-  .words_latitude {
-    background: transparent url(/words/sprite.png) 0px 0px no-repeat;
-    width:66;
+  .words_set {
+    background: transparent url(/words/sprite.png) -85px 0px no-repeat;
+    width:26;
     height:21;
     text-indent:-5000px;
   }
 
-  .words_of {
-    background: transparent url(/words/sprite.png) -66px 0px no-repeat;
-    width:19;
+  .words_specified {
+    background: transparent url(/words/sprite.png) -111px 0px no-repeat;
+    width:70;
     height:21;
     text-indent:-5000px;
   }

data/examples/sprites/words/sprite.css

@@ -1,24 +1,28 @@
   .words_of {
-    background: transparent url(/words/sprite.png) -66px 0px no-repeat;
+    background: transparent url(/examples/sprites/words/sprite.png) -66px 0px no-repeat;
     width:19;
+    height:21;
     text-indent:-5000px;
   }
 
   .words_set {
-    background: transparent url(/words/sprite.png) -85px 0px no-repeat;
+    background: transparent url(/examples/sprites/words/sprite.png) -85px 0px no-repeat;
     width:26;
+    height:21;
     text-indent:-5000px;
   }
 
   .words_specified {
-    background: transparent url(/words/sprite.png) -111px 0px no-repeat;
+    background: transparent url(/examples/sprites/words/sprite.png) -111px 0px no-repeat;
     width:70;
+    height:21;
     text-indent:-5000px;
   }
 
   .words_latitude {
-    background: transparent url(/words/sprite.png) 0px 0px no-repeat;
+    background: transparent url(/examples/sprites/words/sprite.png) 0px 0px no-repeat;
     width:66;
+    height:21;
     text-indent:-5000px;
   }
 

data/lib/spittle/filters.rb

@@ -1,64 +1,46 @@
 module PNG
   class Filters
     class << self
-      #TODO: feature envy, this behavior belongs to a row. 
       def fetch_pixel(idx, row)
-        return 0 if idx < 0
-        return row[idx] || 0
+        idx < 0 ? 0 : row[idx] || 0
       end
 
+      #filter methods are inlined here for performance
       def call( filter_type, value, index, row, last_row, record_width )
         case filter_type
         when 0
-          no_filter( value, index, row, last_row, record_width )
+          #no filter
+          value
         when 1
-          left( value, index, row, last_row, record_width )
+          #up
+          (value + fetch_pixel(index - record_width, row)) % 256
         when 2
-          up( value, index, row, last_row, record_width )
+          #left
+          (value + fetch_pixel(index, last_row)) % 256
         when 3
-          avg( value, index, row, last_row, record_width )
+          #avg
+          (value + ( (fetch_pixel(index - record_width, row) + fetch_pixel(index, last_row)) / 2 ).floor) % 256
         when 4
-          paeth( value, index, row, last_row, record_width )
+          #paeth
+          a = fetch_pixel(index - record_width, row)
+          b = fetch_pixel(index, last_row)
+          c = fetch_pixel(index - record_width, last_row)
+          p = a + b - c
+          pa = (p - a).abs
+          pb = (p - b).abs
+          pc = (p - c).abs
+
+          pr = c
+          if ( pa <= pb and pa <= pc) 
+            pr = a
+          elsif (pb <= pc)
+            pr = b
+          end
+          (value + pr) % 256
         else
           raise "Invalid filter type (#{filter_type})"
         end
       end
-      
-      def no_filter( value, index, row, last_row, record_width )
-        value
-      end
-      
-      def left( value, index, row, last_row, record_width )
-        (value + fetch_pixel(index - record_width, row)) % 256
-      end
-      
-      def up( value, index, row, last_row, record_width )
-        (value + fetch_pixel(index, last_row)) % 256
-      end
-    
-      def avg( value, index, row, last_row, record_width )
-        (value + ( (fetch_pixel(index - record_width, row) + fetch_pixel(index, last_row)) / 2 ).floor) % 256
-      end
-    
-      def paeth( value, index, row, last_row, record_width )
-        a = fetch_pixel(index - record_width, row)
-        b = fetch_pixel(index, last_row)
-        c = fetch_pixel(index - record_width, last_row)
-        p = a + b - c
-        pa = (p - a).abs
-        pb = (p - b).abs
-        pc = (p - c).abs
-
-        pr = c
-        if ( pa <= pb and pa <= pc) 
-          pr = a
-        elsif (pb <= pc)
-          pr = b
-        end
-
-        (value + pr) % 256
-      end
-
     end
   end
 end

data/lib/spittle/idat.rb

@@ -1,7 +1,7 @@
 module PNG
   class IDAT < Chunk
     # I don't like that @compressed contains different values depending on how you're using it
-    # maybe we should introduce a builder? 
+    # maybe we should introduce a builder?
     def initialize( uncompressed="" )
       @compressed = ""
       @compressed += Zlib::Deflate.deflate( uncompressed.pack("C*") ) unless uncompressed == ""
@@ -10,15 +10,15 @@ module PNG
     def <<( data )
       @compressed << data
     end
-    
+
     def encode
       @compressed
     end
-    
+
     def uncompressed
       @uncompressed ||= Zlib::Inflate.inflate( @compressed ).unpack("C*")
     end
-    
+
     def chunk_name
       "IDAT"
     end

data/lib/spittle/image.rb

@@ -1,59 +1,81 @@
 module PNG
   class Image
-    
+
     def self.open( file_name )
       name = File.basename( file_name, ".png" )
-      
+
       File.open(file_name, "r") do |f|
         ihdr, idat = Parser.go!( f )
         Image.new( ihdr, idat, name )
       end
-      
+
     end
-    
+
     def initialize( ihdr, idat, name )
       @ihdr = ihdr
       @idat = idat
       @name = name
     end
-    
+
     attr_reader :name
     def width; @ihdr.width end
     def height; @ihdr.height end
     def depth; @ihdr.depth end
     def color_type; @ihdr.color_type end
 
+    # need better checks, because currently compatible is
+    # similar color type, or depth.. maybe it doesn't matter...
     def compatible?(image)
-      self.height == image.height
+      self.color_type == image.color_type &&
+      self.depth == image.depth
     end
-    
+
     def write(file_name)
       File.open(file_name, 'w') do |f|
         f.write(generate_png)
       end
     end
 
+    def fill_to_height( desired_height )
+      raise "invalid height" if desired_height < height
+      return self if desired_height == height
+
+      data = @idat.uncompressed
+
+      empty_row = [0] + [0] * ( width * pixel_width )
+
+
+      ( desired_height -  height ).times do
+        data = data + empty_row
+      end
+
+      ihdr = IHDR.new( width, desired_height, depth, color_type )
+      idat = IDAT.new( data )
+
+      Image.new( ihdr, idat, name )
+    end
+
     def to_s
-      "#{@name} (#{height} x #{width})"
+      "#{@name} (#{height} x #{width}) [color type: #{color_type}, depth: #{depth}]"
     end
-    
+
     def merge_left( other )
       l = other.rows
       r = self.rows
-      
+
       data = l.zip r
-      
+
       #prepend the filter byte 0 = no filter
-      data.each { |row| row.unshift(0) } 
+      data.each { |row| row.unshift(0) }
       data.flatten!
-      
+
       ihdr = IHDR.new( width + other.width, height, depth, color_type)
       idat = IDAT.new( data )
       img_name  = "#{name}_#{other.name}"
-      
+
       Image.new( ihdr, idat, img_name )
     end
-    
+
     #color types
     RGB = 2
     RGBA = 3
@@ -67,51 +89,52 @@ module PNG
       # + 1 adds filter byte
       (width * pixel_width) + 1
     end
-  
+
     def rows
-     out = []
+     uncompressed = @idat.uncompressed
+     out = Array.new(height)
      offset = 0
-     
+
      height.times do |scanline|
        end_row = scanline_width + offset
-       row = @idat.uncompressed.slice(offset, scanline_width)
-       out << decode(scanline, row, out, pixel_width)
+       row = uncompressed.slice(offset, scanline_width)
+       out[scanline] = decode(scanline, row, out, pixel_width)
        offset = end_row
      end
      out
     end
-    
+
     def inspect
-      "color type: #{color_type}, depth: #{depth}, width: #{width}, height: #{height}"
+      "name: #{name}, color type: #{color_type}, depth: #{depth}, width: #{width}, height: #{height}"
     end
   private
 
     def last_scanline(current, data)
       (current - 1 < 0 ? [] : data[current - 1])
     end
-      
+
     def decode(current, row, data, pixel_width)
       filter_type = row.shift
-      
+
       process_row(row, last_scanline(current, data), filter_type, pixel_width)
     end
-    
+
     def process_row(row, last_scanline, filter_type, pixel_width)
-      o = []
+      o = Array.new(row.size)
       row.each_with_index do |e, i|
         o[i] = Filters.call(filter_type, e, i, o, last_scanline, pixel_width)
       end
       o
     end
-    
+
     def generate_png
       file_header = PNG::FileHeader.new.encode
       raw_data = @idat.uncompressed
-      
+
       ihdr = PNG::IHDR.new( width, height, depth, color_type ).to_chunk
       idat = PNG::IDAT.new( raw_data ).to_chunk
       iend = PNG::IEND.new.to_chunk
-      
+
       file_header + ihdr + idat + iend
     end
   end

data/lib/spittle/sprite.rb

@@ -1,24 +1,26 @@
 module PNG
   class ImageFormatException < Exception; end
   class Sprite
-    attr_reader :images
+    attr_reader :images, :max_height
 
     def initialize
       @images = []
       @locations = {}
     end
-    
+
     def append( image )
       @images.each do |i|
        unless i.compatible? image
-         raise ImageFormatException.new("Incompatible image #{i}")
+         raise ImageFormatException.new("Image #{i} not compatible with #{image}")
        end
       end
+
       @images << image
+      @max_height = @images.map{ |i| i.height }.max
     end
-    
+
     def locations
-      @images.inject(0) do |x, image|  
+      @images.inject(0) do |x, image|
         @locations[image.name.to_sym] = { :x => -(x),
           :width => image.width,
           :height => image.height}
@@ -29,9 +31,9 @@ module PNG
 
     def write( output_filename )
       return if @images.empty?
-
+      right_sized = @images.map{|i| i.fill_to_height(@max_height)}
       # head is the last image, then we merge left
-      head, *tail = @images.reverse
+      head, *tail = right_sized.reverse
       result = tail.inject( head ){ |head, image| head.merge_left( image ) }
       result.write( output_filename )
     end

data/spec/lib/idat_spec.rb

@@ -27,4 +27,5 @@ describe PNG::IDAT do
     
     @idat.encode.should == @data
   end
+  
 end

data/spec/lib/image_spec.rb

@@ -16,4 +16,10 @@ describe PNG::Image do
     
     result.rows.should == [[4,5,6,1,2,3]]
   end
+  
+  it "can insert empty rows to convert an image to a specific height" do
+    result = @image1.fill_to_height(2)
+    result.rows.should == [[1, 2, 3],
+                           [0, 0, 0]]
+  end
 end

data/spec/lib/sprite_spec.rb

@@ -20,17 +20,19 @@ describe PNG::Sprite do
     @sprite.append( @image1 )
     @sprite.append( @image2 )
 
-    @sprite.locations[@image1.name.to_sym].should == {:x => -( 0 ), :width=> @image1.width, :height => @image1.height } 
-    @sprite.locations[@image2.name.to_sym].should == {:x => -( @image2.width ),  :width=> @image2.width, :height => @image2.height } 
+    @sprite.locations[@image1.name.to_sym].should == {:x => -( 0 ), :width=> @image1.width, :height => @image1.height }
+    @sprite.locations[@image2.name.to_sym].should == {:x => -( @image2.width ),  :width=> @image2.width, :height => @image2.height }
   end
 
-  it "raises a pretty exception when the images are incompatible" do 
-    taller_image = @builder.build( :width => 50, :height => 60, :name => "image")
-    
-    lambda do 
-      @sprite.append taller_image
-      @sprite.append @image1
-    end.should raise_error(PNG::ImageFormatException)
+  it "knows the height of the tallest image" do
+    max_height = 70
+
+    @image3 = @builder.build( :width => 50, :height => max_height, :name => "image3")
+
+    @sprite.append( @image1 )
+    @sprite.append( @image3 )
+
+    @sprite.max_height.should == max_height
   end
 
 end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rubygems'
 require 'spittle'
 require 'spec'
 require 'spec/autorun'

data/spittle.gemspec

@@ -5,23 +5,24 @@
 
 Gem::Specification.new do |s|
   s.name = %q{spittle}
-  s.version = "0.9.1"
+  s.version = "0.9.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["aberant", "tjennings"]
-  s.date = %q{2009-11-16}
-  s.default_executable = %q{spittle}
+  s.date = %q{2009-11-17}
   s.description = %q{pure ruby PNG}
   s.email = ["qzzzq1@gmail.com", "tyler.jennings@gmail.com"]
-  s.executables = ["spittle"]
+  s.executables = ["png_info", "spittle"]
   s.extra_rdoc_files = [
     "README"
   ]
   s.files = [
     ".gitignore",
+     "MIT-LICENSE",
      "README",
      "Rakefile",
      "VERSION",
+     "bin/png_info",
      "bin/spittle",
      "examples/sprites/README",
      "examples/sprites/apple/apple.png",
@@ -37,6 +38,11 @@ Gem::Specification.new do |s|
      "examples/sprites/apple/support.png",
      "examples/sprites/fragment.css",
      "examples/sprites/index.html",
+     "examples/sprites/many_sized_cats/cat-on-keyboard.png",
+     "examples/sprites/many_sized_cats/darth_cat.png",
+     "examples/sprites/many_sized_cats/fragment.css",
+     "examples/sprites/many_sized_cats/music-keyboard-cat.png",
+     "examples/sprites/many_sized_cats/sprite.png",
      "examples/sprites/server.rb",
      "examples/sprites/sprite.css",
      "examples/sprites/words/fragment.css",

data/tasks/spittle_tasks.rake

@@ -1,9 +1,25 @@
- desc "Generates sprites"
- task :sprite do
-   require File.dirname(__FILE__)  + "/../lib/spittle.rb"
+#TODO - make this a rake task instead of a function
+module Spittle
+  def self.setup
+     require 'fileutils'
+     require File.dirname(__FILE__)  + "/../lib/spittle.rb"
 
-   opts = {:source =>  RAILS_ROOT + "/public/images/sprites", 
-           :path_prefix =>  "/images"}
+     FileUtils.cd(RAILS_ROOT + "/public/images")
+     opts = {:source =>  "sprites",
+             :path_prefix =>  "/images",
+             :css_file => RAILS_ROOT + '/public/stylesheets/sprites.css'}
+  end
+end
 
-   Spittle::Processor.new(opts).write
- end
+namespace :sprite do 
+  desc "Generates sprite images and stylesheets"
+  task :generate do 
+    opts = Spittle.setup 
+    Spittle::Processor.new(opts).write
+  end
+  desc "Removes generated sprite images and stylesheets"
+  task :cleanup do 
+    opts = Spittle.setup 
+    Spittle::Processor.new(opts).cleanup
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spittle
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.1.3
 platform: ruby
 authors: 
 - aberant
@@ -10,8 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 -06:00
-default_executable: spittle
+date: 2009-11-17 00:00:00 -06:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -28,6 +28,7 @@ email:
 - qzzzq1@gmail.com
 - tyler.jennings@gmail.com
 executables: 
+- png_info
 - spittle
 extensions: []
 
@@ -35,9 +36,11 @@ extra_rdoc_files:
 - README
 files: 
 - .gitignore
+- MIT-LICENSE
 - README
 - Rakefile
 - VERSION
+- bin/png_info
 - bin/spittle
 - examples/sprites/README
 - examples/sprites/apple/apple.png
@@ -53,6 +56,11 @@ files:
 - examples/sprites/apple/support.png
 - examples/sprites/fragment.css
 - examples/sprites/index.html
+- examples/sprites/many_sized_cats/cat-on-keyboard.png
+- examples/sprites/many_sized_cats/darth_cat.png
+- examples/sprites/many_sized_cats/fragment.css
+- examples/sprites/many_sized_cats/music-keyboard-cat.png
+- examples/sprites/many_sized_cats/sprite.png
 - examples/sprites/server.rb
 - examples/sprites/sprite.css
 - examples/sprites/words/fragment.css