chunky_png 1.3.11 → 1.3.12

data/lib/chunky_png/color.rb

@@ -1,5 +1,4 @@
 module ChunkyPNG
-
   # Factory method to return a color value, based on the arguments given.
   #
   # @overload Color(r, g, b, a)
@@ -29,15 +28,16 @@ module ChunkyPNG
   # @raise [ArgumentError] if the arguments weren't understood as a color.
   # @see ChunkyPNG::Color
   # @see ChunkyPNG::Color.parse
-  def self.Color(*args)
+  def self.Color(*args) # rubocop:disable Naming/MethodName # API backwards compatibility
     case args.length
-      when 1; ChunkyPNG::Color.parse(args.first)
-      when 2; (ChunkyPNG::Color.parse(args.first) & 0xffffff00) | args[1].to_i
-      when 3; ChunkyPNG::Color.rgb(*args)
-      when 4; ChunkyPNG::Color.rgba(*args)
+      when 1 then ChunkyPNG::Color.parse(args.first)
+      when 2 then (ChunkyPNG::Color.parse(args.first) & 0xffffff00) | args[1].to_i
+      when 3 then ChunkyPNG::Color.rgb(*args)
+      when 4 then ChunkyPNG::Color.rgba(*args)
       else raise ArgumentError, "Don't know how to create a color from #{args.inspect}!"
     end
   end
+  # rubocop:enable Naming/MethodName
 
   # The Color module defines methods for handling colors. Within the ChunkyPNG
   # library, the concepts of pixels and colors are both used, and they are
@@ -78,15 +78,15 @@ module ChunkyPNG
     #
     # It supports color numbers, colors in hex notation and named HTML colors.
     #
-    # @param [Integer, String] The color value.
+    # @param [Integer, String] source The color value.
     # @return [Integer] The color value, with the opacity applied if one was
     #   given.
     def parse(source)
-      return source if source.kind_of?(Integer)
+      return source if source.is_a?(Integer)
       case source.to_s
-        when /^\d+$/; source.to_s.to_i
-        when HEX3_COLOR_REGEXP, HEX6_COLOR_REGEXP; from_hex(source.to_s)
-        when HTML_COLOR_REGEXP; html_color(source.to_s)
+        when /^\d+$/ then source.to_s.to_i
+        when HEX3_COLOR_REGEXP, HEX6_COLOR_REGEXP then from_hex(source.to_s)
+        when HTML_COLOR_REGEXP then html_color(source.to_s)
         else raise ArgumentError, "Don't know how to create a color from #{source.inspect}!"
       end
     end
@@ -157,22 +157,21 @@ module ChunkyPNG
     # as well as the 3-digit short format (#rgb) for those without.
     # Color strings may include the prefix "0x" or "#".
     #
-    # @param [String] str The color in hex notation. @return [Integer] The
-    #   converted color value.
+    # @param [String] hex_value The color in hex notation.
     # @param [Integer] opacity The opacity value for the color. Overrides any
     #    opacity value given in the hex value if given.
     # @return [Integer] The color value.
     # @raise [ArgumentError] if the value given is not a hex color notation.
     def from_hex(hex_value, opacity = nil)
       base_color = case hex_value
-                   when HEX3_COLOR_REGEXP
-                     $1.gsub(/([0-9a-f])/i, '\1\1').hex << 8
-                   when HEX6_COLOR_REGEXP
-                     $1.hex << 8
-                   else
-                     raise ArgumentError, "Not a valid hex color notation: #{hex_value.inspect}!"
-                   end
-      opacity  ||= $2 ? $2.hex : 0xff
+        when HEX3_COLOR_REGEXP
+          $1.gsub(/([0-9a-f])/i, '\1\1').hex << 8
+        when HEX6_COLOR_REGEXP
+          $1.hex << 8
+        else
+          raise ArgumentError, "Not a valid hex color notation: #{hex_value.inspect}!"
+      end
+      opacity ||= $2 ? $2.hex : 0xff
       base_color | opacity
     end
 
@@ -191,16 +190,18 @@ module ChunkyPNG
     # @raise [ArgumentError] if the hsv triple is invalid.
     # @see http://en.wikipedia.org/wiki/HSL_and_HSV
     def from_hsv(hue, saturation, value, alpha = 255)
-      raise ArgumentError, "Hue must be between 0 and 360" unless (0..360).include?(hue)
-      raise ArgumentError, "Saturation must be between 0 and 1" unless (0..1).include?(saturation)
-      raise ArgumentError, "Value/brightness must be between 0 and 1" unless (0..1).include?(value)
+      raise ArgumentError, "Hue must be between 0 and 360" unless (0..360).cover?(hue)
+      raise ArgumentError, "Saturation must be between 0 and 1" unless (0..1).cover?(saturation)
+      raise ArgumentError, "Value/brightness must be between 0 and 1" unless (0..1).cover?(value)
+
       chroma = value * saturation
       rgb    = cylindrical_to_cubic(hue, saturation, value, chroma)
       rgb.map! { |component| ((component + value - chroma) * 255).to_i }
       rgb << alpha
-      self.rgba(*rgb)
+      rgba(*rgb)
     end
-    alias_method :from_hsb, :from_hsv
+
+    alias from_hsb from_hsv
 
     # Creates a new color from an HSL triple.
     #
@@ -215,14 +216,15 @@ module ChunkyPNG
     # @raise [ArgumentError] if the hsl triple is invalid.
     # @see http://en.wikipedia.org/wiki/HSL_and_HSV
     def from_hsl(hue, saturation, lightness, alpha = 255)
-      raise ArgumentError, "Hue #{hue} was not between 0 and 360" unless (0..360).include?(hue)
-      raise ArgumentError, "Saturation #{saturation} was not between 0 and 1" unless (0..1).include?(saturation)
-      raise ArgumentError, "Lightness #{lightness} was not between 0 and 1" unless (0..1).include?(lightness)
+      raise ArgumentError, "Hue #{hue} was not between 0 and 360" unless (0..360).cover?(hue)
+      raise ArgumentError, "Saturation #{saturation} was not between 0 and 1" unless (0..1).cover?(saturation)
+      raise ArgumentError, "Lightness #{lightness} was not between 0 and 1" unless (0..1).cover?(lightness)
+
       chroma = (1 - (2 * lightness - 1).abs) * saturation
       rgb    = cylindrical_to_cubic(hue, saturation, lightness, chroma)
       rgb.map! { |component| ((component + lightness - 0.5 * chroma) * 255).to_i }
       rgb << alpha
-      self.rgba(*rgb)
+      rgba(*rgb)
     end
 
     # Convert one HSL or HSV triple and associated chroma to a scaled rgb triple
@@ -251,12 +253,12 @@ module ChunkyPNG
       x = chroma * (1 - (hue_prime % 2 - 1).abs)
 
       case hue_prime
-      when (0...1); [chroma, x, 0]
-      when (1...2); [x, chroma, 0]
-      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 (0...1) then [chroma, x, 0]
+      when (1...2) then [x, chroma, 0]
+      when (2...3) then [0, chroma, x]
+      when (3...4) then [0, x, chroma]
+      when (4...5) then [x, 0, chroma]
+      when (5..6)  then [chroma, 0, x]
       end
     end
     private :cylindrical_to_cubic
@@ -392,7 +394,7 @@ module ChunkyPNG
       rgba(new_r, new_g, new_b, new_a)
     end
 
-    alias :compose :compose_quick
+    alias compose compose_quick
 
     # Blends the foreground and background color by taking the average of
     # the components.
@@ -413,7 +415,7 @@ module ChunkyPNG
     # @param [Integer] fg The foreground color.
     # @param [Integer] bg The background color.
     # @param [Integer] alpha The blending factor (fixed 8bit)
-    # @param [Integer] The interpolated color.
+    # @return [Integer] The interpolated color.
     def interpolate_quick(fg, bg, alpha)
       return fg if alpha >= 255
       return bg if alpha <= 0
