zpng 0.0.2 → 0.1.0

data/spec/create_image_spec.rb

@@ -0,0 +1,78 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+include ZPNG
+
+describe Image do
+  def _new_img bpp, color
+    Image.new(:width => 8, :height => 8, :bpp => bpp, :color => color)
+  end
+
+  [1,2,4,8].each do |bpp|
+    [true, false].each do |color|
+      describe "new( :bpp => #{bpp}, :color => #{color} )" do
+        subject(:img){ _new_img(bpp,color) }
+        it("should export"){ img.export.should start_with(Image::PNG_HDR) }
+        it("should to_s")  {  img.to_s.strip.split("\n").size.should == 8 }
+
+        subject{ img.hdr }
+        its(:depth) { should == bpp }
+        its(:color) { should == (color ? COLOR_INDEXED : COLOR_GRAYSCALE) }
+      end
+    end
+  end
+
+  describe "new( :bpp => 16, :color => false )" do
+    subject(:img){ _new_img(16,false) }
+    it("should export"){ img.export.should start_with(Image::PNG_HDR) }
+    it("should to_s")  {  img.to_s.strip.split("\n").size.should == 8 }
+
+    subject{ img.hdr }
+    its(:depth) { should == 8 } # 8 bits per color + 8 per alpha = 16 bpp
+    its(:color) { should == COLOR_GRAY_ALPHA }
+  end
+
+  describe "new( :bpp => 16, :color => true )" do
+    subject{ lambda{ _new_img(16,true) } }
+    it { should raise_exception }
+  end
+
+  describe "new( :bpp => 24, :color => false )" do
+    subject(:img){ _new_img(24,false) }
+    it("should export"){ img.export.should start_with(Image::PNG_HDR) }
+    it("should to_s")  {  img.to_s.strip.split("\n").size.should == 8 }
+
+    subject{ img.hdr }
+    its(:depth) { should == 8 } # each channel depth = 8
+    its(:color) { should == COLOR_RGB }
+  end
+
+  describe "new( :bpp => 24, :color => true )" do
+    subject(:img){ _new_img(24,true) }
+    it("should export"){ img.export.should start_with(Image::PNG_HDR) }
+    it("should to_s")  {  img.to_s.strip.split("\n").size.should == 8 }
+
+    subject{ img.hdr }
+    its(:depth) { should == 8 } # each channel depth = 8
+    its(:color) { should == COLOR_RGB }
+  end
+
+  describe "new( :bpp => 32, :color => false )" do
+    subject(:img){ _new_img(32,false) }
+    it("should export"){ img.export.should start_with(Image::PNG_HDR) }
+    it("should to_s")  {  img.to_s.strip.split("\n").size.should == 8 }
+
+    subject{ img.hdr }
+    its(:depth) { should == 8 } # each channel depth = 8
+    its(:color) { should == COLOR_RGBA }
+  end
+
+  describe "new( :bpp => 32, :color => true )" do
+    subject(:img){ _new_img(32,true) }
+    it("should export"){ img.export.should start_with(Image::PNG_HDR) }
+    it("should to_s")  {  img.to_s.strip.split("\n").size.should == 8 }
+
+    subject{ img.hdr }
+    its(:depth) { should == 8 } # each channel depth = 8
+    its(:color) { should == COLOR_RGBA }
+  end
+end

data/spec/crop_spec.rb

