thinreports 0.9.1 → 0.10.0

data/test/unit/core/format/test_base.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/base/test_internal.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/basic/test_block_format.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/basic/test_block_interface.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/basic/test_block_internal.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/basic/test_format.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/basic/test_interface.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/basic/test_internal.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/image_block/test_interface.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/image_block/test_internal.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/list/test_format.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/list/test_manager.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -29,7 +29,7 @@ class Thinreports::Core::Shape::List::TestManager < Minitest::Test
 
   def test_switch_current_should_replace_own_current_page_property_by_the_given_page
     report = create_report {|r| r.start_new_page }
-    list   = report.page.list
+    list = report.page.list
     new_page = List::Page.new(report.page, list.internal.format)
 
     list.manager.switch_current!(new_page)
@@ -39,7 +39,7 @@ class Thinreports::Core::Shape::List::TestManager < Minitest::Test
 
   def test_switch_current_should_replace_own_current_page_state_property_by_internal_property_of_the_given_page
     report = create_report {|r| r.start_new_page }
-    list   = report.page.list
+    list = report.page.list
     new_page = List::Page.new(report.page, list.internal.format)
 
     list.manager.switch_current!(new_page)
@@ -49,7 +49,7 @@ class Thinreports::Core::Shape::List::TestManager < Minitest::Test
 
   def test_switch_current_should_return_the_self
     report = create_report {|r| r.start_new_page }
-    list   = report.page.list
+    list = report.page.list
     new_page = List::Page.new(report.page, list.internal.format)
 
     assert_same list.manager.switch_current!(new_page), list.manager

data/test/unit/core/shape/list/test_page.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/list/test_page_state.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/list/test_section_format.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/list/test_section_interface.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -62,7 +62,7 @@ class Thinreports::Core::Shape::List::TestSectionInterface < Minitest::Test
   end
 
   def copied_list(list, &block)
-    tblock     = Thinreports::Core::Shape::TextBlock
+    tblock = Thinreports::Core::Shape::TextBlock
     new_parent = @report.start_new_page
 
     %w( foo bar hoge ).each do |id|

data/test/unit/core/shape/list/test_section_internal.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/manager/test_format.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -26,7 +26,7 @@ class Thinreports::Core::Shape::Manager::TestFormat < Minitest::Test
 
   def test_find_shape_should_return_format_of_shape_when_shape_is_found
     format = TestFormat.new({}) do |f|
-      f.shapes[:foo] = Thinreports::Core::Shape::TextBlock::Format.new('id'   => 'foo',
+      f.shapes[:foo] = Thinreports::Core::Shape::TextBlock::Format.new('id' => 'foo',
                                                                        'type' => 'text-block')
     end
     assert_equal format.find_shape(:foo).id, 'foo'

data/test/unit/core/shape/manager/test_internal.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -9,8 +9,8 @@ class Thinreports::Core::Shape::Manager::TestInternal < Minitest::Test
   Shape = Thinreports::Core::Shape
 
   def create_shape_format(type, id, other_config = {})
-    Shape::Format(type).new({'id'      => id,
-                             'type'    => type,
+    Shape::Format(type).new({'id' => id,
+                             'type' => type,
                              'display' => true}.merge(other_config))
   end
 

data/test/unit/core/shape/manager/test_target.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/page_number/test_format.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/page_number/test_interface.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/page_number/test_internal.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/styles/test_base.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/styles/test_basic.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/styles/test_graphic.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/styles/test_text.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/text/test_format.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/text/test_internal.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/text_block/formatter/test_basic.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/text_block/formatter/test_datetime.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/text_block/formatter/test_number.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/text_block/formatter/test_padding.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -34,7 +34,7 @@ class Thinreports::Core::Shape::TextBlock::Formatter::TestPadding < Minitest::Te
   def test_apply_padding_formats_with_right_direction
     formatter = init_formatter(format_padding_length: 5,
                                format_padding_char: '0',
-                               :format_padding_rdir?  => true)
+                               :format_padding_rdir? => true)
 
     assert_equal formatter.apply(123), '12300'
   end

data/test/unit/core/shape/text_block/test_format.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/text_block/test_formatter.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/text_block/test_interface.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/shape/text_block/test_internal.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -13,7 +13,7 @@ class Thinreports::Core::Shape::TextBlock::TestInternal < Minitest::Test
     report.start_new_page do |page|
       # Add to force TextBlock shape.
       page.manager.format.shapes[:foo] = TextBlock::Format.new('type' => 'text-block',
-                                                               'id'   => 'foo')
+                                                               'id' => 'foo')
       # Set value to TextBlock.
       page.item(:foo).value('foo value')
     end
@@ -66,7 +66,7 @@ class Thinreports::Core::Shape::TextBlock::TestInternal < Minitest::Test
   end
 
   def test_real_value_should_return_the_formatted_value_when_tblock_has_any_format
-    tblock = create_internal('format' => {'type'     => 'datetime',
+    tblock = create_internal('format' => {'type' => 'datetime',
                                           'datetime' => {'format' => '%Y/%m/%d'}})
     tblock.write_value(value = Time.now)
 

data/test/unit/core/test_shape.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/unit/core/test_utils.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -10,7 +10,7 @@ class Thinreports::Core::TestShape < Minitest::Test
     expected = '123'
     assert_same expected, call_block_in(expected)
 
-    assert_equal '321', call_block_in('123', &proc { reverse! })
+    assert_equal [1, 2, 3], call_block_in([2, 1, 3], &proc { sort! })
     assert_equal [1, 2, 3], call_block_in([2, 1, 3], &proc { |a| a.sort! })
   end
 

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

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

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

@@ -1,4 +1,5 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class Thinreports::Generator::PDF::Graphics::TestBasic < Minitest::Test

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

@@ -1,150 +1,46 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 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
+  def setup
+    format = Thinreports::Layout::Format.build(self.layout_file.path)
+    @document = Thinreports::Generator::PDF::Document.new.tap { |doc|
+      doc.start_new_page(format)
+    }
   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].path
-
-      assert equal_image(data_file(image_file), normalized_image_path)
-
-      assert_equal normalized_image_path,
-        test_image.normalize_image_from_base64(image_type, base64_normal_image)
+  def test_image
+    each_image do |image_filename|
+      @document.image(data_file(image_filename), 0, 0, 100, 100)
+      @document.image(StringIO.new(read_data_file(image_filename)), 0, 100, 100, 100)
     end
+    assert_equal 6, analyze_pdf_images(@document.render).count
   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].path
-
-    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_equal 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
+  def test_base64image
+    each_image do |image_filename|
+      @document.base64image(Base64.encode64(read_data_file(image_filename)), 0, 0, 100, 100)
     end
+    assert_equal 3, analyze_pdf_images(@document.render).count
   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_equal 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
+  def test_image_box
+    each_image do |image_filename|
+      @document.image_box(data_file(image_filename), 0, 0, 100, 100)
+      @document.image(StringIO.new(read_data_file(image_filename)), 0, 100, 100, 100)
+    end
+    assert_equal 6, analyze_pdf_images(@document.render).count
   end
 
-  def equal_image(expect_path, actual_path)
-    expect_image = File.binread(expect_path)
-    actual_image = File.binread(actual_path)
-    expect_image == actual_image
+  def each_image(&block)
+    %w(
+      image_normal.png
+      image_normal.jpg
+      image_pallete_based.png
+    ).each { |image_filename| block.call(image_filename) }
   end
 end