thinreports 0.8.2 → 0.9.0

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

@@ -4,337 +4,94 @@ require 'test_helper'
 
 class Thinreports::Core::Shape::Style::TestText < Minitest::Test
   include Thinreports::TestHelper
-  
-  def create_format(format = {})
-    Thinreports::Core::Shape::Text::Format.new(format)
-  end
-  
-  def create_text_style(format = nil)
-    format ||= create_format
-    Thinreports::Core::Shape::Style::Text.new(format)
+
+  def test_color
+    style = create_text_style('color' => 'red')
+    assert_equal 'red', style.color
+
+    style.color = 'blue'
+    assert_equal 'blue', style.styles['color']
+    assert_equal 'blue', style.color
   end
 
   def test_font_size
-    format = create_format('svg' => {'attrs' => {'font-size' => '12'}})
-    style  = create_text_style(format)
-
-    assert_equal style.font_size, '12'
+    style = create_text_style('font-size' => 18.0)
+    assert_equal 18.0, style.font_size
 
     style.font_size = 19
-
-    assert_equal style.styles['font-size'], 19
+    assert_equal 19, style.styles['font-size']
+    assert_equal 19, style.font_size
   end
 
-  def test_bold_should_return_true_when_font_weight_property_of_format_is_bold
-    format = create_format('svg' => {'attrs' => {'font-weight' => 'bold'}})
-    style  = create_text_style(format)
-    
-    assert_equal style.bold, true
-  end
-  
-  def test_bold_should_return_false_when_font_weight_property_of_format_is_not_bold
-    format = create_format('svg' => {'attrs' => {'font-weight' => 'normal'}})
-    style  = create_text_style(format)
-    
-    assert_equal style.bold, false
+  def test_initialize_font_style
+    default_font_style = ['bold', 'italic']
+    style = create_text_style('font-style' => default_font_style)
+
+    refute_same default_font_style, style.styles['font-style']
+    assert_equal default_font_style, style.styles['font-style']
   end
-  
-  def test_bold_should_set_normal_to_font_weight_style_when_value_is_false
-    style = create_text_style
+
+  def test_bold
+    style = create_text_style('font-style' => ['bold'])
+    assert_equal true, style.bold
+
     style.bold = false
-    
-    assert_equal style.styles['font-weight'], 'normal'
-  end
-  
-  def test_bold_should_set_bold_to_font_weight_style_when_value_is_true
-    style = create_text_style
-    style.bold = true
-    
-    assert_equal style.styles['font-weight'], 'bold'
-  end
-  
-  def test_bold_should_return_true_when_font_weight_of_internal_style_is_bold
-    style = create_text_style
-    style.styles['font-weight'] = 'bold'
-    
-    assert_equal style.bold, true
+    assert_equal [], style.styles['font-style']
+    assert_equal false, style.bold
   end
-  
-  def test_bold_should_return_false_when_font_weight_of_internal_style_is_not_bold
-    style = create_text_style
-    style.styles['font-weight'] = 'normal'
-    
-    assert_equal style.bold, false
-  end
-  
-  def test_italic_should_return_true_when_font_style_property_of_format_is_italic
-    format = create_format('svg' => {'attrs' => {'font-style' => 'italic'}})
-    style  = create_text_style(format)
-    
-    assert_equal style.italic, true
-  end
-  
-  def test_italic_should_return_false_when_font_style_property_of_format_is_not_italic
-    format = create_format('svg' => {'attrs' => {'font-style' => 'normal'}})
-    style  = create_text_style(format)
-    
-    assert_equal style.italic, false
-  end
-  
-  def test_italic_should_set_normal_to_font_style_style_when_value_is_false
-    style = create_text_style
+
+  def test_italic
+    style = create_text_style('font-style' => ['italic'])
+    assert_equal true, style.italic
+
     style.italic = false
