thinreports 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52d5b58f89d69995f780cad5fee9ee7d9476ba48
-  data.tar.gz: 1ac6e9e07a7fb3776137cd9d4663fdbae832418e
+  metadata.gz: 84effddcf79a2fdea2e5fbaa87f1f8fb5e170c47
+  data.tar.gz: e4e954c45566cc49b69fd0bb7a46700e5970ac93
 SHA512:
-  metadata.gz: 5bd6e15835d02834f428649d474bcdf398e1e550f406652c1827539628e2e83b1aa4e8a550e2003d1521ed950f011dbb9b858101bde330c2eb44322a68eb6dad
-  data.tar.gz: 25ec1244b98b2da6558b05ab5e36650993574c26aae541ed077934169e4f9ae0154b2a0e7153bedfa668e8f3107ca586fd0cac1b67cab461854559f3c12929de
+  metadata.gz: 5f542af1a90cdcb26fb7ba24cb94fad484367b5e9dba8f6ebf527b5c5307a3fca546dd25b6e9f71ec32c0c37a2e93ea9c71a2baefa3641c60d46f47316a43e7c
+  data.tar.gz: dfad16c6e2cf3afae658344c6dbd20817a77408c3cc4d81e51fef0d520a20ec95050bc2141117bbdae8cc59a49d2fad28ced5f5a9935c9e0e56177477293373a

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 
+sudo: false
 rvm:
   - 1.9.3
   - 2.0.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.8.1
+
+### Add OPTIONAL feature for converting a palette-based PNG w. transparency
+
+This feature is **DISABLED** by default. Please see [PR#32](https://github.com/thinreports/thinreports-generator/pull/32) for further details.
+
 ## 0.8.0
 
 This release is a stepping stone to next major version 1.0.0 release.
@@ -113,11 +119,13 @@ See [Issue #18](https://github.com/thinreports/thinreports-generator/issues/18)
 # New setter, same as `page.item(:text_block).value = 'tblock value'`
 page[:text_block] = 'tblock value'
 # New getter, same as `page.item(:text_block).value`
-page[:text_block] # => "tblock value"
+page[:text_block] # => <Tblock>
+page[:text_block].value # => "tblock value"
 page.item(:text_block).value # => "tblock value"
 
 page[:image_block] = '/path/to/image.png'
-page[:image_block] # => "/path/to/image.png"
+page[:image_block].src # => "/path/to/image.png"
+page.item(:image_block).src # => "/path/to/image.png"
 ```
 
 See [Issue #22](https://github.com/thinreports/thinreports-generator/issues/22) for further details.

data/examples/palleted_png/palleted_png.rb

@@ -0,0 +1,9 @@
+# coding: utf-8
+
+example :palleted_png, 'Rendering a palleted PNG with transparency' do |t|
+  report = Thinreports::Report.new layout: t.layout_filename
+  report.start_new_page do |page|
+    page.item(:image).src = t.resource('palleted_png.png')
+  end
+  report.generate filename: t.output_filename
+end

data/examples/palleted_png/palleted_png.tlf

@@ -0,0 +1 @@
+{"version":"0.8.2","config":{"title":"","option":{},"page":{"paper-type":"A4","orientation":"portrait","margin-top":"20","margin-bottom":"20","margin-left":"20","margin-right":"20"}},"svg":"<svg width=\"595.2\" height=\"841.8\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" preserveAspectRatio=\"none\" viewBox=\"0 0 595.2 841.8\"><g class=\"canvas\"><image image-rendering=\"optimizeQuality\" preserveAspectRatio=\"none\" class=\"s-image\" x-display=\"true\" x-id=\"\" id=\"goog_604222137\" x=\"20\" y=\"20\" x-natural-width=\"200\" x-natural-height=\"200\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xlink:href=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAMAAACahl6sAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAD1BMVEX/AAD/AAD/AAD/AAD////Icf73AAAAA3RSTlO/fz8qtTX3AAAAAWJLR0QEj2jZUQAAAAlwSFlzAAALEwAACxMBAJqcGAAAAMtJREFUeNrtzwERgEAAw7AH/HtGBr2RKGjPM+J8HWDESJyRGiM1RmqM1BipMVJjpMZIjZEaIzVGaozUGKkxUmOkxkiNkRojNUZqjNQYqTFSszMCAAAAAAAAAAAA/3SNMFJjpMZIjZEaIzVGaozUGKkxUmOkxkiNkRojNUZqjNQYqTFSY6TGSI2RGiM1RmqM1Bip2Rm5RxipMVJjpMZIjZEaIzVGaozUGKkxUmOkxkiNkRojNUZqjNQYqTFSY6TGSI2RGiM1RmqM1MyMvMkE6mEsuD8jAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE0LTEwLTA5VDEwOjM1OjI1KzAyOjAwxhRVNQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNC0xMC0wOVQxMDozNToyNSswMjowMLdJ7YkAAAAASUVORK5CYII=\" width=\"200\" height=\"200\"/><!--SHAPE{\"type\":\"s-iblock\",\"id\":\"image\",\"display\":\"true\",\"desc\":null,\"box\":{\"x\":278.2,\"y\":20,\"width\":266.7,\"height\":223.7},\"position-x\":\"left\",\"position-y\":\"top\",\"svg\":{\"tag\":\"image\",\"attrs\":{\"x\":278.2,\"y\":20,\"width\":266.7,\"height\":223.7}}}SHAPE--><!--LAYOUT<g xmlns=\"http://www.w3.org/2000/svg\" class=\"s-iblock\" x-display=\"true\" id=\"goog_604222139\" x-id=\"image\" x-width=\"266.7\" x-height=\"223.7\" x-left=\"278.2\" x-top=\"20\"><rect class=\"s-iblock-box\" stroke=\"none\" fill=\"#0096fd\" fill-opacity=\"0.2\" width=\"266.7\" height=\"223.7\" x=\"278.2\" y=\"20\"/><image width=\"16\" height=\"16\" class=\"s-iblock-mark\" opacity=\"0.5\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xlink:href=\"assets/icons/x-image-mark.svg\" display=\"inline\" x=\"403.2\" y=\"123\"/><text class=\"s-iblock-id\" font-size=\"10.5\" font-family=\"Helvetica\" font-weight=\"normal\" font-style=\"normal\" text-decoration=\"none\" text-anchor=\"start\" kerning=\"auto\" stroke=\"none\" fill=\"#0096fd\" fill-opacity=\"1\" x=\"282.2\" y=\"31\">image</text></g>LAYOUT--></g></svg>","state":{"layout-guide":[]}}

data/lib/thinreports/config.rb

@@ -15,6 +15,7 @@ module Thinreports
   class Configuration
     def initialize
       @fallback_fonts = []
+      @convert_palleted_transparency_png = false
     end
 
     # @return [Array<String>]
@@ -33,6 +34,19 @@ module Thinreports
       @fallback_fonts = font_names.is_a?(Array) ? font_names : [font_names]
     end
 
+    # @return [Boolean]
+    # @see https://github.com/thinreports/thinreports-generator/pull/32
+    attr_reader :convert_palleted_transparency_png
+
+    # @param [Boolean]
+    # @example
+    #   config.convert_palleted_transparency_png = true
+    #   config.convert_palleted_transparency_png = false # default
+    # @see https://github.com/thinreports/thinreports-generator/pull/32
+    def convert_palleted_transparency_png=(enable)
+      @convert_palleted_transparency_png = enable
+    end
+
     # @return [Thinreports::Generator::Configuration]
     def generator
       @generator ||= Thinreports::Generator::Configuration.new

data/lib/thinreports/generator/pdf/document/draw_shape.rb

@@ -30,8 +30,9 @@ module Thinreports
       # @param [Thinreports::Core::Shape::Basic::Internal] shape
       def draw_shape_image(shape)
         x, y, w, h = shape.style.svg_attrs.values_at('x', 'y', 'width', 'height')
-        base64image(extract_base64_string(shape.style.svg_attrs['xlink:href']),
-                    x, y, w, h)
+
+        image_type, image_data = extract_base64_string(shape.style.svg_attrs['xlink:href'])
+        base64image(image_type, image_data, x, y, w, h)
       end
 
       # @param [Thinreports::Core::Shape::ImageBlock::Internal] shape

data/lib/thinreports/generator/pdf/document/graphics/attributes.rb

@@ -116,9 +116,10 @@ module Thinreports
       end
 
       # @param [String] xlink
-      # @return [String]
+      # @return [Array<string>] returns ['image/png', '<base64 data>']
       def extract_base64_string(xlink)
-        xlink.sub(%r{^data:image/[a-z]+?;base64,}, '')
+        _, type, data = xlink.match(%r|^data:(image/[a-z]+?);base64,(.+)|).to_a
+        [type, data]
       end
     end
 

data/lib/thinreports/generator/pdf/document/graphics/image.rb

@@ -2,6 +2,8 @@
 
 require 'tempfile'
 require 'base64'
+require 'digest/md5'
+require 'chunky_png'
 
 module Thinreports
   module Generator
@@ -17,14 +19,15 @@ module Thinreports
         pdf.image(filename, at: pos(x, y), width: w, height: h)
       end
 
+      # @param [String] image_type Mime-type of image
       # @param [String] base64
       # @param [Numeric, Strng] x
       # @param [Numeric, Strng] y
       # @param [Numeric, Strng] w
       # @param [Numeric, Strng] h
-      def base64image(base64, x, y, w, h)
-        image = create_temp_imagefile(base64)
-        image(image.path, x, y, w, h)
+      def base64image(image_type, base64_data, x, y, w, h)
+        image_path = normalize_image_from_base64(image_type, base64_data)
+        image(image_path, x, y, w, h)
       end
 
       # @param file (see Prawn#image)
@@ -36,34 +39,126 @@ module Thinreports
       # @option options [:left, :center, :right] :position_x (:left)
       # @option options [:top, :center, :bottom] :position_y (:top)
       def image_box(file, x, y, w, h, options = {})
+        image_path = normalize_image_from_file(file)
+
         w, h = s2f(w, h)
         pdf.bounding_box(pos(x, y), width: w, height: h) do
-          pdf.image(file, position: options[:position_x] || :left,
-                          vposition: options[:position_y] || :top,
-                          auto_fit: [w, h])
+          pdf.image(image_path, position: options[:position_x] || :left,
+                                vposition: options[:position_y] || :top,
+                                auto_fit: [w, h])
         end
       end
 
-    private
+      def normalize_image_from_base64(image_type, base64_string)
+        raw_image_data = Base64.decode64(base64_string)
+
+        image_data = if png_conversion_enabled? && image_type == 'image/png'
+          png_normalizer = PNGNormalizer.load_blob(raw_image_data)
+
+          if png_normalizer.need_normalize?
+            png_normalizer.normalize
+          else
+            raw_image_data
+          end
+        else
+          raw_image_data
+        end
+
+        image_id = Digest::MD5.hexdigest(base64_string)
+        create_temp_imagefile(image_id, image_data)
+      end
+
+      def normalize_image_from_file(filename)
+        extname = File.extname(filename)
+
+        return filename unless png_conversion_enabled?
+        return filename unless extname.downcase == '.png' || extname.empty?
+
+        return temp_image_registry[filename] if temp_image_registry.key?(filename)
+
+        png_normalizer = PNGNormalizer.load_file(filename)
+
+        # Returns the original filename when the image is not PNG.
+        return filename if png_normalizer.nil?
+        return filename unless png_normalizer.need_normalize?
+
+        image_id = filename
+        image_data = png_normalizer.normalize
+
+        create_temp_imagefile(image_id, image_data)
+      end
 
       def clean_temp_images
-        temp_image_registry.each {|tmp| tmp.unlink }
+        temp_image_registry.each_value do |image_path|
+          File.delete(image_path) if File.exists?(image_path)
+        end
       end
 
       def temp_image_registry
-        @temp_image_registry ||= []
+        @temp_image_registry ||= {}
       end
 
-      # @param [String] base64
-      # @return [Tempfile]
-      def create_temp_imagefile(base64)
-        file = Tempfile.new('trg-tmp-img')
-        file.binmode
-        file.write(Base64.decode64(base64))
-        temp_image_registry << file
-        file
-      ensure
-        file.close
+      # @param [String] image_id
+      # @param [String] image_data
+      # @return [String] imagefile path
+      def create_temp_imagefile(image_id, image_data)
+        temp_image_registry[image_id] ||= begin
+          file = Tempfile.new('temp-image')
+          file.binmode
+          file.write(image_data)
+          file.path
+        ensure
+          file.close
+        end
+        temp_image_registry[image_id]
+      end
+
+      def png_conversion_enabled?
+        Thinreports.config.convert_palleted_transparency_png
+      end
+
+      class PNGNormalizer
+        def self.load_file(filename)
+          image = ChunkyPNG::Image.from_file(filename)
+          datastream = ChunkyPNG::Datastream.from_file(filename)
+          self.new image, datastream
+        rescue ChunkyPNG::SignatureMismatch
+          # Returns nil if image is not PNG.
+          nil
+        end
+
+        def self.load_blob(data)
+          image = ChunkyPNG::Image.from_blob(data)
+          datastream = ChunkyPNG::Datastream.from_blob(data)
+          self.new image, datastream
+        rescue ChunkyPNG::SignatureMismatch
+          # Returns nil if image is not PNG.
+          nil
+        end
+
+        def initialize(image, datastream)
+          @image = image
+          @datastream = datastream
+        end
+
+        def need_normalize?
+          pallete_based? && transparency_chunk?
+        end
+
+        def normalize
+          @image.to_blob(color_mode: ChunkyPNG::COLOR_TRUECOLOR_ALPHA)
+        end
+
+        private
+
+        def pallete_based?
+          color_mode, depth = @image.palette.best_color_settings
+          color_mode == ChunkyPNG::COLOR_INDEXED
+        end
+
+        def transparency_chunk?
+          !@datastream.transparency_chunk.nil?
+        end
       end
     end
 

data/lib/thinreports/generator/pdf/document/parse_svg.rb

@@ -78,8 +78,9 @@ module Thinreports
       # @see #draw_svg_rect
       def draw_svg_image(elm)
         x, y, w, h = element_attributes_values_at(elm, 'x', 'y', 'width', 'height')
-        base64image(extract_base64_string(elm.attributes['xlink:href']),
-                    x, y, w, h)
+
+        image_type, image_data = extract_base64_string(elm.attributes['xlink:href'])
+        base64image(image_type, image_data, x, y, w, h)
       end
 
       # @param [Hash] attributes

data/lib/thinreports/report/base.rb

@@ -87,9 +87,6 @@ module Thinreports
       def initialize(options = {})
         @internal = Report::Internal.new(self, options)
         @start_page_number = 1
-
-        @page_create_handler = nil
-        @generate_handler = nil
       end
 
       # @yield [page]

data/lib/thinreports/report/internal.rb

@@ -12,7 +12,6 @@ module Thinreports
       attr_reader :events
 
       attr_accessor :page_create_handler
-      attr_accessor :generate_handler
 
       # @param [Thinreports::Report::Base] report
       # @param options (see Thinreports::Report::Base#initialize)
@@ -28,7 +27,6 @@ module Thinreports
         @page_count = 0
 
         @page_create_handler = nil
-        @generate_handler = nil
 
         @events = Report::Events.new
       end
@@ -63,11 +61,22 @@ module Thinreports
           finalize_current_page
           @finalized = true
 
-          # [DEPRECATION] Please use Report::Base#on_generate callback instead.
+          # [DEPRECATION] You can do the same implements as the :generate Event
+          #   with the following code:
+          #
+          #   report = Thinreports::Report.new layout: 'foo.tlf'
+          #   report.start_new_page do |page|
+          #     page.item(:price).value = 100000
+          #   end
+          #
+          #   report.pages.each do |page|
+          #     page[:title] = 'Common Title'
+          #   end
+          #
+          #   report.generate filename: 'foo.pdf'
+          #
           events.dispatch(Report::Events::Event.new(:generate,
                                                     @report, nil, pages))
-
-          @generate_handler.call(pages) if @generate_handler
         end
       end
 

data/lib/thinreports/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 module Thinreports
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

data/test/test_helper.rb

@@ -8,6 +8,7 @@ require 'mocha/mini_test'
 
 require 'digest/sha1'
 require 'pathname'
+require 'chunky_png'
 require 'thinreports'
 
 module Thinreports::TestHelper
@@ -48,6 +49,10 @@ module Thinreports::TestHelper
     ROOT.join('data', filename).to_s
   end
 
+  def read_data_file(filename)
+    File.read(data_file(filename))
+  end
+
   def temp_file(extname = 'pdf')
     filename = (('a'..'z').to_a + (0..9).to_a).shuffle[0, 8].join + ".#{extname}"
     temp_path.join(filename).to_s

data/test/unit/generator/pdf/document/graphics/test_attributes.rb

@@ -4,11 +4,11 @@ require 'test_helper'
 
 class Thinreports::Generator::PDF::Graphics::TestAttributes < Minitest::Test
   include Thinreports::TestHelper
-  
+
   def setup
     @pdf = Thinreports::Generator::PDF::Document.new
   end
-  
+
   def test_common_graphic_attrs_should_return_converted_Hash_as_attributes
     result = @pdf.common_graphic_attrs('stroke'       => '#ff0000',
                                        'stroke-width' => '1',
@@ -16,41 +16,41 @@ class Thinreports::Generator::PDF::Graphics::TestAttributes < Minitest::Test
     assert_equal result.values_at(:stroke, :stroke_width, :fill),
                  ['#ff0000', '1', '#0000ff']
   end
-  
+
   def test_common_graphic_attrs_should_return_the_stroke_dash_attribute_into_an_array
     result = @pdf.common_graphic_attrs('stroke-dasharray' => '3,5')
     assert_equal result[:stroke_dash], %w( 3 5 )
   end
-  
+
   def test_common_graphic_attrs_should_return_nil_as_a_value_of_stroke_dash_attribute_when_value_is_none
     result = @pdf.common_graphic_attrs('stroke-dasharray' => 'none')
     assert_nil result[:stroke_dash]
   end
-  
+
   def test_common_graphic_attrs_should_return_nil_as_a_value_of_stroke_dash_attribute_when_value_is_empty
     result = @pdf.common_graphic_attrs({})
     assert_nil result[:stroke_dash]
   end
-  
+
   def test_common_graphic_attrs_should_set_0_as_a_value_of_stroke_width_attribute_when_opacity_is_0
     result = @pdf.common_graphic_attrs('stroke-width'   => '1',
                                        'stroke-opacity' => '0')
     assert_equal result[:stroke_width], 0
   end
-  
+
   def test_common_graphic_attrs_with_block
     result = @pdf.common_graphic_attrs('stroke' => '#ff0000') do |attrs|
       attrs[:stroke].gsub!(/0/, 'f')
     end
     assert_equal result[:stroke], '#ffffff'
   end
-  
+
   def test_text_align_should_return_converted_value_type_of_Symbol
     aligns = ['start', 'middle', 'end', nil]
     assert_equal aligns.map {|a| @pdf.text_align(a) },
                  [:left, :center, :right, :left]
   end
-  
+
   def test_text_valign_should_return_converted_value_type_of_Symbol
     valigns = ['top', 'center', 'bottom', nil]
     assert_equal valigns.map {|a| @pdf.text_valign(a) },
@@ -62,76 +62,76 @@ class Thinreports::Generator::PDF::Graphics::TestAttributes < Minitest::Test
     assert_equal @pdf.text_word_wrap('none'), :none
     assert_equal @pdf.text_word_wrap(''), :none
   end
-  
+
   def test_extract_base64_string
     base64 = 'data:image/png;base64,iVBORw0KGg1+/AAy/plYlzil'
     assert_equal @pdf.extract_base64_string(base64),
-                 'iVBORw0KGg1+/AAy/plYlzil'
+                 ['image/png', 'iVBORw0KGg1+/AAy/plYlzil']
   end
-  
+
   def test_font_styles_should_return_bold_style_when_font_weight_is_bold
     assert_equal @pdf.font_styles('font-weight' => 'bold'), [:bold]
   end
-  
+
   def test_font_styles_should_return_italic_style_when_font_style_is_italic
     assert_equal @pdf.font_styles('font-style' => 'italic'), [:italic]
   end
-  
+
   def test_font_styles_should_return_underline_and_strikethrough_style_via_text_decoration
     assert_equal @pdf.font_styles('text-decoration' => 'underline line-through'),
                  [:underline, :strikethrough]
   end
-  
+
   def test_common_text_attrs_should_return_the_value_of_font_family_as_font
     result = @pdf.common_text_attrs('font-family' => 'IPAMincho')
     assert_equal result[:font], 'IPAMincho'
   end
-  
+
   def test_common_text_attrs_should_return_the_value_of_font_size_as_size
     result = @pdf.common_text_attrs('font-size' => '12')
     assert_equal result[:size], '12'
   end
-  
+
   def test_common_text_attrs_should_return_the_value_of_fill_color_as_color
     result = @pdf.common_text_attrs('fill' => '#000000')
     assert_equal result[:color], '#000000'
   end
-  
+
   def test_common_text_attrs_should_return_the_value_of_text_anchor_as_align
     result = @pdf.common_text_attrs('text-anchor' => 'middle')
     assert_equal result[:align], :center
   end
-  
+
   def test_common_text_attrs_should_return_the_value_of_text_styles_as_styles
     result = @pdf.common_text_attrs('font-weight' => 'bold')
     assert_equal result[:styles], [:bold]
   end
-  
+
   def test_common_text_attrs_should_return_the_value_of_letter_spacing_as_letter_spacing
     result = @pdf.common_text_attrs('letter-spacing' => '5')
     assert_equal result[:letter_spacing], '5'
   end
-  
+
   def test_common_text_attrs_should_return_the_value_of_kerning_as_letter_spacing
     result = @pdf.common_text_attrs('kerning' => '10')
     assert_equal result[:letter_spacing], '10'
   end
-  
+
   def test_common_text_attrs_with_block
     result = @pdf.common_text_attrs('fill' => '#000000') do |attrs|
       attrs[:color].gsub!(/0/, 'f')
     end
     assert_equal result[:color], '#ffffff'
   end
-  
+
   def test_text_letter_spacing_should_return_raw_value
     assert_equal @pdf.text_letter_spacing('10'), '10'
   end
-  
+
   def test_text_letter_spacing_should_return_nil_when_value_is_normal
     assert_nil @pdf.text_letter_spacing('normal')
   end
-  
+
   def test_text_letter_spacing_should_return_nil_when_value_is_auto
     assert_nil @pdf.text_letter_spacing('auto')
   end

data/test/unit/generator/pdf/document/graphics/test_image.rb

@@ -0,0 +1,150 @@
+# coding: utf-8
+
+require 'test_helper'
+
+require 'base64'
+require 'digest/md5'
+
+class Thinreports::Generator::PDF::Graphics::TestImage < Minitest::Test
+  include Thinreports::TestHelper
+
+  class TestImage
+    include Thinreports::Generator::PDF::Graphics
+  end
+
+  def test_normalize_image_from_base64_in_disabled
+    Thinreports.config.convert_palleted_transparency_png = false
+
+    test_image = TestImage.new
+    base64_image = Base64.encode64(read_data_file('image_normal.png'))
+
+    # Should not be normalized
+    TestImage::PNGNormalizer.stubs(:load_blob).never
+    test_image.normalize_image_from_base64('image/png', base64_image)
+
+    image_registry = test_image.temp_image_registry
+    assert_equal 1, image_registry.count
+  end
+
+  def test_normalize_image_from_file_in_disabled
+    Thinreports.config.convert_palleted_transparency_png = false
+
+    original_image_path = data_file('image_pallete_based.png')
+
+    test_image = TestImage.new
+    returned_image_path = test_image.normalize_image_from_file(original_image_path)
+
+    # Should not be normalized
+    assert_empty test_image.temp_image_registry
+    assert_same original_image_path, returned_image_path
+  end
+
+  def test_normalize_image_from_base64_with_normal_images
+    Thinreports.config.convert_palleted_transparency_png = true
+
+    [
+      ['image/png',  'image_normal.png'],
+      ['image/jpeg', 'image_normal.jpg']
+    ]
+    .each do |(image_type, image_file)|
+      base64_normal_image = Base64.encode64(read_data_file(image_file))
+
+      test_image = TestImage.new
+
+      normalized_image_path = test_image.normalize_image_from_base64(image_type, base64_normal_image)
+
+      image_registry = test_image.temp_image_registry
+      assert_equal 1, image_registry.count
+
+      image_id = Digest::MD5.hexdigest(base64_normal_image)
+      assert_includes image_registry.keys, image_id
+      assert_equal normalized_image_path, image_registry[image_id]
+
+      assert equal_image(data_file(image_file), normalized_image_path)
+
+      assert_same normalized_image_path,
+        test_image.normalize_image_from_base64(image_type, base64_normal_image)
+    end
+  end
+
+  def test_normalize_image_from_base64_with_palette_transparency_png
+    Thinreports.config.convert_palleted_transparency_png = true
+
+    base64_palleted_png = Base64.encode64(read_data_file('image_pallete_based.png'))
+
+    test_image = TestImage.new
+
+    normalized_image_path = test_image.normalize_image_from_base64('image/png', base64_palleted_png)
+
+    image_registry = test_image.temp_image_registry
+    assert_equal 1, image_registry.count
+
+    image_id = Digest::MD5.hexdigest(base64_palleted_png)
+    assert_includes image_registry.keys, image_id
+    assert_equal normalized_image_path, image_registry[image_id]
+
+    refute equal_image(data_file('image_pallete_based.png'), normalized_image_path)
+
+    assert_not_palette_based_transparency_png File.read(normalized_image_path)
+
+    # 2nd time
+    assert_same normalized_image_path,
+      test_image.normalize_image_from_base64('image/png', base64_palleted_png)
+    assert_equal 1, test_image.temp_image_registry.count
+  end
+
+  def test_normalize_image_from_file_with_normal_images
+    Thinreports.config.convert_palleted_transparency_png = true
+
+    [
+      data_file('image_normal.png'),
+      data_file('iamge_normal.jpg'),
+      data_file('image_normal_png_noext'),
+      data_file('image_normal_jpg_noext')
+    ]
+    .each do |original_image_path|
+      test_image = TestImage.new
+      image_path = test_image.normalize_image_from_file(original_image_path)
+
+      assert_equal original_image_path, image_path
+      assert_empty test_image.temp_image_registry
+    end
+  end
+
+  def test_normalize_image_from_file_with_palette_transparency_png
+    Thinreports.config.convert_palleted_transparency_png = true
+
+    original_image_path = data_file('image_pallete_based.png')
+
+    test_image = TestImage.new
+
+    normalized_image_path = test_image.normalize_image_from_file(original_image_path)
+    image_registry = test_image.temp_image_registry
+
+    assert_equal 1, image_registry.count
+    assert_includes image_registry.keys, original_image_path
+
+    refute equal_image(original_image_path, normalized_image_path)
+
+    assert_not_palette_based_transparency_png File.read(normalized_image_path)
+
+    # It should never called in 2nd time or subsequent.
+    TestImage::PNGNormalizer.stubs(:load_file).never
+    assert_same normalized_image_path,
+      test_image.normalize_image_from_file(original_image_path)
+  end
+
+  def assert_not_palette_based_transparency_png(data)
+    image_data = ChunkyPNG::Image.from_blob(data)
+    datastream = ChunkyPNG::Datastream.from_blob(data)
+
+    assert_equal ChunkyPNG::COLOR_INDEXED, image_data.palette.best_color_settings.first
+    assert_equal nil, datastream.transparency_chunk
+  end
+
+  def equal_image(expect_path, actual_path)
+    expect_image = File.binread(expect_path)
+    actual_image = File.binread(actual_path)
+    expect_image == actual_image
+  end
+end

data/test/unit/test_config.rb

@@ -20,6 +20,14 @@ class Thinreports::TestConfig < Minitest::Test
     end
   end
 
+  def test_convert_palleted_transparency_png
+    config = Thinreports::Configuration.new
+    assert_equal false, config.convert_palleted_transparency_png
+
+    config.convert_palleted_transparency_png = true
+    assert_equal true, config.convert_palleted_transparency_png
+  end
+
   def test_fallback_fonts
     config = Thinreports::Configuration.new
 

data/thinreports.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency 'prawn', '1.3.0'
+  s.add_dependency 'chunky_png', '~> 1.3'
 
   s.add_development_dependency 'bundler', ['>= 1.0.0']
   s.add_development_dependency 'minitest', ['>= 5.0.0']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinreports
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Matsukei Co.,Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -24,6 +24,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: chunky_png
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +147,9 @@ files:
 - examples/list_page_number/list_page_number.tlf
 - examples/page_number/page_number.rb
 - examples/page_number/page_number.tlf
+- examples/palleted_png/palleted_png.png
+- examples/palleted_png/palleted_png.rb
+- examples/palleted_png/palleted_png.tlf
 - examples/password_setting/password_setting.rb
 - examples/password_setting/password_setting.tlf
 - examples/report_callbacks/report_callbacks.rb
@@ -248,6 +265,11 @@ files:
 - lib/thinreports/report/page.rb
 - lib/thinreports/version.rb
 - test/data/font.ttf
+- test/data/image_normal.jpg
+- test/data/image_normal.png
+- test/data/image_normal_jpg_noext
+- test/data/image_normal_png_noext
+- test/data/image_pallete_based.png
 - test/data/layout_block.tlf
 - test/data/layout_list.tlf
 - test/data/layout_list_noheader.tlf
@@ -301,6 +323,7 @@ files:
 - test/unit/core/test_shape.rb
 - test/unit/core/test_utils.rb
 - test/unit/generator/pdf/document/graphics/test_attributes.rb
+- test/unit/generator/pdf/document/graphics/test_image.rb
 - test/unit/generator/pdf/document/graphics/test_text.rb
 - test/unit/generator/pdf/document/test_draw_shape.rb
 - test/unit/generator/pdf/document/test_font.rb
@@ -345,12 +368,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: An open source report generation tool for Ruby.
 test_files:
 - test/data/font.ttf
+- test/data/image_normal.jpg
+- test/data/image_normal.png
+- test/data/image_normal_jpg_noext
+- test/data/image_normal_png_noext
+- test/data/image_pallete_based.png
 - test/data/layout_block.tlf
 - test/data/layout_list.tlf
 - test/data/layout_list_noheader.tlf
@@ -404,6 +432,7 @@ test_files:
 - test/unit/core/test_shape.rb
 - test/unit/core/test_utils.rb
 - test/unit/generator/pdf/document/graphics/test_attributes.rb
+- test/unit/generator/pdf/document/graphics/test_image.rb
 - test/unit/generator/pdf/document/graphics/test_text.rb
 - test/unit/generator/pdf/document/test_draw_shape.rb
 - test/unit/generator/pdf/document/test_font.rb