zpng 0.2.0 → 0.2.1

data/spec/alpha_spec.rb

@@ -0,0 +1,28 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '/spec_helper'))
+require 'zpng/cli'
+
+PNGSuite.each('tb','tp1') do |fname|
+  describe fname.sub(%r|\A#{Regexp::escape(Dir.getwd)}/?|, '') do
+    it "has its very first pixel transparent" do
+      img = ZPNG::Image.load(fname)
+      img[0,0].should be_transparent
+    end
+    it "has its very first pixel NOT opaque" do
+      img = ZPNG::Image.load(fname)
+      img[0,0].should_not be_opaque
+    end
+  end
+end
+
+PNGSuite.each('tp0') do |fname|
+  describe fname.sub(%r|\A#{Regexp::escape(Dir.getwd)}/?|, '') do
+    it "has its very first pixel NOT transparent" do
+      img = ZPNG::Image.load(fname)
+      img[0,0].should_not be_transparent
+    end
+    it "has its very first pixel opaque" do
+      img = ZPNG::Image.load(fname)
+      img[0,0].should be_opaque
+    end
+  end
+end

data/spec/cli_spec.rb

@@ -0,0 +1,62 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '/spec_helper'))
+require 'zpng/cli'
+
+CLI_PATHNAME = File.expand_path(File.join(File.dirname(__FILE__), '/../bin/zpng'))
+
+describe "CLI" do
+  PNGSuite.each_good do |fname|
+    describe fname.sub(%r|\A#{Regexp::escape(Dir.getwd)}/?|, '') do
+
+      it "works" do
+        orig_stdout, out = $stdout, ""
+        begin
+          $stdout = StringIO.new(out)
+          lambda { ZPNG::CLI.new([fname]).run }.should_not raise_error
+        ensure
+          $stdout = orig_stdout
+        end
+      end
+
+      it "works verbosely" do
+        orig_stdout, out = $stdout, ""
+        begin
+          $stdout = StringIO.new(out)
+          lambda { ZPNG::CLI.new([fname, "-vvv"]).run }.should_not raise_error
+        ensure
+          $stdout = orig_stdout
+        end
+      end
+
+      it "to ASCII" do
+        orig_stdout, out = $stdout, ""
+        begin
+          $stdout = StringIO.new(out)
+          lambda { ZPNG::CLI.new([fname, "-A"]).run }.should_not raise_error
+        ensure
+          $stdout = orig_stdout
+        end
+      end
+
+      it "to ANSI" do
+        orig_stdout, out = $stdout, ""
+        begin
+          $stdout = StringIO.new(out)
+          lambda { ZPNG::CLI.new([fname, "-N"]).run }.should_not raise_error
+        ensure
+          $stdout = orig_stdout
+        end
+      end
+
+      it "to ANSI256" do
+        orig_stdout, out = $stdout, ""
+        begin
+          $stdout = StringIO.new(out)
+          lambda { ZPNG::CLI.new([fname, "-2"]).run }.should_not raise_error
+        ensure
+          $stdout = orig_stdout
+        end
+      end
+
+    end
+  end
+end

data/spec/color_spec.rb

@@ -24,8 +24,8 @@ describe ZPNG::Color do
       c = c.to_depth(8)
       c.depth.should == 8
       c.r.should == 0
-      c.g.should == 0x20
-      c.b.should == 0x3f
+      c.g.should == 2*17
+      c.b.should == 3*17
     end
 
     it "keeps color depth" do
@@ -37,4 +37,14 @@ describe ZPNG::Color do
       c.b.should == 0x33
     end
   end
+
+  it "sorts" do
+    c1 = ZPNG::Color.new 0x11, 0x11, 0x11
+    c2 = ZPNG::Color.new 0x22, 0x22, 0x22
+    c3 = ZPNG::Color.new    0,    0, 0xff
+
+    [c3,c1,c2].sort.should == [c1,c2,c3]
+    [c3,c2,c1].sort.should == [c1,c2,c3]
+    [c1,c3,c2].sort.should == [c1,c2,c3]
+  end
 end

data/spec/deinterlace_spec.rb

@@ -0,0 +1,19 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '/spec_helper'))
+require 'zpng/cli'
+
+PNGSuite.each("???i*.png") do |fname|
+  describe fname.sub(%r|\A#{Regexp::escape(Dir.getwd)}/?|, '') do
+    it "deinterlaced should be pixel-by-pixel-identical to interlaced" do
+      interlaced = ZPNG::Image.load(fname)
+      deinterlaced = interlaced.deinterlace
+      deinterlaced.each_pixel do |color,x,y|
+        interlaced[x,y].should == color
+      end
+      interlaced.each_pixel do |color,x,y|
+        deinterlaced[x,y].should == color
+      end
+
+      interlaced.pixels.to_a.should == deinterlaced.pixels.to_a
+    end
+  end
+end

data/spec/metadata_spec.rb

@@ -0,0 +1,22 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe ZPNG::Metadata do
+  # itxt.png contains all possible text chunks
+  describe "itxt.png" do
+    let!(:metadata){
+      ZPNG::Image.load( File.join(SAMPLES_DIR, "itxt.png") ).metadata
+    }
+    it "should get all values" do
+      metadata.size.should == 4
+    end
+    it "should not find not existing value" do
+      metadata['foobar'].should be_nil
+    end
+    it "should find all existing values" do
+      metadata['Title'].should == "PNG"
+      metadata['Author'].should == "La plume de ma tante"
+      metadata['Warning'].should == "Es is verboten, um diese Datei in das GIF-Bildformat\numzuwandeln.  Sie sind gevarnt worden."
+      metadata['Description'].should =~ /Since POV-Ray does not direclty support/
+    end
+  end
+end

data/spec/pixel_access_spec.rb

@@ -0,0 +1,16 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '/spec_helper'))
+require 'zpng/cli'
+
+PNGSuite.each_good do |fname|
+  describe fname.sub(%r|\A#{Regexp::escape(Dir.getwd)}/?|, '') do
+    it "accessess all pixels" do
+      img = ZPNG::Image.load(fname)
+      n = 0
+      img.each_pixel do |px|
+        px.should be_instance_of(ZPNG::Color)
+        n += 1
+      end
+      n.should == img.width*img.height
+    end
+  end
+end

data/spec/pixels_enumerator_spec.rb

@@ -0,0 +1,34 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '/spec_helper'))
+require 'zpng/cli'
+
+PNGSuite.each_good do |fname|
+  describe fname.sub(%r|\A#{Regexp::escape(Dir.getwd)}/?|, '') do
+    it "accessess all pixels via enumerator" do
+      img = ZPNG::Image.load(fname)
+
+      first_pixel = img.pixels.first
+
+      n = 0
+      img.pixels.each do |px|
+        px.should be_instance_of(ZPNG::Color)
+        if n == 0
+          px.should == first_pixel
+        end
+        n += 1
+      end
+      n.should == img.width*img.height
+    end
+  end
+end
+
+describe "pixels enumerator" do
+  describe "#uniq" do
+    it "returns only unique pixels" do
+      fname = File.join(SAMPLES_DIR, "qr_bw.png")
+      img = ZPNG::Image.load(fname)
+      a = img.pixels.uniq
+      a.size.should == 2
+      a.sort.should == [ZPNG::Color::BLACK, ZPNG::Color::WHITE].sort
+    end
+  end
+end

data/spec/set_random_pixel_spec.rb

@@ -0,0 +1,13 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe ZPNG::Image do
+  it "creates image" do
+    img = ZPNG::Image.new :width => 16, :height => 16
+    lambda {
+      10.times do
+        img[rand(16),rand(16)] = ZPNG::Color::BLACK
+      end
+      img.export
+    }.should_not raise_error
+  end
+end

data/spec/spec_helper.rb

@@ -20,31 +20,10 @@ SAMPLES =
     Dir[File.join(SAMPLES_DIR,'qr_*.png')]
   end
 
-PNG_SUITE_URL = "http://www.schaik.com/pngsuite/PngSuite-2011apr25.tgz"
-
-def get_png_suite
-  dir = File.join(SAMPLES_DIR, "png_suite")
-  if Dir.exist?(dir)
-    if Dir[File.join(dir, "*.png")].size > 100
-      # already fetched and unpacked
-      return
-    end
-  else
-    Dir.mkdir(dir)
-  end
-  require 'open-uri'
-  puts "[.] fetching PNG test-suite from #{PNG_SUITE_URL} .. "
-  data = open(PNG_SUITE_URL).read
-
-  fname = File.join(dir, "png_suite.tgz")
-  File.open(fname, "wb"){ |f| f<<data }
-  puts "[.] unpacking .. "
-  system "tar", "xzf", fname, "-C", dir
-end
+PNGSuite.init( File.join(SAMPLES_DIR, "png_suite") )
 
 RSpec.configure do |config|
   config.before :suite do
-    get_png_suite
   end
 end
 

data/spec/support/png_suite.rb

@@ -0,0 +1,43 @@
+module PNGSuite
+  PNG_SUITE_URL = "http://www.schaik.com/pngsuite/PngSuite-2011apr25.tgz"
+
+  class << self
+    attr_accessor :dir
+
+    def init dir
+      @dir = dir
+      if Dir.exist?(dir)
+        if Dir[File.join(dir, "*.png")].size > 100
+          # already fetched and unpacked
+          return
+        end
+      else
+        Dir.mkdir(dir)
+      end
+      require 'open-uri'
+      puts "[.] fetching PNG test-suite from #{PNG_SUITE_URL} .. "
+      data = open(PNG_SUITE_URL).read
+
+      fname = File.join(dir, "png_suite.tgz")
+      File.open(fname, "wb"){ |f| f<<data }
+      puts "[.] unpacking .. "
+      system "tar", "xzf", fname, "-C", dir
+    end
+
+    def each *prefixes
+      Dir[File.join(dir,"*.png")].each do |fname|
+        if prefixes.empty?
+          yield fname
+        elsif prefixes.any?{ |p| p[/[*?\[]/] ? File.fnmatch(p, File.basename(fname)) : File.basename(fname).start_with?(p) }
+          yield fname
+        end
+      end
+    end
+
+    def each_good
+      Dir[File.join(dir,"[^x]*.png")].each do |fname|
+        yield fname
+      end
+    end
+  end
+end

data/zpng.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "zpng"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrey \"Zed\" Zaikin"]
-  s.date = "2012-12-23"
+  s.date = "2013-01-02"
   s.email = "zed.0xff@gmail.com"
   s.executables = ["zpng"]
   s.extra_rdoc_files = [
@@ -37,12 +37,17 @@ Gem::Specification.new do |s|
     "lib/zpng/cli.rb",
     "lib/zpng/color.rb",
     "lib/zpng/deep_copyable.rb",
+    "lib/zpng/hexdump.rb",
     "lib/zpng/image.rb",
+    "lib/zpng/metadata.rb",
+    "lib/zpng/pixels.rb",
     "lib/zpng/scan_line.rb",
     "lib/zpng/string_ext.rb",
+    "lib/zpng/text_chunk.rb",
     "misc/chars.png",
     "misc/gen_ascii_map.rb",
     "samples/captcha_4bpp.png",
+    "samples/itxt.png",
     "samples/modify.rb",
     "samples/qr_aux_chunks.png",
     "samples/qr_bw.png",
@@ -53,14 +58,22 @@ Gem::Specification.new do |s|
     "samples/qr_rgb.png",
     "samples/qr_rgba.png",
     "spec/adam7_spec.rb",
+    "spec/alpha_spec.rb",
     "spec/ascii_spec.rb",
+    "spec/cli_spec.rb",
     "spec/color_spec.rb",
     "spec/create_image_spec.rb",
     "spec/crop_spec.rb",
+    "spec/deinterlace_spec.rb",
     "spec/image_spec.rb",
+    "spec/metadata_spec.rb",
     "spec/modify_spec.rb",
+    "spec/pixel_access_spec.rb",
+    "spec/pixels_enumerator_spec.rb",
     "spec/running_pixel_spec.rb",
+    "spec/set_random_pixel_spec.rb",
     "spec/spec_helper.rb",
+    "spec/support/png_suite.rb",
     "spec/zpng_spec.rb",
     "zpng.gemspec"
   ]
@@ -74,20 +87,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<hexdump>, [">= 0"])
       s.add_runtime_dependency(%q<rainbow>, [">= 0"])
       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"])
     else
