thinreports 0.7.7 → 0.8.0

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

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

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

@@ -1,16 +1,16 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape
 
     class PageNumber::Format < Basic::Format
       config_reader :overflow, :target, :box
-      config_reader :default_format => %w( format )
+      config_reader default_format: %w( format )
 
       def id
         unless @id
           @id = read('id')
-          @id = self.class.next_default_id if @id.blank?
+          @id = self.class.next_default_id if blank_value?(@id)
         end
         @id
       end

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

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

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

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape
 
     class PageNumber::Internal < Basic::Internal
@@ -19,7 +19,7 @@ module ThinReports
       end
 
       def build_format(page_no, page_count)
-        return '' if read_format.blank?
+        return '' if blank_value?(read_format)
 
         if start_page_number > 1
           page_no += start_page_number - 1
@@ -37,7 +37,7 @@ module ThinReports
       end
 
       def for_report?
-        format.target.blank?
+        blank_value?(format.target)
       end
 
       def type_of?(type_name)

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/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,124 +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, nil]
       def default_valign
         if accessible_styles.include?(:valign)
-          @format.valign.blank? ? :top : @format.valign.to_sym
+          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)
@@ -135,6 +141,6 @@ module ThinReports
         write_internal_style('text-decoration', deco)
       end
     end
-    
+
   end
 end