chunky_png 1.3.8 → 1.3.13

data/spec/chunky_png_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe ChunkyPNG do
   it "should have a VERSION constant" do
-    expect(ChunkyPNG.const_defined?('VERSION')).to eql true
+    expect(ChunkyPNG.const_defined?("VERSION")).to be_truthy
   end
 end

data/spec/png_suite_spec.rb

@@ -1,8 +1,7 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe 'PNG testuite' do
-
-  context 'Decoding broken images' do
+describe "PNG testuite" do
+  context "Decoding broken images" do
     png_suite_files(:broken).each do |file|
       it "should report #{File.basename(file)} as broken" do
         expect { ChunkyPNG::Image.from_file(file) }.to raise_error(ChunkyPNG::Exception)
@@ -10,24 +9,22 @@ describe 'PNG testuite' do
     end
   end
 
-  context 'Decoding supported images' do
-    png_suite_files(:basic, '*.png').each do |file|
-
-      reference  = file.sub(/\.png$/, '.rgba')
+  context "Decoding supported images" do
+    png_suite_files(:basic, "*.png").each do |file|
+      reference  = file.sub(/\.png$/, ".rgba")
       color_mode = file.match(/[in](\d)[apgc](\d\d)\.png$/)[1].to_i
       bit_depth  = file.match(/[in](\d)[apgc](\d\d)\.png$/)[2].to_i
 
       it "should decode #{File.basename(file)} (color mode: #{color_mode}, bit depth: #{bit_depth}) exactly the same as the reference image" do
         decoded = ChunkyPNG::Canvas.from_file(file)
-        File.open(reference, 'rb') { |f| expect(decoded.to_rgba_stream).to eql f.read }
+        expect(decoded.to_rgba_stream).to eql(File.read(reference, mode: "rb"))
       end
     end
   end
 
-  context 'Decoding text chunks' do
-
+  context "Decoding text chunks" do
     it "should not find metadata in a file without text chunks" do
-      image = ChunkyPNG::Image.from_file(png_suite_file(:metadata, 'cm0n0g04.png'))
+      image = ChunkyPNG::Image.from_file(png_suite_file(:metadata, "cm0n0g04.png"))
       expect(image.metadata).to be_empty
     end
 
@@ -42,10 +39,9 @@ describe 'PNG testuite' do
     # end
   end
 
-  context 'Decoding filter methods' do
-    png_suite_files(:filtering, '*_reference.png').each do |reference_file|
-
-      file = reference_file.sub(/_reference\.png$/, '.png')
+  context "Decoding filter methods" do
+    png_suite_files(:filtering, "*_reference.png").each do |reference_file|
+      file = reference_file.sub(/_reference\.png$/, ".png")
       filter_method = file.match(/f(\d\d)[a-z0-9]+\.png/)[1].to_i
 
       it "should decode #{File.basename(file)} (filter method: #{filter_method}) exactly the same as the reference image" do
@@ -56,54 +52,53 @@ describe 'PNG testuite' do
     end
   end
 
-  context 'Decoding different chunk splits' do
+  context "Decoding different chunk splits" do
     it "should decode grayscale images successfully regardless of the data chunk ordering and splitting" do
-      reference = ChunkyPNG::Datastream.from_file(png_suite_file(:chunk_ordering, 'oi1n0g16.png')).imagedata
-      expect(ChunkyPNG::Datastream.from_file(png_suite_file(:chunk_ordering, 'oi2n0g16.png')).imagedata).to eql reference
-      expect(ChunkyPNG::Datastream.from_file(png_suite_file(:chunk_ordering, 'oi4n0g16.png')).imagedata).to eql reference
-      expect(ChunkyPNG::Datastream.from_file(png_suite_file(:chunk_ordering, 'oi9n0g16.png')).imagedata).to eql reference
+      reference = ChunkyPNG::Datastream.from_file(png_suite_file(:chunk_ordering, "oi1n0g16.png")).imagedata
+      expect(ChunkyPNG::Datastream.from_file(png_suite_file(:chunk_ordering, "oi2n0g16.png")).imagedata).to eql reference
+      expect(ChunkyPNG::Datastream.from_file(png_suite_file(:chunk_ordering, "oi4n0g16.png")).imagedata).to eql reference
+      expect(ChunkyPNG::Datastream.from_file(png_suite_file(:chunk_ordering, "oi9n0g16.png")).imagedata).to eql reference
     end
 
     it "should decode color images successfully regardless of the data chunk ordering and splitting" do
-      reference = ChunkyPNG::Datastream.from_file(png_suite_file(:chunk_ordering, 'oi1n2c16.png')).imagedata
-      expect(ChunkyPNG::Datastream.from_file(png_suite_file(:chunk_ordering, 'oi2n2c16.png')).imagedata).to eql reference
-      expect(ChunkyPNG::Datastream.from_file(png_suite_file(:chunk_ordering, 'oi4n2c16.png')).imagedata).to eql reference
-      expect(ChunkyPNG::Datastream.from_file(png_suite_file(:chunk_ordering, 'oi9n2c16.png')).imagedata).to eql reference
+      reference = ChunkyPNG::Datastream.from_file(png_suite_file(:chunk_ordering, "oi1n2c16.png")).imagedata
+      expect(ChunkyPNG::Datastream.from_file(png_suite_file(:chunk_ordering, "oi2n2c16.png")).imagedata).to eql reference
+      expect(ChunkyPNG::Datastream.from_file(png_suite_file(:chunk_ordering, "oi4n2c16.png")).imagedata).to eql reference
+      expect(ChunkyPNG::Datastream.from_file(png_suite_file(:chunk_ordering, "oi9n2c16.png")).imagedata).to eql reference
     end
   end
 
-  context 'Decoding different compression levels' do
+  context "Decoding different compression levels" do
     it "should decode the image successfully regardless of the compression level" do
-      reference = ChunkyPNG::Datastream.from_file(png_suite_file(:compression_levels, 'z00n2c08.png')).imagedata
-      expect(ChunkyPNG::Datastream.from_file(png_suite_file(:compression_levels, 'z03n2c08.png')).imagedata).to eql reference
-      expect(ChunkyPNG::Datastream.from_file(png_suite_file(:compression_levels, 'z06n2c08.png')).imagedata).to eql reference
-      expect(ChunkyPNG::Datastream.from_file(png_suite_file(:compression_levels, 'z09n2c08.png')).imagedata).to eql reference
+      reference = ChunkyPNG::Datastream.from_file(png_suite_file(:compression_levels, "z00n2c08.png")).imagedata
+      expect(ChunkyPNG::Datastream.from_file(png_suite_file(:compression_levels, "z03n2c08.png")).imagedata).to eql reference
+      expect(ChunkyPNG::Datastream.from_file(png_suite_file(:compression_levels, "z06n2c08.png")).imagedata).to eql reference
+      expect(ChunkyPNG::Datastream.from_file(png_suite_file(:compression_levels, "z09n2c08.png")).imagedata).to eql reference
     end
   end
 
-  context 'Decoding transparency' do
-    png_suite_files(:transparency, 'tp0*.png').each do |file|
+  context "Decoding transparency" do
+    png_suite_files(:transparency, "tp0*.png").each do |file|
       it "should not have transparency in #{File.basename(file)}" do
-        expect(ChunkyPNG::Color.a(ChunkyPNG::Image.from_file(file)[0,0])).to eql 255
+        expect(ChunkyPNG::Color.a(ChunkyPNG::Image.from_file(file)[0, 0])).to eql 255
       end
     end
 
-    png_suite_files(:transparency, 'tp1*.png').each do |file|
+    png_suite_files(:transparency, "tp1*.png").each do |file|
       it "should have transparency in #{File.basename(file)}" do
