thinreports 0.6.0.pre3 → 0.7.0

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

@@ -0,0 +1,17 @@
+# coding: utf-8
+
+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

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

@@ -0,0 +1,60 @@
+# coding: utf-8
+
+module ThinReports
+  module Core::Shape
+    
+    class Style::Graphic < Style::Basic
+      style_accessible :border_color, :border_width, :fill_color, :border, 
+                       :fill, :stroke
+      
+      # @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>]
+      def border=(width_and_color)
+        w, c = width_and_color
+        self.border_width = w
+        self.border_color = c
+      end
+    end
+    
+  end
+end

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

@@ -0,0 +1,138 @@
+# coding: utf-8
+
+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
+      
+      # @method color
+      #   @return [String]
+      # @method color=(v)
+      #   @param [String] v
+      style_accessor :color, 'fill'
+      
+      def initialize(*args)
+        super
+        @valign = default_valign
+      end
+      
+      # @override
+      def copy
+        new_style = super
+        new_style.valign = self.valign
+        new_style
+      end
+      
+      # @override
+      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]
+      def default_valign
+        @format.valign.blank? ? :top : @format.valign.to_sym
+      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)
+        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)
+      end
+    end
+    
+  end
+end

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

@@ -8,6 +8,10 @@ module ThinReports
       # 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

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

@@ -0,0 +1,16 @@
+# coding: utf-8
+
+module ThinReports
+  module Core::Shape
+    
+    module TextBlock
+      TYPE_NAME = 's-tblock'
+    end
+    
+  end
+end
+
+require 'thinreports/core/shape/text_block/format'
+require 'thinreports/core/shape/text_block/internal'
+require 'thinreports/core/shape/text_block/interface'
+require 'thinreports/core/shape/text_block/formatter'

data/lib/thinreports/core/shape/{tblock → text_block}/format.rb

@@ -4,10 +4,10 @@ module ThinReports
   module Core::Shape
     
     # @private
-    class Tblock::Format < Basic::Format
-      config_reader :value
+    class TextBlock::Format < Basic::BlockFormat
       config_reader :ref_id => %w( ref-id )
-      config_reader :box
+      config_reader :valign
+      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 ),

data/lib/thinreports/core/shape/{tblock → text_block}/formatter.rb

@@ -1,12 +1,12 @@
 # coding: utf-8
 
 module ThinReports
-  module Core::Shape::Tblock
+  module Core::Shape::TextBlock
     
     # @private
     module Formatter
-      # @param [ThinReports::Core::Shape::Tblock::Format] format
-      # @return [ThinReports::Core::Shape::Tblock::Formatter::Base]
+      # @param [ThinReports::Core::Shape::TextBlock::Format] format
+      # @return [ThinReports::Core::Shape::TextBlock::Formatter::Base]
       def self.setup(format)
         klass = if format.format_type.blank?
           Basic
@@ -26,7 +26,7 @@ module ThinReports
   end
 end
 
-require 'thinreports/core/shape/tblock/formatter/basic'
-require 'thinreports/core/shape/tblock/formatter/datetime'
-require 'thinreports/core/shape/tblock/formatter/padding'
-require 'thinreports/core/shape/tblock/formatter/number'
+require 'thinreports/core/shape/text_block/formatter/basic'
+require 'thinreports/core/shape/text_block/formatter/datetime'
+require 'thinreports/core/shape/text_block/formatter/padding'
+require 'thinreports/core/shape/text_block/formatter/number'

data/lib/thinreports/core/shape/{tblock → text_block}/formatter/basic.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 module ThinReports
-  module Core::Shape::Tblock
+  module Core::Shape::TextBlock
     
     # @private
     class Formatter::Basic

data/lib/thinreports/core/shape/{tblock → text_block}/formatter/datetime.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 module ThinReports
-  module Core::Shape::Tblock
+  module Core::Shape::TextBlock
     
     # @private
     class Formatter::Datetime < Formatter::Basic

data/lib/thinreports/core/shape/{tblock → text_block}/formatter/number.rb

@@ -3,7 +3,7 @@
 require 'bigdecimal'
 
 module ThinReports
-  module Core::Shape::Tblock
+  module Core::Shape::TextBlock
     
     # @private
     class Formatter::Number < Formatter::Basic

data/lib/thinreports/core/shape/{tblock → text_block}/formatter/padding.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 module ThinReports
-  module Core::Shape::Tblock
+  module Core::Shape::TextBlock
     
     # @private
     class Formatter::Padding < Formatter::Basic
@@ -10,18 +10,20 @@ module ThinReports
     
     ruby_18 do
       def apply_format_to(value)
-        strs    = in_utf8 { value.to_s.split(//) }
-        pad_len = format.format_padding_length
+        value = value.to_s
         
-        if pad_len > strs.size
-          pad_strs = format.format_padding_char * (pad_len - strs.size)
+        char_length = value.unpack('U*').length
+        pad_length  = format.format_padding_length
+        
+        if pad_length > char_length
+          pad_strs = format.format_padding_char * (pad_length - char_length)
           if format.format_padding_rdir?
-            strs.to_s + pad_strs
+            value + pad_strs
           else
-            pad_strs + strs.to_s
+            pad_strs + value
           end
         else
-          value.to_s
+          value
         end
       end
     end

data/lib/thinreports/core/shape/{tblock → text_block}/interface.rb

@@ -3,7 +3,7 @@
 module ThinReports
   module Core::Shape
     
-    class Tblock::Interface < Basic::Interface
+    class TextBlock::Interface < Basic::BlockInterface
       internal_delegators :format_enabled?
       
       # @param [Boolean] enabled
@@ -13,25 +13,6 @@ module ThinReports
         self
       end
       
-      # @overload value(val)
-      #   Set a val
-      #   @param [Object] val
-      #   @return [self]
-      # @overload value
-      #   Return the value
-      #   @return [Object]
-      def value(*args)
-        case args.size
-        when 0
-          internal.read_value
-        when 1
-          internal.write_value(args.first)
-          self
-        else
-          raise ArgumentError, '#value can take 0 or 1 argument.'
-        end
-      end
-      
       # @param [Object] val
       # @param [Hash<Symbol, Object>] style_settings
       # @return [self]
@@ -44,7 +25,7 @@ module ThinReports
       
       # @see ThinReports::Core::Shape::Base::Interface#init_internal
       def init_internal(parent, format)
-        Tblock::Internal.new(parent, format)
+        TextBlock::Internal.new(parent, format)
       end
     end
     

data/lib/thinreports/core/shape/{tblock → text_block}/internal.rb

@@ -4,14 +4,21 @@ module ThinReports
   module Core::Shape
     
     # @private
-    class Tblock::Internal < Basic::Internal
-      format_delegators :multiple?, :box
+    class TextBlock::Internal < Basic::BlockInternal
+      format_delegators :multiple?
       
       def initialize(*args)
         super(*args)
         
         @reference = nil
         @formatter = nil
+        
+        @style = Style::Text.new(format)
+        @style.accessible_styles.delete(:valign) unless multiple?
+      end
+      
+      def style
+        @style
       end
       
       def read_value
@@ -19,17 +26,16 @@ module ThinReports
           @reference ||= parent.item(format.ref_id)
           @reference.value
         else
-          states.key?(:value) ? states[:value] : format.value
+          super
         end
       end
-      alias_method :value, :read_value
       
       def write_value(val)
         if format.has_reference?
-          warn 'The set value is not reflected, ' +
+          warn 'The set value was not saved, ' +
                "Because '#{format.id}' refers to '#{format.ref_id}'."
         else
-          states[:value] = val
+          super
         end
       end
       
@@ -37,7 +43,7 @@ module ThinReports
         if format_enabled?
           formatter.apply(read_value)
         else
-          read_value
+          super
         end
       end
       
@@ -51,18 +57,18 @@ module ThinReports
         if states.key?(:format_enabled)
           states[:format_enabled]
         else
-          format.has_format?
+          !format.format_base.blank? || format.has_format?
         end
       end
       
       def type_of?(type_name)
-        type_name == :tblock
+        type_name == :tblock || super
       end
       
     private
       
       def formatter
-        @formatter ||= Tblock::Formatter.setup(format)
+        @formatter ||= TextBlock::Formatter.setup(format)
       end
     end