thinreports 0.7.7 → 0.8.0

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/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_block.rb

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

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

@@ -1,27 +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 :word_wrap => %w( word-wrap )
+      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|
@@ -29,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.rb

@@ -1,14 +1,13 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape::TextBlock
-    
-    # @private
+
     module Formatter
-      # @param [ThinReports::Core::Shape::TextBlock::Format] format
-      # @return [ThinReports::Core::Shape::TextBlock::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?
+        klass = if Thinreports.blank_value?(format.format_type)
           Basic
         else
           case format.format_type
@@ -16,13 +15,13 @@ module ThinReports
           when 'datetime' then Datetime
           when 'padding'  then Padding
           else
-            raise ThinReports::Errors::UnknownFormatterType
+            raise Thinreports::Errors::UnknownFormatterType
           end
         end
         klass.new(format)
       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

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

@@ -2,23 +2,22 @@
 
 require 'bigdecimal'
 
-module ThinReports
+module Thinreports
   module Core::Shape::TextBlock
-    
-    # @private
+
     class Formatter::Number < Formatter::Basic
-      
+
     private
-      
+
       def apply_format_to(value)
         precision = format.format_number_precision
         delimiter = format.format_number_delimiter
-        
+
         if_applicable value do |val|
-          unless precision.blank?
+          unless blank_value?(precision)
             val = number_with_precision(val, precision)
           end
-          unless delimiter.blank?
+          unless blank_value?(delimiter)
             val = number_with_delimiter(val, delimiter)
           end
           val
@@ -34,16 +33,16 @@ module ThinReports
         end
         val.nil? ? value : block.call(val)
       end
-      
+
       def number_with_delimiter(value, delimiter = ',')
         value.to_s.gsub(/(\d)(?=(\d{3})+(?!\d))/){ "#{$1}#{delimiter}" }
       end
-      
+
       def number_with_precision(value, precision = 3)
         value = BigDecimal(value.to_s).round(precision)
         sprintf("%.#{precision}f", value)
       end
     end
-    
+
   end
-end
+end

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

@@ -1,45 +1,22 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape::TextBlock
-    
-    # @private
+
     class Formatter::Padding < Formatter::Basic
-      
-    private
-    
-    ruby_18 do
-      def apply_format_to(value)
-        value = value.to_s
-        
-        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?
-            value + pad_strs
-          else
-            pad_strs + value
-          end
-        else
-          value
-        end
-      end
-    end
-    
-    ruby_19 do
+
+      private
+
       def apply_format_to(value)
         value.to_s.send(format.format_padding_rdir? ? :ljust : :rjust,
                         format.format_padding_length,
                         format.format_padding_char)
       end
-    end
-    
+
       def applicable?(value)
-        !format.format_padding_char.blank? && format.format_padding_length > 0
+        !blank_value?(format.format_padding_char) && format.format_padding_length > 0
       end
     end
-    
+
   end
-end
+end

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

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape
     
     class TextBlock::Interface < Basic::BlockInterface
@@ -23,7 +23,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)
         TextBlock::Internal.new(parent, format)
       end

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

@@ -1,26 +1,25 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape
-    
-    # @private
+
     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
         if format.has_reference?
           @reference ||= parent.item(format.ref_id)
@@ -29,16 +28,16 @@ module ThinReports
           super
         end
       end
-      
+
       def write_value(val)
         if format.has_reference?
           warn 'The set value was not saved, ' +
-               "Because '#{format.id}' refers to '#{format.ref_id}'."
+               "Because '#{format.id}' has reference to '#{format.ref_id}'."
         else
           super
         end
       end
-      
+
       def real_value
         if format_enabled?
           formatter.apply(read_value)
@@ -46,31 +45,31 @@ module ThinReports
           super
         end
       end
-      
+
       def format_enabled(enabled)
         states[:format_enabled] = enabled
       end
-      
+
       def format_enabled?
         return false if multiple?
-        
+
         if states.key?(:format_enabled)
           states[:format_enabled]
         else
-          !format.format_base.blank? || format.has_format?
+          !blank_value?(format.format_base) || format.has_format?
         end
       end
-      
+
       def type_of?(type_name)
         type_name == :tblock || super
       end
-      
+
     private
-      
+
       def formatter
         @formatter ||= TextBlock::Formatter.setup(format)
       end
     end
-    
+
   end
-end
+end