spittle 0.9.1.7 → 0.9.1.8

data/README.rdoc

@@ -13,7 +13,7 @@
 
 It takes your PNG's, chews them up and spits out sprites!
 
-point bin/spittle at a directory, and watch it sprite away!
+point bin/sprite at a directory, and watch it sprite away!
 
 == Installation - standalone
 
@@ -51,7 +51,6 @@ Check out examples/sprites if you want to see what spittle can do without doing
 
 == Limitations
 
-- supports RGB and RGBA color types only (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)
 - does not support reading interlaced PNGs.
 
@@ -64,10 +63,12 @@ Check out examples/sprites if you want to see what spittle can do without doing
 - Supports varying dimensions in source images
 - Does not regenerate sprites that have not changed
 - Supports all PNG filter types to improve image compression
+- supports mixing RGB and RGBA color types
 
 == Roadmap - by priority
 
 - Reading interlaced images
+- Translate between png color spaces automatically.
 - allow a global css template override
 - allow per-sprite and global configuration
 

data/VERSION

@@ -1 +1 @@
-0.9.1.7
+0.9.1.8

data/lib/spittle/image_data.rb

@@ -1,5 +1,10 @@
+require 'enumerator'
+
 module Spittle
   class ImageData
+    RGB_WIDTH = 3
+    RGBA_WIDTH = 4
+
     def initialize(options = {})
       @data = (options.delete :data) || []
       @properties = options
@@ -46,6 +51,27 @@ module Spittle
       img
     end
 
+    def to_rgba( alpha_value=255 )
+      # test that conversion updates pixel width, scanline width
+
+      return self if pixel_width == RGBA_WIDTH
+
+      # so ruby 1.9 has different ideas then 1.8 on how Enumerable should work
+      # 1.9 returns Enumerable object if no block given
+      # 1.8 complains if no block, unless using enum_x methods
+      slice_method = (RUBY_VERSION.include?( "1.9" )) ? :each_slice : :enum_slice
+
+      rgba_data = @data.map do |row|
+        pixels = row.send( slice_method, RGB_WIDTH )
+        pixels.inject([]){|result, pixel| result + pixel + [alpha_value] }
+      end
+
+      ImageData.new( :data => rgba_data,
+                     :pixel_width => 4,
+                     :scanline_width => (@properties[:scanline_width] / RGB_WIDTH) * RGBA_WIDTH,
+                     :name => name)
+    end
+
     def [](row)
       @data[row]
     end

data/lib/spittle/png/image.rb

@@ -1,37 +1,47 @@
 module PNG
-
   class Image
-    def self.default_filter_type
-      4 # paeth
-    end
+    #color types
+    RGB = 2
+    RGBA = 6
+
+    class << self
+      def image_data( file_name, options={} )
+        image_options = {:rgba => true}.merge( options )
 
-    def self.open( file_name )
-      name = File.basename( file_name, ".png" )
+        png = open(file_name)
 
-      File.open(file_name, "r") do |f|
-        ihdr, idat = Parser.go!( f )
-        Image.new( ihdr, idat, name )
+        return png.to_image unless image_options[:rgba]
+        png.to_image.to_rgba
       end
-    end
-    
-    #TODO - rename this 'image_data'
-    def self.image_data( file_name )
-      png = open(file_name)
-      png.to_image
-    end
 
-    def self.write( file_name, data, options = {} )
-      ihdr = PNG::IHDR.new(data.width, data.height, 8, color_type_of(data.pixel_width))
-      Image.new(ihdr, nil, file_name, :rows => data).write( file_name, options)
-    end
+      def 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 write( file_name, data, options = {} )
+        ihdr = PNG::IHDR.new(data.width, data.height, 8, color_type_of(data.pixel_width))
+
+        Image.new(ihdr, nil, file_name, :rows => data).write( file_name, options)
+      end
+
+      def default_filter_type
+        4 # paeth
+      end
 
-    #TODO - Nieve We should only store RBGA
-    def self.color_type_of(pixel_width)
-      case pixel_width
-      when 3
-        RGB
-      when 4
-        RGBA
+    private # class methods
+
+      def color_type_of(pixel_width)
+        case pixel_width
+        when 3
+          RGB
+        when 4
+          RGBA
+        end
       end
     end
 
@@ -56,29 +66,11 @@ module PNG
       end
     end
 
-    def to_s
-      inspect
-    end
-
-    #color types
-    RGB = 2
-    RGBA = 3
-
     # check for RGB or RGBA
     def pixel_width
       ( color_type == RGB ? 3 : 4)
     end
 
-
-    def scanline_width
-      # + 1 adds filter byte
-      (width * pixel_width) + 1
-    end
-
-    def rows
-      @rows ||= to_image
-    end
-
     def filter_encoded_rows(filter_type)
       out = Array.new(height)
       rows.each_with_index do |row, scanline|
@@ -106,11 +98,25 @@ module PNG
       n_out
     end
 
+    def to_s
+      inspect
+    end
+
     def inspect
       "#{@name} (#{height} x #{width}) [color type: #{color_type}, depth: #{depth}]"
     end
+
   private
 
+    def scanline_width
+      # + 1 adds filter byte
+      (width * pixel_width) + 1
+    end
+
+    def rows
+      @rows ||= to_image
+    end
+
     def decode(current, row, data, pixel_width)
       filter_type = row.shift
       decode_row(row, data.last_scanline(current), filter_type, pixel_width)

data/spec/image_data_spec.rb

@@ -46,4 +46,18 @@ describe Spittle::ImageData do
   it "will return the last scanline given a current index" do 
     @id.last_scanline(1).should == [1,2,3]
   end
+  
+  describe "RGBA conversion" do
+    it "updates pixel width" do
+      @id.to_rgba.pixel_width.should == 4 # RGBA pixel width
+    end
+    
+    it "updates scanline width" do
+      @id.to_rgba.scanline_width.should == 4
+    end
+    
+    it "puts in an alpha byte with a default value of 255" do
+      @id.to_rgba[0].should == [1,2,3,255]
+    end
+  end
 end

data/spec/integration_spec.rb

@@ -15,8 +15,8 @@ describe 'PNG' do
   end
 
   it 'can merge one PNG on the left of another' do 
-    one = PNG::Image.image_data("#{@img_dir}/lightening.png")
-    two = PNG::Image.image_data("#{@img_dir}/lightening.png")
+    one = PNG::Image.image_data("#{@img_dir}/lightening.png", :rgba => false)
+    two = PNG::Image.image_data("#{@img_dir}/lightening.png", :rgba => false)
     merged = one.merge_left two
     PNG::Image.write("#{@tmp_dir}/merge_right_test.png", merged, :filter_type => 0)
     read("#{@expected_dir}/merge_right_test.png").should == read("#{@tmp_dir}/merge_right_test.png")

data/spittle.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{spittle}
-  s.version = "0.9.1.7"
+  s.version = "0.9.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["aberant", "tjennings"]
-  s.date = %q{2010-01-01}
+  s.date = %q{2010-01-04}
   s.description = %q{Spittle is a pure ruby PNG spriting library. It can be used standalone or as a Rails plugin, see the readme for details.}
   s.email = ["qzzzq1@gmail.com", "tyler.jennings@gmail.com"]
   s.executables = ["png_info", "sprite"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spittle
 version: !ruby/object:Gem::Version 
-  version: 0.9.1.7
+  version: 0.9.1.8
 platform: ruby
 authors: 
 - aberant
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-01 00:00:00 -06:00
+date: 2010-01-04 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency