chunky_png 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00c6b5bf5c682e05964783d8d05f964582c5f7aa
-  data.tar.gz: 8552180cbcd29adacd71df55a253d8a69a499e8e
+  metadata.gz: 1395efeb7e88472e7540738a53c3741b73fca724
+  data.tar.gz: 47a55fd705b53d3c55df1d3c172e49c5890f29c5
 SHA512:
-  metadata.gz: d8ef6769e7d848d4fb526b2fa23710edc122c0ce67e9a4cabea9504faed8124cb1a667318ee61139282f91eb928c3aa7e745ba51308985f7713f050460ffa914
-  data.tar.gz: b04f411542d0bacf557ea6449abfa0a0d99406b8c26bb73b2b55fb7d275460c3b616c5a372e0a97dcb12eb44229a60a1bedbb260dedca77b216c261e0c374eee
+  metadata.gz: aff023ebfaa594917ac6b46b6fa39725a66cb81e3430f05b0c9fa7fab421eeaa2844bf6617ec12958087655211d435a3ed873e76789b9be1bea910234cdeac6b
+  data.tar.gz: 440d1f499da4349fab1c47b912fbf26347f304a33470c7420c4bb5b96511ac80f6bd677544e974116ed90669dea75197089043da6d4c852a63687ea2cdfd1546

data/.travis.yml

@@ -3,17 +3,14 @@ script: bundle exec rake
 sudo: false
 
 rvm:
-- "1.8"
-- "1.9"
 - "2.0"
 - "2.1"
 - "2.2"
 - ruby-head
-- rbx
-- jruby-18mode
+- rbx-19mode
 - jruby-19mode
 
 matrix:
   allow_failures:
-  - rvm: rbx
+  - rvm: rbx-19mode
   - rvm: ruby-head

data/README.rdoc

