thinreports 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de107dd9a703e23d4e1f84dcb2849c481efc1ae2
-  data.tar.gz: 2630e25d206449815b82be3cd96ac87da09f4b94
+  metadata.gz: c93b3357d3d5cf6c1b61a01e9426482712d918da
+  data.tar.gz: d6947e5e59242e15735d7bb3022dda152ed03d5d
 SHA512:
-  metadata.gz: dd9c28499653a33484ae6a8724ce7c0c01fab0a9c26e2d37af415a5d55c33316ed626b2f6562ab3d54ccb4af88f1b96141691a703f9041fca9ab83614a8081aa
-  data.tar.gz: 0a76ccd613319b2766118031ccdd473e7c42e7fe9e7a9103120c944bb2573dfc9e19915b546468829ac68d2361698f50a82adfa35dfe84b53d70b2562d46b2fe
+  metadata.gz: c05756da8074b034b0747ee7d469086c11348ec9366e2311874230961aa36d82c105453ad0d9079eb6ca0c63b3a05ded8135d8bfb3b17fa41aff330f7c2e2804
+  data.tar.gz: 10805e8930c437ecc4c2c48fb370c93a450d155af49d783405e0ec2289e1f263b3bd8a29111e6675eac8bf67d426df237ecc5f4831e02dbe477e1696bafac73e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.9.1
+
+ * Fixed bug that line-height of text-block is always set to 0 #68
+ * Fixed a referenced text-block not rendered #68
+ * Fixed #66 an error occurred when render list #68
+
 ## 0.9.0
 
  * Drop support for layout file saved with Editor v0.7 or lower #62

data/lib/thinreports/layout/legacy_schema.rb

@@ -6,8 +6,14 @@ require 'rexml/document'
 module Thinreports
   module Layout
     class LegacySchema
+      include Utils
+
       def initialize(legacy_schema)
         @legacy_schema = legacy_schema
+        @legacy_svg = legacy_schema['svg'].dup
+        @legacy_item_schemas = extract_legacy_item_schemas(legacy_svg)
+
+        normalize_svg!(@legacy_svg)
       end
 
       def upgrade
@@ -24,20 +30,23 @@ module Thinreports
             'orientation' => page_config['orientation'],
             'margin' => page_config.values_at('margin-top', 'margin-right', 'margin-bottom', 'margin-left').map(&:to_f)
           },
-          'items' => build_item_schemas_from_svg(legacy_schema['svg'].dup, '/svg/g', 1)
+          'items' => item_schemas
         }
       end
 
-      attr_reader :legacy_schema
+      attr_reader :legacy_schema, :legacy_svg, :legacy_item_schemas
+
+      def item_schemas
+        svg = REXML::Document.new(legacy_svg)
+        build_item_schemas_from_svg(svg.elements['/svg/g'])
+      end
 
-      def build_item_schemas_from_svg(svg, root_xpath, level)
-        item_schemas = extract_item_schemas(svg, level)
+      def build_item_schemas_from_svg(svg_elements)
+        return [] unless svg_elements
 
-        svg_doc = REXML::Document.new(normalize_svg(svg, level))
         items = []
 
-        svg_doc.elements[root_xpath].each do |item_element|
-          item_schema = item_schemas[item_element.attributes['x-id']] || {}
+        svg_elements.each do |item_element|
           item_attributes = item_element.attributes
 
           items <<
@@ -50,7 +59,7 @@ module Thinreports
             when 's-tblock' then text_block_item_schema(item_attributes)
             when 's-iblock' then image_block_item_schema(item_attributes)
             when 's-pageno' then page_number_item_schema(item_attributes)
-            when 's-list' then list_item_schema(item_schema)
+            when 's-list' then list_item_schema(item_element)
             else raise 'Unknown item type'
             end
         end
@@ -224,6 +233,7 @@ module Thinreports
           'value' => attributes['x-value'],
           'multiple-line' => attributes['x-multiple'] == 'true',
           'format' => text_format,
