thinreports 0.9.1 → 0.10.0

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

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

data/test/unit/generator/pdf/document/test_font.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -26,7 +26,7 @@ class Thinreports::Generator::PDF::TestFont < Minitest::Test
                    pdf.font_families[original_font]
     end
 
-    assert_equal Font::DEFAULT_FALLBACK_FONTS, pdf.fallback_fonts[-2..-1]
+    assert_equal Font::DEFAULT_FALLBACK_FONTS, %w[IPAMincho]
   end
 
   def test_setup_fonts_with_custom_fallback_fonts

data/test/unit/generator/pdf/document/test_graphics.rb

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

data/test/unit/generator/pdf/document/test_page.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -9,20 +9,20 @@ class Thinreports::Generator::PDF::Document::TestPage < Minitest::Test
     @pdf = Thinreports::Generator::PDF::Document.new
   end
 
-  def test_page_geometry
-    page_geometry = ::PDF::Core::PageGeometry::SIZES
-    assert_equal page_geometry['B4_JIS'], [728.5, 1031.8]
-    assert_equal page_geometry['B5_JIS'], [515.9, 728.5]
+  def test_JIS_page_size
+    sizes = Thinreports::Generator::PDF::Document::JIS_SIZES
+    assert_equal sizes['B4'], [728.5, 1031.8]
+    assert_equal sizes['B5'], [515.9, 728.5]
   end
 
-  def test_B4_paper_size_should_be_converted_to_B4_JIS
+  def test_B4_paper_size_should_returns_size_as_B4_JIS
     create_pdf
 
     format = Thinreports::Layout::Format.build(layout_file.path)
     format.stubs(page_paper_type: 'B4')
 
     @pdf.start_new_page(format)
-    assert_equal @pdf.internal.page.size, 'B4_JIS'
+    assert_equal @pdf.internal.page.size, [728.5, 1031.8]
   end
 
   def test_B4_ISO_paper_size_should_be_converted_to_B4

data/test/unit/generator/pdf/document/test_parse_color.rb

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

data/test/unit/generator/pdf/prawn_ext/test_calc_image_dimensions.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class Thinreports::Generator::PrawnExt::TestCalcImageDimensions < Minitest::Test
+  class Klass
+    prepend Thinreports::Generator::PrawnExt::CalcImageDimensions
+
+    def calc_image_dimensions(options)
+      options
+    end
+  end
+
+  def setup
+    @klass = Klass.new
+  end
+
+  def test_calc_image_dimensions
+    res_options = @klass.calc_image_dimensions(
+      auto_fit: [100, 200],
+      width: 101,
+      height: 199
+    )
+    assert_equal [100, 200], res_options[:fit]
+    refute_includes res_options.keys, :auto_fit
+
+    res_options = @klass.calc_image_dimensions(
+      auto_fit: [100, 200],
+      width: 99,
+      height: 201
+    )
+    assert_equal [100, 200], res_options[:fit]
+
+    res_options = @klass.calc_image_dimensions(
+      auto_fit: [100, 200],
+      width: 99,
+      height: 199
+    )
+    refute_includes res_options.keys, :fit
+  end
+end

data/test/unit/generator/pdf/prawn_ext/test_width_of.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class Thinreports::Generator::PrawnExt::TestWidthOf < Minitest::Test
+  def setup
+    @pdf = Prawn::Document.new
+  end
+
+  def test_width_of
+    text_width = @pdf.width_of('abcd')
+
+    @pdf.character_spacing(1) do
+      expected_character_space_width = 1 * 3
+      assert_equal text_width + expected_character_space_width, @pdf.width_of('abcd')
+    end
+
+    @pdf.character_spacing(1) do
+      assert_equal 0, @pdf.width_of('')
+    end
+  end
+end

data/test/unit/generator/pdf/test_document.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -8,13 +8,15 @@ class Thinreports::Generator::PDF::TestDocument < Minitest::Test
   # Alias
   Document = Thinreports::Generator::PDF::Document
 
-  def test_new_without_page_creation
+  def test_new
     pdf = Document.new
     assert_equal pdf.internal.page_count, 0