-    
-    assert_equal style.styles['font-style'], 'normal'
-  end
-  
-  def test_italic_should_set_italic_to_font_style_style_when_value_is_true
-    style = create_text_style
-    style.italic = true
-    
-    assert_equal style.styles['font-style'], 'italic'
-  end
-  
-  def test_italic_should_return_false_when_font_style_of_internal_style_is_not_italic
-    style = create_text_style
-    style.styles['font-style'] = 'normal'
-    
-    assert_equal style.italic, false
-  end
-  
-  def test_italic_should_return_true_when_font_style_of_internal_style_is_italic
-    style = create_text_style
-    style.styles['font-style'] = 'italic'
-    
-    assert_equal style.italic, true
-  end
-  
-  def test_underline_should_return_true_when_underline_is_included_in_text_decoration_property_of_format
-    format = create_format('svg' => {'attrs' => {'text-decoration' => 'underline line-through'}})
-    style  = create_text_style(format)
-    
-    assert_equal style.underline, true
-  end
-  
-  def test_underline_should_return_false_when_underline_is_not_included_in_text_decoration_property_of_format
-    format = create_format('svg' => {'attrs' => {'text-decoration' => 'line-through'}})
-    style  = create_text_style(format)
-    
-    assert_equal style.underline, false
-  end
-  
-  def test_underline_should_return_true_when_underline_is_included_in_text_decoration_of_internal_style
-    style = create_text_style
-    style.styles['text-decoration'] = 'underline line-through'
-    
-    assert_equal style.underline, true
-  end
-  
-  def test_underline_should_return_false_when_underline_is_not_included_in_text_decoration_of_internal_style
-    style = create_text_style
-    style.styles['text-decoration'] = 'none'
-    
-    assert_equal style.underline, false
+    assert_equal [], style.styles['font-style']
+    assert_equal false, style.italic
   end
-  
-  def test_underline_should_include_underline_in_text_decoration_when_value_is_true
-    format = create_format('svg' => {'attrs' => {'text-decoration' => 'line-through'}})
-    style  = create_text_style(format)
-    style.underline = true
-    
-    assert_includes style.styles['text-decoration'], 'underline'
-  end
-  
-  def test_underline_should_remove_underline_from_text_decoration_when_value_is_false
-    format = create_format('svg' => {'attrs' => {'text-decoration' => 'underline line-through'}})
-    style  = create_text_style(format)
+
+  def test_underline
+    style = create_text_style('font-style' => ['underline'])
+    assert_equal true, style.underline
+
     style.underline = false
-    
-    refute_includes style.styles['text-decoration'], 'underline'
-  end
-  
-  def test_linethrough_should_return_true_when_line_through_is_included_in_text_decoration_property_of_format
-    format = create_format('svg' => {'attrs' => {'text-decoration' => 'underline line-through'}})
-    style  = create_text_style(format)
-    
-    assert_equal style.linethrough, true
-  end
-  
-  def test_linethrough_should_return_false_when_line_through_is_not_included_in_text_decoration_property_of_format
-    format = create_format('svg' => {'attrs' => {'text-decoration' => 'underline'}})
-    style  = create_text_style(format)
-    
-    assert_equal style.linethrough, false
-  end
-  
-  def test_linethrough_should_return_true_when_line_through_is_included_in_text_decoration_of_internal_style
-    style = create_text_style
-    style.styles['text-decoration'] = 'underline line-through'
-    
-    assert_equal style.linethrough, true
-  end
-  
-  def test_linethrough_should_return_false_when_line_through_is_not_included_in_text_decoration_of_internal_style
-    style = create_text_style
-    style.styles['text-decoration'] = 'underline'
-    
-    assert_equal style.linethrough, false
+    assert_equal [], style.styles['font-style']
+    assert_equal false, style.underline
   end
-  
-  def test_linethrough_should_include_line_through_in_text_decoration_when_value_is_true
-    format = create_format('svg' => {'attrs' => {'text-decoration' => 'none'}})
-    style  = create_text_style(format)
-    style.linethrough = true
-    
-    assert_includes style.styles['text-decoration'], 'line-through'
-  end
-  
-  def test_linethrough_should_remove_line_through_from_text_decoration_when_value_is_false
-    format = create_format('svg' => {'attrs' => {'text-decoration' => 'underline line-through'}})
-    style  = create_text_style(format)
+
+  def test_linethrough
+    style = create_text_style('font-style' => ['linethrough'])
+    assert_equal true, style.linethrough
+
     style.linethrough = false