@@ -0,0 +1,93 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+CROP_WIDTH  = 10
+CROP_HEIGHT = 10
+CROP_SAMPLE = File.join(SAMPLES_DIR, "captcha_4bpp.png")
+
+QR_SQUARE = <<EOF
+#######
+#.....#
+#.###.#
+#.###.#
+#.###.#
+#.....#
+#######
+EOF
+
+include ZPNG
+
+describe Image do
+  describe "crop" do
+    it "crops and keeps original image unchanged" do
+      src1 = Image.load(CROP_SAMPLE)
+      src2 = Image.load(CROP_SAMPLE)
+      dest = src1.crop :width => CROP_WIDTH, :height => CROP_HEIGHT
+
+      dest.width.should  == CROP_WIDTH
+      dest.height.should == CROP_HEIGHT
+
+      dest.width.should_not  == src1.width
+      dest.height.should_not == src1.height
+
+      src1.export.should == src2.export
+      src1.export.should_not == dest.export
+      src2.export.should_not == dest.export
+    end
+  end
+
+  describe "crop! result" do
+    let!(:img){
+      Image.load(CROP_SAMPLE).crop! :width => CROP_WIDTH, :height => CROP_HEIGHT
+    }
+    it "has #{CROP_HEIGHT} scanlines" do
+      img.scanlines.size.should == CROP_HEIGHT
+    end
+
+    CROP_HEIGHT.times do |i|
+      it "calculates proper #size" do
+        scanline_size = (img.hdr.bpp*img.width/8).ceil + 1
+        img.scanlines[i].size.should == scanline_size
+      end
+      it "exports proper count of bytes" do
+        scanline_size = (img.hdr.bpp*img.width/8).ceil + 1
+        img.scanlines[i].export.size.should == scanline_size
+      end
+    end
+
+    describe "reimported" do
+      let!(:img2){ Image.new(img.export) }
+
+      it "has #{CROP_HEIGHT} scanlines" do
+        img2.scanlines.size.should == CROP_HEIGHT
+      end
+    end
+  end
+
+  SAMPLES.find_all{ |fname| fname['qr_'] }.each do |fname|
+    describe fname do
+      let!(:img){ Image.load fname }
+
+      it "should extract left square" do
+        img.crop! :x => 1, :y => 1, :width => 7, :height => 7
+        img.to_s(:white => '.', :black => '#').strip.should == QR_SQUARE.strip
+      end
+
+      it "should extract right square" do
+        img.crop! :x => 27, :y => 1, :width => 7, :height => 7
+        img.to_s(:white => '.', :black => '#').strip.should == QR_SQUARE.strip
+      end
+
+      it "should extract bottom square" do
+        img.crop! :x => 1, :y => 27, :width => 7, :height => 7
+        img.to_s(:white => '.', :black => '#').strip.should == QR_SQUARE.strip
+      end
+
+      it "keeps whole original image if crop is larger than image" do
+        img2 = img.crop :x => 0, :y => 0, :width => 7000, :height => 7000
+        img2.width.should  == img.width
+        img2.height.should == img.height
+        img2.to_s.should   == img.to_s
+      end
+    end
+  end
+end

data/spec/image_spec.rb

@@ -0,0 +1,54 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+NEW_IMG_WIDTH  = 20
+NEW_IMG_HEIGHT = 10
+
+describe ZPNG::Image do
+  describe "new" do
+    let!(:img){ ZPNG::Image.new :width => NEW_IMG_WIDTH, :height => NEW_IMG_HEIGHT }
+
+    it "returns ZPNG::Image" do
+      img.should be_instance_of(ZPNG::Image)
+    end
+    it "creates new image of specified size" do
+      img.width.should  == NEW_IMG_WIDTH
+      img.height.should == NEW_IMG_HEIGHT
+    end
+
+    describe "exported image" do
+      let!(:eimg){ img.export }
+      it "has PNG header" do
+        eimg.should start_with(ZPNG::Image::PNG_HDR)
+      end
+
+      describe "parsed again" do
+        let!(:img2){ ZPNG::Image.new(eimg) }
+
+        it "is a ZPNG::Image" do
+          img2.should be_instance_of(ZPNG::Image)
+        end
+
+        it "should be of specified size" do
+          img2.width.should  == NEW_IMG_WIDTH
+          img2.height.should == NEW_IMG_HEIGHT
+        end
+
+        it "should have bpp = 32" do
+          img2.hdr.bpp.should == 32
+        end
+
+        it "should have 3 chunks: IHDR, IDAT, IEND" do
+          img2.chunks.map(&:type).should == %w'IHDR IDAT IEND'
+        end
+
+        it "should have all pixels transparent" do
+          NEW_IMG_HEIGHT.times do |y|
+            NEW_IMG_WIDTH.times do |x|
+              img2[x,y].should be_transparent
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/modify_spec.rb

@@ -38,18 +38,11 @@ ASCII_MODIFIED_QR = <<EOF
 ...................................
 EOF
 
-samples =
-  if ENV['SAMPLES']
-    ENV['SAMPLES'].split(' ')
-  else
-    Dir[File.join(SAMPLES_DIR,'qr_*.png')]
-  end
-
 describe "ZPNG modify" do
   it "should have QR examples" do
-    samples.should_not be_empty
+    SAMPLES.should_not be_empty
   end
-  samples.each do |fname|
+  SAMPLES.each do |fname|
     describe fname.sub(File.dirname(SAMPLES_DIR)+'/','') do
       img = ZPNG::Image.new(fname)
       it "modifies img - color=#{img.hdr.color}, depth=#{img.hdr.depth}, bpp=#{img.hdr.bpp}" do

data/spec/running_pixel_spec.rb