@@ -1,4 +1,4 @@
-= Chunky PNG {<img src="https://travis-ci.org/wvanbergen/chunky_png.png?branch=master" alt="Build Status" />}[https://travis-ci.org/wvanbergen/chunky_png]
+= Chunky PNG {<img src="https://travis-ci.org/wvanbergen/chunky_png.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/wvanbergen/chunky_png]
 
 This library can read and write PNG files. It is written in pure Ruby for
 maximum portability. Let me rephrase: it does NOT require RMagick or any other

data/lib/chunky_png/canvas/operations.rb

@@ -175,11 +175,18 @@ module ChunkyPNG
           raise ChunkyPNG::OutOfBounds, 'Original image height is too small!'
         end
 
-        new_pixels = []
-        for cy in 0...crop_height do
-          new_pixels.concat pixels.slice((cy + y) * width + x, crop_width)
+        if crop_width == width && x == 0
+          # We only need to crop off the top and/or bottom, so we can take a
+          # shortcut.
+          replace_canvas!(crop_width, crop_height,
+                          pixels.slice(y * width, width * crop_height))
+        else
+          new_pixels = []
+          for cy in 0...crop_height do
+            new_pixels.concat pixels.slice((cy + y) * width + x, crop_width)
+          end
+          replace_canvas!(crop_width, crop_height, new_pixels)
         end
-        replace_canvas!(crop_width, crop_height, new_pixels)
       end
 
       # Flips the image horizontally, leaving the original intact.

data/lib/chunky_png/chunk.rb

@@ -245,7 +245,11 @@ module ChunkyPNG
 
     class ImageData < Generic
       def self.combine_chunks(data_chunks)
-        Zlib::Inflate.inflate(data_chunks.map { |c| c.content }.join(''))
+        zstream = Zlib::Inflate.new
+        data_chunks.each { |c| zstream << c.content }
+        inflated = zstream.finish
+        zstream.close
+        inflated
       end
 
       def self.split_in_chunks(data, level = Zlib::DEFAULT_COMPRESSION, chunk_size = 2147483647)

data/lib/chunky_png/color.rb

@@ -256,7 +256,7 @@ module ChunkyPNG
       when (2...3); [0, chroma, x]
       when (3...4); [0, x, chroma]
       when (4...5); [x, 0, chroma]
-      when (5...6); [chroma, 0, x]
+      when (5..6);  [chroma, 0, x]
       end
     end
     private :cylindrical_to_cubic

data/lib/chunky_png/datastream.rb

@@ -131,7 +131,7 @@ module ChunkyPNG
     def chunks
       enum_for(:each_chunk)
     end
-    
+
     # Returns all the textual metadata key/value pairs as hash.
     # @return [Hash] A hash containing metadata fields and their values.
     def metadata
@@ -141,7 +141,7 @@ module ChunkyPNG
       end
       metadata
     end
-   
+
     # Returns the uncompressed image data, combined from all the IDAT chunks
     # @return [String] The uncompressed image data for this datastream
     def imagedata
@@ -175,6 +175,7 @@ module ChunkyPNG
     # @return [String] The encoded PNG datastream.
     def to_blob
       str = StringIO.new
+      str.set_encoding('ASCII-8BIT')
       write(str)
       return str.string
     end

data/lib/chunky_png/rmagick.rb

@@ -1,4 +1,4 @@
-require 'RMagick'
+require 'rmagick'
 
 module ChunkyPNG
   

data/lib/chunky_png/version.rb

@@ -1,5 +1,5 @@
 module ChunkyPNG
   # The current version of ChunkyPNG.
   # Set it and commit the change this before running rake release.
-  VERSION = "1.3.4"
+  VERSION = "1.3.5"
 end

data/spec/chunky_png/canvas/operations_spec.rb

@@ -48,22 +48,46 @@ describe ChunkyPNG::Canvas::Operations do
   end
 
   describe '#crop!' do
-    it "should crop the right pixels from the original canvas" do
-      subject.crop!(10, 5, 4, 8)
-      expect(subject).to eql reference_canvas('cropped')
-    end
+    context 'when cropping both width and height' do
+      let(:crop_opts) { [10, 5, 4, 8] }
+
+      it "should crop the right pixels from the original canvas" do
+        subject.crop!(*crop_opts)
+        expect(subject).to eql reference_canvas('cropped')
+      end
 
-    it "should have a new width and height" do
-      expect { subject.crop!(10, 5, 4, 8) }.to change { subject.dimension }.
-          from(ChunkyPNG::Dimension('16x16')).to(ChunkyPNG::Dimension('4x8'))
+      it "should have a new width and height" do
+        expect { subject.crop!(*crop_opts) }.to change { subject.dimension }.
+            from(ChunkyPNG::Dimension('16x16')).to(ChunkyPNG::Dimension('4x8'))
+      end
+
+      it "should return itself" do
+        expect(subject.crop!(*crop_opts)).to equal(subject)
+      end
     end
 
-    it "should raise an exception when the cropped image falls outside the oiginal image" do
-      expect { subject.crop!(16, 16, 2, 2) }.to raise_error(ChunkyPNG::OutOfBounds)
+    context "when cropping just the height" do
+      let(:crop_opts) { [0, 5, 16, 8] }
+
+      it "should crop the right pixels from the original canvas" do
+        subject.crop!(*crop_opts)
+        expect(subject).to eql reference_canvas('cropped_height')
+      end
+
+      it "should have a new width and height" do
+        expect { subject.crop!(*crop_opts) }.to change { subject.dimension }.
+            from(ChunkyPNG::Dimension('16x16')).to(ChunkyPNG::Dimension('16x8'))
+      end
+
+      it "should return itself" do
+        expect(subject.crop!(*crop_opts)).to equal(subject)
+      end
     end
 
-    it "should return itself" do
-      expect(subject.crop!(10, 5, 4, 8)).to equal(subject)
+    context "when the cropped image falls outside the original image" do
+      it "should raise an exception" do
+        expect { subject.crop!(16, 16, 2, 2) }.to raise_error(ChunkyPNG::OutOfBounds)
+      end
     end
   end
 

data/spec/chunky_png/color_spec.rb

@@ -129,6 +129,10 @@ describe ChunkyPNG::Color do
 
       # And, finally, one random color
       expect(from_hsv(120, 0.5, 0.80)).to eql 0x66cc66ff
+
+      # Hue 0 and hue 360 should be equivalent
+      expect(from_hsv(0, 0.5, 0.5)).to eql from_hsv(360, 0.5, 0.5)
+      expect(from_hsv(0, 0.5, 0.5)).to eql from_hsv(360.0, 0.5, 0.5)
     end
 
     it 'should optionally accept a fourth param for alpha' do
@@ -162,6 +166,10 @@ describe ChunkyPNG::Color do
       from_hsl(87.27, 0.5, 0.5686)     == 0x96c85aff
       from_hsl(271.83, 0.5399, 0.4176) == 0x6e31a4ff
       from_hsl(63.6, 0.5984, 0.4882)   == 0xbec732ff
+
+      # Hue 0 and hue 360 should be equivalent
+      expect(from_hsl(0, 0.5, 0.5)).to eql from_hsl(360, 0.5, 0.5)
+      expect(from_hsl(0, 0.5, 0.5)).to eql from_hsl(360.0, 0.5, 0.5)
     end
 
     it 'should optionally accept a fourth param for alpha' do

data/spec/chunky_png/datastream_spec.rb

@@ -5,12 +5,17 @@ describe ChunkyPNG::Datastream do
   describe '.from_io'do
     it "should raise an error when loading a file with a bad signature" do
       filename = resource_file('damaged_signature.png')
-      expect { ChunkyPNG::Datastream.from_file(filename) }.to raise_error
+      expect { ChunkyPNG::Datastream.from_file(filename) }.to raise_error(ChunkyPNG::SignatureMismatch)
     end
 
     it "should raise an error if the CRC of a chunk is incorrect" do
       filename = resource_file('damaged_chunk.png')
-      expect { ChunkyPNG::Datastream.from_file(filename) }.to raise_error
+      expect { ChunkyPNG::Datastream.from_file(filename) }.to raise_error(ChunkyPNG::CRCMismatch)
+    end
+
+    it "should raise an error for a stream that is too short" do
+      stream = StringIO.new
+      expect { ChunkyPNG::Datastream.from_io(stream) }.to raise_error(ChunkyPNG::SignatureMismatch)
     end
   end
 

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: chunky_png
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Willem van Bergen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-10-28 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: 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 +65,9 @@ extra_rdoc_files:
 - CONTRIBUTING.rdoc
 - CHANGELOG.rdoc
 files:
-- ".gitignore"
-- ".travis.yml"
-- ".yardopts"
+- .gitignore
+- .travis.yml
+- .yardopts
 - BENCHMARKING.rdoc
 - CHANGELOG.rdoc
 - CONTRIBUTING.rdoc
@@ -362,6 +362,7 @@ files:
 - spec/resources/clock_updated.png
 - spec/resources/composited.png
 - spec/resources/cropped.png
+- spec/resources/cropped_height.png
 - spec/resources/damaged_chunk.png
 - spec/resources/damaged_signature.png
 - spec/resources/empty.png
@@ -392,27 +393,27 @@ licenses:
 metadata: {}
 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.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Pure ruby library for read/write, chunk-level access to PNG files
@@ -676,6 +677,7 @@ test_files:
 - spec/resources/clock_updated.png
 - spec/resources/composited.png
 - spec/resources/cropped.png
+- spec/resources/cropped_height.png
 - spec/resources/damaged_chunk.png
 - spec/resources/damaged_signature.png
 - spec/resources/empty.png