-    
-    refute_includes style.styles['text-decoration'], 'line-through'
-  end
-  
-  def test_text_decoration_should_return_none
-    assert_equal create_text_style.send(:text_decoration, false, false), 'none'
-  end
-  
-  def test_text_decoration_should_return_underline
-    assert_equal create_text_style.send(:text_decoration, true, false), 'underline'
-  end
-  
-  def test_text_decoration_should_return_line_through
-    assert_equal create_text_style.send(:text_decoration, false, true), 'line-through'
-  end
-  
-  def test_text_decoration_should_return_underline_line_through
-    assert_equal create_text_style.send(:text_decoration, true, true), 'underline line-through'
-  end
-  
-  def test_interface_text_align_should_return_Symbol_left_when_value_is_undefined
-    assert_equal create_text_style.send(:interface_text_align, nil), :left
-  end
-  
-  def test_interface_text_align_should_return_Symbol_left_when_value_is_String_start
-    assert_equal create_text_style.send(:interface_text_align, 'start'), :left
-  end
-  
-  def test_interface_text_align_should_return_Symbol_left_when_value_is_unknown_align_type
-    assert_equal create_text_style.send(:interface_text_align, 'unknown'), :left
-  end
-  
-  def test_interface_text_align_should_return_Symbol_center_when_value_is_String_middle
-    assert_equal create_text_style.send(:interface_text_align, 'middle'), :center
-  end
-  
-  def test_interface_text_align_should_return_Symbol_right_when_value_is_String_end
-    assert_equal create_text_style.send(:interface_text_align, 'end'), :right
-  end
-  
-  def test_internal_text_align_should_return_nil_when_value_is_unknown
-    assert_equal create_text_style.send(:internal_text_align, :unknown), nil
-  end
-  
-  def test_internal_text_align_should_return_String_start_when_value_is_Symbol_left
-    assert_equal create_text_style.send(:internal_text_align, :left), 'start'
-  end
-  
-  def test_internal_text_align_should_return_String_middle_when_value_is_Symbol_center
-    assert_equal create_text_style.send(:internal_text_align, :center), 'middle'
-  end
-  
-  def test_internal_text_align_should_return_String_end_when_value_is_Symbol_right
-    assert_equal create_text_style.send(:internal_text_align, :right), 'end'
+    assert_equal [], style.styles['font-style']
+    assert_equal false, style.linethrough
   end
-  
-  def test_align_should_properly_return_align_type_with_reference_to_text_anchor_property_of_format
-    result = []
-    
-    format_left   = create_format('svg' => {'attrs' => {'text-anchor' => 'start'}})
-    format_center = create_format('svg' => {'attrs' => {'text-anchor' => 'middle'}})
-    format_right  = create_format('svg' => {'attrs' => {'text-anchor' => 'end'}})
-    
-    result << create_text_style(format_left).align
-    result << create_text_style(format_center).align
-    result << create_text_style(format_right).align
-    
-    assert_equal result, [:left, :center, :right]
-  end
-  
-  def test_copy_should_properly_copy_the_valign_property_of_the_original
-    style = create_text_style
-    style.valign = :center
-    
-    assert_equal style.copy.valign, :center
-  end
-  
-  def test_align_should_property_return_align_type_with_reference_to_text_anchor_of_internal_style
-    style = create_text_style
-    style.styles['text-anchor'] = 'middle'
-    
-    assert_equal style.align, :center
-  end
-  
-  def test_align_should_set_interface_align_type_to_text_anchor
-    style = create_text_style
+
+  def test_align
+    style = create_text_style('text-align' => 'center')
+    assert_equal :center, style.align
+
     style.align = :right
-    
-    assert_equal style.styles['text-anchor'], 'end'
-  end
-  
-  def test_align_should_raise_when_the_specified_type_is_unknown
-    assert_raises ArgumentError do
-      create_text_style.align = :unknown
-    end
-  end
-  
-  def test_valign_should_return_top_when_valign_of_format_is_blank
-    assert_equal create_text_style.valign, :top
-  end
-  
-  def test_valign_should_return_valign_type_of_format_as_default
-    format = create_format('valign' => 'bottom')
-    style  = create_text_style(format)
-    
-    assert_equal style.valign, :bottom
-  end
-  
-  def test_valign_should_properly_set_valign_type
-    style = create_text_style
-    style.valign = :center
-    
-    assert_equal style.valign, :center
-  end
-  
-  def test_valign_should_raise_when_the_specified_type_is_unknown
-    assert_raises ArgumentError do
-      create_text_style.valign = :unknonw
-    end
+    assert_equal 'right', style.styles['text-align']
+    assert_equal :right, style.align
   end
 
-  def test_initialize
-    klass = Class.new(Thinreports::Core::Shape::Style::Text)
-    klass.class_eval do
-      accessible_styles.delete(:valign)
-    end
+  def test_valign
+    style = create_text_style('vertical-align' => '')
+    assert_equal :top, style.valign
 
-    style = klass.new(create_format('valign' => ''))
-    assert_equal style.valign, :top, 'should be set :top as default to @valign style ' + 
-                                     'if :valign is not accessible'
-  end
-  
-  def test_identifier_should_return_the_same_value_as_create_identifier_method_when_valign_has_not_been_changed
-    style = create_text_style
-    assert_equal style.identifier, style.send(:create_identifier, style.styles)
+    style.valign = :middle
+    assert_equal 'middle', style.styles['vertical-align']
+    assert_equal :middle, style.valign
+
+    assert_deprecated { style.valign = :center }
+    assert_equal :middle, style.valign
   end
-  
-  def test_identifier_should_return_the_value_which_added_valign_to_the_value_of_create_identifier_when_valign_has_been_changed
-    style = create_text_style
-    style.valign = :bottom
-    
-    assert_equal style.identifier,
-                 style.send(:create_identifier, style.styles) + 'bottom'
+
+  private
+
+  def create_text_style(default_style = {})
+    format = Thinreports::Core::Shape::Text::Format.new('style' => default_style)
+    Thinreports::Core::Shape::Style::Text.new(format)
   end
 end

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

@@ -5,69 +5,40 @@ require 'test_helper'
 class Thinreports::Core::Shape::Text::TestFormat < Minitest::Test
   include Thinreports::TestHelper
 
-  TEST_TEXT_FORMAT = {
-    "type" => "s-text",
-    "id" => "text_1",
-    "display" => "true",
-    "text" => ["Text Content1", "Text Content2"],
-    "valign" => "top",
-    "line-height" => 60,
-    "box" => {
-      "x" => 100.0,
-      "y" => 100.0,
-      "width" => 100.0,
-      "height" => 100.0
-    },
-    "svg" => {
-      "tag" => "g",
-      "attrs" => {
-        "stroke-width" => "0",
-        "font-weight" => "normal",
-        "font-style" => "normal",
-        "font-family" => "Arial",
-        "font-size" => "12",
-        "text-anchor" => "start",
-        "fill" => "#000000",
-        "fill-opacity" => "1",
-        "text-decoration" => "none",
-        "letter-spacing" => "normal"
-      },
-      "content" => "<text class=\"s-text-l0\" xml:space=\"preserve\" " +
-                   "stroke=\"none\" fill=\"inherit\" fill-opacity=\"1\" " +
-                   "text-decoration=\"none\" x=\"92\" y=\"93\">" +
-                   "Text Content1</text>" +
-                   "<text class=\"s-text-l1\" xml:space=\"preserve\" " +
-                   "stroke=\"none\" fill=\"inherit\" fill-opacity=\"1\" " +
-                   "text-decoration=\"none\" x=\"92\" y=\"107\">" +
-                   "Text Content2</text>"
+  TEXT_FORMAT = {
+    'id' => 'text_1',
+    'type' => 'text',
+    'x' => 100.0,
+    'y' => 200.0,
+    'width' => 300.0,
+    'height' => 400.0,
+    'description' => 'Description for item',
+    'display' => true,
+    'texts' => [
+      '1st text line',
+      '2nd text line'
+    ],
+    'valign' => 'top',
+    'style' => {
+      'font-family' => ['Arial'],
+      'font-size' => 12,
+      'color' => '#000000',
+      'font-style' => ['bold', 'italic', 'linethrough', 'underline'],
+      'text-align' => 'left',
+      'vertical-align' => 'top',
+      'line-height' => 60,
+      'line-height-ratio' => 1.5,
+      'letter-spacing' => 'normal'
     }
   }
 
-  # Alias
-  Format = Thinreports::Core::Shape::Text::Format
+  Text = Thinreports::Core::Shape::Text
 
-  def test_build_format
-    build_format
-  rescue => e
-    flunk exception_details(e, 'Building failed.')
-  end
+  def test_attribute_readers
+    format = Text::Format.new(TEXT_FORMAT)
 
-  def test_config_readers
-    format = Format.new(TEST_TEXT_FORMAT)
-    
-    assert_instance_of ::Hash, format.box
-    assert_equal format.box['x'], 100.0
-    
-    assert_instance_of ::Array, format.text
-    assert_equal format.text.first, 'Text Content1'
-    
-    assert_equal format.valign, 'top'
-    assert_equal format.line_height, 60
-    
-    assert_equal format.svg_content, TEST_TEXT_FORMAT['svg']['content']
-  end
-  
-  def build_format
-    Format.build(TEST_TEXT_FORMAT)
+    assert_equal TEXT_FORMAT['texts'], format.texts
+    assert_equal 'top', format.valign
+    assert_equal 60, format.line_height
   end
 end