chunky_png 1.2.4 → 1.2.5

data/.travis.yml

@@ -6,4 +6,5 @@ rvm:
   - ruby-head
   - ree
   - rbx
+  - rbx-2.0
   - jruby

data/chunky_png.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
 
   # Do not change the version and date fields by hand. This will be done
   # automatically by the gem release script.
-  s.version = "1.2.4"
-  s.date    = "2011-09-14"
+  s.version = "1.2.5"
+  s.date    = "2011-09-23"
 
   s.summary     = "Pure ruby library for read/write, chunk-level access to PNG files"
   s.description = <<-EOT

data/lib/chunky_png.rb

@@ -25,7 +25,7 @@ module ChunkyPNG
 
   # The current version of ChunkyPNG. This value will be updated 
   # automatically by them <tt>gem:release</tt> rake task.
-  VERSION = "1.2.4"
+  VERSION = "1.2.5"
 
   ###################################################
   # PNG international standard defined constants

data/lib/chunky_png/canvas/data_url_importing.rb

@@ -1,12 +1,14 @@
 module ChunkyPNG
   class Canvas
 
-    # Methods to export a canvas to a PNG data URL.
+    # Methods to import a canvas from a PNG data URL.
     module DataUrlImporting
 
-      # Exports the canvas as a data url (e.g. data:image/png;base64,<data>) that can
-      # easily be used inline in CSS or HTML.
-      # @return [String] The canvas formatted as a data URL string.
+      # Imports a canvas from a PNG data URL.
+      # @param [String] string The data URL string to load from.
+      # @return [Canvas] The imported canvas.
+      # @raise ChunkyPNG::SignatureMismatch if the provides string is not a properly
+      #    formatted PNG data URL (i.e. it should start with "data:image/png;base64,")
       def from_data_url(string)
         if string =~ %r[^data:image/png;base64,((?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=))$]
           from_blob($1.unpack('m').first)

data/lib/chunky_png/canvas/masking.rb

@@ -20,7 +20,7 @@ module ChunkyPNG
       #
       # @param [Integer] old_theme_color The original theme color in this image.
       # @param [Integer] new_theme_color The color to replace the old theme color with.
-      # @param [Integer] The background color on which the theme colored pixels are placed.
+      # @param [Integer] bg_color The background color on which the theme colored pixels are placed.
       # @param [Integer] tolerance The tolerance level to use when extracting the mask image. Five is 
       #    the default; increase this if the masked image does not extract all the required pixels, 
       #    decrease it if too many pixels get extracted.

data/lib/chunky_png/color.rb

@@ -422,8 +422,13 @@ module ChunkyPNG
     # @param [Integer] bg The background color on which the color was composed.
     # @return [Integer] The decomposed alpha value for the channel.
     def decompose_alpha_component(channel, color, mask, bg)
-      ((send(channel, bg) - send(channel, color)).to_f / 
-          (send(channel, bg) - send(channel, mask)).to_f * MAX).round
+      cc, mc, bc = send(channel, color), send(channel, mask), send(channel, bg)
+      
+      return 0x00 if bc == cc
+      return 0xff if bc == mc
+      return 0xff if cc == mc
+      
+      (((bc - cc).to_f / (bc - mc).to_f) * MAX).round
     end
     
     # Decomposes the alpha channels for the r, g and b color channel.

data/spec/chunky_png/color_spec.rb

@@ -219,6 +219,18 @@ describe ChunkyPNG::Color do
     it "should decompose the alpha channel correctly" do
       decompose_alpha(0x9fc2d6ff, @opaque, @white).should == 0x00000064
     end
+    
+    it "should return fully transparent if the background channel matches the resulting color" do
+      decompose_alpha(0xabcdefff, 0xff000000, 0xabcdefff).should == 0x00
+    end
+    
+    it "should return fully opaque if the background channel matches the mask color" do
+      decompose_alpha(0xff000000, 0xabcdefff, 0xabcdefff).should == 0xff
+    end
+    
+    it "should return fully opaque if the resulting color matches the mask color" do
+      decompose_alpha(0xabcdefff, 0xabcdefff, 0xffffffff).should == 255
+    end    
   end
   
   describe '#blend' do

metadata

@@ -1,63 +1,60 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: chunky_png
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.2.5
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 4
-  version: 1.2.4
 platform: ruby
-authors: 
+authors:
 - Willem van Bergen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-14 00:00:00 -04:00
+date: 2011-09-23 00:00:00.000000000 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153017100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153017100
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2153016480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        version: "2.2"
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :development
-  version_requirements: *id002
-description: "    This pure Ruby library can read and write PNG images without depending on an external \n    image library, like RMagick. It tries to be memory efficient and reasonably fast.\n    \n    It supports reading and writing all PNG variants that are defined in the specification, \n    with one limitation: only 8-bit color depth is supported. It supports all transparency, \n    interlacing and filtering options the PNG specifications allows. It can also read and \n    write textual metadata from PNG files. Low-level read/write access to PNG chunks is\n    also possible.\n    \n    This library supports simple drawing on the image canvas and simple operations like\n    alpha composition and cropping. Finally, it can import from and export to RMagick for \n    interoperability.\n    \n    Also, have a look at OilyPNG at http://github.com/wvanbergen/oily_png. OilyPNG is a \n    drop in mixin module that implements some of the ChunkyPNG algorithms in C, which \n    provides a massive speed boost to encoding and decoding.\n"
-email: 
+  prerelease: false
+  version_requirements: *2153016480
+description: ! "    This pure Ruby library can read and write PNG images without depending
+  on an external \n    image library, like RMagick. It tries to be memory efficient
+  and reasonably fast.\n    \n    It supports reading and writing all PNG variants
+  that are defined in the specification, \n    with one limitation: only 8-bit color
+  depth is supported. It supports all transparency, \n    interlacing and filtering
+  options the PNG specifications allows. It can also read and \n    write textual
+  metadata from PNG files. Low-level read/write access to PNG chunks is\n    also
+  possible.\n    \n    This library supports simple drawing on the image canvas and
+  simple operations like\n    alpha composition and cropping. Finally, it can import
+  from and export to RMagick for \n    interoperability.\n    \n    Also, have a look
+  at OilyPNG at http://github.com/wvanbergen/oily_png. OilyPNG is a \n    drop in
+  mixin module that implements some of the ChunkyPNG algorithms in C, which \n    provides
+  a massive speed boost to encoding and decoding.\n"
+email:
 - willem@railsdoctors.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - BENCHMARKS.rdoc
-files: 
+files:
 - .gitignore
 - .infinity_test
 - .travis.yml
@@ -378,43 +375,35 @@ files:
 has_rdoc: true
 homepage: http://wiki.github.com/wvanbergen/chunky_png
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - chunky_png
 - --main
 - README.rdoc
 - --line-numbers
 - --inline-source
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Pure ruby library for read/write, chunk-level access to PNG files
-test_files: 
+test_files:
 - spec/chunky_png/canvas/adam7_interlacing_spec.rb
 - spec/chunky_png/canvas/data_url_exporting_spec.rb
 - spec/chunky_png/canvas/data_url_importing_spec.rb