thinreports 0.8.2 → 0.9.0

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

@@ -4,16 +4,16 @@ require 'test_helper'
 
 class Thinreports::Core::Shape::Text::TestInternal < Minitest::Test
   include Thinreports::TestHelper
-  
+
   Text = Thinreports::Core::Shape::Text
-  
+
   def create_internal(format_config = {})
-    report = new_report('layout_text1.tlf')
+    report = Thinreports::Report.new layout: layout_file.path
     Text::Internal.new(report.start_new_page, Text::Format.new(format_config))
   end
-  
+
   def test_type_of?
-    assert create_internal.type_of?(:text), true
+    assert create_internal.type_of?('text'), true
     refute create_internal.type_of?(:basic), false
   end
 

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

@@ -4,16 +4,16 @@ require 'test_helper'
 
 class Thinreports::Core::Shape::TextBlock::Formatter::TestDatetime < Minitest::Test
   include Thinreports::TestHelper
-  
+
   # Aliases
   TextBlock = Thinreports::Core::Shape::TextBlock
   Formatter = TextBlock::Formatter::Datetime
-  
+
   def setup
     @datetime_format = '%Y/%m/%d %H:%M:%S'
     @time = Time.now
   end
-  
+
   def text_block_format(format = {})
     default = {'base' => '', 'datetime' => {'format' => '%Y/%m/%d %H:%M:%S'}}
     TextBlock::Format.new('format' => default.merge(format))
@@ -21,29 +21,29 @@ class Thinreports::Core::Shape::TextBlock::Formatter::TestDatetime < Minitest::T
 
   def test_apply_datetime_format_without_basic_format
     formatter = Formatter.new(text_block_format)
-    
-    assert_equal @time.strftime(@datetime_format), 
+
+    assert_equal @time.strftime(@datetime_format),
                  formatter.apply(@time)
   end
-  
+
   def test_apply_datetime_format_with_basic_format
     formatter = Formatter.new(text_block_format('base' => 'Now: {value}'))
-    
-    assert_equal "Now: #{@time.strftime(@datetime_format)}", 
+
+    assert_equal "Now: #{@time.strftime(@datetime_format)}",
                  formatter.apply(@time)
-                 
+
   end
-  
+
   def test_not_apply_datetime_format_and_return_raw_value
     # When value is invalid
     formatter = Formatter.new(text_block_format)
-    
+
     assert_same formatter.apply(val = 'invalid value'), val
     assert_same formatter.apply(val = 123456), val
-    
+
     # When format is empty
     formatter = Formatter.new(text_block_format('datetime' => {'format' => ''}))
-    
+
     assert_same formatter.apply(@time), @time
   end
 end

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

@@ -5,166 +5,165 @@ require 'test_helper'
 class Thinreports::Core::Shape::TextBlock::TestFormat < Minitest::Test
   include Thinreports::TestHelper
 
-  TEST_TBLOCK_FORMAT = {
-    "type" => "s-tblock",
-    "id" => "block_1", 
-    "display" => "true", 
-    "multiple" => "false",
-    "overflow" => "truncate",
-    "word-wrap" => "break-word",
-    "box" => {
-      "x" => 100.0,
-      "y" => 100.0,
-      "width" => 100.0,
-      "height" => 100.0
-    },
-    "format" => {
-      "base" => "￥{value}", 
-      "type" => "number", 
-      "number" => {
-        "delimiter" => ",", 
-        "precision" => 1
+  TEXT_BLOCK_FORMAT = {
+    'id' => 'text_block',
+    'reference-id' => 'referenced_text_block',
+    'type' => 'text-block',
+    'display' => true,
+    'multiple-line' => false,
+    'x' => 100.0,
+    'y' => 200.0,
+    'width' => 300.0,
+    'height' => 400.0,
+    'value' => 'default value',
+    'format' => {
+      'base' => 'Price: {value}',
+      'type' => 'number',
+      'number' => {
+        'delimiter' => ',',
+        'precision' => 1
       }
     },
-    "value" => "", 
-    "ref-id" => "", 
-    "svg" => {
-      "tag" => "text", 
-      "attrs" => {
-        "x" => 200.1, 
-        "y" => 65.6, 
-        "text-anchor" => "end", 
-        "xml:space" => "preserve", 
-        "fill" => "#000000", 
-        "fill-opacity" => "1", 
-        "font-size" => "12", 
-        "font-family" => "Helvetica", 
-        "font-weight" => "bold", 
-        "font-style" => "normal", 
-        "text-decoration" => "none", 
-        "clip-path" => "url(#_svgdef_0)"
-      }
+    'description' => 'Description for item',
+    'style' => {
+      'word-wrap' => 'break-word',
+      'overflow' => 'truncate',
+      'text-align' => 'right',
+      'vertical-align' => 'middle',
+      'color' => '#000000',
+      'font-size' => 12,
+      'font-family' => ['Helvetica'],
+      'font-style' => ['bold', 'italic', 'linethrough', 'underline'],
+      'letter-spacing' => 'normal',
+      'line-height' => 30,
+      'line-height-ratio' => 1.5
     }
   }
 
-  def test_build
-    build_format
-  rescue => e
-    flunk exception_details(e, 'Building failed.')
-  end
+  TextBlock = Thinreports::Core::Shape::TextBlock
 
-  def test_value_reader_via_TEST_TBLOCK_FORMAT
-    assert_equal format(TEST_TBLOCK_FORMAT).value, ''
-  end
+  def test_attribute_readers
+    format = TextBlock::Format.new(TEXT_BLOCK_FORMAT)
 
-  def test_word_wrap_reader_via_TEST_TBLOCK_FORMAT
-    assert_equal format(TEST_TBLOCK_FORMAT).word_wrap, 'break-word'
-  end
-  
-  def test_ref_id_reader_via_TEST_TBLOCK_FORMAT
-    assert_equal format(TEST_TBLOCK_FORMAT).ref_id, ''
-  end
-  
-  def test_format_base_reader_via_TEST_TBLOCK_FORMAT
-    assert_equal format(TEST_TBLOCK_FORMAT).format_base, '￥{value}'
-  end
-  
-  def test_format_type_reader_via_TEST_TBLOCK_FORMAT
-    assert_equal format(TEST_TBLOCK_FORMAT).format_type, 'number'
-  end
-  
-  def test_box_reader_via_TEST_TBLOCK_FORMAT
-    assert_equal format(TEST_TBLOCK_FORMAT).box.values_at('x', 'y', 'width', 'height'),
-                 [100.0, 100.0, 100.0, 100.0]
-  end
-  
-  def test_format_datetime_format_reader_via_TEST_TBLOCK_FORMAT
-    assert_nil format(TEST_TBLOCK_FORMAT).format_datetime_format
-  end
-  
-  def test_format_padding_char_reader_via_TEST_TBLOCK_FORMAT
-    assert_nil format(TEST_TBLOCK_FORMAT).format_padding_char
-  end
-  
-  def test_format_padding_dir_reader_via_TEST_TBLOCK_FORMAT
-    assert_nil format(TEST_TBLOCK_FORMAT).format_padding_dir
-  end
-  
-  def test_format_padding_length_via_TEST_TBLOCK_FORMAT
-    assert_equal format(TEST_TBLOCK_FORMAT).format_padding_length, 0
-  end
-  
-  def test_format_padding_rdir_checker_via_TEST_TBLOCK_FORMAT
-    assert_equal format(TEST_TBLOCK_FORMAT).format_padding_rdir?, false
-  end
-  
-  def test_format_has_format_asker_via_TEST_TBLOCK_FORMAT
-    assert_equal format(TEST_TBLOCK_FORMAT).has_format?, true
-  end
-  
-  def test_format_has_reference_asker_via_TEST_TBLOCK_FORMAT
-    assert_equal format(TEST_TBLOCK_FORMAT).has_reference?, false
-  end
-  
-  def test_format_multiple_checker_via_TEST_TBLOCK_FORMAT
-    assert_equal format(TEST_TBLOCK_FORMAT).multiple?, false
-  end
-  
-  def test_overflow_via_TEST_TBLOCK_FORMAT
-    assert_equal format(TEST_TBLOCK_FORMAT).overflow, 'truncate'
-  end
-  
-  def test_multiple_checker_should_return_true
-    assert format('multiple' => 'true').multiple?
-  end
-  
-  def test_multiple_checker_should_return_false
-    refute format('multiple' => 'false').multiple?
-  end
-  
-  def test_format_padding_rdir_checker_should_return_false
-    data = {'format' => {'padding' => {'direction' => 'L'}}}
-    refute format(data).format_padding_rdir?
-  end
-  
-  def test_format_padding_rdir_checker_should_return_true
-    data = {'format' => {'padding' => {'direction' => 'R'}}}
-    assert format(data).format_padding_rdir?
-  end
-  
-  def test_format_padding_length_should_return_Numeric
-    data = {'format' => {'padding' => {'length' => '999'}}}
-    assert_kind_of ::Numeric, format(data).format_padding_length
+    assert_equal 'referenced_text_block', format.ref_id
+    assert_equal 'middle', format.valign
+    assert_equal 'truncate', format.overflow
+    assert_equal 30, format.line_height
+    assert_equal false, format.multiple?
+    assert_equal 'Price: {value}', format.format_base
+    assert_equal 'number', format.format_type
   end
 
-  def test_has_format_asker_should_return_false_with_empty_value
-    data = {'format' => {'type' => ''}}
-    refute format(data).has_format?
+  def test_has_reference?
+    format_has_reference = TextBlock::Format.new(TEXT_BLOCK_FORMAT.merge('reference-id' => 'other'))
+    assert_equal true, format_has_reference.has_reference?
+
+    format_has_no_reference = TextBlock::Format.new(TEXT_BLOCK_FORMAT.merge('reference-id' => ''))
+    assert_equal false, format_has_no_reference.has_reference?
   end
-  
-  def test_has_format_asker_should_return_false_with_unknown_type
-    data = {'format' => {'type' => 'unknown'}}
-    refute format(data).has_format?
+
+  def test_has_format?
+    format_has_text_format = TextBlock::Format.new(TEXT_BLOCK_FORMAT.merge(
+      'format' => { 'type' => 'datetime' }
+    ))
+    assert_equal true, format_has_text_format.has_format?
+
+    format_has_no_text_format = TextBlock::Format.new(TEXT_BLOCK_FORMAT.merge(
+      'format' => { 'type' => '' }
+    ))
+    assert_equal false, format_has_no_text_format.has_format?
   end
-  
-  def test_has_format_asker_should_return_true
-    data = {'format' => {'type' => 'number'}}
-    assert format(data).has_format?
+
+  def test_number_format_attribute_readers
+    format = TextBlock::Format.new(TEXT_BLOCK_FORMAT.merge(
+      'format' => {
+        'type' => 'number',
+        'number' => {
+          'delimiter' => ',',
+          'precision' => 1
+        }
+      }
+    ))
+    assert_equal ',', format.format_number_delimiter
+    assert_equal 1, format.format_number_precision
   end
-  
-  def test_has_reference_asker_should_return_false
-    refute format('ref-id' => '').has_reference?
+
+  def test_datetime_format_attribute_readers
+    format = TextBlock::Format.new(TEXT_BLOCK_FORMAT.merge(
+      'format' => {
+        'type' => 'datetime',
+        'datetime' => {
+          'format' => '%Y-%m-%d'
+        }
+      }
+    ))
+    assert_equal '%Y-%m-%d', format.format_datetime_format
   end
-  
-  def test_has_reference_asker_should_return_true
-    assert format('ref-id' => 'ref_tblock_1').has_reference?
+
+  def test_padding_format_attribute_readers
+    format = TextBlock::Format.new(TEXT_BLOCK_FORMAT.merge(
+      'format' => {
+        'type' => 'padding',
+        'padding' => {
+          'char' => '0',
+          'length' => 10,
+          'direction' => 'L'
+        }
+      }
+    ))
+    assert_equal '0', format.format_padding_char
+    assert_equal 'L', format.format_padding_dir
   end
-  
-  def build_format
-    Thinreports::Core::Shape::TextBlock::Format.build(TEST_TBLOCK_FORMAT)
+
+  def test_format_padding_length
+    format = TextBlock::Format.new(TEXT_BLOCK_FORMAT.merge(
+      'format' => {
+        'type' => 'padding',
+        'padding' => {
+          'char' => '0',
+          'length' => 10,
+          'direction' => 'L'
+        }
+      }
+    ))
+    assert_equal 10, format.format_padding_length
+
+    format = TextBlock::Format.new(TEXT_BLOCK_FORMAT.merge(
+      'format' => {
+        'type' => 'padding',
+        'padding' => {
+          'char' => '0',
+          'length' => '',
+          'direction' => 'L'
+        }
+      }
+    ))
+    assert_equal 0, format.format_padding_length
   end
-  
-  def format(data)
-    Thinreports::Core::Shape::TextBlock::Format.new(data)
+
+  def test_format_padding_rdir?
+    format_direction_left = TextBlock::Format.new(TEXT_BLOCK_FORMAT.merge(
+      'format' => {
+        'type' => 'padding',
+        'padding' => {
+          'char' => '0',
+          'length' => 10,
+          'direction' => 'L'
+        }
+      }
+    ))
+    assert_equal false, format_direction_left.format_padding_rdir?
+
+    format_direction_right = TextBlock::Format.new(TEXT_BLOCK_FORMAT.merge(
+      'format' => {
+        'type' => 'padding',
+        'padding' => {
+          'char' => '0',
+          'length' => 10,
+          'direction' => 'R'
+        }
+      }
+    ))
+    assert_equal true, format_direction_right.format_padding_rdir?
   end
 end

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

@@ -9,7 +9,7 @@ class Thinreports::Core::Shape::TextBlock::TestInterface < Minitest::Test
   TextBlock = Thinreports::Core::Shape::TextBlock
 
   def create_interface(format_config = {})
-    report = new_report 'layout_text1'
+    report = Thinreports::Report.new layout: layout_file.path
     parent = report.start_new_page
 
     TextBlock::Interface.new parent, TextBlock::Format.new(format_config)
@@ -47,17 +47,17 @@ class Thinreports::Core::Shape::TextBlock::TestInterface < Minitest::Test
   end
 
   def test_value=
-    report = new_report 'layout_block.tlf'
+    report = Thinreports::Report.new layout: layout_file.path
     page = report.start_new_page
 
-    page.item(:text_block1).value = 'foo'
-    assert_equal 'foo', page.item(:text_block1).value
+    page.item(:text_block).value = 'foo'
+    assert_equal 'foo', page.item(:text_block).value
 
-    page.item(:text_block1).value += 'bar'
-    assert_equal 'foobar', page.item(:text_block1).value
+    page.item(:text_block).value += 'bar'
+    assert_equal 'foobar', page.item(:text_block).value
 
-    page.item(:text_block1).value = 1000
-    page.item(:text_block1).value += 999
-    assert_equal 1999, page.item(:text_block1).value
+    page.item(:text_block).value = 1000
+    page.item(:text_block).value += 999
+    assert_equal 1999, page.item(:text_block).value
   end
 end

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

@@ -9,10 +9,10 @@ class Thinreports::Core::Shape::TextBlock::TestInternal < Minitest::Test
   TextBlock = Thinreports::Core::Shape::TextBlock
 
   def create_parent
-    report = new_report('layout_text1.tlf')
+    report = Thinreports::Report.new layout: layout_file.path
     report.start_new_page do |page|
       # Add to force TextBlock shape.
-      page.manager.format.shapes[:foo] = TextBlock::Format.new('type' => 's-tblock',
+      page.manager.format.shapes[:foo] = TextBlock::Format.new('type' => 'text-block',
                                                                'id'   => 'foo')
       # Set value to TextBlock.
       page.item(:foo).value('foo value')
@@ -24,7 +24,7 @@ class Thinreports::Core::Shape::TextBlock::TestInternal < Minitest::Test
   end
 
   def test_multiple_asker_should_operate_as_delegator_of_format
-    tblock = create_internal('multiple' => 'true')
+    tblock = create_internal('multiple-line' => true)
     assert_equal tblock.multiple?, tblock.format.multiple?
   end
 
@@ -38,7 +38,7 @@ class Thinreports::Core::Shape::TextBlock::TestInternal < Minitest::Test
   end
 
   def test_read_value_should_return_the_value_of_referenced_shape
-    tblock = create_internal('ref-id' => 'foo')
+    tblock = create_internal('reference-id' => 'foo', 'value' => '')
     assert_equal tblock.read_value, 'foo value'
   end
 
@@ -57,7 +57,7 @@ class Thinreports::Core::Shape::TextBlock::TestInternal < Minitest::Test
   end
 
   def test_write_value_should_show_warnings_when_tblock_has_reference
-    tblock = create_internal('id' => 'bar', 'ref-id' => 'foo')
+    tblock = create_internal('id' => 'bar', 'reference-id' => 'foo')
     _out, err = capture_io do
       tblock.write_value('value')
     end
@@ -104,16 +104,16 @@ class Thinreports::Core::Shape::TextBlock::TestInternal < Minitest::Test
   end
 
   def test_format_enabled_asker_should_return_false_constantly_when_tblock_is_multiple_mode
-    tblock = create_internal('multiple' => 'true',
-                             'format'   => {'base' => '{value}',
-                                            'type' => 'number'})
+    tblock = create_internal('multiple-line' => true,
+                             'format' => {'base' => '{value}',
+                                          'type' => 'number'})
     tblock.format_enabled(true)
 
     assert_equal tblock.format_enabled?, false
   end
 
   def test_type_of_asker_should_return_true_when_value_is_tblock
-    assert_equal create_internal.type_of?(:tblock), true
+    assert_equal create_internal.type_of?('text-block'), true
   end
 
   def test_type_of_asker_should_return_true_when_value_is_block