oily_png 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,21 +1,31 @@
 PATH
   remote: .
   specs:
-    oily_png (0.1.0)
-      chunky_png (~> 0.10.2)
+    oily_png (0.1.1)
+      chunky_png (~> 0.10.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    chunky_png (0.10.2)
+    chunky_png (0.10.4)
+    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
 
 DEPENDENCIES
-  chunky_png (~> 0.10.2)
+  chunky_png (~> 0.10.4)
   oily_png!
   rake
-  rspec (>= 1.3)
+  rspec (~> 2.0)

data/lib/oily_png.rb

@@ -2,7 +2,7 @@ require 'chunky_png'
 
 module OilyPNG
   
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 
   def self.included(base)
     base::Canvas.send(:extend, OilyPNG::PNGDecoding)

data/oily_png.gemspec

@@ -4,8 +4,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.1.0"
-  s.date    = "2010-10-08"
+  s.version = "0.1.1"
+  s.date    = "2010-10-18"
 
   s.summary     = "Native mixin to speed up ChunkyPNG"
   s.description = <<-EOT
@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
   s.extensions    = ["ext/oily_png/extconf.rb"]
   s.require_paths = ["lib", "ext"]
 
-  s.add_runtime_dependency('chunky_png', '~> 0.10.2')
+  s.add_runtime_dependency('chunky_png', '~> 0.10.4')
 
   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']

data/spec/encoding_spec.rb

@@ -9,26 +9,26 @@ describe OilyPNG::PNGEncoding do
     end
     
     it "should encode an image using grayscale correctly" do
-      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = "", ChunkyPNG::COLOR_GRAYSCALE, ChunkyPNG::FILTER_NONE)
-      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = "", ChunkyPNG::COLOR_GRAYSCALE, ChunkyPNG::FILTER_NONE)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_GRAYSCALE, ChunkyPNG::FILTER_NONE)
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_GRAYSCALE, ChunkyPNG::FILTER_NONE)
       stream1.should == stream2
     end
     
     it "should encode an image using grayscale alpha correctly" do
-      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = "", ChunkyPNG::COLOR_GRAYSCALE_ALPHA, ChunkyPNG::FILTER_NONE)
-      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = "", ChunkyPNG::COLOR_GRAYSCALE_ALPHA, ChunkyPNG::FILTER_NONE)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_GRAYSCALE_ALPHA, ChunkyPNG::FILTER_NONE)
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_GRAYSCALE_ALPHA, ChunkyPNG::FILTER_NONE)
       stream1.should == stream2
     end
     
     it "should encode an image using truecolor correctly" do
-      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = "", ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_NONE)
-      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = "", ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_NONE)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_NONE)
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_NONE)
       stream1.should == stream2
     end
     
     it "should encode an image using truecolor alpha correctly" do
-      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = "", ChunkyPNG::COLOR_TRUECOLOR_ALPHA, ChunkyPNG::FILTER_NONE)
-      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = "", ChunkyPNG::COLOR_TRUECOLOR_ALPHA, ChunkyPNG::FILTER_NONE)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR_ALPHA, ChunkyPNG::FILTER_NONE)
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR_ALPHA, ChunkyPNG::FILTER_NONE)
       stream1.should == stream2
     end
     
@@ -38,8 +38,8 @@ describe OilyPNG::PNGEncoding do
       @canvas.stub(:encoding_palette).and_return(mock_palette)
       @oily_canvas.stub(:encoding_palette).and_return(mock_palette)
       
-      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = "", ChunkyPNG::COLOR_INDEXED, ChunkyPNG::FILTER_NONE)
-      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = "", ChunkyPNG::COLOR_INDEXED, ChunkyPNG::FILTER_NONE)
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_INDEXED, ChunkyPNG::FILTER_NONE)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_INDEXED, ChunkyPNG::FILTER_NONE)
       stream1.should == stream2
     end
   end
@@ -51,32 +51,32 @@ describe OilyPNG::PNGEncoding do
     end
     
     it "should encode correctly with no filtering" do
-      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = "", ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_NONE)
-      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = "", ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_NONE)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_NONE)
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_NONE)
       stream1.should == stream2
     end
     
     it "should encode correctly with sub filtering" do
-      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = "", ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_SUB)
-      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = "", ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_SUB)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_SUB)
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_SUB)
       stream1.should == stream2
     end
     
     it "should encode correctly with up filtering" do
-      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = "", ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_UP)
-      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = "", ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_UP)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_UP)
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_UP)
       stream1.should == stream2
     end
 
     it "should encode correctly with average filtering" do
-      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = "", ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_AVERAGE)
-      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = "", ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_AVERAGE)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_AVERAGE)
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_AVERAGE)
       stream1.should == stream2
     end
     
     it "should encode correctly with paeth filtering" do
-      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = "", ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_PAETH)
-      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = "", ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_PAETH)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_PAETH)
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_PAETH)
       stream1.should == stream2
     end
   end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require 'bundler'
 
 Bundler.setup
 
-require 'spec'
+require 'rspec'
 require 'chunky_png'
 require 'oily_png/oily_png_ext'
 
@@ -35,7 +35,7 @@ module CanvasHelper
   end
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.extend ResourceHelper
   config.include CanvasHelper
 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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oily_png
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -15,7 +15,7 @@ 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 
@@ -24,16 +24,16 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 63
         segments: 
         - 0
         - 10
-        - 2
-        version: 0.10.2
+        - 4
+        version: 0.10.4
   requirement: *id001
+  type: :runtime
   name: chunky_png
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -45,24 +45,24 @@ dependencies:
         - 0
         version: "0"
   requirement: *id002
+  type: :development
   name: rake
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 3
         segments: 
-        - 1
-        - 3
-        version: "1.3"
+        - 2
+        - 0
+        version: "2.0"
   requirement: *id003
+  type: :development
   name: rspec
   prerelease: false
-  type: :development
 description: "    This Ruby C extenstion defines a module that can be included into ChunkyPNG to improve its speed.\n"
 email: 
 - willem@railsdoctors.com