@@ -499,7 +501,7 @@ module ChunkyPNG
     # @see #decompose_alpha
     def alpha_decomposable?(color, mask, bg, tolerance = 1)
       components = decompose_alpha_components(color, mask, bg)
-      sum = components.inject(0) { |a,b| a + b }
+      sum = components.inject(0) { |a, b| a + b }
       max = components.max * 3
       components.max <= 255 && components.min >= 0 && (sum + tolerance * 3) >= max
     end
@@ -520,7 +522,7 @@ module ChunkyPNG
     # @see #alpha_decomposable?
     def decompose_alpha(color, mask, bg)
       components = decompose_alpha_components(color, mask, bg)
-      (components.inject(0) { |a,b| a + b } / 3.0).round
+      (components.inject(0) { |a, b| a + b } / 3.0).round
     end
 
     # Decomposes an alpha channel for either the r, g or b color channel.
@@ -552,7 +554,7 @@ module ChunkyPNG
       [
         decompose_alpha_component(:r, color, mask, bg),
         decompose_alpha_component(:g, color, mask, bg),
-        decompose_alpha_component(:b, color, mask, bg)
+        decompose_alpha_component(:b, color, mask, bg),
       ]
     end
 
@@ -563,10 +565,11 @@ module ChunkyPNG
     # Returns a string representing this color using hex notation (i.e.
     # #rrggbbaa).
     #
-    # @param [Integer] value The color to convert.
+    # @param [Integer] color The color to convert.
+    # @param [Boolean] include_alpha
     # @return [String] The color in hex notation, starting with a pound sign.
     def to_hex(color, include_alpha = true)
-      include_alpha ? ('#%08x' % color) : ('#%06x' % [color >> 8])
+      include_alpha ? ("#%08x" % color) : ("#%06x" % [color >> 8])
     end
 
     # Returns an array with the separate HSV components of a color.
@@ -596,7 +599,8 @@ module ChunkyPNG
       include_alpha ? [hue, saturation, value, a(color)] :
                       [hue, saturation, value]
     end
-    alias_method :to_hsb, :to_hsv
+
+    alias to_hsb to_hsv
 
     # Returns an array with the separate HSL components of a color.
     #
@@ -629,29 +633,30 @@ module ChunkyPNG
     # a ChunkPNG color. This logic is shared by the cylindrical HSV/HSB and HSL
     # color space models.
     #
-    # @param [Integer] A ChunkyPNG color.
+    # @param [Integer] color A ChunkyPNG color.
     # @return [Fixnum] hue The hue of the color (0-360)
     # @return [Fixnum] chroma The chroma of the color (0-1)
     # @return [Fixnum] max The magnitude of the largest scaled rgb component (0-1)
     # @return [Fixnum] min The magnitude of the smallest scaled rgb component (0-1)
     # @private
     def hue_and_chroma(color)
-      scaled_rgb      = to_truecolor_bytes(color)
+      scaled_rgb = to_truecolor_bytes(color)
       scaled_rgb.map! { |component| component.fdiv(255) }
       min, max = scaled_rgb.minmax
       chroma   = max - min
 
       r, g, b   = scaled_rgb
       hue_prime = chroma.zero? ? 0 : case max
-                                     when r; (g - b).fdiv(chroma)
-                                     when g; (b - r).fdiv(chroma) + 2
-                                     when b; (r - g).fdiv(chroma) + 4
+                                     when r then (g - b).fdiv(chroma)
+                                     when g then (b - r).fdiv(chroma) + 2
+                                     when b then (r - g).fdiv(chroma) + 4
                                      else 0
                                      end
       hue = 60 * hue_prime
 
-      return hue.round, chroma, max, min
+      [hue.round, chroma, max, min]
     end
+
     private :hue_and_chroma
 
     # Returns an array with the separate RGBA values for this color.
@@ -735,153 +740,153 @@ module ChunkyPNG
 
     # @return [Hash<Symbol, Integer>] All the predefined color names in HTML.
     PREDEFINED_COLORS = {
-      :aliceblue            => 0xf0f8ff00,
-      :antiquewhite         => 0xfaebd700,
-      :aqua                 => 0x00ffff00,
-      :aquamarine           => 0x7fffd400,
-      :azure                => 0xf0ffff00,
-      :beige                => 0xf5f5dc00,
-      :bisque               => 0xffe4c400,
-      :black                => 0x00000000,
-      :blanchedalmond       => 0xffebcd00,
-      :blue                 => 0x0000ff00,
-      :blueviolet           => 0x8a2be200,
-      :brown                => 0xa52a2a00,
-      :burlywood            => 0xdeb88700,
-      :cadetblue            => 0x5f9ea000,
-      :chartreuse           => 0x7fff0000,
-      :chocolate            => 0xd2691e00,
-      :coral                => 0xff7f5000,
-      :cornflowerblue       => 0x6495ed00,
-      :cornsilk             => 0xfff8dc00,
-      :crimson              => 0xdc143c00,
-      :cyan                 => 0x00ffff00,
-      :darkblue             => 0x00008b00,
-      :darkcyan             => 0x008b8b00,
-      :darkgoldenrod        => 0xb8860b00,
-      :darkgray             => 0xa9a9a900,
-      :darkgrey             => 0xa9a9a900,
-      :darkgreen            => 0x00640000,
-      :darkkhaki            => 0xbdb76b00,
-      :darkmagenta          => 0x8b008b00,
-      :darkolivegreen       => 0x556b2f00,
-      :darkorange           => 0xff8c0000,
-      :darkorchid           => 0x9932cc00,
-      :darkred              => 0x8b000000,
-      :darksalmon           => 0xe9967a00,
-      :darkseagreen         => 0x8fbc8f00,
-      :darkslateblue        => 0x483d8b00,
-      :darkslategray        => 0x2f4f4f00,
-      :darkslategrey        => 0x2f4f4f00,
-      :darkturquoise        => 0x00ced100,
-      :darkviolet           => 0x9400d300,
-      :deeppink             => 0xff149300,
-      :deepskyblue          => 0x00bfff00,
-      :dimgray              => 0x69696900,
-      :dimgrey              => 0x69696900,
-      :dodgerblue           => 0x1e90ff00,
-      :firebrick            => 0xb2222200,
-      :floralwhite          => 0xfffaf000,
-      :forestgreen          => 0x228b2200,
-      :fuchsia              => 0xff00ff00,
-      :gainsboro            => 0xdcdcdc00,
-      :ghostwhite           => 0xf8f8ff00,
-      :gold                 => 0xffd70000,
-      :goldenrod            => 0xdaa52000,
-      :gray                 => 0x80808000,
-      :grey                 => 0x80808000,
-      :green                => 0x00800000,
-      :greenyellow          => 0xadff2f00,
-      :honeydew             => 0xf0fff000,
-      :hotpink              => 0xff69b400,
-      :indianred            => 0xcd5c5c00,
-      :indigo               => 0x4b008200,
-      :ivory                => 0xfffff000,
-      :khaki                => 0xf0e68c00,
-      :lavender             => 0xe6e6fa00,
-      :lavenderblush        => 0xfff0f500,
-      :lawngreen            => 0x7cfc0000,
-      :lemonchiffon         => 0xfffacd00,
-      :lightblue            => 0xadd8e600,
-      :lightcoral           => 0xf0808000,
-      :lightcyan            => 0xe0ffff00,
-      :lightgoldenrodyellow => 0xfafad200,
-      :lightgray            => 0xd3d3d300,
-      :lightgrey            => 0xd3d3d300,
-      :lightgreen           => 0x90ee9000,
-      :lightpink            => 0xffb6c100,
-      :lightsalmon          => 0xffa07a00,
-      :lightseagreen        => 0x20b2aa00,
-      :lightskyblue         => 0x87cefa00,
-      :lightslategray       => 0x77889900,
-      :lightslategrey       => 0x77889900,
-      :lightsteelblue       => 0xb0c4de00,
-      :lightyellow          => 0xffffe000,
-      :lime                 => 0x00ff0000,
-      :limegreen            => 0x32cd3200,
-      :linen                => 0xfaf0e600,
-      :magenta              => 0xff00ff00,
-      :maroon               => 0x80000000,
-      :mediumaquamarine     => 0x66cdaa00,
-      :mediumblue           => 0x0000cd00,
-      :mediumorchid         => 0xba55d300,
-      :mediumpurple         => 0x9370d800,
-      :mediumseagreen       => 0x3cb37100,
-      :mediumslateblue      => 0x7b68ee00,
-      :mediumspringgreen    => 0x00fa9a00,
-      :mediumturquoise      => 0x48d1cc00,
-      :mediumvioletred      => 0xc7158500,
-      :midnightblue         => 0x19197000,
-      :mintcream            => 0xf5fffa00,
-      :mistyrose            => 0xffe4e100,
-      :moccasin             => 0xffe4b500,
-      :navajowhite          => 0xffdead00,
-      :navy                 => 0x00008000,
-      :oldlace              => 0xfdf5e600,
-      :olive                => 0x80800000,
-      :olivedrab            => 0x6b8e2300,
-      :orange               => 0xffa50000,
-      :orangered            => 0xff450000,
-      :orchid               => 0xda70d600,
-      :palegoldenrod        => 0xeee8aa00,
-      :palegreen            => 0x98fb9800,
-      :paleturquoise        => 0xafeeee00,
-      :palevioletred        => 0xd8709300,
-      :papayawhip           => 0xffefd500,
-      :peachpuff            => 0xffdab900,
-      :peru                 => 0xcd853f00,
-      :pink                 => 0xffc0cb00,
-      :plum                 => 0xdda0dd00,
-      :powderblue           => 0xb0e0e600,
-      :purple               => 0x80008000,
-      :red                  => 0xff000000,
-      :rosybrown            => 0xbc8f8f00,
-      :royalblue            => 0x4169e100,
-      :saddlebrown          => 0x8b451300,
-      :salmon               => 0xfa807200,
-      :sandybrown           => 0xf4a46000,
-      :seagreen             => 0x2e8b5700,
-      :seashell             => 0xfff5ee00,
-      :sienna               => 0xa0522d00,
-      :silver               => 0xc0c0c000,
-      :skyblue              => 0x87ceeb00,
-      :slateblue            => 0x6a5acd00,
-      :slategray            => 0x70809000,
-      :slategrey            => 0x70809000,
-      :snow                 => 0xfffafa00,
-      :springgreen          => 0x00ff7f00,
-      :steelblue            => 0x4682b400,
-      :tan                  => 0xd2b48c00,
-      :teal                 => 0x00808000,
-      :thistle              => 0xd8bfd800,
-      :tomato               => 0xff634700,
-      :turquoise            => 0x40e0d000,
-      :violet               => 0xee82ee00,
-      :wheat                => 0xf5deb300,
-      :white                => 0xffffff00,
-      :whitesmoke           => 0xf5f5f500,
-      :yellow               => 0xffff0000,
-      :yellowgreen          => 0x9acd3200
+      aliceblue: 0xf0f8ff00,
+      antiquewhite: 0xfaebd700,
+      aqua: 0x00ffff00,
+      aquamarine: 0x7fffd400,
+      azure: 0xf0ffff00,
+      beige: 0xf5f5dc00,
+      bisque: 0xffe4c400,
+      black: 0x00000000,
+      blanchedalmond: 0xffebcd00,
+      blue: 0x0000ff00,
+      blueviolet: 0x8a2be200,
+      brown: 0xa52a2a00,
+      burlywood: 0xdeb88700,
+      cadetblue: 0x5f9ea000,
+      chartreuse: 0x7fff0000,
+      chocolate: 0xd2691e00,
+      coral: 0xff7f5000,
+      cornflowerblue: 0x6495ed00,
+      cornsilk: 0xfff8dc00,
+      crimson: 0xdc143c00,
+      cyan: 0x00ffff00,
+      darkblue: 0x00008b00,
+      darkcyan: 0x008b8b00,
+      darkgoldenrod: 0xb8860b00,
+      darkgray: 0xa9a9a900,
+      darkgrey: 0xa9a9a900,
+      darkgreen: 0x00640000,
+      darkkhaki: 0xbdb76b00,
+      darkmagenta: 0x8b008b00,
+      darkolivegreen: 0x556b2f00,
+      darkorange: 0xff8c0000,
+      darkorchid: 0x9932cc00,
+      darkred: 0x8b000000,
+      darksalmon: 0xe9967a00,
+      darkseagreen: 0x8fbc8f00,
+      darkslateblue: 0x483d8b00,
+      darkslategray: 0x2f4f4f00,
+      darkslategrey: 0x2f4f4f00,
+      darkturquoise: 0x00ced100,
+      darkviolet: 0x9400d300,
+      deeppink: 0xff149300,
+      deepskyblue: 0x00bfff00,
+      dimgray: 0x69696900,
+      dimgrey: 0x69696900,
+      dodgerblue: 0x1e90ff00,
+      firebrick: 0xb2222200,
+      floralwhite: 0xfffaf000,
+      forestgreen: 0x228b2200,
+      fuchsia: 0xff00ff00,
+      gainsboro: 0xdcdcdc00,
+      ghostwhite: 0xf8f8ff00,
+      gold: 0xffd70000,
+      goldenrod: 0xdaa52000,
+      gray: 0x80808000,
+      grey: 0x80808000,
+      green: 0x00800000,
+      greenyellow: 0xadff2f00,
+      honeydew: 0xf0fff000,
+      hotpink: 0xff69b400,
+      indianred: 0xcd5c5c00,
+      indigo: 0x4b008200,
+      ivory: 0xfffff000,
+      khaki: 0xf0e68c00,
+      lavender: 0xe6e6fa00,
+      lavenderblush: 0xfff0f500,
+      lawngreen: 0x7cfc0000,
+      lemonchiffon: 0xfffacd00,
+      lightblue: 0xadd8e600,
+      lightcoral: 0xf0808000,
+      lightcyan: 0xe0ffff00,
+      lightgoldenrodyellow: 0xfafad200,
+      lightgray: 0xd3d3d300,
+      lightgrey: 0xd3d3d300,
+      lightgreen: 0x90ee9000,
+      lightpink: 0xffb6c100,
+      lightsalmon: 0xffa07a00,
+      lightseagreen: 0x20b2aa00,
+      lightskyblue: 0x87cefa00,
+      lightslategray: 0x77889900,
+      lightslategrey: 0x77889900,
+      lightsteelblue: 0xb0c4de00,
+      lightyellow: 0xffffe000,
+      lime: 0x00ff0000,
+      limegreen: 0x32cd3200,
+      linen: 0xfaf0e600,
+      magenta: 0xff00ff00,
+      maroon: 0x80000000,
+      mediumaquamarine: 0x66cdaa00,
+      mediumblue: 0x0000cd00,
+      mediumorchid: 0xba55d300,
+      mediumpurple: 0x9370d800,
+      mediumseagreen: 0x3cb37100,
+      mediumslateblue: 0x7b68ee00,
+      mediumspringgreen: 0x00fa9a00,
+      mediumturquoise: 0x48d1cc00,
+      mediumvioletred: 0xc7158500,
+      midnightblue: 0x19197000,
+      mintcream: 0xf5fffa00,
+      mistyrose: 0xffe4e100,
+      moccasin: 0xffe4b500,
+      navajowhite: 0xffdead00,
+      navy: 0x00008000,
+      oldlace: 0xfdf5e600,
+      olive: 0x80800000,
+      olivedrab: 0x6b8e2300,
+      orange: 0xffa50000,
+      orangered: 0xff450000,
+      orchid: 0xda70d600,
+      palegoldenrod: 0xeee8aa00,
+      palegreen: 0x98fb9800,
+      paleturquoise: 0xafeeee00,
+      palevioletred: 0xd8709300,
+      papayawhip: 0xffefd500,
+      peachpuff: 0xffdab900,
+      peru: 0xcd853f00,
+      pink: 0xffc0cb00,
+      plum: 0xdda0dd00,
+      powderblue: 0xb0e0e600,
+      purple: 0x80008000,
+      red: 0xff000000,
+      rosybrown: 0xbc8f8f00,
+      royalblue: 0x4169e100,
+      saddlebrown: 0x8b451300,
+      salmon: 0xfa807200,
+      sandybrown: 0xf4a46000,
+      seagreen: 0x2e8b5700,
+      seashell: 0xfff5ee00,
+      sienna: 0xa0522d00,
+      silver: 0xc0c0c000,
+      skyblue: 0x87ceeb00,
+      slateblue: 0x6a5acd00,
+      slategray: 0x70809000,
+      slategrey: 0x70809000,
+      snow: 0xfffafa00,
+      springgreen: 0x00ff7f00,
+      steelblue: 0x4682b400,
+      tan: 0xd2b48c00,
+      teal: 0x00808000,
+      thistle: 0xd8bfd800,
+      tomato: 0xff634700,
+      turquoise: 0x40e0d000,
+      violet: 0xee82ee00,
+      wheat: 0xf5deb300,
+      white: 0xffffff00,
+      whitesmoke: 0xf5f5f500,
+      yellow: 0xffff0000,
+      yellowgreen: 0x9acd3200,
     }
 
     # Gets a color value based on a HTML color name.
@@ -903,14 +908,14 @@ module ChunkyPNG
     def html_color(color_name, opacity = nil)
       if color_name.to_s =~ HTML_COLOR_REGEXP
         opacity ||= $2 ? ($2.to_f * 255.0).round : 0xff
-        base_color_name = $1.gsub(/[^a-z]+/i, '').downcase.to_sym
-        return PREDEFINED_COLORS[base_color_name] | opacity if PREDEFINED_COLORS.has_key?(base_color_name)
+        base_color_name = $1.gsub(/[^a-z]+/i, "").downcase.to_sym
+        return PREDEFINED_COLORS[base_color_name] | opacity if PREDEFINED_COLORS.key?(base_color_name)
       end
       raise ArgumentError, "Unknown color name #{color_name}!"
     end
 
     # @return [Integer] Black pixel/color
-    BLACK = rgb(  0,   0,   0)
+    BLACK = rgb(0, 0, 0)
 
     # @return [Integer] White pixel/color
     WHITE = rgb(255, 255, 255)
@@ -927,11 +932,11 @@ module ChunkyPNG
     # @return [Integer] The number of sample values per pixel.
     def samples_per_pixel(color_mode)
       case color_mode
-        when ChunkyPNG::COLOR_INDEXED;         1
-        when ChunkyPNG::COLOR_TRUECOLOR;       3
-        when ChunkyPNG::COLOR_TRUECOLOR_ALPHA; 4
-        when ChunkyPNG::COLOR_GRAYSCALE;       1
-        when ChunkyPNG::COLOR_GRAYSCALE_ALPHA; 2
+        when ChunkyPNG::COLOR_INDEXED         then 1
+        when ChunkyPNG::COLOR_TRUECOLOR       then 3
+        when ChunkyPNG::COLOR_TRUECOLOR_ALPHA then 4
+        when ChunkyPNG::COLOR_GRAYSCALE       then 1
+        when ChunkyPNG::COLOR_GRAYSCALE_ALPHA then 2
         else raise ChunkyPNG::NotSupported, "Don't know the number of samples for this colormode: #{color_mode}!"
       end
     end
@@ -973,7 +978,7 @@ module ChunkyPNG
     #   stored.
     # @param [Integer] depth The color depth of the pixels.
     # @param [Integer] width The width of the image pass.
-    # @param [Integer] width The height of the image pass.
+    # @param [Integer] height The height of the image pass.
     # @return [Integer] The number of bytes used per scanline in a datastream.
     def pass_bytesize(color_mode, depth, width, height)
       return 0 if width == 0 || height == 0