chunky_png 0.9.1 → 0.9.2

data/Gemfile.lock

@@ -1,12 +1,11 @@
 PATH
   remote: .
   specs:
-    chunky_png (0.9.1)
+    chunky_png (0.9.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    gemcutter (0.6.1)
     git (1.2.5)
     rake (0.8.7)
     rspec (1.3.0)
@@ -16,7 +15,6 @@ PLATFORMS
 
 DEPENDENCIES
   chunky_png!
-  gemcutter
   git
   rake
   rspec (>= 1.3)

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.9.1"
-  s.date    = "2010-09-16"
+  s.version = "0.9.2"
+  s.date    = "2010-09-17"
 
   s.summary     = "Pure ruby library for read/write, chunk-level access to PNG files"
   s.description = <<-EOT
@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
   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', '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.9.1"
+  VERSION = "0.9.2"
 
   ###################################################
   # PNG international standard defined constants

data/lib/chunky_png/canvas/png_decoding.rb

@@ -113,7 +113,7 @@ module ChunkyPNG
       # @param color_mode (see ChunkyPNG::Canvas::PNGDecoding#decode_png_pixelstream)
       # @return (see ChunkyPNG::Canvas::PNGDecoding#decode_png_pixelstream)
       def decode_png_with_adam7_interlacing(stream, width, height, color_mode)
-        canvas     = ChunkyPNG::Canvas.new(width, height)
+        canvas     = new(width, height)
         pixel_size = Color.bytesize(color_mode)
         start_pos  = 0
         for pass in 0...7 do

data/spec/chunky_png/canvas/adam7_interlacing_spec.rb

@@ -73,8 +73,6 @@ describe ChunkyPNG::Canvas::Adam7Interlacing do
   end
 
   describe '#adam7_merge_pass' do
-    before(:each) { @reference = reference_canvas('adam7') } 
-    
     it "should merge the submatrices correctly" do
       submatrices = [
         ChunkyPNG::Canvas.new(1, 1,  168430335), # r = 10
@@ -86,9 +84,9 @@ describe ChunkyPNG::Canvas::Adam7Interlacing do
         ChunkyPNG::Canvas.new(8, 4, 1175063295), # r = 70
       ]
       
-      canvas = ChunkyPNG::Canvas.new(8,8)
+      canvas = ChunkyPNG::Image.new(8,8)
       submatrices.each_with_index { |m, pass| adam7_merge_pass(pass, canvas, m) }
-      canvas.should == @reference
+      canvas.should == reference_image('adam7')
     end
   end
 

data/spec/spec_helper.rb

@@ -25,6 +25,10 @@ module MatrixSpecHelper
   def reference_canvas(name)
     ChunkyPNG::Canvas.from_file(resource_file("#{name}.png"))
   end
+  
+  def reference_image(name)
+    ChunkyPNG::Image.from_file(resource_file("#{name}.png"))
+  end
 end
 
 Spec::Runner.configure do |config|

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: chunky_png
 version: !ruby/object:Gem::Version 
-  hash: 57
   prerelease: false
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -15,66 +14,46 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-16 00:00:00 +02:00
+date: 2010-09-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   requirement: *id001
-  type: :development
   name: rake
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 1
         - 3
         version: "1.3"
   requirement: *id002
-  type: :development
   name: rspec
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   requirement: *id003
-  type: :development
   name: git
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
-  type: :development
-  name: gemcutter
-  prerelease: false
 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
@@ -175,27 +154,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Pure ruby library for read/write, chunk-level access to PNG files