thinreports 0.8.2 → 0.9.0

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

@@ -5,9 +5,7 @@ module Thinreports
 
     class List::SectionInternal < Base::Internal
       format_delegators :height,
-                        :relative_left,
-                        :relative_top,
-                        :svg_tag
+                        :relative_left
 
       # @return [Symbol]
       attr_accessor :section_name
@@ -21,10 +19,9 @@ module Thinreports
         states[:relative_top] = ry
       end
 
-      # @return [Array<Numeric>]
-      def relative_position
-        [relative_left,
-         relative_top + (states[:relative_top] || 0)]
+      # @return [Float]
+      def relative_top
+        states[:relative_top] || 0
       end
     end
 

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

@@ -7,8 +7,6 @@ module Thinreports
       # @return [Symbol, Integer]
       attr_reader :identifier
 
-      config_reader layout: %w( svg )
-
       def initialize(config, id = nil, &block)
         super(config, &block)
         @identifier = id || self.object_id

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

@@ -57,7 +57,7 @@ module Thinreports
             shape
           end
         # When shape was not found in registry.
-      elsif format.has_shape?(id)
+        elsif format.has_shape?(id)
           shape_format = find_format(id)
           return nil unless shape_format.display?
 

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

@@ -4,7 +4,7 @@ module Thinreports
   module Core::Shape
 
     module PageNumber
-      TYPE_NAME = 's-pageno'
+      TYPE_NAME = 'page-number'
     end
 
   end

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

@@ -4,15 +4,18 @@ module Thinreports
   module Core::Shape
 
     class PageNumber::Format < Basic::Format
-      config_reader :overflow, :target, :box
+      config_reader :target
       config_reader default_format: %w( format )
 
+      # For saving compatible 0.8.x format API
+      config_reader overflow: %w( style overflow )
+
       def id
-        unless @id
-          @id = read('id')
-          @id = self.class.next_default_id if blank_value?(@id)
-        end
-        @id
+        @id ||= blank_value?(read('id')) ? self.class.next_default_id : read('id')
+      end
+
+      def for_report?
+        blank_value?(target)
       end
 
       def self.next_default_id

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

@@ -16,7 +16,7 @@ module Thinreports
       end
 
     private
-    
+
       # @see Thinreports::Core::Shape::Base::Interface#init_internal
       def init_internal(parent, format)
         PageNumber::Internal.new(parent, format)

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

@@ -4,7 +4,7 @@ module Thinreports
   module Core::Shape
 
     class PageNumber::Internal < Basic::Internal
-      format_delegators :box
+      format_delegators :box, :for_report?
 
       def read_format
         states.key?(:format) ? states[:format] : format.default_format.dup
@@ -36,12 +36,8 @@ module Thinreports
         @style ||= PageNumber::Style.new(format)
       end
 
-      def for_report?
-        blank_value?(format.target)
-      end
-
       def type_of?(type_name)
-        type_name == :pageno
+        type_name == PageNumber::TYPE_NAME
       end
 
       def start_page_number

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

@@ -54,10 +54,9 @@ module Thinreports
       def initialize(format, default_styles = {})
         @format = format
         @styles = default_styles
-        @base_styles = format.svg_attrs || {}
+        @base_styles = format.style || {}
 
         @accessible_styles = self.class.accessible_styles.dup
-        @finalized_svg_attributes = nil
       end
 
       # @param [Symbol] style_method
@@ -84,17 +83,6 @@ module Thinreports
         self.class.new(@format, @styles.empty? ? {} : deep_copy(@styles))
       end
 
-      # @return [Hash]
-      def finalized_svg_attributes
-        @finalized_svg_attributes ||=
-          if @styles.empty?
-            @base_styles.dup
-          else
-            @base_styles.merge(@styles)
-          end
-      end
-      alias_method :svg_attrs, :finalized_svg_attributes
-
       # @param [String, Symbol] style
       # @return [Object]
       def read_internal_style(style)
@@ -114,6 +102,16 @@ module Thinreports
         accessible_styles.include?(style_method)
       end
 
+      # @return [Hash]
+      def finalized_styles
+        @finalized_styles ||=
+          if @styles.empty?
+            @base_styles.dup
+          else
+            @base_styles.merge(@styles)
+          end
+      end
+
     private
 
       # @param [Hash] s

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

@@ -2,16 +2,16 @@
 
 module Thinreports
   module Core::Shape
-    
+
     class Style::Basic < Style::Base
       style_accessible :visible
       attr_accessor :visible
-      
+
       def initialize(*args)
         super
         @visible = @format.display?
       end
     end
-    
+
   end
-end
+end

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

@@ -10,23 +10,17 @@ module Thinreports
       #   @return [String]
       # @method border_color=(color)
       #   @param [String] color
-      style_accessor :border_color, 'stroke'
+      style_accessor :border_color, 'border-color'
 
       # @method border_width
-      #   @return [String, Number]
-      style_reader :border_width, 'stroke-width'
+      #   @return [Number]
+      style_accessor :border_width, 'border-width'
 
       # @method fill_color
       #   @return [String]
       # @method fill_color=(color)
       #   @param [String] color
-      style_accessor :fill_color, 'fill'
-
-      # @param [String, Number] width
-      def border_width=(width)
-        write_internal_style('stroke-opacity', '1') unless width.to_i.zero?
-        write_internal_style('stroke-width', width)
-      end
+      style_accessor :fill_color, 'fill-color'
 
       # @return [Array<String, Number>]
       def border

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

@@ -4,10 +4,6 @@ module Thinreports
   module Core::Shape
 
     class Style::Text < Style::Basic
-      TEXT_ALIGN_NAMES = {left: 'start',
-                          center: 'middle',
-                          right: 'end'}
-
       style_accessible :bold, :italic, :underline, :linethrough,
                        :align, :valign, :color, :font_size
 
@@ -15,7 +11,7 @@ module Thinreports
       #   @return [String]
       # @method color=(v)
       #   @param [String] v
-      style_accessor :color, 'fill'
+      style_accessor :color, 'color'
 
       # @method font_size
       #   @return [Numeric, String]
@@ -23,123 +19,94 @@ module Thinreports
       #   @param [Numeric, String]
       style_accessor :font_size, 'font-size'
 
-      def initialize(*args)
+      def initialize(*)
         super
-        @valign = default_valign
-      end
-
-      def copy
-        new_style = super
-        new_style.valign = self.valign
-        new_style
-      end
-
-      def identifier
-        super + (@valign == default_valign ? '' : @valign.to_s)
+        initialize_font_style
       end
 
       # @return [Boolean]
       def bold
-        read_internal_style('font-weight') == 'bold'
+        read_internal_style('font-style').include?('bold')
       end
 
       # @param [Boolean] enable
       def bold=(enable)
-        write_internal_style('font-weight', enable ? 'bold' : 'normal')
+        write_font_style('bold', enable)
       end
 
       # @return [Boolean]
       def italic
-        read_internal_style('font-style') == 'italic'
+        read_internal_style('font-style').include?('italic')
       end
 
       # @param [Boolean] enable
       def italic=(enable)
-        write_internal_style('font-style', enable ? 'italic' : 'normal')
+        write_font_style('italic', enable)
       end
 
       # @return [Boolean]
       def underline
-        read_internal_style('text-decoration').include?('underline')
+        read_internal_style('font-style').include?('underline')
       end
 
       # @param [Boolean] enable
       def underline=(enable)
-        text_decoration(enable, linethrough)
+        write_font_style('underline', enable)
       end
 
       # @return [Boolean]
       def linethrough
-        read_internal_style('text-decoration').include?('line-through')
+        read_internal_style('font-style').include?('linethrough')
       end
 
       # @param [Boolean] enable
       def linethrough=(enable)
-        text_decoration(underline, enable)
+        write_font_style('linethrough', enable)
       end
 
-      # @return [Symbol]
+      # @return [:left, :center, :right]
       def align
-        interface_text_align(read_internal_style('text-anchor'))
+        read_internal_style('text-align').to_sym
       end
 
       # @param [:left, :center, :right] align_name
       def align=(align_name)
-        verify_style_value(align_name, TEXT_ALIGN_NAMES.keys,
+        verify_style_value(align_name, [:left, :center, :right],
                            'Only :left or :center, :right can be specified as align.')
-        write_internal_style('text-anchor', internal_text_align(align_name))
+        write_internal_style('text-align', align_name.to_s)
       end
 
-      # @return [Symbol]
+      # @return [:top, :middle, :bottom]
       def valign
-        @valign
+        vertical_align = read_internal_style('vertical-align')
+        blank_value?(vertical_align) ? :top : vertical_align.to_sym
       end
 
-      # @param [:top, :center, :bottom] valign_name
+      # @param [:top, :center, :middle, :bottom] valign_name
       def valign=(valign_name)
-        verify_style_value(valign_name, [:top, :center, :bottom],
-                           'Only :top or :center, :bottom can be specified as valign.')
-        @valign = valign_name
-      end
-
-    private
-
-      # @return [Symbol, nil]
-      def default_valign
-        if accessible_styles.include?(:valign)
-          blank_value?(@format.valign) ? :top : @format.valign.to_sym
-        else
-          :top
+        if valign_name == :center
+          warn '[DEPRECATION] :center value for valign style is deprecated and will be removed in thinreports-generator 1.0.' \
+               ' Please use :middle instead of :center.'
+          valign_name = :middle
         end
-      end
 
-      # @param [Symbol] align The interface align name.
-      # @return [String, nil]
-      def internal_text_align(align)
-        TEXT_ALIGN_NAMES[align]
+        verify_style_value(valign_name, [:top, :middle, :bottom],
+                           'Only :top or :middle (:center), :bottom can be specified as valign.')
+        write_internal_style('vertical-align', valign_name.to_s)
       end
 
-      # @param [String] align The internal align name.
-      # @return [Symbol]
-      def interface_text_align(align)
-        TEXT_ALIGN_NAMES.invert[align] || :left
+      private
+
+      def initialize_font_style
+        styles['font-style'] ||= (@base_styles['font-style'] || []).dup
       end
 
-      # @param [Boolean] u
-      # @param [Boolean] s
-      def text_decoration(u, s)
-        deco =
-          case
-          when u && s
-            'underline line-through'
-          when u && !s
-            'underline'
-          when !u && s
-            'line-through'
-          else
-            'none'
-          end
-        write_internal_style('text-decoration', deco)
+      def write_font_style(style_name, enable)
+        if enable
+          styles['font-style'].push(style_name).uniq!
+        else
+          styles['font-style'].delete(style_name)
+        end
       end
     end
 

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

@@ -2,11 +2,11 @@
 
 module Thinreports
   module Core::Shape
-    
+
     module Text
-      TYPE_NAME = 's-text'
+      TYPE_NAME = 'text'
     end
-    
+
   end
 end
 

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

@@ -4,20 +4,10 @@ module Thinreports
   module Core::Shape
 
     class Text::Format < Basic::Format
-      config_reader :text, :box, :valign
-      config_reader svg_content: %w( svg content ),
-                    line_height: %w( line-height )
 
-      class << self
-      private
-
-        # @see Thinreports::Core::Shape::Basic::Format#build_internal
-        def build_internal(raw_format)
-          new(raw_format) do |f|
-            clean_with_attributes(f.svg_content)
-          end
-        end
-      end
+      config_reader :texts
+      config_reader valign: %w( style vertical-align )
+      config_reader line_height: %w( style line-height )
     end
 
   end

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

@@ -5,14 +5,14 @@ module Thinreports
 
     class Text::Internal < Basic::Internal
       # Delegate to Format's methods
-      format_delegators :svg_content, :text, :box
+      format_delegators :texts, :box
 
       def style
         @style ||= Style::Text.new(format)
       end
 
       def type_of?(type_name)
-        type_name == :text
+        type_name == Text::TYPE_NAME
       end
     end