chunky_png 0.8.0 → 0.9.0

data/.bundle/config

@@ -0,0 +1,2 @@
+--- 
+BUNDLE_DISABLE_SHARED_GEMS: "1"

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/Gemfile.lock

@@ -0,0 +1,22 @@
+PATH
+  remote: .
+  specs:
+    chunky_png (0.9.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    gemcutter (0.6.1)
+    git (1.2.5)
+    rake (0.8.7)
+    rspec (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  chunky_png!
+  gemcutter
+  git
+  rake
+  rspec (>= 1.3)

data/README.rdoc

@@ -19,10 +19,11 @@ Issue tracker:: http://github.com/wvanbergen/chunky_png/issues
   chosen automatically, based on the amount of used colors.
 * R/W access to the image's pixels.
 * R/W access to all image metadata that is stored in chunks.
-* Memory efficient (uses a Fixnum, i.e. 4 bytes of memory, per pixel)
+* Memory efficient (uses a Fixnum, i.e. 4 or 8 bytes of memory per pixel, depending
+  on the hardware)
 * Reasonably fast for Ruby standards, by only using integer math and a highly
   optimized saving routine.
-* Interoperability with RMagick.
+* Interoperability with RMagick if you really have to.
 
 == Classes
 

data/Rakefile

@@ -1,4 +1,9 @@
 Dir['tasks/*.rake'].each { |file| load(file) }
 
+require 'rubygems'
+require 'bundler'
+
+Bundler.setup
+
 GithubGem::RakeTasks.new(:gem)
 task :default => [:spec]

data/chunky_png.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
 
   # Do not change the version and date fields by hand. This will be done
   # automatically by the gem release script.
-  s.version = "0.8.0"
-  s.date    = "2010-07-01"
+  s.version = "0.9.0"
+  s.date    = "2010-08-18"
 
   s.summary     = "Pure ruby library for read/write, chunk-level access to PNG files"
   s.description = <<-EOT
@@ -25,13 +25,16 @@ Gem::Specification.new do |s|
   s.email    = ['willem@railsdoctors.com']
   s.homepage = 'http://wiki.github.com/wvanbergen/chunky_png'
 
-  s.add_development_dependency('rspec', '>= 1.2.9')
+  s.add_development_dependency('rake')
+  s.add_development_dependency('rspec', '>= 1.3')
+  s.add_development_dependency('git')
+  s.add_development_dependency('gemcutter')
 
   s.rdoc_options << '--title' << s.name << '--main' << 'README.rdoc' << '--line-numbers' << '--inline-source'
   s.extra_rdoc_files = ['README.rdoc']
 
   # Do not change the files and test_files fields by hand. This will be done
   # automatically by the gem release script.
-  s.files      = %w(spec/spec_helper.rb spec/resources/ztxt_chunk.png spec/resources/text_chunk.png spec/resources/replaced.png spec/resources/pixelstream.rgb spec/resources/indexed_4bit.png spec/resources/gray_10x10_grayscale.png spec/resources/damaged_signature.png spec/resources/damaged_chunk.png spec/resources/clock_updated.png spec/chunky_png/canvas/png_encoding_spec.rb lib/chunky_png/canvas/stream_exporting.rb spec/resources/gray_10x10.png lib/chunky_png/color.rb lib/chunky_png/canvas/operations.rb spec/resources/clock.png .gitignore spec/resources/gray_10x10_truecolor_alpha.png spec/chunky_png/canvas_spec.rb LICENSE spec/resources/gray_10x10_truecolor.png spec/resources/composited.png spec/resources/clock_mask.png spec/chunky_png/color_spec.rb spec/chunky_png/canvas/adam7_interlacing_spec.rb lib/chunky_png/chunk.rb lib/chunky_png/canvas/stream_importing.rb lib/chunky_png/canvas/png_encoding.rb lib/chunky_png/canvas/adam7_interlacing.rb spec/resources/operations.png spec/chunky_png/canvas/png_decoding_spec.rb lib/chunky_png/canvas.rb Rakefile spec/resources/transparent_gray_10x10.png spec/resources/pixelstream.rgba spec/resources/cropped.png README.rdoc spec/resources/gray_10x10_indexed.png spec/resources/clock_base.png spec/resources/16x16_non_interlaced.png spec/chunky_png_spec.rb spec/chunky_png/canvas/drawing_spec.rb lib/chunky_png/palette.rb lib/chunky_png/datastream.rb chunky_png.gemspec tasks/github-gem.rake spec/resources/pixelstream_reference.png spec/resources/lines.png spec/resources/gray_10x10_grayscale_alpha.png spec/resources/16x16_interlaced.png spec/chunky_png/image_spec.rb lib/chunky_png/canvas/drawing.rb spec/resources/rect.png spec/resources/clock_mask_updated.png spec/resources/adam7.png lib/chunky_png/rmagick.rb lib/chunky_png/image.rb spec/chunky_png/rmagick_spec.rb spec/chunky_png/datastream_spec.rb lib/chunky_png/canvas/png_decoding.rb lib/chunky_png.rb)
-  s.test_files = %w(spec/chunky_png/canvas/png_encoding_spec.rb spec/chunky_png/canvas_spec.rb spec/chunky_png/color_spec.rb spec/chunky_png/canvas/adam7_interlacing_spec.rb spec/chunky_png/canvas/png_decoding_spec.rb spec/chunky_png_spec.rb spec/chunky_png/canvas/drawing_spec.rb spec/chunky_png/image_spec.rb spec/chunky_png/rmagick_spec.rb spec/chunky_png/datastream_spec.rb)
-end
+  s.files      = %w(.bundle/config .gitignore Gemfile Gemfile.lock LICENSE README.rdoc Rakefile chunky_png.gemspec lib/chunky_png.rb lib/chunky_png/canvas.rb lib/chunky_png/canvas/adam7_interlacing.rb lib/chunky_png/canvas/drawing.rb lib/chunky_png/canvas/operations.rb lib/chunky_png/canvas/png_decoding.rb lib/chunky_png/canvas/png_encoding.rb lib/chunky_png/canvas/stream_exporting.rb lib/chunky_png/canvas/stream_importing.rb lib/chunky_png/chunk.rb lib/chunky_png/color.rb lib/chunky_png/datastream.rb lib/chunky_png/image.rb lib/chunky_png/palette.rb lib/chunky_png/rmagick.rb spec/chunky_png/canvas/adam7_interlacing_spec.rb spec/chunky_png/canvas/drawing_spec.rb spec/chunky_png/canvas/operations_spec.rb spec/chunky_png/canvas/png_decoding_spec.rb spec/chunky_png/canvas/png_encoding_spec.rb spec/chunky_png/canvas_spec.rb spec/chunky_png/color_spec.rb spec/chunky_png/datastream_spec.rb spec/chunky_png/image_spec.rb spec/chunky_png/rmagick_spec.rb spec/chunky_png_spec.rb spec/resources/16x16_interlaced.png spec/resources/16x16_non_interlaced.png spec/resources/adam7.png spec/resources/clock.png spec/resources/clock_base.png spec/resources/clock_flip_horizontally.png spec/resources/clock_flip_vertically.png spec/resources/clock_mask.png spec/resources/clock_mask_updated.png spec/resources/clock_rotate_180.png spec/resources/clock_rotate_left.png spec/resources/clock_rotate_right.png spec/resources/clock_stubbed.png spec/resources/clock_updated.png spec/resources/composited.png spec/resources/cropped.png spec/resources/damaged_chunk.png spec/resources/damaged_signature.png spec/resources/gray_10x10.png spec/resources/gray_10x10_grayscale.png spec/resources/gray_10x10_grayscale_alpha.png spec/resources/gray_10x10_indexed.png spec/resources/gray_10x10_truecolor.png spec/resources/gray_10x10_truecolor_alpha.png spec/resources/indexed_4bit.png spec/resources/lines.png spec/resources/operations.png spec/resources/pixelstream.rgb spec/resources/pixelstream.rgba spec/resources/pixelstream_reference.png spec/resources/rect.png spec/resources/replaced.png spec/resources/text_chunk.png spec/resources/transparent_gray_10x10.png spec/resources/ztxt_chunk.png spec/spec_helper.rb tasks/github-gem.rake)
+  s.test_files = %w(spec/chunky_png/canvas/adam7_interlacing_spec.rb spec/chunky_png/canvas/drawing_spec.rb spec/chunky_png/canvas/operations_spec.rb spec/chunky_png/canvas/png_decoding_spec.rb spec/chunky_png/canvas/png_encoding_spec.rb spec/chunky_png/canvas_spec.rb spec/chunky_png/color_spec.rb spec/chunky_png/datastream_spec.rb spec/chunky_png/image_spec.rb spec/chunky_png/rmagick_spec.rb spec/chunky_png_spec.rb)
+end

data/lib/chunky_png.rb

@@ -27,7 +27,7 @@ module ChunkyPNG
 
   # The current version of ChunkyPNG. This value will be updated automatically
   # by them gem:release rake task.
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 
   ###################################################
   # PNG international standard defined constants
@@ -51,19 +51,19 @@ module ChunkyPNG
   FILTER_UP             = 2
   FILTER_AVERAGE        = 3
   FILTER_PAETH          = 4
-  
+
   ###################################################
   # ChunkyPNG exception classes
   ###################################################
-  
+
   # Default exception class for ChunkyPNG
   class Exception < ::StandardError
   end
-  
+
   # Exception that is raised for an unsopported PNG image.
   class NotSupported < ChunkyPNG::Exception
   end
-  
+
   # Exception that is raised if the PNG signature is not encountered at the 
   # beginning of the file.
   class SignatureMismatch < ChunkyPNG::Exception
@@ -73,8 +73,11 @@ module ChunkyPNG
   class CRCMismatch < ChunkyPNG::Exception
   end
 
-  
   # Exception that is raised if an expectation fails.
   class ExpectationFailed < ChunkyPNG::Exception
-  end  
+  end
+
+  # Exception that is raised if an expectation fails.
+  class OutOfBounds < ChunkyPNG::ExpectationFailed
+  end
 end

data/lib/chunky_png/canvas.rb

@@ -98,6 +98,7 @@ module ChunkyPNG
     # @param [Integer] y The y-coordinate of the pixel (row)
     # @param [ChunkyPNG::Color] pixel The new pixel for the provided coordinates.
     def []=(x, y, color)
+      assert_xy!(x, y)
       @pixels[y * width + x] = color
     end
 
@@ -106,16 +107,67 @@ module ChunkyPNG
     # @param [Integer] y The y-coordinate of the pixel (row)
     # @return [ChunkyPNG::Color] The current pixel at the provided coordinates.
     def [](x, y)
+      assert_xy!(x, y)
       @pixels[y * width + x]
     end
-    
+
+    # Returns an extracted row as vector of pixels
+    # @param [Integer] y The 0-based row index
+    # @return [Array<Integer>] The vector of pixels in the requested row
+    def row(y)
+      assert_y!(y)
+      pixels.slice(y * width, width)
+    end
+
+    # Returns an extracted column as vector of pixels.
+    # @param [Integer] x The 0-based column index.
+    # @return [Array<Integer>] The vector of pixels in the requested column.
+    def column(x)
+      assert_x!(x)
+      (0...height).inject([]) { |pixels, y| pixels << self[x, y] }
+    end
+
+    # Replaces a row of pixels on this canvas.
+    # @param [Integer] y The 0-based row index.
+    # @param [Array<Integer>] vector The vector of pixels to replace the row with.
+    def replace_row!(y, vector)
+      assert_y!(y) && assert_width!(vector.length)
+      pixels[y * width, width] = vector
+    end
+
+    # Replaces a column of pixels on this canvas.
+    # @param [Integer] x The 0-based column index.
+    # @param [Array<Integer>] vector The vector of pixels to replace the column with.
+    def replace_column!(x, vector)
+      assert_x!(x) && assert_height!(vector.length)
+      for y in 0...height do
+        self[x, y] = vector[y]
+      end
+    end
+
     # Checks whether the given coordinates are in the range of the canvas
     # @param [Integer] x The x-coordinate of the pixel (column)
     # @param [Integer] y The y-coordinate of the pixel (row)
     # @return [true, false] True if the x and y coordinate are in the range 
     #    of this canvas.
-    def include?(x, y)
-      (0...width).include?(x) && (0...height).include?(y)
+    def include_xy?(x, y)
+      include_x?(x) && include_y?(y)
+    end
+    
+    alias_method :include?, :include_xy?
+
+    # Checks whether the given y-coordinate is in the range of the canvas
+    # @param [Integer] y The y-coordinate of the pixel (row)
+    # @return [true, false] True if the y-coordinate is in the range of this canvas.
+    def include_y?(y)
+      y >= 0 && y < height
+    end
+
+    # Checks whether the given x-coordinate is in the range of the canvas
+    # @param [Integer] x The y-coordinate of the pixel (column)
+    # @return [true, false] True if the x-coordinate is in the range of this canvas.
+    def include_x?(x)
+      x >= 0 && x < width
     end
 
     # Returns the palette used for this canvas.
@@ -145,5 +197,52 @@ module ChunkyPNG
     def to_image
       ChunkyPNG::Image.from_canvas(self)
     end
+    
+    #################################################################
+    # RUBY 1.8.6 compatibility
+    #################################################################
+    
+    unless respond_to?(:tap)
+      def tap(&block)
+        yield(self)
+        self
+      end
+    end
+    
+    protected
+    
+    # Throws an exception if the x-coordinate is out of bounds.
+    def assert_x!(x)
+      raise ChunkyPNG::OutOfBounds, "Column index out of bounds!" unless include_x?(x)
+      return true
+    end
+    
+    # Throws an exception if the y-coordinate is out of bounds.
+    def assert_y!(y)
+      raise ChunkyPNG::OutOfBounds, "Row index out of bounds!" unless include_y?(y)
+      return true
+    end
+    
+    # Throws an exception if the x- or y-coordinate is out of bounds.
+    def assert_xy!(x, y)
+      raise ChunkyPNG::OutOfBounds, "Coordinates out of bounds!" unless include_xy?(x, y)
+      return true
+    end
+    
+    def assert_height!(vector_length)
+      raise ChunkyPNG::ExpectationFailed, "The length of the vector does not match the canvas height!" if height != vector_length
+      return true
+    end
+    
+    def assert_width!(vector_length)
+      raise ChunkyPNG::ExpectationFailed, "The length of the vector does not match the canvas width!" if width != vector_length
+      return true
+    end
+    
+    def assert_size!(matrix_width, matrix_height)
+      raise ChunkyPNG::ExpectationFailed, "The width of the matrix does not match the canvas width!"   if width  != matrix_width
+      raise ChunkyPNG::ExpectationFailed, "The height of the matrix does not match the canvas height!" if height != matrix_height
+      return true
+    end
   end
 end

data/lib/chunky_png/canvas/drawing.rb

@@ -39,9 +39,9 @@ module ChunkyPNG
             e_acc_temp, e_acc = e_acc, (e_acc + e) & 0xffff
             x0 = x0 + sx if (e_acc <= e_acc_temp)
             w = 0xff - (e_acc >> 8)
-            point(x0, y0, ChunkyPNG::Color.fade(color, w)) if include?(x0, y0)
+            point(x0, y0, ChunkyPNG::Color.fade(color, w)) if include_xy?(x0, y0)
             y0 = y0 + 1
-            point(x0 + sx, y0, ChunkyPNG::Color.fade(color, 0xff - w)) if include?(x0 + sx, y0)
+            point(x0 + sx, y0, ChunkyPNG::Color.fade(color, 0xff - w)) if include_xy?(x0 + sx, y0)
           end
           point(x1, y1, color)
           
@@ -53,9 +53,9 @@ module ChunkyPNG
             e_acc_temp, e_acc = e_acc, (e_acc + e) & 0xffff
             y0 += 1 if (e_acc <= e_acc_temp)
             w = 0xff - (e_acc >> 8)
-            point(x0, y0, ChunkyPNG::Color.fade(color, w)) if include?(x0, y0)
+            point(x0, y0, ChunkyPNG::Color.fade(color, w)) if include_xy?(x0, y0)
             x0 += sx
-            point(x0, y0 + 1, ChunkyPNG::Color.fade(color, 0xff - w)) if include?(x0, y0 + 1)
+            point(x0, y0 + 1, ChunkyPNG::Color.fade(color, 0xff - w)) if include_xy?(x0, y0 + 1)
           end
           point(x1, y1, color)
         end

data/lib/chunky_png/canvas/operations.rb

@@ -56,6 +56,46 @@ module ChunkyPNG
         raise ChunkyPNG::ExpectationFailed, "This is not a mask image!" if palette.opaque_palette.size != 1
         pixels.map! { |pixel| (new_color & 0xffffff00) | ChunkyPNG::Color.a(pixel) }
       end
+      
+      def flip_horizontally
+        self.class.new(width, height).tap do |flipped|
+          for y in 0...height do
+            flipped.replace_row!(height - (y + 1), row(y))
+          end
+        end
+      end
+      
+      def flip_vertically
+        self.class.new(width, height).tap do |flipped|
+          for x in 0...width do
+            flipped.replace_column!(width - (x + 1), column(x))
+          end
+        end
+      end
+
+      def rotate_right
+        self.class.new(height, width).tap do |rotated|
+          for i in 0...width do
+            rotated.replace_row!(i, column(i).reverse)
+          end
+        end
+      end
+      
+      def rotate_left
+        self.class.new(height, width).tap do |rotated|
+          for i in 0...width do
+            rotated.replace_row!(width - (i + 1), column(i))
+          end
+        end
+      end
+      
+      def rotate_180
+        self.class.new(width, height).tap do |flipped|
+          for y in 0...height do
+            flipped.replace_row!(height - (y + 1), row(y).reverse)
+          end
+        end
+      end
 
       protected
 

data/lib/chunky_png/canvas/png_encoding.rb

@@ -52,7 +52,18 @@ module ChunkyPNG
       alias :to_s :to_blob
 
       # Converts this Canvas to a datastream, so that it can be saved as a PNG image.
-      # @param [Hash] constraints The constraints to use when encoding the canvas.
+      # @param [Hash, Symbol] constraints The constraints to use when encoding the canvas.
+      #    This can either be a hash with different constraints, or a symbol which acts as a 
+      #    preset for some constraints. If no constraints are given, ChunkyPNG will decide  
+      #    for itself how to best create the PNG datastream. 
+      #    Supported presets are :fast_rgba for quickly saving images with transparency,
+      #    :fast_rgb for quickly saving opaque images, and :best_compression to obtain the
+      #    smallest possible filesize.
+      # @option constraints [Fixnum] :color_mode The color mode to use. Use one of the 
+      #    ChunkyPNG::COLOR_* constants.
+      # @option constraints [true, false] :interlace Whether to use interlacing.
+      # @option constraints [Fixnum] :compression The compression level for Zlib. This can be a
+      #    value between 0 and 9, or a Zlib constant like Zlib::BEST_COMPRESSION.
       # @return [ChunkyPNG::Datastream] The PNG datastream containing the encoded canvas.
       # @see ChunkyPNG::Canvas::PNGEncoding#determine_png_encoding
       def to_datastream(constraints = {})
@@ -81,7 +92,8 @@ module ChunkyPNG
       # You can provide constraints for the encoding variables by passing a hash with 
       # encoding variables to this method.
       #
-      # @param [Hash] constraints The constraints for the encoding.
+      # @param [Hash, Symbol] constraints The constraints for the encoding. This can be a
+      #    Hash or a preset symbol.
       # @return [Hash] A hash with encoding options for {ChunkyPNG::Canvas::PNGEncoding#to_datastream}
       def determine_png_encoding(constraints = {})
         

data/spec/chunky_png/canvas/operations_spec.rb

@@ -0,0 +1,120 @@
+require 'spec_helper'
+
+describe ChunkyPNG::Canvas::Operations do
+  describe '#crop' do
+    before(:each) do
+      @canvas = ChunkyPNG::Canvas.from_file(resource_file('operations.png'))
+    end
+
+    it "should crop the right pixels from the original canvas" do
+      cropped = @canvas.crop(10, 5, 4, 8)
+      cropped.should == reference_canvas('cropped')
+    end
+  end
+
+  describe '#compose' do
+    it "should compose pixels correctly" do
+      canvas = ChunkyPNG::Canvas.from_file(resource_file('operations.png'))
+      subcanvas = ChunkyPNG::Canvas.new(4, 8, ChunkyPNG::Color.rgba(0, 0, 0, 75))
+      canvas.compose(subcanvas, 8, 4)
+      canvas.should == reference_canvas('composited')
+    end
+    
+    it "should compose a base image and mask correctly" do
+      base = reference_canvas('clock_base')
+      mask = reference_canvas('clock_mask_updated')
+      base.compose(mask).should == reference_canvas('clock_updated')
+    end
+  end
+
+  describe '#replace' do
+    before(:each) do
+      @canvas = ChunkyPNG::Canvas.from_file(resource_file('operations.png'))
+    end
+
+    it "should replace the correct pixels" do
+      subcanvas = ChunkyPNG::Canvas.new(3, 2, ChunkyPNG::Color.rgb(200, 255, 0))
+      @canvas.replace(subcanvas, 5, 4)
+      @canvas.should == reference_canvas('replaced')
+    end
+  end
+  
+  describe '#change_theme_color!' do
+    
+    before(:each) do
+      @theme_color = ChunkyPNG::Color.from_hex('#e10f7a')
+      @new_color   = ChunkyPNG::Color.from_hex('#ff0000')
+      @canvas      = reference_canvas('clock')
+    end
+    
+    it "should change the theme color correctly" do
+      @canvas.change_theme_color!(@theme_color, @new_color)
+      @canvas.should == reference_canvas('clock_updated')
+    end
+  end
+  
+  describe '#extract_mask' do
+    before(:each) do
+      @mask_color = ChunkyPNG::Color.from_hex('#e10f7a')
+      @canvas     = reference_canvas('clock')
+    end
+    
+    it "should create the correct base and mask image" do
+      base, mask = @canvas.extract_mask(@mask_color, ChunkyPNG::Color::WHITE)
+      base.should == reference_canvas('clock_base')
+      mask.should == reference_canvas('clock_mask')
+    end
+    
+    it "should create a mask image with only one opaque color" do
+      base, mask = @canvas.extract_mask(@mask_color, ChunkyPNG::Color::WHITE)
+      mask.palette.opaque_palette.size.should == 1
+    end
+  end
+  
+  describe '#change_mask_color!' do
+    before(:each) do
+      @new_color = ChunkyPNG::Color.from_hex('#ff0000')
+      @mask      = reference_canvas('clock_mask')
+    end
+    
+    it "should replace the mask color correctly" do
+      @mask.change_mask_color!(@new_color)
+      @mask.should == reference_canvas('clock_mask_updated')
+    end
+    
+    it "should still only have one opaque color" do
+      @mask.change_mask_color!(@new_color)
+      @mask.palette.opaque_palette.size.should == 1
+    end
+  end
+  
+  describe '#flip_horizontally' do
+    it "should flip the pixels horizontally" do
+      reference_canvas('clock_stubbed').flip_horizontally.should == reference_canvas('clock_flip_horizontally')
+    end
+  end
+  
+  describe '#flip_vertically' do
+    it "should flip the pixels vertically" do
+      reference_canvas('clock_stubbed').flip_vertically.should == reference_canvas('clock_flip_vertically')
+    end
+  end
+
+  describe '#rotate_left' do
+    it "should rotate the pixels 90 degrees counter-clockwise" do
+      reference_canvas('clock_stubbed').rotate_left.should == reference_canvas('clock_rotate_left')
+    end
+  end
+  
+  describe '#rotate_right' do
+    it "should rotate the pixels 90 degrees clockwise" do
+      reference_canvas('clock_stubbed').rotate_right.should == reference_canvas('clock_rotate_right')
+    end
+  end
+  
+  describe '#rotate_180' do
+    it "should rotate the pixels 180 degrees" do
+      reference_canvas('clock_stubbed').rotate_180.should == reference_canvas('clock_rotate_180')
+    end
+  end
+end

data/spec/chunky_png/canvas_spec.rb

@@ -21,111 +21,48 @@ describe ChunkyPNG::Canvas do
   end
   
   describe '#to_rgba_stream' do
-    before(:each) do
-      File.open(resource_file('pixelstream.rgba'), 'rb') { |f| @reference_data = f.read }
-    end
+    before { File.open(resource_file('pixelstream.rgba'), 'rb') { |f| @reference_data = f.read } }
     
     it "should load an image correctly from a datastream" do
-      canvas = reference_canvas('pixelstream_reference')
-      canvas.to_rgba_stream.should == @reference_data
+      reference_canvas('pixelstream_reference').to_rgba_stream.should == @reference_data
     end
   end
 
   describe '#to_rgb_stream' do
-    before(:each) do
-      File.open(resource_file('pixelstream.rgb'), 'rb') { |f| @reference_data = f.read }
-    end
+    before { File.open(resource_file('pixelstream.rgb'), 'rb') { |f| @reference_data = f.read } }
     
     it "should load an image correctly from a datastream" do
-      canvas = reference_canvas('pixelstream_reference')
-      canvas.to_rgb_stream.should == @reference_data
+      reference_canvas('pixelstream_reference').to_rgb_stream.should == @reference_data
     end
   end
+  
+  describe '#row' do
+    before { @canvas = reference_canvas('operations') }
 
-  describe '#crop' do
-    before(:each) do
-      @canvas = ChunkyPNG::Canvas.from_file(resource_file('operations.png'))
+    it "should give an out of bounds exception when y-coordinate is out of bounds" do
+      lambda { @canvas.row(-1) }.should raise_error(ChunkyPNG::OutOfBounds)
+      lambda { @canvas.row(16) }.should raise_error(ChunkyPNG::OutOfBounds)
     end
 
-    it "should crop the right pixels from the original canvas" do
-      cropped = @canvas.crop(10, 5, 4, 8)
-      cropped.should == reference_canvas('cropped')
+    it "should return the correct pixels" do
+      data = @canvas.row(0)
+      data.should have(@canvas.width).items
+      data.should == [65535, 268500991, 536936447, 805371903, 1073807359, 1342242815, 1610678271, 1879113727, 2147549183, 2415984639, 2684420095, 2952855551, 3221291007, 3489726463, 3758161919, 4026597375]
     end
   end
 
-  describe '#compose' do
-    it "should compose pixels correctly" do
-      canvas = ChunkyPNG::Canvas.from_file(resource_file('operations.png'))
-      subcanvas = ChunkyPNG::Canvas.new(4, 8, ChunkyPNG::Color.rgba(0, 0, 0, 75))
-      canvas.compose(subcanvas, 8, 4)
-      canvas.should == reference_canvas('composited')
-    end
-    
-    it "should compose a base image and mask correctly" do
-      base = reference_canvas('clock_base')
-      mask = reference_canvas('clock_mask_updated')
-      base.compose(mask).should == reference_canvas('clock_updated')
-    end
-  end
+  describe '#column' do
+    before { @canvas = reference_canvas('operations') }
 
-  describe '#replace' do
-    before(:each) do
-      @canvas = ChunkyPNG::Canvas.from_file(resource_file('operations.png'))
+    it "should give an out of bounds exception when x-coordinate is out of bounds" do
+      lambda { @canvas.column(-1) }.should raise_error(ChunkyPNG::OutOfBounds)
+      lambda { @canvas.column(16) }.should raise_error(ChunkyPNG::OutOfBounds)
     end
 
-    it "should replace the correct pixels" do
-      subcanvas = ChunkyPNG::Canvas.new(3, 2, ChunkyPNG::Color.rgb(200, 255, 0))
-      @canvas.replace(subcanvas, 5, 4)
-      @canvas.should == reference_canvas('replaced')
-    end
-  end
-  
-  describe '#change_theme_color!' do
-    
-    before(:each) do
-      @theme_color = ChunkyPNG::Color.from_hex('#e10f7a')
-      @new_color   = ChunkyPNG::Color.from_hex('#ff0000')
-      @canvas      = reference_canvas('clock')
-    end
-    
-    it "should change the theme color correctly" do
-      @canvas.change_theme_color!(@theme_color, @new_color)
-      @canvas.should == reference_canvas('clock_updated')
-    end
-  end
-  
-  describe '#extract_mask' do
-    before(:each) do
-      @mask_color = ChunkyPNG::Color.from_hex('#e10f7a')
-      @canvas     = reference_canvas('clock')
-    end
-    
-    it "should create the correct base and mask image" do
-      base, mask = @canvas.extract_mask(@mask_color, ChunkyPNG::Color::WHITE)
-      base.should == reference_canvas('clock_base')
-      mask.should == reference_canvas('clock_mask')
-    end
-    
-    it "should create a mask image with only one opaque color" do
-      base, mask = @canvas.extract_mask(@mask_color, ChunkyPNG::Color::WHITE)
-      mask.palette.opaque_palette.size.should == 1
-    end
-  end
-  
-  describe '#change_mask_color!' do
-    before(:each) do
-      @new_color = ChunkyPNG::Color.from_hex('#ff0000')
-      @mask      = reference_canvas('clock_mask')
-    end
-    
-    it "should replace the mask color correctly" do
-      @mask.change_mask_color!(@new_color)
-      @mask.should == reference_canvas('clock_mask_updated')
-    end
-    
-    it "should still only have one opaque color" do
-      @mask.change_mask_color!(@new_color)
-      @mask.palette.opaque_palette.size.should == 1
+    it "should return the correct pixels" do
+      data = @canvas.column(0)
+      data.should have(@canvas.height).items
+      data.should == [65535, 1114111, 2162687, 3211263, 4259839, 5308415, 6356991, 7405567, 8454143, 9502719, 10551295, 11599871, 12648447, 13697023, 14745599, 15794175]
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,11 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rubygems'
-require 'spec'
+require 'bundler'
+
+Bundler.setup
 
+require 'spec'
 require 'chunky_png'
 
 module ResourceFileHelper

data/tasks/github-gem.rake

@@ -134,8 +134,8 @@ module GithubGem
           desc "Release the next version of the gem, by incrementing the last version segment by 1"
           task(:next => [:next_version] + release_tasks) { release_task }
 
-          desc "Release the next version of the gem, using a bump increment (0.0.1)"
-          task(:bump => [:next_bump_version] + release_tasks) { release_task }
+          desc "Release the next version of the gem, using a patch increment (0.0.1)"
+          task(:patch => [:next_patch_version] + release_tasks) { release_task }
 
           desc "Release the next version of the gem, using a minor increment (0.1.0)"
           task(:minor => [:next_minor_version] + release_tasks) { release_task }
@@ -152,7 +152,7 @@ module GithubGem
         task(:commit_modified_files) { commit_modified_files_task }
 
         task(:next_version)       { next_version_task }
-        task(:next_bump_version)  { next_version_task(:bump) }
+        task(:next_patch_version)  { next_version_task(:patch) }
         task(:next_minor_version) { next_version_task(:minor) }
         task(:next_major_version) { next_version_task(:major) }
         
@@ -187,7 +187,7 @@ module GithubGem
       next_version = newest_version.segments
       increment_index = case increment
         when :micro then 3
-        when :bump  then 2
+        when :patch then 2
         when :minor then 1
         when :major then 0
         else next_version.length - 1
@@ -217,7 +217,7 @@ module GithubGem
 
     def check_version_task
       raise "#{ENV['VERSION']} is not a valid version number!" if ENV['VERSION'] && !Gem::Version.correct?(ENV['VERSION'])
-      proposed_version = Gem::Version.new(ENV['VERSION'] || gemspec.version)
+      proposed_version = Gem::Version.new(ENV['VERSION'].dup || gemspec.version)
       raise "This version (#{proposed_version}) is not higher than the highest tagged version (#{newest_version})" if newest_version >= proposed_version
     end
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: chunky_png
 version: !ruby/object:Gem::Version 
-  hash: 63
   prerelease: false
   segments: 
   - 0
-  - 8
+  - 9
   - 0
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -15,25 +14,62 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-01 00:00:00 +02:00
+date: 2010-08-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
+  name: rake
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
+        - 0
+        version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
+  type: :development
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: git
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: gemcutter
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id004
 description: "    This pure Ruby library can read and write PNG images without depending on an external \n    image library, like RMagick. It tries to be memory efficient and reasonably fast.\n    \n    It supports reading and writing all PNG variants that are defined in the specification, \n    with one limitation: only 8-bit color depth is supported. It supports all transparency, \n    interlacing and filtering options the PNG specifications allows. It can also read and \n    write textual metadata from PNG files. Low-level read/write access to PNG chunks is\n    also possible.\n    \n    This library supports simple drawing on the image canvas and simple operations like alpha composition\n    and cropping. Finally, it can import from and export to RMagick for interoperability. \n"
 email: 
 - willem@railsdoctors.com
@@ -44,67 +80,77 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- spec/spec_helper.rb
-- spec/resources/ztxt_chunk.png
-- spec/resources/text_chunk.png
-- spec/resources/replaced.png
-- spec/resources/pixelstream.rgb
-- spec/resources/indexed_4bit.png
-- spec/resources/gray_10x10_grayscale.png
-- spec/resources/damaged_signature.png
-- spec/resources/damaged_chunk.png
-- spec/resources/clock_updated.png
-- spec/chunky_png/canvas/png_encoding_spec.rb
-- lib/chunky_png/canvas/stream_exporting.rb
-- spec/resources/gray_10x10.png
-- lib/chunky_png/color.rb
-- lib/chunky_png/canvas/operations.rb
-- spec/resources/clock.png
+- .bundle/config
 - .gitignore
-- spec/resources/gray_10x10_truecolor_alpha.png
-- spec/chunky_png/canvas_spec.rb
+- Gemfile
+- Gemfile.lock
 - LICENSE
-- spec/resources/gray_10x10_truecolor.png
-- spec/resources/composited.png
-- spec/resources/clock_mask.png
-- spec/chunky_png/color_spec.rb
-- spec/chunky_png/canvas/adam7_interlacing_spec.rb
-- lib/chunky_png/chunk.rb
-- lib/chunky_png/canvas/stream_importing.rb
-- lib/chunky_png/canvas/png_encoding.rb
+- README.rdoc
+- Rakefile
+- chunky_png.gemspec
+- lib/chunky_png.rb
+- lib/chunky_png/canvas.rb
 - lib/chunky_png/canvas/adam7_interlacing.rb
-- spec/resources/operations.png
+- lib/chunky_png/canvas/drawing.rb
+- lib/chunky_png/canvas/operations.rb
+- lib/chunky_png/canvas/png_decoding.rb
+- lib/chunky_png/canvas/png_encoding.rb
+- lib/chunky_png/canvas/stream_exporting.rb
+- lib/chunky_png/canvas/stream_importing.rb
+- lib/chunky_png/chunk.rb
+- lib/chunky_png/color.rb
+- lib/chunky_png/datastream.rb
+- lib/chunky_png/image.rb
+- lib/chunky_png/palette.rb
+- lib/chunky_png/rmagick.rb
+- spec/chunky_png/canvas/adam7_interlacing_spec.rb
+- spec/chunky_png/canvas/drawing_spec.rb
+- spec/chunky_png/canvas/operations_spec.rb
 - spec/chunky_png/canvas/png_decoding_spec.rb
-- lib/chunky_png/canvas.rb
-- Rakefile
-- spec/resources/transparent_gray_10x10.png
-- spec/resources/pixelstream.rgba
+- spec/chunky_png/canvas/png_encoding_spec.rb
+- spec/chunky_png/canvas_spec.rb
+- spec/chunky_png/color_spec.rb
+- spec/chunky_png/datastream_spec.rb
+- spec/chunky_png/image_spec.rb
+- spec/chunky_png/rmagick_spec.rb
+- spec/chunky_png_spec.rb
+- spec/resources/16x16_interlaced.png
+- spec/resources/16x16_non_interlaced.png
+- spec/resources/adam7.png
+- spec/resources/clock.png
+- spec/resources/clock_base.png
+- spec/resources/clock_flip_horizontally.png
+- spec/resources/clock_flip_vertically.png
+- spec/resources/clock_mask.png
+- spec/resources/clock_mask_updated.png
+- spec/resources/clock_rotate_180.png
+- spec/resources/clock_rotate_left.png
+- spec/resources/clock_rotate_right.png
+- spec/resources/clock_stubbed.png
+- spec/resources/clock_updated.png
+- spec/resources/composited.png
 - spec/resources/cropped.png
-- README.rdoc
+- spec/resources/damaged_chunk.png
+- spec/resources/damaged_signature.png
+- spec/resources/gray_10x10.png
+- spec/resources/gray_10x10_grayscale.png
+- spec/resources/gray_10x10_grayscale_alpha.png
 - spec/resources/gray_10x10_indexed.png
-- spec/resources/clock_base.png
-- spec/resources/16x16_non_interlaced.png
-- spec/chunky_png_spec.rb
-- spec/chunky_png/canvas/drawing_spec.rb
-- lib/chunky_png/palette.rb
-- lib/chunky_png/datastream.rb
-- chunky_png.gemspec
-- tasks/github-gem.rake
-- spec/resources/pixelstream_reference.png
+- spec/resources/gray_10x10_truecolor.png
+- spec/resources/gray_10x10_truecolor_alpha.png
+- spec/resources/indexed_4bit.png
 - spec/resources/lines.png
-- spec/resources/gray_10x10_grayscale_alpha.png
-- spec/resources/16x16_interlaced.png
-- spec/chunky_png/image_spec.rb
-- lib/chunky_png/canvas/drawing.rb
+- spec/resources/operations.png
+- spec/resources/pixelstream.rgb
+- spec/resources/pixelstream.rgba
+- spec/resources/pixelstream_reference.png
 - spec/resources/rect.png
-- spec/resources/clock_mask_updated.png
-- spec/resources/adam7.png
-- lib/chunky_png/rmagick.rb
-- lib/chunky_png/image.rb
-- spec/chunky_png/rmagick_spec.rb
-- spec/chunky_png/datastream_spec.rb
-- lib/chunky_png/canvas/png_decoding.rb
-- lib/chunky_png.rb
+- spec/resources/replaced.png
+- spec/resources/text_chunk.png
+- spec/resources/transparent_gray_10x10.png
+- spec/resources/ztxt_chunk.png
+- spec/spec_helper.rb
+- tasks/github-gem.rake
 has_rdoc: true
 homepage: http://wiki.github.com/wvanbergen/chunky_png
 licenses: []
@@ -124,7 +170,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 2219291082232343403
       segments: 
       - 0
       version: "0"
@@ -133,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 2219291082232343403
       segments: 
       - 0
       version: "0"
@@ -145,13 +191,14 @@ signing_key:
 specification_version: 3
 summary: Pure ruby library for read/write, chunk-level access to PNG files
 test_files: 
+- spec/chunky_png/canvas/adam7_interlacing_spec.rb
+- spec/chunky_png/canvas/drawing_spec.rb
+- spec/chunky_png/canvas/operations_spec.rb
+- spec/chunky_png/canvas/png_decoding_spec.rb
 - spec/chunky_png/canvas/png_encoding_spec.rb
 - spec/chunky_png/canvas_spec.rb
 - spec/chunky_png/color_spec.rb
-- spec/chunky_png/canvas/adam7_interlacing_spec.rb
-- spec/chunky_png/canvas/png_decoding_spec.rb
-- spec/chunky_png_spec.rb
-- spec/chunky_png/canvas/drawing_spec.rb
+- spec/chunky_png/datastream_spec.rb
 - spec/chunky_png/image_spec.rb
 - spec/chunky_png/rmagick_spec.rb
-- spec/chunky_png/datastream_spec.rb
+- spec/chunky_png_spec.rb