thinreports 0.10.0 → 0.12.0

data/lib/thinreports/core/shape/list/page.rb

@@ -74,7 +74,6 @@ module Thinreports
 
           # @param [Thinreports::Report::Page] new_parent
           # @return [Thinreports::Core::Shape::List::Page]
-          # rubocop:disable Metrics/AbcSize
           def copy(new_parent)
             if manager.auto_page_break?
               new_list = self.class.new(new_parent, internal.format,
@@ -87,12 +86,10 @@ module Thinreports
               internal.rows.each do |row|
                 new_list.internal.rows << row.copy(new_list)
               end
-              new_list.finalized!
+              new_list.internal.finalized!
             end
 
-            if internal.format.has_header?
-              new_list.internal.header = internal.header.copy(new_list)
-            end
+            new_list.internal.header = internal.header.copy(new_list) if internal.format.has_header?
             new_list
           end
 

data/lib/thinreports/core/shape/manager/internal.rb

@@ -47,7 +47,6 @@ module Thinreports
 
           # @param [String, Symbol] id
           # @return [Thinreports::Core::Shape::Base::Interface, nil]
-          # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
           def final_shape(id)
             shape = shapes[id]
 

data/lib/thinreports/core/shape/page_number.rb

@@ -4,7 +4,7 @@ module Thinreports
   module Core
     module Shape
       module PageNumber
-        TYPE_NAME = 'page-number'.freeze
+        TYPE_NAME = 'page-number'
       end
     end
   end

data/lib/thinreports/core/shape/page_number/internal.rb

@@ -19,7 +19,6 @@ module Thinreports
             states[:format] = format.to_s
           end
 
-          # rubocop:disable Metrics/AbcSize
           def build_format(page_no, page_count)
             return '' if blank_value?(read_format)
 

data/lib/thinreports/core/shape/stack_view.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Thinreports
+  module Core
+    module Shape
+      module StackView
+        TYPE_NAME = 'stack-view'.freeze
+      end
+    end
+  end
+end
+
+require_relative 'stack_view/format'
+require_relative 'stack_view/interface'
+require_relative 'stack_view/internal'
+
+require_relative 'stack_view/row_format'

data/lib/thinreports/core/shape/stack_view/format.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Thinreports
+  module Core
+    module Shape
+      module StackView
+        class Format < Basic::Format
+          attr_reader :rows
+
+          def initialize(*)
+            super
+            initialize_rows
+          end
+
+          private
+
+          def initialize_rows
+            @rows = []
+            attributes['rows'].each do |row|
+              @rows << StackView::RowFormat.new(row)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/thinreports/core/shape/stack_view/interface.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Thinreports
+  module Core
+    module Shape
+      module StackView
+        class Interface < Basic::Interface
+          private
+
+          def init_internal(parent, format)
+            StackView::Internal.new(parent, format)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/thinreports/core/shape/stack_view/internal.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Thinreports
+  module Core
+    module Shape
+      module StackView
+        class Internal < Basic::Internal
+          def initialize(parent, format)
+            super
+            @rows = []
+          end
+
+          attr_accessor :rows
+
+          def type_of?(type_name)
+            type_name == StackView::TYPE_NAME
+          end
+        end
+      end
+    end
+  end
+end

data/lib/thinreports/core/shape/stack_view/row_format.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Thinreports
+  module Core
+    module Shape
+      module StackView
+        class RowFormat < Core::Format::Base
+          config_reader :id
+          config_reader :height
+          config_checker true, :display
+          config_checker true, auto_stretch: 'auto-stretch'
+
+          attr_reader :items
+
+          def initialize(*)
+            super
+            @items = []
+            @item_with_ids = {}
+            initialize_items(attributes['items'])
+          end
+
+          def find_item(id)
+            @item_with_ids[id.to_sym]
+          end
+
+          private
+
+          def initialize_items(item_schemas)
+            item_schemas.each do |item_schema|
+              item = Core::Shape::Format(item_schema['type']).new(item_schema)
+              @items << item
+              @item_with_ids[item.id.to_sym] = item unless item.id.empty?
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/thinreports/core/shape/style/basic.rb

@@ -5,9 +5,12 @@ module Thinreports
     module Shape
       module Style
         class Basic < Style::Base
-          style_accessible :visible
+          style_accessible :visible, :offset_x, :offset_y
           attr_accessor :visible
 
+          style_accessor :offset_x, 'offset-x'
+          style_accessor :offset_y, 'offset-y'
+
           def initialize(*args)
             super
             @visible = @format.display?

data/lib/thinreports/core/shape/text.rb

@@ -4,7 +4,7 @@ module Thinreports
   module Core
     module Shape
       module Text
-        TYPE_NAME = 'text'.freeze
+        TYPE_NAME = 'text'
       end
     end
   end

data/lib/thinreports/core/shape/text_block.rb

@@ -4,7 +4,7 @@ module Thinreports
   module Core
     module Shape
       module TextBlock
-        TYPE_NAME = 'text-block'.freeze
+        TYPE_NAME = 'text-block'
       end
     end
   end

data/lib/thinreports/core/shape/text_block/formatter/number.rb

@@ -15,12 +15,8 @@ module Thinreports
               delimiter = format.format_number_delimiter
 
               if_applicable value do |val|
-                unless blank_value?(precision)
-                  val = number_with_precision(val, precision)
-                end
-                unless blank_value?(delimiter)
-                  val = number_with_delimiter(val, delimiter)
-                end
+                val = number_with_precision(val, precision) unless blank_value?(precision)
+                val = number_with_delimiter(val, delimiter) unless blank_value?(delimiter)
                 val
               end
             end
@@ -32,21 +28,37 @@ module Thinreports
 
             def normalize(value)
               if value.is_a?(String)
-                # rubocop:disable Style/RescueModifier
-                (Integer(value) rescue nil) || (Float(value) rescue nil)
+                convert_to_integer(value) || convert_to_float(value)
               else
                 value
               end
             end
 
             def number_with_delimiter(value, delimiter = ',')
-              value.to_s.gsub(/(\d)(?=(\d{3})+(?!\d))/) { "#{$1}#{delimiter}" }
+              value_int, value_float = value.to_s.split('.')
+
+              [
+                value_int.gsub(/(\d)(?=(\d{3})+(?!\d))/) { "#{$1}#{delimiter}" },
+                value_float
+              ].compact.join('.')
             end
 
             def number_with_precision(value, precision = 3)
               value = BigDecimal(value.to_s).round(precision)
               sprintf("%.#{precision}f", value)
             end
+
+            def convert_to_integer(value)
+              Integer(value)
+            rescue ArgumentError
+              nil
+            end
+
+            def convert_to_float(value)
+              Float(value)
+            rescue ArgumentError
+              nil
+            end
           end
         end
       end

data/lib/thinreports/core/shape/text_block/internal.rb

@@ -50,8 +50,6 @@ module Thinreports
           end
 
           def format_enabled?
-            return false if multiple?
-
             if states.key?(:format_enabled)
               states[:format_enabled]
             else

data/lib/thinreports/core/utils.rb

@@ -6,13 +6,16 @@ module Thinreports
       klass.extend self
     end
 
-    # rubocop:disable Style/RescueModifier
     def deep_copy(src)
       case src
       when Hash
-        src.each_with_object({}) { |(k, v), h| h[k] = v.dup rescue v }
+        src.each_with_object({}) do |(k, v), h|
+          h[k] = v.dup rescue v
+        end
       when Array
-        src.map { |a| a.dup rescue a }
+        src.map do |a|
+          a.dup rescue a
+        end
       else
         raise ArgumentError
       end

data/lib/thinreports/generate.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_relative 'section_report/generate'
+
+module Thinreports
+  class Generate
+    def call(report_params, filename: nil)
+      SectionReport::Generate.new.call(report_params, filename: filename)
+    end
+  end
+end

data/lib/thinreports/generator/pdf/document/draw_shape.rb

@@ -5,21 +5,26 @@ module Thinreports
     class PDF
       module DrawShape
         # @param [Thinreports::Core::Shape::TextBlock::Internal] shape
-        # rubocop:disable Metrics/AbcSize
-        def draw_shape_tblock(shape)
-          x, y, w, h = shape.format.attributes.values_at('x', 'y', 'width', 'height')
+        # @param [Numeric] height (nil) It will be used as rendering height if present.
+        #   Otherwise, the rendering height is the height of schema.
+        # @param [:truncate, :shrink_to_fit, :expand] overflow (nil) It will be set the overflow attribute if present.
+        def draw_shape_tblock(shape, height: nil, overflow: nil, &block)
+          x, y, w = shape.format.attributes.values_at('x', 'y', 'width')
+
+          h = height || shape.format.attributes['height']
 
           content = shape.real_value.to_s
           return if content.empty?
 
           attrs = build_text_attributes(shape.style.finalized_styles)
+          attrs[:overflow] = overflow if overflow
 
           unless shape.multiple?
             content = content.tr("\n", ' ')
             attrs[:single] = true
           end
 
-          text_box(content, x, y, w, h, attrs)
+          text_box(content, x, y, w, h, attrs, &block)
         end
 
         def draw_shape_pageno(shape, page_no, page_count)
@@ -45,6 +50,21 @@ module Thinreports
           style = shape.style.finalized_styles
 
           image_box(
+            shape.src, x, y, w, h,
+            position_x: image_position_x(style['position-x']),
+            position_y: image_position_y(style['position-y']),
+            offset_x: style['offset-x'],
+            offset_y: style['offset-y']
+          )
+        end
+
+        def shape_iblock_dimenions(shape)
+          return nil if blank_value?(shape.src)
+
+          x, y, w, h = shape.format.attributes.values_at('x', 'y', 'width', 'height')
+          style = shape.style.finalized_styles
+
+          image_dimensions(
             shape.src, x, y, w, h,
             position_x: image_position_x(style['position-x']),
             position_y: image_position_y(style['position-y'])
@@ -52,10 +72,10 @@ module Thinreports
         end
 
         # @param [Thinreports::Core::Shape::Text::Internal] shape
-        def draw_shape_text(shape)
+        def draw_shape_text(shape, dheight = 0)
           x, y, w, h = shape.format.attributes.values_at('x', 'y', 'width', 'height')
           text(
-            shape.texts.join("\n"), x, y, w, h,
+            shape.texts.join("\n"), x, y, w, h + dheight,
             build_text_attributes(shape.style.finalized_styles)
           )
         end
@@ -67,18 +87,18 @@ module Thinreports
         end
 
         # @param [Thinreports::Core::Shape::Basic::Internal] shape
-        def draw_shape_line(shape)
+        def draw_shape_line(shape, dy1 = 0, dy2 = 0)
           x1, y1, x2, y2 = shape.format.attributes.values_at('x1', 'y1', 'x2', 'y2')
-          line(x1, y1, x2, y2, build_graphic_attributes(shape.style.finalized_styles))
+          line(x1, y1 + dy1, x2, y2 + dy2, build_graphic_attributes(shape.style.finalized_styles))
         end
 
         # @param [Thinreports::Core::Shape::Basic::Internal] shape
-        def draw_shape_rect(shape)
+        def draw_shape_rect(shape, dheight = 0)
           x, y, w, h = shape.format.attributes.values_at('x', 'y', 'width', 'height')
           rect_attributes = build_graphic_attributes(shape.style.finalized_styles) do |attrs|
-            attrs[:radius] = shape.format.attributes['rx']
+            attrs[:radius] = shape.format.attributes['border-radius']
           end
-          rect(x, y, w, h, rect_attributes)
+          rect(x, y, w, h + dheight, rect_attributes)
         end
       end
     end

data/lib/thinreports/generator/pdf/document/draw_template_items.rb

@@ -5,7 +5,6 @@ module Thinreports
     class PDF
       module DrawTemplateItems
         # @param [Array<Hash>] items
-        # rubocop:disable Metrics/CyclomaticComplexity
         def draw_template_items(items)
           items.each do |item_attributes|
             next unless drawable?(item_attributes)
@@ -26,7 +25,7 @@ module Thinreports
         def draw_rect(item_attributes)
           x, y, w, h = item_attributes.values_at('x', 'y', 'width', 'height')
           graphic_attributes = build_graphic_attributes(item_attributes['style']) do |attrs|
-            attrs[:radius] = item_attributes['rx']
+            attrs[:radius] = item_attributes['border-radius']
           end
 
           rect(x, y, w, h, graphic_attributes)

data/lib/thinreports/generator/pdf/document/font.rb

@@ -7,10 +7,10 @@ module Thinreports
         FONT_STORE = Thinreports.root.join('fonts')
 
         BUILTIN_FONTS = {
-          'IPAMincho'  => { normal: FONT_STORE.join('ipam.ttf').to_s },
-          'IPAPMincho' => { normal: FONT_STORE.join('ipamp.ttf').to_s },
-          'IPAGothic'  => { normal: FONT_STORE.join('ipag.ttf').to_s },
-          'IPAPGothic' => { normal: FONT_STORE.join('ipagp.ttf').to_s }
+          'IPAMincho'  => FONT_STORE.join('ipam.ttf').to_s,
+          'IPAPMincho' => FONT_STORE.join('ipamp.ttf').to_s,
+          'IPAGothic'  => FONT_STORE.join('ipag.ttf').to_s,
+          'IPAPGothic' => FONT_STORE.join('ipagp.ttf').to_s
         }.freeze
 
         DEFAULT_FALLBACK_FONTS = %w[IPAMincho].freeze
@@ -20,10 +20,11 @@ module Thinreports
           'Times New Roman' => 'Times-Roman'
         }.freeze
 
-        # rubocop:disable Metrics/AbcSize
         def setup_fonts
           # Install built-in fonts.
-          pdf.font_families.update(BUILTIN_FONTS)
+          BUILTIN_FONTS.each do |font_name, font_path|
+            install_font(font_name, font_path)
+          end
 
           # Create aliases from the font list provided by Prawn.
           PRAWN_BUINTIN_FONT_ALIASES.each do |alias_name, name|
@@ -70,11 +71,16 @@ module Thinreports
           pdf.font_families.key?(family) ? family : default_family
         end
 
-        # @param [String] font
-        # @param [Symbol] style
+        # @param [String] font_name
+        # @param [:bold, :italic] font_style
         # @return [Boolean]
-        def font_has_style?(font, style)
-          (f = pdf.font_families[font]) && f.key?(style)
+        def font_has_style?(font_name, font_style)
+          font = pdf.font_families[font_name]
+
+          return false unless font
+          return false unless font.key?(font_style)
+
+          font[font_style] != font[:normal]
         end
       end
     end