thinreports 0.9.1 → 0.11.0

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

@@ -1,15 +1,15 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 module Thinreports
-  module Core::Shape
-
-    module Text
-      TYPE_NAME = 'text'
+  module Core
+    module Shape
+      module Text
+        TYPE_NAME = 'text'
+      end
     end
-
   end
 end
 
-require 'thinreports/core/shape/text/format'
-require 'thinreports/core/shape/text/internal'
-require 'thinreports/core/shape/text/interface'
+require_relative 'text/format'
+require_relative 'text/internal'
+require_relative 'text/interface'

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

@@ -1,14 +1,15 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 module Thinreports
-  module Core::Shape
-
-    class Text::Format < Basic::Format
-
-      config_reader :texts
-      config_reader valign: %w( style vertical-align )
-      config_reader line_height: %w( style line-height )
+  module Core
+    module Shape
+      module Text
+        class Format < Basic::Format
+          config_reader :texts
+          config_reader valign: %w[style vertical-align]
+          config_reader line_height: %w[style line-height]
+        end
+      end
     end
-
   end
 end

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

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

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

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

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

@@ -1,16 +1,16 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 module Thinreports
-  module Core::Shape
-
-    module TextBlock
-      TYPE_NAME = 'text-block'
+  module Core
+    module Shape
+      module TextBlock
+        TYPE_NAME = 'text-block'
+      end
     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'
+require_relative 'text_block/format'
+require_relative 'text_block/internal'
+require_relative 'text_block/interface'
+require_relative 'text_block/formatter'

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

@@ -1,39 +1,41 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 module Thinreports
-  module Core::Shape
-
-    class TextBlock::Format < Basic::BlockFormat
-      # For saving compatible 0.8.x format API
-      config_reader ref_id: %w( reference-id )
-      config_reader valign: %w( style vertical-align )
-      config_reader overflow: %w( style overflow )
-      config_reader line_height: %w( style 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_checker true, multiple: %w( multiple-line )
-      config_checker 'R', format_padding_rdir: %w( format padding direction )
-
-      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|
-        %w( datetime number padding ).include?(type)
-      end
-
-      # For saving compatible 0.8.x format API
-      def has_reference?
-        !blank_value?(ref_id)
+  module Core
+    module Shape
+      module TextBlock
+        class Format < Basic::BlockFormat
+          # For saving compatible 0.8.x format API
+          config_reader ref_id: %w[reference-id]
+          config_reader valign: %w[style vertical-align]
+          config_reader overflow: %w[style overflow]
+          config_reader line_height: %w[style 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_checker true, multiple: %w[multiple-line]
+          config_checker 'R', format_padding_rdir: %w[format padding direction]
+
+          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|
+            %w[datetime number padding].include?(type)
+          end
+
+          # For saving compatible 0.8.x format API
+          def has_reference?
+            !blank_value?(ref_id)
+          end
+        end
       end
     end
-
   end
 end

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

@@ -1,32 +1,34 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 module Thinreports
-  module Core::Shape::TextBlock
-
-    module Formatter
-      # @param [Thinreports::Core::Shape::TextBlock::Format] format
-      # @return [Thinreports::Core::Shape::TextBlock::Formatter::Base]
-      def self.setup(format)
-        klass =
-          if Thinreports.blank_value?(format.format_type)
-            Basic
-          else
-            case format.format_type
-            when 'number'   then Number
-            when 'datetime' then Datetime
-            when 'padding'  then Padding
-            else
-              raise Thinreports::Errors::UnknownFormatterType
-            end
+  module Core
+    module Shape
+      module TextBlock
+        module Formatter
+          # @param [Thinreports::Core::Shape::TextBlock::Format] format
+          # @return [Thinreports::Core::Shape::TextBlock::Formatter::Base]
+          def self.setup(format)
+            klass =
+              if Thinreports.blank_value?(format.format_type)
+                Basic
+              else
+                case format.format_type
+                when 'number'   then Number
+                when 'datetime' then Datetime
+                when 'padding'  then Padding
+                else
+                  raise Thinreports::Errors::UnknownFormatterType
+                end
+              end
+            klass.new(format)
           end
-        klass.new(format)
+        end
       end
     end
-
   end
 end
 
-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'
+require_relative 'formatter/basic'
+require_relative 'formatter/datetime'
+require_relative 'formatter/padding'
+require_relative 'formatter/number'

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

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

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

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

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

@@ -1,49 +1,67 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'bigdecimal'
 
 module Thinreports
-  module Core::Shape::TextBlock
+  module Core
+    module Shape
+      module TextBlock
+        module Formatter
+          class Number < Formatter::Basic
+            private
 
-    class Formatter::Number < Formatter::Basic
+            def apply_format_to(value)
+              precision = format.format_number_precision
+              delimiter = format.format_number_delimiter
 
-    private
+              if_applicable value do |val|
+                val = number_with_precision(val, precision) unless blank_value?(precision)
+                val = number_with_delimiter(val, delimiter) unless blank_value?(delimiter)
+                val
+              end
+            end
 
-      def apply_format_to(value)
-        precision = format.format_number_precision
-        delimiter = format.format_number_delimiter
+            def if_applicable(value, &block)
+              normalized_value = normalize(value)
+              normalized_value.nil? ? value : block.call(normalized_value)
+            end
 
-        if_applicable value do |val|
-          unless blank_value?(precision)
-            val = number_with_precision(val, precision)
-          end
-          unless blank_value?(delimiter)
-            val = number_with_delimiter(val, delimiter)
-          end
-          val
-        end
-      end
+            def normalize(value)
+              if value.is_a?(String)
+                convert_to_integer(value) || convert_to_float(value)
+              else
+                value
+              end
+            end
 
-      def if_applicable(value, &block)
-        val =
-          case value
-            when Numeric then value
-            when String
-              (Integer(value) rescue nil) || (Float(value) rescue nil)
-            else nil
-          end
-        val.nil? ? value : block.call(val)
-      end
+            def number_with_delimiter(value, delimiter = ',')
+              value_int, value_float = value.to_s.split('.')
 
-      def number_with_delimiter(value, delimiter = ',')
-        value.to_s.gsub(/(\d)(?=(\d{3})+(?!\d))/){ "#{$1}#{delimiter}" }
-      end
+              [
+                value_int.gsub(/(\d)(?=(\d{3})+(?!\d))/) { "#{$1}#{delimiter}" },
+                value_float
+              ].compact.join('.')
+            end
+
+            def number_with_precision(value, precision = 3)
+              value = BigDecimal(value.to_s).round(precision)
+              sprintf("%.#{precision}f", value)
+            end
+
+            def convert_to_integer(value)
+              Integer(value)
+            rescue ArgumentError
+              nil
+            end
 
-      def number_with_precision(value, precision = 3)
-        value = BigDecimal(value.to_s).round(precision)
-        sprintf("%.#{precision}f", value)
+            def convert_to_float(value)
+              Float(value)
+            rescue ArgumentError
+              nil
+            end
+          end
+        end
       end
     end
-
   end
 end