@@ -0,0 +1,47 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+include ZPNG
+
+describe Image do
+  def _new_img bpp, color
+    Image.new(:width => 16, :height => 1, :bpp => bpp, :color => color)
+  end
+
+#  before :all do
+#    $html = "<style>img {width:64px}</style>\n<div style='background-color:#ccc'>\n"
+#  end
+
+  [1,2,4,8,16,24,32].each do |bpp|
+    [true, false].each do |color|
+      next if bpp == 16 && color
+      describe "new( :bpp => #{bpp}, :color => #{color} )" do
+        16.times do |x|
+          it "should set pixel at pos #{x}" do
+            bg = Color::BLACK
+            fg = Color::WHITE
+
+            img = _new_img bpp, color
+            if img.palette
+              img.palette << bg if img.palette
+            else
+              img.width.times{ |i| img[i,0] = bg }
+            end
+            img[x,0] = fg
+
+            s = '#'*16
+            s[x] = ' '
+            img.to_s.should == s
+
+  #          fname = "out-#{x}-#{bpp}-#{color}.png"
+  #          img.save fname
+  #          $html << "<img src='#{fname}'><br/>\n"
+          end
+        end
+      end
+    end
+  end
+
+#  after :all do
+#    $html << "</div>"
+#    File.open("index.html","w"){ |f| f<<$html }
+#  end
+end

data/spec/spec_helper.rb

@@ -8,7 +8,6 @@ require 'zpng'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-
 end
 
 SAMPLES_DIR = File.join(
@@ -16,3 +15,10 @@ SAMPLES_DIR = File.join(
     File.dirname(
       File.expand_path(__FILE__))),
   "samples")
+
+SAMPLES =
+  if ENV['SAMPLES']
+    ENV['SAMPLES'].split(' ')
+  else
+    Dir[File.join(SAMPLES_DIR,'qr_*.png')]
+  end

data/zpng.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "zpng"
-  s.version = "0.0.2"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrey \"Zed\" Zaikin"]
-  s.date = "2012-03-18"
+  s.date = "2012-12-10"
   s.email = "zed.0xff@gmail.com"
   s.executables = ["zpng"]
   s.extra_rdoc_files = [
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/zpng/color.rb",
     "lib/zpng/image.rb",
     "lib/zpng/scan_line.rb",
+    "samples/captcha_4bpp.png",
     "samples/modify.rb",
     "samples/qr_aux_chunks.png",
     "samples/qr_bw.png",
@@ -45,7 +46,11 @@ Gem::Specification.new do |s|
     "samples/qr_rgb.png",
     "samples/qr_rgba.png",
     "spec/ascii_spec.rb",
+    "spec/create_image_spec.rb",
+    "spec/crop_spec.rb",
+    "spec/image_spec.rb",
     "spec/modify_spec.rb",
+    "spec/running_pixel_spec.rb",
     "spec/spec_helper.rb",
     "spec/zpng_spec.rb",
     "zpng.gemspec"
@@ -53,7 +58,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/zed-0xff/zpng"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.24"
   s.summary = "pure ruby PNG file manipulation & validation"
 
   if s.respond_to? :specification_version then
@@ -62,25 +67,22 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<colorize>, [">= 0"])
       s.add_runtime_dependency(%q<hexdump>, [">= 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.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 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<colorize>, [">= 0"])
       s.add_dependency(%q<hexdump>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 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<colorize>, [">= 0"])
     s.add_dependency(%q<hexdump>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 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
 end
 

metadata

@@ -1,82 +1,96 @@
 --- !ruby/object:Gem::Specification
 name: zpng
 version: !ruby/object:Gem::Version
-  version: 0.0.2
   prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Andrey "Zed" Zaikin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-18 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: colorize
-  requirement: &70231152732120 !ruby/object:Gem::Requirement
+  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'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70231152732120
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: hexdump
-  requirement: &70231152731280 !ruby/object:Gem::Requirement
+  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'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70231152731280
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
   name: rspec
-  requirement: &70231152746560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.8.0
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.8.0
-  type: :development
-  prerelease: false
-  version_requirements: *70231152746560
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
   name: bundler
-  requirement: &70231152745500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *70231152745500
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
   name: jeweler
-  requirement: &70231152744400 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
-  type: :development
-  prerelease: false
-  version_requirements: *70231152744400
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70231152742060 !ruby/object:Gem::Requirement
+        version: 1.8.4
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70231152742060
+        version: 1.8.4
+    none: false
 description: 
 email: zed.0xff@gmail.com
 executables:
@@ -104,6 +118,7 @@ files:
 - lib/zpng/color.rb
 - lib/zpng/image.rb
 - lib/zpng/scan_line.rb
+- samples/captcha_4bpp.png
 - samples/modify.rb
 - samples/qr_aux_chunks.png
 - samples/qr_bw.png
@@ -114,7 +129,11 @@ files:
 - samples/qr_rgb.png
 - samples/qr_rgba.png
 - spec/ascii_spec.rb
+- spec/create_image_spec.rb
+- spec/crop_spec.rb
+- spec/image_spec.rb
 - spec/modify_spec.rb
+- spec/running_pixel_spec.rb
 - spec/spec_helper.rb
 - spec/zpng_spec.rb
 - zpng.gemspec
@@ -126,23 +145,23 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -893836760864101821
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: -488684070557161038
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: pure ruby PNG file manipulation & validation