+          'reference-id' => attributes['x-ref-id'],
           'style' => {
             'font-family' => [ attributes['font-family'] ],
             'font-size' => attributes['font-size'].to_f,
@@ -234,29 +244,47 @@ module Thinreports
             'line-height' => line_height(attributes['x-line-height']),
             'letter-spacing' => letter_spacing(attributes['kerning']),
             'overflow' => attributes['x-overflow'],
-            'word-wrap' => attributes['x-word-wrap']
+            'word-wrap' => attributes['x-word-wrap'] || ''
           }
         }
       end
 
-      def list_item_schema(legacy_schema)
-        {
+      def list_item_schema(legacy_element)
+        legacy_schema = legacy_item_schemas[legacy_element.attributes['x-id']]
+
+        header = list_section_schema('header', legacy_element, legacy_schema)
+        detail = list_section_schema('detail', legacy_element, legacy_schema)
+        page_footer = list_section_schema('page-footer', legacy_element, legacy_schema)
+        footer = list_section_schema('footer', legacy_element, legacy_schema)
+
+        schema = {
           'id' => legacy_schema['id'],
           'type' => Core::Shape::List::TYPE_NAME,
           'content-height' => legacy_schema['content-height'].to_f,
           'auto-page-break' => legacy_schema['page-break'] == 'true',
           'display' => display(legacy_schema['display']),
-          'header' => list_section_schema('header', legacy_schema),
-          'detail' => list_section_schema('detail', legacy_schema),
-          'page-footer' => list_section_schema('page-footer', legacy_schema),
-          'footer' => list_section_schema('footer', legacy_schema)
+          'header' => header,
+          'detail' => detail,
+          'page-footer' => page_footer,
+          'footer' => footer
         }
+
+        if page_footer['enabled']
+          page_footer['translate']['y'] += detail['height']
+        end
+
+        if footer['enabled']
+          footer['translate']['y'] += detail['height']
+          footer['translate']['y'] += page_footer['height'] if page_footer['enabled']
+        end
+        schema
       end
 
-      def list_section_schema(section_name, legacy_list_schema)
+      def list_section_schema(section_name, legacy_list_element, legacy_list_schema)
         legacy_section_schema = legacy_list_schema[section_name]
+        return {} if legacy_section_schema.empty?
 
-        section_svg = %(<svg xmlns:xlink="http://www.w3.org/1999/xlink">#{legacy_section_schema['svg']['content']}</svg>)
+        section_item_elements = legacy_list_element.elements["g[@class='s-list-#{section_name}']"]
 
         section_schema = {
           'height' => legacy_section_schema['height'].to_f,
@@ -264,7 +292,7 @@ module Thinreports
             'x' => legacy_section_schema['translate']['x'].to_f,
             'y' => legacy_section_schema['translate']['y'].to_f
           },
-          'items' => build_item_schemas_from_svg(section_svg, '/svg', 2)
+          'items' => build_item_schemas_from_svg(section_item_elements)
         }
 
         unless section_name == 'detail'
@@ -310,7 +338,7 @@ module Thinreports
       end
 
       def vertical_align(legacy_vertical_align)
-        return nil unless legacy_vertical_align
+        return '' unless legacy_vertical_align
 
         case legacy_vertical_align
         when 'top' then 'top'
@@ -321,7 +349,7 @@ module Thinreports
       end
 
       def line_height(legacy_line_height)
-        legacy_line_height == '' ? '' : legacy_line_height.to_f
+        blank_value?(legacy_line_height) ? '' : legacy_line_height.to_f
       end
 
       def letter_spacing(legacy_letter_spacing)
@@ -331,23 +359,18 @@ module Thinreports
         end
       end
 
-      def extract_item_schemas(svg, level)
+      def extract_legacy_item_schemas(svg)
         items = {}
-        svg.scan(/<!--#{level_symbol(level)}SHAPE(.*?)SHAPE#{level_symbol(level)}-->/) do |(item_schema_json)|
+        svg.scan(/<!--SHAPE(.*?)SHAPE-->/) do |(item_schema_json)|
           item_schema = JSON.parse(item_schema_json)
           items[item_schema['id']] = item_schema
         end
         items
       end
 
-      def normalize_svg(svg, level)
-        svg.gsub!(/<!--#{level_symbol(level)}SHAPE.*?SHAPE#{level_symbol(level)}-->/, '')
-        svg.gsub!(/<!--#{level_symbol(level)}LAYOUT(.*?)LAYOUT#{level_symbol(level)}-->/) { $1 }
-        svg
-      end
-
-      def level_symbol(level)
-        '-' * (level - 1)
+      def normalize_svg!(svg)
+        svg.gsub!(/<!--SHAPE.*?SHAPE-->/, '')
+        svg.gsub!(/<!--LAYOUT(.*?)LAYOUT-->/) { $1 }
       end
     end
   end

data/lib/thinreports/version.rb

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

data/test/unit/layout/test_legacy_schema.rb

@@ -312,7 +312,8 @@ class Thinreports::Layout::TestLegacySchema < Minitest::Test
       'x-overflow' => 'expand',
       'x-word-wrap' => 'break-word',
       'x-format-base' => '$ {value}',
-      'x-format-type' => ''
+      'x-format-type' => '',
+      'x-ref-id' => 'other_text_block_id'
     }
     assert_equal(
       {
@@ -325,6 +326,7 @@ class Thinreports::Layout::TestLegacySchema < Minitest::Test
         'display' => true,
         'value' => 'default value',
         'multiple-line' => true,
+        'reference-id' => 'other_text_block_id',
         'format' => {
           'base' => '$ {value}',
           'type' => ''
@@ -398,17 +400,15 @@ class Thinreports::Layout::TestLegacySchema < Minitest::Test
   end
 
   def test_list_item_schema
-    rect_item_svg = '<rect stroke="#000000" stroke-width="1" fill="#FFFFFF" class="s-rect" x-display="true" x-stroke-type="solid" stroke-dasharray="none" x-id="" rx="0" width="102.6" height="42" x="40" y="20"/>'
-
     legacy_schema = {
       'id' => 'default',
       'type' => 's-list',
       'content-height' => '300',
       'page-break' => 'true',
       'display' => 'false',
-      'header-enabled' => 'true',
+      'header-enabled' => 'false',
       'page-footer-enabled' => 'true',
-      'footer-enabled' => 'false',
+      'footer-enabled' => 'true',
       'header' => {
         'height' => '100.1',
         'translate' => {
@@ -423,9 +423,7 @@ class Thinreports::Layout::TestLegacySchema < Minitest::Test
           'x' => '300',
           'y' => '400'
         },
-        'svg' => {
-          'content' => rect_item_svg
-        }
+        'svg' => { 'content' => '' }
       },
       'page-footer' => {
         'height' => '300.1',
@@ -444,6 +442,13 @@ class Thinreports::Layout::TestLegacySchema < Minitest::Test
         'svg' => { 'content' => '' }
       }
     }
+
+    layout_legacy_schema.stubs(:legacy_item_schemas).returns({ 'default' => legacy_schema })
+
+    legacy_element = mock()
+    legacy_element.stubs(:attributes).returns({ 'x-id' => 'default' })
+    legacy_element.stubs(:elements).returns({})
+
     assert_equal(
       {
         'id' => 'default',
@@ -458,7 +463,7 @@ class Thinreports::Layout::TestLegacySchema < Minitest::Test
             'y' => 200.0
           },
           'items' => [],
-          'enabled' => true
+          'enabled' => false
         },
         'detail' => {
           'height' => 200.1,
@@ -466,27 +471,13 @@ class Thinreports::Layout::TestLegacySchema < Minitest::Test
             'x' => 300.0,
             'y' => 400.0
           },
-          'items' => [{
-            'id' => '',
-            'type' => 'rect',
-            'x' => 40.0,
-            'y' => 20.0,
-            'width' => 102.6,
-            'height' => 42.0,
-            'display' => true,
-            'style' => {
-              'border-width' => 1.0,
-              'border-color' => '#000000',
-              'border-style' => 'solid',
-              'fill-color' => '#FFFFFF'
-            }
-          }]
+          'items' => []
         },
         'page-footer' => {
           'height' => 300.1,
           'translate' => {
             'x' => 500.0,
-            'y' => 600.0
+            'y' => 800.1
           },
           'items' => [],
           'enabled' => true
@@ -495,13 +486,13 @@ class Thinreports::Layout::TestLegacySchema < Minitest::Test
           'height' => 400.1,
           'translate' => {
             'x' => 700.0,
-            'y' => 800.0
+            'y' => 1300.2
           },
           'items' => [],
-          'enabled' => false
+          'enabled' => true
         }
       },
-      layout_legacy_schema.list_item_schema(legacy_schema)
+      layout_legacy_schema.list_item_schema(legacy_element)
     )
   end
 
@@ -537,7 +528,7 @@ class Thinreports::Layout::TestLegacySchema < Minitest::Test
   end
 
   def test_vertical_align
-    assert_equal nil, layout_legacy_schema.vertical_align(nil)
+    assert_equal '', layout_legacy_schema.vertical_align(nil)
     assert_equal 'top', layout_legacy_schema.vertical_align('top')
     assert_equal 'middle', layout_legacy_schema.vertical_align('center')
     assert_equal 'bottom', layout_legacy_schema.vertical_align('bottom')
@@ -546,6 +537,7 @@ class Thinreports::Layout::TestLegacySchema < Minitest::Test
 
   def test_line_height
     assert_equal '', layout_legacy_schema.line_height('')
+    assert_equal '', layout_legacy_schema.line_height(nil)
     assert_equal 20.1, layout_legacy_schema.line_height('20.1')
   end
 
@@ -555,11 +547,6 @@ class Thinreports::Layout::TestLegacySchema < Minitest::Test
     assert_equal 2.5, layout_legacy_schema.letter_spacing('2.5')
   end
 
-  def test_level_symbol
-    assert_equal '', layout_legacy_schema.level_symbol(1)
-    assert_equal '-', layout_legacy_schema.level_symbol(2)
-  end
-
   def test_extract_item_schemas
     svg = <<-SVG
 <!--SHAPE{"id":"item1"}SHAPE-->
@@ -568,20 +555,20 @@ class Thinreports::Layout::TestLegacySchema < Minitest::Test
 SVG
     assert_equal(
       { 'item1' => { 'id' => 'item1' }, 'item3' => { 'id' => 'item3' } },
-      layout_legacy_schema.extract_item_schemas(svg, 1)
+      layout_legacy_schema.extract_legacy_item_schemas(svg)
     )
   end
 
   def test_normalize_svg
-    svg = '<!---SHAPE{"id":"item1"}SHAPE---><!---LAYOUT<rect id="item2"/>LAYOUT---><!--SHAPE{"id":"item2"}SHAPE-->'
-    normalized_svg = '<rect id="item2"/><!--SHAPE{"id":"item2"}SHAPE-->'
+    svg = '<!--SHAPE{"id":"item1"}SHAPE--><!--LAYOUT<rect id="item2"/>LAYOUT--><!--SHAPE{"id":"item2"}SHAPE-->'
 
-    assert_equal normalized_svg, layout_legacy_schema.normalize_svg(svg, 2)
+    layout_legacy_schema.normalize_svg!(svg)
+    assert_equal '<rect id="item2"/>', svg
   end
 
   private
 
   def layout_legacy_schema
-    @layout_legacy_schema ||= Layout::LegacySchema.new({})
+    @layout_legacy_schema ||= Layout::LegacySchema.new({ 'svg' => '' })
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinreports
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Matsukei Co.,Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn