zpng 0.2.1 → 0.2.2

data/spec/ascii_spec.rb

@@ -45,7 +45,7 @@ describe "ZPNG png2ascii" do
   Dir[File.join(SAMPLES_DIR,'qr_*.png')].each do |fname|
     describe fname do
       it "generates a nice ascii img" do
-        ZPNG::Image.new(fname).to_ascii('#.').strip.should == ASCII_QR.strip
+        ZPNG::Image.load(fname).to_ascii('#.').strip.should == ASCII_QR.strip
       end
     end
   end

data/spec/bmp_spec.rb

@@ -0,0 +1,20 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+each_sample("mouse*.bmp") do |fname|
+  describe fname do
+    subject(:bmp){ ZPNG::Image.load(fname) }
+    let!(:png){ ZPNG::Image.load(fname.sub(".bmp",".png")) }
+
+    its(:width ){ should == png.width }
+    its(:height){ should == png.height }
+    its(:format){ should == :bmp }
+
+    it "should be equal to PNG" do
+      bmp.should == png
+    end
+
+    it "should restore original imagedata" do
+      File.binread(fname).should include(bmp.imagedata)
+    end
+  end
+end

data/spec/cli_spec.rb

@@ -59,4 +59,16 @@ describe "CLI" do
 
     end
   end
+
+  it "cuts long metadata" do
+    fname = File.join(SAMPLES_DIR, "cats.png")
+    orig_stdout, out = $stdout, ""
+    begin
+      $stdout = StringIO.new(out)
+      lambda { ZPNG::CLI.new([fname]).run }.should_not raise_error
+    ensure
+      $stdout = orig_stdout
+    end
+    out.size.should < 100_000
+  end
 end

data/spec/exception_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe ZPNG::Image do
+  it "should raise ZPNG::NotSupported on unknown file" do
+    lambda{
+      ZPNG::Image.load(__FILE__)
+    }.should raise_error(ZPNG::NotSupported)
+  end
+end

data/spec/load_save_spec.rb

@@ -0,0 +1,22 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+each_sample do |fname|
+  describe fname do
+    before(:all) do
+      @src = ZPNG::Image.load(fname)
+      @dst = ZPNG::Image.new(@src.export)
+    end
+
+    it "should have equal width" do
+      @src.width.should == @dst.width
+    end
+
+    it "should have equal width" do
+      @src.height.should == @dst.height
+    end
+
+    it "should have equal data" do
+      @src.should == @dst
+    end
+  end
+end

data/spec/modify_spec.rb

@@ -44,7 +44,7 @@ describe "ZPNG modify" do
   end
   SAMPLES.each do |fname|
     describe fname.sub(File.dirname(SAMPLES_DIR)+'/','') do
-      img = ZPNG::Image.new(fname)
+      img = ZPNG::Image.load(fname)
       it "modifies img - color=#{img.hdr.color}, depth=#{img.hdr.depth}, bpp=#{img.hdr.bpp}" do
         img.width.times do |x|
           img[x,0] = (x%2==0) ? ZPNG::Color::WHITE : ZPNG::Color::BLACK

data/spec/spec_helper.rb

@@ -20,6 +20,16 @@ SAMPLES =
     Dir[File.join(SAMPLES_DIR,'qr_*.png')]
   end
 
+def each_sample glob="*.png"
+  Dir[File.join(SAMPLES_DIR, glob)].each do |fname|
+    yield fname.sub(Dir.pwd+'/','')
+  end
+end
+
+def sample fname
+  File.join(SAMPLES_DIR, fname)
+end
+
 PNGSuite.init( File.join(SAMPLES_DIR, "png_suite") )
 
 RSpec.configure do |config|

data/zpng.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "zpng"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrey \"Zed\" Zaikin"]
-  s.date = "2013-01-02"
+  s.date = "2013-01-13"
   s.email = "zed.0xff@gmail.com"
   s.executables = ["zpng"]
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "lib/zpng.rb",
     "lib/zpng/adam7_decoder.rb",
     "lib/zpng/block.rb",
+    "lib/zpng/bmp/reader.rb",
     "lib/zpng/chunk.rb",
     "lib/zpng/cli.rb",
     "lib/zpng/color.rb",
@@ -41,14 +42,21 @@ Gem::Specification.new do |s|
     "lib/zpng/image.rb",
     "lib/zpng/metadata.rb",
     "lib/zpng/pixels.rb",
+    "lib/zpng/readable_struct.rb",
     "lib/zpng/scan_line.rb",
+    "lib/zpng/scan_line/mixins.rb",
     "lib/zpng/string_ext.rb",
     "lib/zpng/text_chunk.rb",
     "misc/chars.png",
     "misc/gen_ascii_map.rb",
     "samples/captcha_4bpp.png",
+    "samples/cats.png",
     "samples/itxt.png",
     "samples/modify.rb",
+    "samples/mouse.bmp",
+    "samples/mouse.png",
+    "samples/mouse17.bmp",
+    "samples/mouse17.png",
     "samples/qr_aux_chunks.png",
     "samples/qr_bw.png",
     "samples/qr_gray_alpha.png",
@@ -60,12 +68,15 @@ Gem::Specification.new do |s|
     "spec/adam7_spec.rb",
     "spec/alpha_spec.rb",
     "spec/ascii_spec.rb",
+    "spec/bmp_spec.rb",
     "spec/cli_spec.rb",
     "spec/color_spec.rb",
     "spec/create_image_spec.rb",
     "spec/crop_spec.rb",
     "spec/deinterlace_spec.rb",
+    "spec/exception_spec.rb",
     "spec/image_spec.rb",
+    "spec/load_save_spec.rb",
     "spec/metadata_spec.rb",
     "spec/modify_spec.rb",
     "spec/pixel_access_spec.rb",
@@ -74,7 +85,6 @@ Gem::Specification.new do |s|
     "spec/set_random_pixel_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/png_suite.rb",
-    "spec/zpng_spec.rb",
     "zpng.gemspec"
   ]
   s.homepage = "http://github.com/zed-0xff/zpng"
@@ -91,17 +101,20 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 2.8.0"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<what_methods>, [">= 0"])
     else
       s.add_dependency(%q<rainbow>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.8.0"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<what_methods>, [">= 0"])
     end
   else
     s.add_dependency(%q<rainbow>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.8.0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<what_methods>, [">= 0"])
   end
 end
 

metadata

@@ -2,14 +2,14 @@
 name: zpng
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Andrey "Zed" Zaikin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -75,6 +75,22 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.8.4
     none: false
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
+  name: what_methods
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 description: 
 email: zed.0xff@gmail.com
 executables:
@@ -100,6 +116,7 @@ files:
 - lib/zpng.rb
 - lib/zpng/adam7_decoder.rb
 - lib/zpng/block.rb
+- lib/zpng/bmp/reader.rb
 - lib/zpng/chunk.rb
 - lib/zpng/cli.rb
 - lib/zpng/color.rb
@@ -108,14 +125,21 @@ files:
 - lib/zpng/image.rb
 - lib/zpng/metadata.rb
 - lib/zpng/pixels.rb
+- lib/zpng/readable_struct.rb
 - lib/zpng/scan_line.rb
+- lib/zpng/scan_line/mixins.rb
 - lib/zpng/string_ext.rb
 - lib/zpng/text_chunk.rb
 - misc/chars.png
 - misc/gen_ascii_map.rb
 - samples/captcha_4bpp.png
+- samples/cats.png
 - samples/itxt.png
 - samples/modify.rb
+- samples/mouse.bmp
+- samples/mouse.png
+- samples/mouse17.bmp
+- samples/mouse17.png
 - samples/qr_aux_chunks.png
 - samples/qr_bw.png
 - samples/qr_gray_alpha.png
@@ -127,12 +151,15 @@ files:
 - spec/adam7_spec.rb
 - spec/alpha_spec.rb
 - spec/ascii_spec.rb
+- spec/bmp_spec.rb
 - spec/cli_spec.rb
 - spec/color_spec.rb
 - spec/create_image_spec.rb
 - spec/crop_spec.rb
 - spec/deinterlace_spec.rb
+- spec/exception_spec.rb
 - spec/image_spec.rb
+- spec/load_save_spec.rb
 - spec/metadata_spec.rb
 - spec/modify_spec.rb
 - spec/pixel_access_spec.rb
@@ -141,7 +168,6 @@ files:
 - spec/set_random_pixel_spec.rb
 - spec/spec_helper.rb
 - spec/support/png_suite.rb
-- spec/zpng_spec.rb
 - zpng.gemspec
 homepage: http://github.com/zed-0xff/zpng
 licenses:
@@ -157,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2687381686191062956
+      hash: 3712335013458038737
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:

data/spec/zpng_spec.rb

@@ -1,7 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Zpng" do
-  it "fails" do
-#    fail "hey buddy, you should probably rename this file and start specing for real"
-  end
-end