-  end
-
-  def test_new_with_zero_margin_canvas
-    pdf = Document.new
     assert_equal pdf.internal.page.margins.values, [0, 0, 0, 0]
+
+    pdf = Document.new(security: { owner_password: 'abc' })
+    assert_equal true, pdf.internal.state.encrypt
+
+    pdf = Document.new(title: 'Title')
+    assert_equal 'Title', pdf.internal.state.store.info.data[:Title]
   end
 end

data/test/unit/generator/test_pdf.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -7,18 +7,20 @@ class Thinreports::Generator::TestPDF < Minitest::Test
 
   PDF = Thinreports::Generator::PDF
 
-  def test_new_should_set_title_as_metadata
+  def test_default_layout
+    layout_filename = layout_file.path
+    report = Thinreports::Report.new layout: layout_filename
+
+    generator = PDF.new report
+    assert_equal layout_filename, generator.default_layout.filename
+  end
+
+  def test_initialize
     report = Thinreports::Report.new layout: layout_file.path
     report.start_new_page
 
-    actual_pdf_title = nil
-    PDF::Document.define_singleton_method(:new) {|_options, meta|
-      actual_pdf_title = meta[:Title]
-    }
-    PDF.new report, {}
+    PDF.new(report)
 
-    assert_equal 'Report Title', actual_pdf_title
-  ensure
-    PDF::Document.singleton_class.send(:remove_method, :new)
+    assert_equal true, report.finalized?
   end
 end

data/test/unit/layout/test_base.rb

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

data/test/unit/layout/test_format.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -27,7 +27,7 @@ class Thinreports::Layout::TestFormat < Minitest::Test
     ]
   }
 
-  Shape  = Thinreports::Core::Shape
+  Shape = Thinreports::Core::Shape
   Layout = Thinreports::Layout
 
   def test_attribute_readers

data/test/unit/layout/test_legacy_schema.rb

@@ -1,4 +1,5 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class Thinreports::Layout::TestLegacySchema < Minitest::Test
@@ -559,11 +560,10 @@ SVG
     )
   end
 
-  def test_normalize_svg
+  def test_cleanup_svg
     svg = '<!--SHAPE{"id":"item1"}SHAPE--><!--LAYOUT<rect id="item2"/>LAYOUT--><!--SHAPE{"id":"item2"}SHAPE-->'
 
-    layout_legacy_schema.normalize_svg!(svg)
-    assert_equal '<rect id="item2"/>', svg
+    assert_equal '<rect id="item2"/>', layout_legacy_schema.cleanup_svg(svg)
   end
 
   private

data/test/unit/layout/test_version.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -8,88 +8,19 @@ class Thinreports::Layout::TestVersion < Minitest::Test
   # Alias
   Version = Thinreports::Layout::Version
 
-  def test_comparable_version_should_add_99_when_the_given_version_is_not_PRE
-    assert_equal Version.comparable_version('0.7.0'), '0.7.0.99'
-  end
-
-  def test_comparable_version_should_map_pre_to_1_when_the_given_version_is_PRE
-    assert_equal Version.comparable_version('0.6.0.pre'), '0.6.0.1'
-  end
-
-  def test_comparable_version_should_map_pre2_to_2_when_the_given_version_is_PRE2
-    assert_equal Version.comparable_version('0.6.0.pre2'), '0.6.0.2'
-  end
-
-  def test_compare_with_equal_rule_should_return_true_when_the_given_version_is_equal_to_the_version_of_rule
-    assert Version.compare('0.7.0', '== 0.7.0')
-  end
-
-  def test_compare_with_equal_rule_should_return_false_when_the_given_version_is_not_equal_to_the_version_of_rule
-    refute Version.compare('0.6.0.pre3', '== 0.6.0.pre2')
-  end
-
-  def test_compare_with_larger_rule_should_return_true_when_the_given_version_is_larger_than_the_version_of_rule
-    assert Version.compare('0.7.0', '> 0.6.0.pre3')
-  end
-
-  def test_compare_with_larger_rule_should_return_false_when_the_given_version_is_not_larger_than_the_version_of_rule
-    refute Version.compare('0.7.0', '> 0.7.0')
-  end
-
-  def test_compare_with_one_or_more_rule_should_return_true_when_the_given_version_is_equal_to_the_version_of_rule
-    assert Version.compare('0.7.0', '>= 0.7.0')
-  end
+  def test_compatible?
+    Version.stubs(:compatible_rules).returns(['>= 0.8.0', '< 1.0.0'])
 