-        expect(ChunkyPNG::Color.a(ChunkyPNG::Image.from_file(file)[0,0])).to eql 0
+        expect(ChunkyPNG::Color.a(ChunkyPNG::Image.from_file(file)[0, 0])).to eql 0
       end
     end
 
-    png_suite_files(:transparency, 'tb*.png').each do |file|
+    png_suite_files(:transparency, "tb*.png").each do |file|
       it "should have transparency in #{File.basename(file)}" do
-        expect(ChunkyPNG::Color.a(ChunkyPNG::Image.from_file(file)[0,0])).to eql 0
+        expect(ChunkyPNG::Color.a(ChunkyPNG::Image.from_file(file)[0, 0])).to eql 0
       end
     end
   end
 
-  context 'Decoding different sizes' do
-
-    png_suite_files(:sizes, '*n*.png').each do |file|
+  context "Decoding different sizes" do
+    png_suite_files(:sizes, "*n*.png").each do |file|
       dimension = file.match(/s(\d\d)n\dp\d\d/)[1].to_i
 
       it "should create a canvas with a #{dimension}x#{dimension} size" do

data/spec/spec_helper.rb

@@ -1,9 +1,8 @@
-require 'rubygems'
-require 'bundler/setup'
-require 'chunky_png'
+require "rubygems"
+require "bundler/setup"
+require "chunky_png"
 
 module PNGSuite
-
   def png_suite_file(kind, file)
     File.join(png_suite_dir(kind), file)
   end
@@ -12,21 +11,19 @@ module PNGSuite
     File.expand_path("./png_suite/#{kind}", File.dirname(__FILE__))
   end
 
-  def png_suite_files(kind, pattern = '*.png')
+  def png_suite_files(kind, pattern = "*.png")
     Dir[File.join(png_suite_dir(kind), pattern)]
   end
 end
 
-
 module ResourceFileHelper
-
   def resource_file(name)
     File.expand_path("./resources/#{name}", File.dirname(__FILE__))
   end
 
   def resource_data(name)
     data = nil
-    File.open(resource_file(name), 'rb') { |f| data = f.read }
+    File.open(resource_file(name), "rb") { |f| data = f.read }
     data
   end
 
@@ -39,16 +36,25 @@ module ResourceFileHelper
   end
 
   def display(png)
-    filename = resource_file('_tmp.png')
+    filename = resource_file("_tmp.png")
     png.save(filename)
     `open #{filename}`
   end
 end
 
+module ChunkOperationsHelper
+  def serialized_chunk(chunk)
+    chunk.write(stream = StringIO.new)
+    stream.rewind
+    ChunkyPNG::Chunk.read(stream)
+  end
+end
+
 RSpec.configure do |config|
   config.extend PNGSuite
   config.include PNGSuite
   config.include ResourceFileHelper
+  config.include ChunkOperationsHelper
 
   config.expect_with :rspec do |c|
     c.syntax = [:should, :expect]

data/tasks/benchmarks.rake

@@ -1,24 +1,23 @@
 all_benchamrk_tasks = []
 
 namespace(:benchmark) do
-  
-  Dir[File.join(File.dirname(__FILE__), '..', 'benchmarks', '*_benchmark.rb')]. each do |benchmark_file|
-    task_name = File.basename(benchmark_file, '_benchmark.rb').to_sym
-    
+  Dir[File.join(File.dirname(__FILE__), "..", "benchmarks", "*_benchmark.rb")]. each do |benchmark_file|
+    task_name = File.basename(benchmark_file, "_benchmark.rb").to_sym
+
     desc "Run the #{task_name} benchmark."
     task(task_name, :n) do |task, args|
-      ENV['N'] = args[:n] if args[:n]
+      ENV["N"] = args[:n] if args[:n]
       load(File.expand_path(benchmark_file))
     end
-    
+
     all_benchamrk_tasks << "benchmark:#{task_name}"
   end
 end
 
 unless all_benchamrk_tasks.empty?
-  desc 'Run the whole benchmark suite'
+  desc "Run the whole benchmark suite"
   task(:benchmark, :n) do |task, args|
-    all_benchamrk_tasks.each do |t| 
+    all_benchamrk_tasks.each do |t|
       task(t).invoke(args[:n])
       puts
     end

metadata

@@ -1,41 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: chunky_png
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.13
 platform: ruby
 authors:
 - Willem van Bergen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 description: |2
@@ -65,9 +93,10 @@ extra_rdoc_files:
 - CONTRIBUTING.rdoc
 - CHANGELOG.rdoc
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".github/workflows/ruby.yml"
+- ".gitignore"
+- ".standard.yml"
+- ".yardopts"
 - BENCHMARKING.rdoc
 - CHANGELOG.rdoc
 - CONTRIBUTING.rdoc
@@ -78,6 +107,8 @@ files:
 - benchmarks/decoding_benchmark.rb
 - benchmarks/encoding_benchmark.rb
 - benchmarks/filesize_benchmark.rb
+- bin/rake
+- bin/standardrb
 - chunky_png.gemspec
 - lib/chunky_png.rb
 - lib/chunky_png/canvas.rb
@@ -94,7 +125,6 @@ files:
 - lib/chunky_png/canvas/stream_importing.rb
 - lib/chunky_png/chunk.rb
 - lib/chunky_png/color.rb
-- lib/chunky_png/compatibility.rb
 - lib/chunky_png/datastream.rb
 - lib/chunky_png/dimension.rb
 - lib/chunky_png/image.rb
@@ -366,6 +396,7 @@ files:
 - spec/resources/damaged_chunk.png
 - spec/resources/damaged_signature.png
 - spec/resources/empty.png
+- spec/resources/itxt_chunk.png
 - spec/resources/lines.png
 - spec/resources/operations.png
 - spec/resources/operations_border.png
@@ -388,33 +419,34 @@ files:
 - spec/resources/ztxt_chunk.png
 - spec/spec_helper.rb
 - tasks/benchmarks.rake
-homepage: http://wiki.github.com/wvanbergen/chunky_png
+homepage: https://github.com/wvanbergen/chunky_png/wiki
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/wvanbergen/chunky_png
+  wiki_uri: https://github.com/wvanbergen/chunky_png/wiki
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - chunky_png
-- --main
+- "--main"
 - README.rdoc
-- --line-numbers
-- --inline-source
+- "--line-numbers"
+- "--inline-source"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Pure ruby library for read/write, chunk-level access to PNG files
@@ -682,6 +714,7 @@ test_files:
 - spec/resources/damaged_chunk.png
 - spec/resources/damaged_signature.png
 - spec/resources/empty.png
+- spec/resources/itxt_chunk.png
 - spec/resources/lines.png
 - spec/resources/operations.png
 - spec/resources/operations_border.png

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-script: bundle exec rake
-sudo: false
-
-rvm:
-- "2.0"
-- "2.1"
-- "2.2"
-- ruby-head
-- rbx-19mode
-- jruby-19mode
-
-matrix:
-  allow_failures:
-  - rvm: rbx-19mode
-  - rvm: ruby-head

data/lib/chunky_png/compatibility.rb

@@ -1,15 +0,0 @@
-# Define the byte-operators on a string if they're not defined (Ruby 1.8)
-
-class String
-  alias_method :getbyte, :[]    unless method_defined?(:getbyte)
-  alias_method :setbyte, :[]=   unless method_defined?(:setbyte)
-  alias_method :bytesize, :size unless method_defined?(:bytesize)
-end
-
-module Enumerable
-  unless method_defined?(:minmax)
-    def minmax
-      [min, max]
-    end
-  end
-end