chunky_png 0.10.3 → 0.10.4

data/Gemfile.lock

@@ -1,13 +1,23 @@
 PATH
   remote: .
   specs:
-    chunky_png (0.10.3)
+    chunky_png (0.10.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    diff-lcs (1.1.2)
     rake (0.8.7)
-    rspec (1.3.0)
+    rspec (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+      rspec-mocks (= 2.0.0)
+    rspec-core (2.0.0)
+    rspec-expectations (2.0.0)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
 
 PLATFORMS
   ruby
@@ -15,4 +25,4 @@ PLATFORMS
 DEPENDENCIES
   chunky_png!
   rake
-  rspec (~> 1.3)
+  rspec (~> 2.0)

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.10.3"
-  s.date    = "2010-10-08"
+  s.version = "0.10.4"
+  s.date    = "2010-10-18"
 
   s.summary     = "Pure ruby library for read/write, chunk-level access to PNG files"
   s.description = <<-EOT
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.homepage = 'http://wiki.github.com/wvanbergen/chunky_png'
 
   s.add_development_dependency('rake')
-  s.add_development_dependency('rspec', '~> 1.3')
+  s.add_development_dependency('rspec', '~> 2.0')
 
   s.rdoc_options << '--title' << s.name << '--main' << 'README.rdoc' << '--line-numbers' << '--inline-source'
   s.extra_rdoc_files = ['README.rdoc', 'BENCHMARKS.rdoc']

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.10.3"
+  VERSION = "0.10.4"
 
   ###################################################
   # PNG international standard defined constants
@@ -81,7 +81,8 @@ module ChunkyPNG
   class OutOfBounds < ChunkyPNG::ExpectationFailed
   end
   
-  EXTRA_BYTE = (RUBY_VERSION.to_f < 1.9) ? "\0" : "\0".force_encoding('ASCII-8BIT')
+  EMPTY_BYTEARRAY = (RUBY_VERSION.to_f < 1.9) ? "".freeze : "".force_encoding('ASCII-8BIT').freeze
+  EXTRA_BYTE      = (RUBY_VERSION.to_f < 1.9) ? "\0" : "\0".force_encoding('ASCII-8BIT')
 end
 
 if RUBY_VERSION.to_f < 1.9

data/lib/chunky_png/canvas/png_encoding.rb

@@ -136,7 +136,7 @@ module ChunkyPNG
         end
         return encoding
       end
-
+      
       # Encodes the canvas according to the PNG format specification with a given color 
       # mode, possibly with interlacing.
       # @param [Integer] color_mode The color mode to use for encoding.
@@ -160,7 +160,7 @@ module ChunkyPNG
       # @param [Integer] filtering The filtering method to use.
       # @return [String] The PNG encoded canvas as string.
       def encode_png_image_without_interlacing(color_mode, filtering = ChunkyPNG::FILTER_NONE)
-        stream = ""
+        stream = ChunkyPNG::Datastream.empty_bytearray
         encode_png_image_pass_to_stream(stream, color_mode, filtering)
         stream
       end
@@ -175,7 +175,7 @@ module ChunkyPNG
       # @param [Integer] filtering The filtering method to use.
       # @return [String] The PNG encoded canvas as string.
       def encode_png_image_with_interlacing(color_mode, filtering = ChunkyPNG::FILTER_NONE)
-        stream = ""
+        stream = ChunkyPNG::Datastream.empty_bytearray
         0.upto(6) do |pass|
           subcanvas = self.class.adam7_extract_pass(pass, self)
           subcanvas.encoding_palette = encoding_palette

data/lib/chunky_png/chunk.rb

@@ -158,14 +158,14 @@ module ChunkyPNG
       # @return [ChunkyPNG::Chunk::End] The new End chunk instance.
       # @raise [RuntimeError] Raises an exception if the content was not empty.
       def self.read(type, content)
-        raise 'The IEND chunk should be empty!' if content != ''
+        raise 'The IEND chunk should be empty!' if content.bytesize > 0
         self.new
       end
 
       # Returns an empty string, because this chunk should always be empty.
       # @return [""] An empty string.
       def content
-        ''
+        ChunkyPNG::Datastream.empty_bytearray
       end
     end
 

data/lib/chunky_png/datastream.rb

@@ -146,6 +146,12 @@ module ChunkyPNG
     # WRITING DATASTREAMS
     ##################################################################################
 
+    # Returns an empty stream using binary encoding that can be used as stream to encode to.
+    # @eturn [String] An empty, binary string.
+    def self.empty_bytearray
+      ChunkyPNG::EMPTY_BYTEARRAY.dup
+    end
+
     # Writes the datastream to the given output stream.
     # @param [IO] io The output stream to write to.
     def write(io)

data/spec/chunky_png/canvas/png_encoding_spec.rb

@@ -72,39 +72,39 @@ describe ChunkyPNG::Canvas::PNGEncoding do
     before { @canvas = ChunkyPNG::Canvas.new(2, 2, ChunkyPNG::Color.rgba(1, 2, 3, 4)) }
 
     it "should encode using RGBA / no filtering mode correctly" do
-      @canvas.encode_png_image_pass_to_stream(stream = "", ChunkyPNG::COLOR_TRUECOLOR_ALPHA, ChunkyPNG::FILTER_NONE)
+      @canvas.encode_png_image_pass_to_stream(stream = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR_ALPHA, ChunkyPNG::FILTER_NONE)
       stream.should == "\0\1\2\3\4\1\2\3\4\0\1\2\3\4\1\2\3\4"
     end
 
     it "should encode using RGBA / SUB filtering mode correctly" do
-      @canvas.encode_png_image_pass_to_stream(stream = "", ChunkyPNG::COLOR_TRUECOLOR_ALPHA, ChunkyPNG::FILTER_SUB)
+      @canvas.encode_png_image_pass_to_stream(stream = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR_ALPHA, ChunkyPNG::FILTER_SUB)
       stream.should == "\1\1\2\3\4\0\0\0\0\1\1\2\3\4\0\0\0\0"
     end
 
     it "should encode using RGBA / UP filtering mode correctly" do
-      @canvas.encode_png_image_pass_to_stream(stream = "", ChunkyPNG::COLOR_TRUECOLOR_ALPHA, ChunkyPNG::FILTER_UP)
+      @canvas.encode_png_image_pass_to_stream(stream = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR_ALPHA, ChunkyPNG::FILTER_UP)
       stream.should == "\2\1\2\3\4\1\2\3\4\2\0\0\0\0\0\0\0\0"
     end
 
     it "should encode using RGBA / AVERAGE filtering mode correctly" do
-      @canvas.encode_png_image_pass_to_stream(stream = "", ChunkyPNG::COLOR_TRUECOLOR_ALPHA, ChunkyPNG::FILTER_AVERAGE)
+      @canvas.encode_png_image_pass_to_stream(stream = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR_ALPHA, ChunkyPNG::FILTER_AVERAGE)
       stream.should == "\3\1\2\3\4\1\1\2\2\3\1\1\2\2\0\0\0\0"
     end
 
     it "should encode using RGB / no filtering mode correctly" do
-      @canvas.encode_png_image_pass_to_stream(stream = "", ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_NONE)
+      @canvas.encode_png_image_pass_to_stream(stream = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_NONE)
       stream.should == "\0\1\2\3\1\2\3\0\1\2\3\1\2\3"
     end
 
     it "should encode using indexed / no filtering mode correctly" do
       @canvas.stub(:encoding_palette).and_return(mock('Palette', :index => 1))
-      @canvas.encode_png_image_pass_to_stream(stream = "", ChunkyPNG::COLOR_INDEXED, ChunkyPNG::FILTER_NONE)
+      @canvas.encode_png_image_pass_to_stream(stream = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_INDEXED, ChunkyPNG::FILTER_NONE)
       stream.should == "\0\1\1\0\1\1"
     end
 
     it "should encode using indexed / PAETH filtering mode correctly" do
       @canvas.stub(:encoding_palette).and_return(mock('Palette', :index => 1))
-      @canvas.encode_png_image_pass_to_stream(stream = "", ChunkyPNG::COLOR_INDEXED, ChunkyPNG::FILTER_PAETH)
+      @canvas.encode_png_image_pass_to_stream(stream = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_INDEXED, ChunkyPNG::FILTER_PAETH)
       stream.should == "\4\1\0\4\0\0"
     end
   end

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require 'bundler'
 
 Bundler.setup
 
-require 'spec'
+require 'rspec'
 require 'chunky_png'
 
 module ResourceFileHelper
@@ -31,7 +31,7 @@ module MatrixSpecHelper
   end
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.include ResourceFileHelper
   config.include MatrixSpecHelper
 end

data/tasks/github-gem.rake

@@ -71,23 +71,23 @@ module GithubGem
 
     # Defines RSpec tasks
     def define_rspec_tasks!
-      require 'spec/rake/spectask'
+      require 'rspec/core/rake_task'
 
       namespace(:spec) do
         desc "Verify all RSpec examples for #{gemspec.name}"
-        Spec::Rake::SpecTask.new(:basic) do |t|
-          t.spec_files = FileList[spec_pattern]
+        RSpec::Core::RakeTask.new(:basic) do |t|
+          t.pattern = spec_pattern
         end
 
         desc "Verify all RSpec examples for #{gemspec.name} and output specdoc"
-        Spec::Rake::SpecTask.new(:specdoc) do |t|
-          t.spec_files = FileList[spec_pattern]
-          t.spec_opts << '--format' << 'specdoc' << '--color'
+        RSpec::Core::RakeTask.new(:specdoc) do |t|
+          t.pattern = spec_pattern
+          t.rspec_opts = ['--format', 'documentation', '--color']
         end
 
         desc "Run RCov on specs for #{gemspec.name}"
-        Spec::Rake::SpecTask.new(:rcov) do |t|
-          t.spec_files = FileList[spec_pattern]
+        RSpec::Core::RakeTask.new(:rcov) do |t|
+          t.pattern = spec_pattern
           t.rcov = true
           t.rcov_opts = ['--exclude', '"spec/*,gems/*"', '--rails']
         end
@@ -271,8 +271,7 @@ module GithubGem
     # All work is done by the task's dependencies, so just display a release completed message.
     def release_task
       puts
-      puts '------------------------------------------------------------'
-      puts "Released #{gemspec.name} version #{gemspec.version}"
+      puts "Release successful."
     end
 
     private
@@ -333,7 +332,7 @@ module GithubGem
         # Reload the gemspec so the changes are incorporated
         load_gemspec!
         
-        # ALso mark the Gemfile.lock file as changed because of the new version.
+        # Also mark the Gemfile.lock file as changed because of the new version.
         modified_files << 'Gemfile.lock' if File.exist?(File.join(root_dir, 'Gemfile.lock'))
       end
     end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: chunky_png
 version: !ruby/object:Gem::Version 
-  hash: 49
   prerelease: false
   segments: 
   - 0
   - 10
-  - 3
-  version: 0.10.3
+  - 4
+  version: 0.10.4
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -15,38 +14,36 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 +02:00
+date: 2010-10-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: rake
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: rspec
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
-        - 1
-        - 3
-        version: "1.3"
-  requirement: *id002
-  name: rspec
-  prerelease: false
+        - 2
+        - 0
+        version: "2.0"
   type: :development
+  prerelease: false
+  version_requirements: *id002
 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\n    alpha composition and cropping. Finally, it can import from and export to RMagick for \n    interoperability.\n    \n    Also, have a look at OilyPNG at http://github.com/wvanbergen/oily_png. OilyPNG is a \n    drop in mixin module that implements some of the ChunkyPNG algorithms in C, which \n    provides a massive speed boost to encoding and decoding.\n"
 email: 
 - willem@railsdoctors.com
@@ -154,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -1708180723927543177
       segments: 
       - 0
       version: "0"
@@ -163,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -1708180723927543177
       segments: 
       - 0
       version: "0"