-  def test_compare_with_one_or_more_rule_should_return_true_when_the_given_version_is_larger_than_the_version_of_rule
-    assert Version.compare('0.7.0', '>= 0.6.0.pre3')
-  end
+    assert Version.new('0.8.0').compatible?
+    assert Version.new('0.9.9').compatible?
+    assert Version.new('0.10.0').compatible?
 
-  def test_compare_with_one_or_more_rule_should_return_false_when_the_give_version_is_not_more_than_the_version_of_rule
-    refute Version.compare('0.6.0.pre3', '>= 0.7.0')
+    refute Version.new('0.7.9').compatible?
+    refute Version.new('1.0.0').compatible?
   end
 
-  def test_compare_with_one_or_less_rule_should_return_true_when_the_given_version_is_equal_to_the_version_of_rule
-    assert Version.compare('0.7.0', '<= 0.7.0')
-  end
-
-  def test_compare_with_one_or_less_rule_should_return_true_when_the_given_version_is_smaller_than_the_version_of_rule
-    assert Version.compare('0.7.0', '<= 0.7.1')
-  end
-
-  def test_compare_with_one_or_less_rule_should_return_false_when_the_given_version_is_not_less_than_the_version_of_rule
-    refute Version.compare('0.7.0', '<= 0.6.0.pre3')
-  end
-
-  def test_inspect_required_rules_should_properly_return_an_inspection_of_rule_when_one_rule_is_given
-    required_rules('== 0.6.0') do
-      assert_equal Version.inspect_required_rules, '(== 0.6.0)'
-    end
-  end
-
-  def test_inspect_required_rules_should_properly_return_an_inspection_of_rules_when_multiple_rules_are_given
-    required_rules('>= 0.6.0.pre3', '< 0.8.0') do
-      assert_equal Version.inspect_required_rules, '(>= 0.6.0.pre3 and < 0.8.0)'
-    end
-  end
-
-  def test_compatible_asker_should_return_true_when_the_given_version_matches_REEQUIRED_RULES
-    required_rules('>= 0.6.0.pre3', '< 0.8.0') do
-      assert Version.compatible?('0.7.0')
-    end
-  end
-
-  def test_compatible_asker_should_return_false_when_the_given_version_does_not_matches_REQUIRED_RULES
-    required_rules('>= 0.6.0.pre3', '< 0.8.0') do
-      refute Version.compatible?('0.8.0')
-    end
-  end
-
-  def required_rules(*rules, &block)
-    original_required_rules = Version::REQUIRED_RULES.dup
-
-    Version::REQUIRED_RULES.replace(rules)
-    block.call
-  ensure
-    Version::REQUIRED_RULES.replace(original_required_rules)
+  def test_legacy?
+    assert Version.new('0.8.9').legacy?
+    refute Version.new('0.9.0').legacy?
   end
 end

data/test/unit/report/test_base.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -118,17 +118,20 @@ class Thinreports::Report::TestBase < Minitest::Test
     assert_equal @report.layout(:foo).filename, @layout_file.path
   end
 
-  def test_generate_with_filename
-    report = Report::Base.new layout: @layout_file.path
+  def test_generate
+    report = Report::Base.new(layout: @layout_file.path)
 
-    report.generate :pdf, filename: temp_path.join('result1.pdf')
-    report.generate filename: temp_path.join('result2.pdf')
+    generator = mock('generator')
+    generator.expects(:generate).with('result.pdf')
 
-    assert File.exist?(temp_path.join('result1.pdf'))
-    assert File.exist?(temp_path.join('result2.pdf'))
+    Thinreports::Generator::PDF.expects(:new)
+      .with(report, { security: { owner_password: 'pass' }})
+      .returns(generator)
 
-    assert_equal File.read(temp_path.join('result1.pdf')),
-                 File.read(temp_path.join('result2.pdf'))
+    report.generate(
+      filename: 'result.pdf',
+      security: { owner_password: 'pass' }
+    )
   end
 
   def test_page_should_return_the_current_page
@@ -202,61 +205,44 @@ class Thinreports::Report::TestBase < Minitest::Test
     end
   end
 
-  def test_Base_generate_with_filename
-    Report::Base.generate(:pdf, report: { layout: @layout_file.path },
-                          generator: { filename: temp_path.join('result1.pdf') }) {}
-    Report::Base.generate(report: { layout: @layout_file.path },
-                          generator: { filename: temp_path.join('result2.pdf') }) {}
-
-    assert_equal temp_path.join('result1.pdf').read,
-                 temp_path.join('result2.pdf').read
-  end
-
   def test_Base_generate_should_raise_when_no_block_given
     assert_raises ArgumentError do
       Report::Base.generate(:pdf)
     end
   end
 
-  def test_Base_extract_options_should_return_as_report_option_the_value_which_has_report_in_a_key
-    report, _generator = Report::Base.send(:extract_options!, [{report: {layout: 'hoge.tlf'}}])
-    assert_equal report[:layout], 'hoge.tlf'
-  end
-
-  def test_Base_extract_options_should_operate_an_argument_destructively
-    args = [:pdf, 'output.pdf', {report: {layout: 'foo.tlf'}}]
-    Report::Base.send(:extract_options!, args)
-    assert_equal args, [:pdf, 'output.pdf']
-  end
-
-  def test_Base_extract_options_should_include_the_layout_key_in_the_report_option
-    report, _generator = Report::Base.send(:extract_options!, [{layout: 'hoge.tlf'}])
-    assert_equal report[:layout], 'hoge.tlf'
-  end
-
-  def test_Base_extract_options_should_give_priority_to_the_value_of_the_layout_key_over_in_the_report_option
-    report, _generator = Report::Base.send(:extract_options!,
-                                          [{report: {layout: 'foo.tlf'}, layout: 'hoge.tlf'}])
-    assert_equal report[:layout], 'hoge.tlf'
-  end
-
-  def test_Base_extract_options_should_return_as_generator_option_the_value_which_has_generator_in_a_key
-    _report, generator = Report::Base.send(:extract_options!,
-                                          [{generator: {option: 'value'}}])
-    assert_equal generator[:option], 'value'
-  end
-
-  def test_Base_extract_options_should_give_priority_to_the_value_of_other_keys_over_in_the_generator_option
-    _report, generator = Report::Base.send(:extract_options!,
-                                          [{generator: {option: 'value1'}, option: 'value2'}])
-    assert_equal generator[:option], 'value2'
-  end
-
-  def test_Base_extract_options_should_return_all_the_values_except_the_report_option_as_a_generator_option
-    _report, generator = Report::Base.send(:extract_options!,
-                                          [{report: {layout: 'foo.tlf'}, layout: 'hoge.tlf',
-                                            generator_opt1: 'value1', generator_opt2: 'value2'}])
-    assert_equal generator.values_at(:generator_opt1, :generator_opt2),
-                 ['value1', 'value2']
+  def test_Base_generate_with_deprecated_arguments
+    Report::Base.expects(:create).with(layout: '/path/to/layout.tlf').returns(@report)
+    @report.expects(:generate).with(
+      filename: 'result.pdf',
+      security: { owner_password: 'pass' }
+    )
+
+    Report::Base.generate(
+      report: { layout: '/path/to/layout.tlf' },
+      generator: {
+        filename: 'result.pdf',
+        security: { owner_password: 'pass' }
+      }
+    ) { |_| }
+  end
+
+  def test_Base_generate_argument_priority
+    Report::Base.expects(:create).with(layout: '/path/to/layout.tlf').returns(@report)
+    @report.expects(:generate).with(
+      filename: 'result.pdf',
+      security: { owner_password: 'pass' }
+    )
+
+    Report::Base.generate(
+      layout: '/path/to/layout.tlf',
+      filename: 'result.pdf',
+      security: { owner_password: 'pass' },
+      report: { layout: '/path/to/deprecated.tlf' },
+      generator: {
+        filename: 'deprecated.pdf',
+        security: { owner_password: 'deprecated' }
+      }
+    ) { |_| }
   end
 end