zpng 0.0.1 → 0.0.2

data/README.md

@@ -47,6 +47,8 @@ Usage
 
 ### ASCII
 
+source image: ![qr_rgb.png](https://github.com/zed-0xff/zpng/raw/master/samples/qr_rgb.png)
+
     # zpng --ascii qr_rgb.png
 
                                        

data/README.md.tpl

@@ -25,6 +25,8 @@ Usage
 
 ### ASCII
 
+source image: ![qr_rgb.png](https://github.com/zed-0xff/zpng/raw/master/samples/qr_rgb.png)
+
 % zpng --ascii qr_rgb.png
 
 ### Scanlines

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/zpng/chunk.rb

@@ -1,6 +1,6 @@
 module ZPNG
   class Chunk
-    attr_accessor :size, :type, :data, :crc
+    attr_accessor :size, :type, :data, :crc, :idx
 
     def self.from_stream io
       size, type = io.read(8).unpack('Na4')
@@ -39,7 +39,7 @@ module ZPNG
       size = @size ? sprintf("%5d",@size) : sprintf("%5s","???")
       crc  = @crc  ? sprintf("%08x",@crc) : sprintf("%8s","???")
       type = @type.to_s.gsub(/[^0-9a-z]/i){ |x| sprintf("\\x%02X",x.ord) }
-      sprintf("#<ZPNG::Chunk  %4s size=%s, crc=%s >", type, size, crc)
+      sprintf "<Chunk #%02d %4s size=%s, crc=%s >", idx.to_i, type, size, crc
     end
 
     def crc_ok?
@@ -129,5 +129,25 @@ module ZPNG
 
     class IEND < Chunk
     end
+
+    class ZTXT < Chunk
+      attr_accessor :keyword, :comp_method, :text
+      def initialize *args
+        super
+        @keyword,@comp_method,@text = data.unpack('Z*Ca*')
+        if @text
+          @text = Zlib::Inflate.inflate(@text)
+        end
+      end
+      def inspect
+        super.sub(/ *>$/,'') + ", " +
+          (instance_variables-[:@type, :@crc, :@data, :@size]).
+          map do |var|
+            t = instance_variable_get(var).to_s
+            t = t[0..10] + "..." if t.size > 10
+            "#{var.to_s.tr('@','')}=#{t}"
+          end.join(", ") + ">"
+      end
+    end
   end
 end

data/lib/zpng/cli.rb

@@ -34,6 +34,10 @@ class ZPNG::CLI
       ACTIONS.each do |t,desc|
         opts.on *[ "-#{t[0].upcase}", "--#{t}", desc, eval("lambda{ |_| @actions << :#{t} }") ]
       end
+
+      opts.on "-E", "--extract-chunk id" do |id|
+        @actions << [:extract_chunk, id.to_i]
+      end
     end
 
     if (argv = optparser.parse(@argv)).empty?
@@ -51,7 +55,11 @@ class ZPNG::CLI
       @zpng = load_file fname
 
       @actions.each do |action|
-        self.send(action) if self.respond_to?(action)
+        if action.is_a?(Array)
+          self.send(*action) if self.respond_to?(action.first)
+        else
+          self.send(action) if self.respond_to?(action)
+        end
       end
     end
   rescue Errno::EPIPE
@@ -59,6 +67,19 @@ class ZPNG::CLI
     # prevents a 'Broken pipe - <STDOUT> (Errno::EPIPE)' message
   end
 
+  def extract_chunk id
+    @img.chunks.each do |chunk|
+      if chunk.idx == id
+        case chunk
+        when ZPNG::Chunk::ZTXT
+          print chunk.text
+        else
+          print chunk.data
+        end
+      end
+    end
+  end
+
   def load_file fname
     @img = ZPNG::Image.new fname
   end

data/lib/zpng/image.rb

@@ -26,6 +26,7 @@ module ZPNG
       @chunks = []
       while !io.eof?
         chunk = Chunk.from_stream(io)
+        chunk.idx = @chunks.size
         @chunks << chunk
         case chunk
         when Chunk::IHDR

data/zpng.gemspec

@@ -0,0 +1,86 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "zpng"
+  s.version = "0.0.2"
+
+  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.email = "zed.0xff@gmail.com"
+  s.executables = ["zpng"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md",
+    "README.md.tpl"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "README.md.tpl",
+    "Rakefile",
+    "VERSION",
+    "bin/zpng",
+    "lib/zpng.rb",
+    "lib/zpng/block.rb",
+    "lib/zpng/chunk.rb",
+    "lib/zpng/cli.rb",
+    "lib/zpng/color.rb",
+    "lib/zpng/image.rb",
+    "lib/zpng/scan_line.rb",
+    "samples/modify.rb",
+    "samples/qr_aux_chunks.png",
+    "samples/qr_bw.png",
+    "samples/qr_gray_alpha.png",
+    "samples/qr_grayscale.png",
+    "samples/qr_plte.png",
+    "samples/qr_plte_bw.png",
+    "samples/qr_rgb.png",
+    "samples/qr_rgba.png",
+    "spec/ascii_spec.rb",
+    "spec/modify_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/zpng_spec.rb",
+    "zpng.gemspec"
+  ]
+  s.homepage = "http://github.com/zed-0xff/zpng"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "pure ruby PNG file manipulation & validation"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    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"])
+    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"])
+    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"])
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zpng
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-20 00:00:00.000000000 Z
+date: 2012-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70359178912700 !ruby/object:Gem::Requirement
+  requirement: &70231152732120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70359178912700
+  version_requirements: *70231152732120
 - !ruby/object:Gem::Dependency
   name: hexdump
-  requirement: &70359178930900 !ruby/object:Gem::Requirement
+  requirement: &70231152731280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70359178930900
+  version_requirements: *70231152731280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70359178930200 !ruby/object:Gem::Requirement
+  requirement: &70231152746560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70359178930200
+  version_requirements: *70231152746560
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70359178929280 !ruby/object:Gem::Requirement
+  requirement: &70231152745500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70359178929280
+  version_requirements: *70231152745500
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70359178928180 !ruby/object:Gem::Requirement
+  requirement: &70231152744400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70359178928180
+  version_requirements: *70231152744400
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70359178927440 !ruby/object:Gem::Requirement
+  requirement: &70231152742060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359178927440
+  version_requirements: *70231152742060
 description: 
 email: zed.0xff@gmail.com
 executables:
@@ -117,6 +117,7 @@ files:
 - spec/modify_spec.rb
 - spec/spec_helper.rb
 - spec/zpng_spec.rb
+- zpng.gemspec
 homepage: http://github.com/zed-0xff/zpng
 licenses:
 - MIT
@@ -132,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 958619003383702064
+      hash: -893836760864101821
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: