chunky_png 1.1.0 → 1.1.1

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 = "1.1.0"
-  s.date    = "2011-03-19"
+  s.version = "1.1.1"
+  s.date    = "2011-04-22"
 
   s.summary     = "Pure ruby library for read/write, chunk-level access to PNG files"
   s.description = <<-EOT

data/lib/chunky_png.rb

@@ -25,7 +25,7 @@ module ChunkyPNG
 
   # The current version of ChunkyPNG. This value will be updated 
   # automatically by them <tt>gem:release</tt> rake task.
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 
   ###################################################
   # PNG international standard defined constants

data/lib/chunky_png/canvas/stream_exporting.rb

@@ -23,7 +23,24 @@ module ChunkyPNG
       #
       # @return [String] The RGB-formatted pixel data.
       def to_rgb_stream
-        pixels.pack('NX' * (width * height))
+        pixels.pack('NX' * pixels.length)
+      end
+      
+      # Creates a stream of the alpha channel of this canvas.
+      #
+      # @return [String] The 0-255 alpha values of all pixels packed as string
+      def to_alpha_channel_stream
+        pixels.pack('C*')
+      end
+
+      # Creates a grayscale stream of this canvas.
+      #
+      # This method assume sthat this image is fully grayscale, i.e. R = G = B for
+      # every pixel. The alpha channel will not be included in the stream.
+      #
+      # @return [String] The 0-255 grayscale values of all pixels packed as string.
+      def to_grayscale_stream
+        pixels.pack('nX' * pixels.length)
       end
 
       # Creates an ABGR-formatted pixelstream with the pixel data from this canvas.

data/spec/chunky_png/canvas/stream_exporting_spec.rb

@@ -3,18 +3,57 @@ require 'spec_helper'
 describe ChunkyPNG::Canvas do
   
   describe '#to_rgba_stream' do
-    before { File.open(resource_file('pixelstream.rgba'), 'rb') { |f| @reference_data = f.read } }
-    
-    it "should load an image correctly from a datastream" do
-      reference_canvas('pixelstream_reference').to_rgba_stream.should == @reference_data
+    it "should export a sample canvas to an RGBA stream correctly" do
+      canvas = ChunkyPNG::Canvas.new(2, 2, [ChunkyPNG::Color.rgba(1,2,3,4), ChunkyPNG::Color.rgba(5,6,7,8),
+                                            ChunkyPNG::Color.rgba(4,3,2,1), ChunkyPNG::Color.rgba(8,7,6,5)])
+
+      canvas.to_rgba_stream.should ==  [1,2,3,4,5,6,7,8,4,3,2,1,8,7,6,5].pack('C16')
     end
+    
+    it "should export an image to an RGBA datastream correctly" do
+      reference_canvas('pixelstream_reference').to_rgba_stream.should == resource_data('pixelstream.rgba')
+    end    
   end
 
   describe '#to_rgb_stream' do
-    before { File.open(resource_file('pixelstream.rgb'), 'rb') { |f| @reference_data = f.read } }
+    it "should export a sample canvas to an RGBA stream correctly" do
+      canvas = ChunkyPNG::Canvas.new(2, 2, [ChunkyPNG::Color.rgba(1,2,3,4), ChunkyPNG::Color.rgba(5,6,7,8),
+                                            ChunkyPNG::Color.rgba(4,3,2,1), ChunkyPNG::Color.rgba(8,7,6,5)])
+
+      canvas.to_rgb_stream.should == [1,2,3,5,6,7,4,3,2,8,7,6].pack('C12')
+    end    
+    
+    it "should export an image to an RGB datastream correctly" do
+      reference_canvas('pixelstream_reference').to_rgb_stream.should == resource_data('pixelstream.rgb')
+    end
+  end
+  
+  describe '#to_grayscale_stream' do
+    
+    it "should export a grayscale image to a grayscale datastream correctly" do
+      canvas = ChunkyPNG::Canvas.new(2, 2, [ChunkyPNG::Color.grayscale(1), ChunkyPNG::Color.grayscale(2),
+                                            ChunkyPNG::Color.grayscale(3), ChunkyPNG::Color.grayscale(4)])
+      canvas.to_grayscale_stream.should == [1,2,3,4].pack('C4')
+    end    
+
+    
+    it "should export a color image to a grayscale datastream, using B values" do
+      canvas = ChunkyPNG::Canvas.new(2, 2, [ChunkyPNG::Color.rgba(1,2,3,4), ChunkyPNG::Color.rgba(5,6,7,8),
+                                            ChunkyPNG::Color.rgba(4,3,2,1), ChunkyPNG::Color.rgba(8,7,6,5)])
+      canvas.to_grayscale_stream.should == [3,7,2,6].pack('C4')
+    end    
+  end
+  
+  describe '#to_alpha_channel_stream' do
+    it "should export an opaque image to an alpha channel datastream correctly" do
+      grayscale_array = Array.new(reference_canvas('pixelstream_reference').pixels.length, 255)
+      reference_canvas('pixelstream_reference').to_alpha_channel_stream.should == grayscale_array.pack('C*')
+    end
     
-    it "should load an image correctly from a datastream" do
-      reference_canvas('pixelstream_reference').to_rgb_stream.should == @reference_data
+    it "should export a transparent image to an alpha channel datastream correctly" do
+      canvas = ChunkyPNG::Canvas.new(2, 2, [ChunkyPNG::Color.rgba(1,2,3,4), ChunkyPNG::Color.rgba(5,6,7,8),
+                                            ChunkyPNG::Color.rgba(4,3,2,1), ChunkyPNG::Color.rgba(8,7,6,5)])
+      canvas.to_alpha_channel_stream.should == [4,8,1,5].pack('C4')
     end
   end
 end

data/spec/chunky_png_spec.rb

@@ -1,37 +1,8 @@
 require 'spec_helper'
 
 describe ChunkyPNG do
-
-  # it "should create reference images for all color modes" do
-  #   image    = ChunkyPNG::Image.new(10, 10, ChunkyPNG::Color.rgb(100, 100, 100))
-  #   [:indexed, :grayscale, :grayscale_alpha, :truecolor, :truecolor_alpha].each do |color_mode|
-  #
-  #     color_mode_id = ChunkyPNG.const_get("COLOR_#{color_mode.to_s.upcase}")
-  #     filename = resource_file("gray_10x10_#{color_mode}.png")
-  #     image.save(filename, :color_mode => color_mode_id)
-  #   end
-  # end
-
-  # it "should create a reference image for operations" do
-  #   image = ChunkyPNG::Image.new(16, 16, ChunkyPNG::Color::WHITE)
-  #   r = 0
-  #   image.width.times do |x|
-  #     g = 0
-  #     image.height.times do |y|
-  #       image[x, y] = ChunkyPNG::Color.rgb(r, g, 255)
-  #       g += 16
-  #     end
-  #     r += 16
-  #   end
-  #   filename = resource_file('operations.png')
-  #   image.save(filename)
-  #   # `open #{filename}`
-  # end
   
-  # it "should create damaged CRC values" do
-  #   Zlib.stub!(:crc32).and_return(12345)
-  #   image = ChunkyPNG::Image.new(10, 10, ChunkyPNG::Color::BLACK)
-  #   image.save(resource_file('damaged_chunk.png'))
-  # end
+  it "should have a VERSION constant" do
+    ChunkyPNG.const_defined?('VERSION').should be_true
+  end
 end
-

data/spec/png_suite_spec.rb

@@ -14,20 +14,6 @@ describe 'PNG testuite' do
     end
   end
   
-  context 'Decoding unsupported images' do
-
-    # TODO: we eventually want to support these!
-    
-    png_suite_files(:basic_not_supported).each do |file|
-      color_mode = file.match(/[in](\d)[apgc](\d\d)\.png$/)[1].to_i
-      bit_depth  = file.match(/[in](\d)[apgc](\d\d)\.png$/)[2].to_i
-      
-      it "should report #{File.basename(file)} (color mode: #{color_mode}, bit depth: #{bit_depth}) as unsupported" do
-        lambda { ChunkyPNG::Image.from_file(file) }.should raise_error(ChunkyPNG::NotSupported)
-      end
-    end
-  end
-  
   context 'Decoding supported images' do
     png_suite_files(:basic, '*.png').each do |file|
 

data/spec/spec_helper.rb

@@ -24,6 +24,12 @@ module ResourceFileHelper
     File.expand_path("./resources/#{name}", File.dirname(__FILE__))
   end  
   
+  def resource_data(name)
+    data = nil
+    File.open(resource_file(name), 'rb') { |f| data = f.read } 
+    data
+  end
+  
   def reference_canvas(name)
     ChunkyPNG::Canvas.from_file(resource_file("#{name}.png"))
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-19 00:00:00 -04:00
+date: 2011-04-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency