thinreports 0.7.6 → 0.8.0

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

@@ -1,10 +1,11 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape
-    
-    # @private
+
     class Style::Base
+      include Utils
+
       class << self
         # @param [Symbol] style_method
         # @param [String] style
@@ -13,77 +14,76 @@ module ThinReports
           style_reader(style_method, style)
           style_writer(style_method, style)
         end
-        
+
         # @see .style_accessor
         def style_reader(style_method, style)
           define_method(style_method) do
             read_internal_style(style)
           end
         end
-        
+
         # @see .style_accessor
         def style_writer(style_method, style)
           define_method(:"#{style_method}=") do |value|
             write_internal_style(style, value)
           end
         end
-        
+
         # @param [Array<Symbol>] style_methods
         def style_accessible(*style_methods)
           accessible_styles.concat(style_methods)
         end
-        
+
         # @return [Array<Symbol>]
         def accessible_styles
           @accessible_styles ||= []
         end
-        
-        # @private
+
         def inherited(s)
           s.accessible_styles.concat(accessible_styles.dup)
         end
       end
-      
+
       # @return [Hash]
       attr_accessor :styles
       # @see .accessible_styles
       attr_reader :accessible_styles
-      
-      # @param [ThinReports::Core::Format::Base] format
+
+      # @param [Thinreports::Core::Format::Base] format
       # @param [Hash] default_styles ({})
       def initialize(format, default_styles = {})
         @format = format
         @styles = default_styles
         @base_styles = format.svg_attrs || {}
-        
+
         @accessible_styles = self.class.accessible_styles.dup
         @finalized_svg_attributes = nil
       end
-      
+
       # @param [Symbol] style_method
       # @return [Object]
       def [](style_method)
         verify_style_method(style_method)
         send(style_method.to_sym)
       end
-      
+
       # @param [Symbol] style_method
       # @param [String, Number, Array<String, Number>] value
       def []=(style_method, value)
         verify_style_method(style_method)
         send(:"#{style_method}=", value)
       end
-      
+
       # @return [String]
       def identifier
         create_identifier(@styles)
       end
-      
+
       # @return [self]
       def copy
-        self.class.new(@format, @styles.empty? ? {} : @styles.simple_deep_copy)
+        self.class.new(@format, @styles.empty? ? {} : deep_copy(@styles))
       end
-      
+
       # @return [Hash]
       def finalized_svg_attributes
         if @finalized_svg_attributes.nil?
@@ -96,44 +96,44 @@ module ThinReports
         @finalized_svg_attributes
       end
       alias_method :svg_attrs, :finalized_svg_attributes
-    
+
       # @param [String, Symbol] style
       # @return [Object]
       def read_internal_style(style)
         style = style.to_s
         @styles.key?(style) ? @styles[style] : @base_styles[style]
       end
-      
+
       # @param [String, Symbol] style
       # @param [Object] value
       def write_internal_style(style, value)
         @styles[style.to_s] = value
       end
-      
+
       # @param [Symbol] style_method
       # @return [Boolean]
       def has_style?(style_method)
         accessible_styles.include?(style_method)
       end
-      
+
     private
-      
+
       # @param [Hash] s
       # @return [String]
       def create_identifier(s)
         s.empty? ? '' : s.hash.to_s
       end
-      
+
       # @param [Symbol] style_method
       # @return [Boolean]
-      # @raise ThinReports::Errors::UnknownShapeStyleName
+      # @raise Thinreports::Errors::UnknownShapeStyleName
       def verify_style_method(style_method)
         unless has_style?(style_method)
-          raise ThinReports::Errors::UnknownShapeStyleName.new(style_method,
+          raise Thinreports::Errors::UnknownShapeStyleName.new(style_method,
                                                                accessible_styles)
         end
       end
-      
+
       # @param [Object] value
       # @param [Array<Object>] allows
       # @param [String] msg (nil)
@@ -144,6 +144,6 @@ module ThinReports
         end
       end
     end
-    
+
   end
 end

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

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape
     
     class Style::Basic < Style::Base

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

@@ -1,53 +1,38 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape
-    
+
     class Style::Graphic < Style::Basic
-      style_accessible :border_color, :border_width, :fill_color, :border, 
-                       :fill, :stroke
-      
+      style_accessible :border_color, :border_width, :fill_color, :border
+
       # @method border_color
       #   @return [String]
       # @method border_color=(color)
       #   @param [String] color
       style_accessor :border_color, 'stroke'
-      
+
       # @method border_width
       #   @return [String, Number]
       style_reader :border_width, 'stroke-width'
-      
+
       # @method fill_color
       #   @return [String]
       # @method fill_color=(color)
       #   @param [String] color
       style_accessor :fill_color, 'fill'
-      
-      # @method fill
-      #   @return [String]
-      # @method fill=(color)
-      #   @param [String] color
-      # @deprecated Please use the #fill_color method instead.
-      style_accessor :fill, 'fill'
-      
-      # @method stroke
-      #   @return [String, Number]
-      # @method stroke=(width)
-      #   @param [String, Number] width
-      # @deprecated Please use the #stroke_width method instead.
-      style_accessor :stroke, 'stroke-width'
-      
+
       # @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
-      
+
       # @return [Array<String, Number>]
       def border
         [self.border_width, self.border_color]
       end
-      
+
       # @param [Array<String, Number>] width_and_color
       def border=(width_and_color)
         w, c = width_and_color
@@ -55,6 +40,6 @@ module ThinReports
         self.border_color = c
       end
     end
-    
+
   end
 end

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

@@ -1,120 +1,130 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape
-    
+
     class Style::Text < Style::Basic
-      TEXT_ALIGN_NAMES = {:left   => 'start',
-                          :center => 'middle',
-                          :right  => 'end'}
-      
+      TEXT_ALIGN_NAMES = {left: 'start',
+                          center: 'middle',
+                          right: 'end'}
+
       style_accessible :bold, :italic, :underline, :linethrough,
-                       :align, :valign, :color
-      
+                       :align, :valign, :color, :font_size
+
       # @method color
       #   @return [String]
       # @method color=(v)
       #   @param [String] v
       style_accessor :color, 'fill'
-      
+
+      # @method font_size
+      #   @return [Numeric, String]
+      # @method font_size=(v)
+      #   @param [Numeric, String]
+      style_accessor :font_size, 'font-size'
+
       def initialize(*args)
         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)
       end
-      
+
       # @return [Boolean]
       def bold
         read_internal_style('font-weight') == 'bold'
       end
-      
+
       # @param [Boolean] enable
       def bold=(enable)
         write_internal_style('font-weight', enable ? 'bold' : 'normal')
       end
-      
+
       # @return [Boolean]
       def italic
         read_internal_style('font-style') == 'italic'
       end
-      
+
       # @param [Boolean] enable
       def italic=(enable)
         write_internal_style('font-style', enable ? 'italic' : 'normal')
       end
-      
+
       # @return [Boolean]
       def underline
         read_internal_style('text-decoration').include?('underline')
       end
-      
+
       # @param [Boolean] enable
       def underline=(enable)
         text_decoration(enable, linethrough)
       end
-      
+
       # @return [Boolean]
       def linethrough
         read_internal_style('text-decoration').include?('line-through')
       end
-      
+
       # @param [Boolean] enable
       def linethrough=(enable)
         text_decoration(underline, enable)
       end
-      
+
       # @return [Symbol]
       def align
         interface_text_align(read_internal_style('text-anchor'))
       end
-      
+
       # @param [:left, :center, :right] align_name
       def align=(align_name)
         verify_style_value(align_name, TEXT_ALIGN_NAMES.keys,
                            'Only :left or :center, :right can be specified as align.')
         write_internal_style('text-anchor', internal_text_align(align_name))
       end
-      
+
       # @return [Symbol]
       def valign
         @valign
       end
-      
+
       # @param [:top, :center, :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]
+
+      # @return [Symbol, nil]
       def default_valign
-        @format.valign.blank? ? :top : @format.valign.to_sym
+        if accessible_styles.include?(:valign)
+          blank_value?(@format.valign) ? :top : @format.valign.to_sym
+        else
+          :top
+        end
       end
-      
+
       # @param [Symbol] align The interface align name.
       # @return [String, nil]
       def internal_text_align(align)
         TEXT_ALIGN_NAMES[align]
       end
-      
+
       # @param [String] align The internal align name.
       # @return [Symbol]
       def interface_text_align(align)
         TEXT_ALIGN_NAMES.invert[align] || :left
       end
-      
+
       # @param [Boolean] u
       # @param [Boolean] s
       def text_decoration(u, s)
@@ -131,6 +141,6 @@ module ThinReports
         write_internal_style('text-decoration', deco)
       end
     end
-    
+
   end
 end

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

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape
     
     module Style

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

@@ -1,18 +1,17 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape
-    
-    # @private
+
     class Text::Format < Basic::Format
       config_reader :text, :box, :valign
-      config_reader :svg_content => %w( svg content ),
-                    :line_height => %w( line-height )
-                    
+      config_reader svg_content: %w( svg content ),
+                    line_height: %w( line-height )
+
       class << self
       private
-        
-        # @see ThinReports::Core::Shape::Basic::Format#build_internal
+
+        # @see Thinreports::Core::Shape::Basic::Format#build_internal
         def build_internal(raw_format)
           new(raw_format) do |f|
             clean_with_attributes(f.svg_content)
@@ -20,6 +19,6 @@ module ThinReports
         end
       end
     end
-    
+
   end
 end

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

@@ -1,12 +1,12 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape
     
     class Text::Interface < Basic::Interface
     private
     
-      # @see ThinReports::Core::Shape::Base::Interface#init_internal
+      # @see Thinreports::Core::Shape::Base::Interface#init_internal
       def init_internal(parent, format)
         Text::Internal.new(parent, format)
       end

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

@@ -1,21 +1,20 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape
-    
-    # @private
+
     class Text::Internal < Basic::Internal
       # Delegate to Format's methods
       format_delegators :svg_content, :text, :box
-      
+
       def style
         @style ||= Style::Text.new(format)
       end
-      
+
       def type_of?(type_name)
         type_name == :text
       end
     end
-    
+
   end
-end
+end

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

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape
     
     module Text

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

@@ -1,26 +1,26 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape
-    
-    # @private
+
     class TextBlock::Format < Basic::BlockFormat
-      config_reader :ref_id => %w( ref-id )
+      config_reader ref_id: %w( ref-id )
       config_reader :valign, :overflow
-      config_reader :line_height => %w( line-height )      
-      config_reader :format_base             => %w( format base ),
-                    :format_type             => %w( format type ),
-                    :format_datetime_format  => %w( format datetime format ),
-                    :format_number_delimiter => %w( format number delimiter ),
-                    :format_number_precision => %w( format number precision ),
-                    :format_padding_char     => %w( format padding char ),
-                    :format_padding_dir      => %w( format padding direction )
+      config_reader line_height: %w( line-height )
+      config_reader format_base: %w( format base ),
+                    format_type: %w( format type ),
+                    format_datetime_format: %w( format datetime format ),
+                    format_number_delimiter: %w( format number delimiter ),
+                    format_number_precision: %w( format number precision ),
+                    format_padding_char: %w( format padding char ),
+                    format_padding_dir: %w( format padding direction )
+      config_reader word_wrap: %w( word-wrap )
 
       config_checker 'true', :multiple
-      config_checker 'R', :format_padding_rdir => %w( format padding direction )
+      config_checker 'R', format_padding_rdir: %w( format padding direction )
 
-      config_reader :format_padding_length => %w( format padding length ) do |len|
-        len.blank? ? 0 : len.to_i
+      config_reader format_padding_length: %w( format padding length ) do |len|
+        blank_value?(len) ? 0 : len.to_i
       end
 
       config_reader :has_format? => %w( format type ) do |type|
@@ -28,9 +28,9 @@ module ThinReports
       end
 
       config_reader :has_reference? => %w( ref-id ) do |ref_id|
-        !ref_id.blank?
+        !blank_value?(ref_id)
       end
     end
-    
+
   end
 end

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

@@ -1,38 +1,39 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape::TextBlock
-    
-    # @private
+
     class Formatter::Basic
+      include Utils
+
       attr_reader :format
-      
+
       def initialize(format)
         @format = format
       end
-      
+
       def apply(value)
         if applicable?(value)
           value = apply_format_to(value)
         end
-        
-        unless format.format_base.blank?
+
+        unless blank_value?(format.format_base)
           format.format_base.gsub(/\{value\}/, value.to_s)
         else
           value
         end
       end
-    
+
     private
-      
+
       def apply_format_to(value)
         value
       end
-      
+
       def applicable?(value)
         true
       end
     end
-    
+
   end
-end
+end

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

@@ -1,21 +1,20 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape::TextBlock
-    
-    # @private
+
     class Formatter::Datetime < Formatter::Basic
-      
+
     private
-      
+
       def apply_format_to(value)
         value.strftime(format.format_datetime_format)
       end
-      
+
       def applicable?(value)
-        !format.format_datetime_format.blank? && value.respond_to?(:strftime)
+        !blank_value?(format.format_datetime_format) && value.respond_to?(:strftime)
       end
     end
-    
+
   end
-end
+end