-      s.add_dependency(%q<hexdump>, [">= 0"])
       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"])
     end
   else
-    s.add_dependency(%q<hexdump>, [">= 0"])
     s.add_dependency(%q<rainbow>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.8.0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

metadata

@@ -2,31 +2,15 @@
 name: zpng
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrey "Zed" Zaikin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-23 00:00:00.000000000 Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :runtime
-  name: hexdump
-  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
 - !ruby/object:Gem::Dependency
   prerelease: false
   type: :runtime
@@ -120,12 +104,17 @@ files:
 - lib/zpng/cli.rb
 - lib/zpng/color.rb
 - lib/zpng/deep_copyable.rb
+- lib/zpng/hexdump.rb
 - lib/zpng/image.rb
+- lib/zpng/metadata.rb
+- lib/zpng/pixels.rb
 - lib/zpng/scan_line.rb
 - lib/zpng/string_ext.rb
+- lib/zpng/text_chunk.rb
 - misc/chars.png
 - misc/gen_ascii_map.rb
 - samples/captcha_4bpp.png
+- samples/itxt.png
 - samples/modify.rb
 - samples/qr_aux_chunks.png
 - samples/qr_bw.png
@@ -136,14 +125,22 @@ files:
 - samples/qr_rgb.png
 - samples/qr_rgba.png
 - spec/adam7_spec.rb
+- spec/alpha_spec.rb
 - spec/ascii_spec.rb
+- spec/cli_spec.rb
 - spec/color_spec.rb
 - spec/create_image_spec.rb
 - spec/crop_spec.rb
+- spec/deinterlace_spec.rb
 - spec/image_spec.rb
+- spec/metadata_spec.rb
 - spec/modify_spec.rb
+- spec/pixel_access_spec.rb
+- spec/pixels_enumerator_spec.rb
 - spec/running_pixel_spec.rb
+- 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
@@ -160,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -93398394471482814
+      hash: -2687381686191062956
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: