thinreports 0.9.1 → 0.10.0

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

@@ -1,22 +1,25 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 module Thinreports
-  module Core::Shape::TextBlock
+  module Core
+    module Shape
+      module TextBlock
+        module Formatter
+          class Padding < Formatter::Basic
+            private
 
-    class Formatter::Padding < Formatter::Basic
+            def apply_format_to(value)
+              value.to_s.send(format.format_padding_rdir? ? :ljust : :rjust,
+                              format.format_padding_length,
+                              format.format_padding_char)
+            end
 
-      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
-
-      def applicable?(_value)
-        !blank_value?(format.format_padding_char) && format.format_padding_length > 0
+            def applicable?(_value)
+              !blank_value?(format.format_padding_char) && format.format_padding_length > 0
+            end
+          end
+        end
       end
     end
-
   end
 end

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

@@ -1,33 +1,35 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 module Thinreports
-  module Core::Shape
+  module Core
+    module Shape
+      module TextBlock
+        class Interface < Basic::BlockInterface
+          internal_delegators :format_enabled?
 
-    class TextBlock::Interface < Basic::BlockInterface
-      internal_delegators :format_enabled?
+          # @param [Boolean] enabled
+          # @return [self]
+          def format_enabled(enabled)
+            internal.format_enabled(enabled)
+            self
+          end
 
-      # @param [Boolean] enabled
-      # @return [self]
-      def format_enabled(enabled)
-        internal.format_enabled(enabled)
-        self
-      end
-
-      # @param [Object] val
-      # @param [Hash<Symbol, Object>] style_settings
-      # @return [self]
-      def set(val, style_settings = {})
-        value(val)
-        styles(style_settings) #=> self
-      end
+          # @param [Object] val
+          # @param [Hash<Symbol, Object>] style_settings
+          # @return [self]
+          def set(val, style_settings = {})
+            value(val)
+            styles(style_settings) #=> self
+          end
 
-    private
+          private
 
-      # @see Thinreports::Core::Shape::Base::Interface#init_internal
-      def init_internal(parent, format)
-        TextBlock::Internal.new(parent, format)
+          # @see Thinreports::Core::Shape::Base::Interface#init_internal
+          def init_internal(parent, format)
+            TextBlock::Internal.new(parent, format)
+          end
+        end
       end
     end
-
   end
 end

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

@@ -1,75 +1,75 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 module Thinreports
-  module Core::Shape
-
-    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)
-          @reference.value
-        else
-          super
-        end
-      end
-
-      def write_value(val)
-        if format.has_reference?
-          warn 'The set value was not saved, ' +
-               "Because '#{format.id}' has reference to '#{format.ref_id}'."
-        else
-          super
-        end
-      end
-
-      def real_value
-        if format_enabled?
-          formatter.apply(read_value)
-        else
-          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
-          !blank_value?(format.format_base) || format.has_format?
+  module Core
+    module Shape
+      module TextBlock
+        class Internal < Basic::BlockInternal
+          format_delegators :multiple?
+
+          attr_reader :style
+
+          def initialize(*args)
+            super(*args)
+
+            @reference = nil
+            @formatter = nil
+
+            @style = Style::Text.new(format)
+            @style.accessible_styles.delete(:valign) unless multiple?
+          end
+
+          def read_value
+            if format.has_reference?
+              @reference ||= parent.item(format.ref_id)
+              @reference.value
+            else
+              super
+            end
+          end
+
+          def write_value(val)
+            if format.has_reference?
+              warn 'The set value was not saved, ' \
+                   "Because '#{format.id}' has reference to '#{format.ref_id}'."
+            else
+              super
+            end
+          end
+
+          def real_value
+            if format_enabled?
+              formatter.apply(read_value)
+            else
+              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
+              !blank_value?(format.format_base) || format.has_format?
+            end
+          end
+
+          def type_of?(type_name)
+            type_name == TextBlock::TYPE_NAME || super
+          end
+
+          private
+
+          def formatter
+            @formatter ||= TextBlock::Formatter.setup(format)
+          end
         end
       end
-
-      def type_of?(type_name)
-        type_name == TextBlock::TYPE_NAME || super
-      end
-
-    private
-
-      def formatter
-        @formatter ||= TextBlock::Formatter.setup(format)
-      end
     end
-
   end
 end

data/lib/thinreports/core/utils.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 module Thinreports
   module Utils
@@ -6,12 +6,13 @@ module Thinreports
       klass.extend self
     end
 
+    # rubocop:disable Style/RescueModifier
     def deep_copy(src)
       case src
       when Hash
-        src.inject({}) {|h, (k, v)| h[k] = (v.dup rescue v); h }
+        src.each_with_object({}) { |(k, v), h| h[k] = v.dup rescue v }
       when Array
-        src.map {|a| a.dup rescue a }
+        src.map { |a| a.dup rescue a }
       else
         raise ArgumentError
       end

data/lib/thinreports/generator/pdf.rb

@@ -1,37 +1,37 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-begin
-  gem 'prawn', '1.3.0'
-  require 'prawn'
-rescue LoadError
-  puts 'Thinreports requires Prawn = 1.3.0. ' +
-       'Please `gem install prawn -v 1.3.0` and try again.'
-end
+require 'prawn'
 
 module Thinreports
   module Generator
+    class PDF
+      # @return [Thinreports::Report::Base]
+      attr_reader :report
 
-    class PDF < Base
-      # @param report (see Thinreports::Generator::Base#initialize)
-      # @param [Hash] options
-      # @option options [Hash] :security (nil)
-      #   See Prawn::Document#encrypt_document
-      def initialize(report, options)
-        super
+      # @param [Thinreports::Report::Base] report
+      # @param [Hash] security (nil)
+      def initialize(report, security: nil)
+        report.finalize
 
+        @report = report.internal
         title = default_layout ? default_layout.format.report_title : nil
 
-        @document = Document.new(options, Title: title)
+        @document = Document.new(title: title, security: security)
         @drawers = {}
       end
 
-      # @see Thinreports::Generator::Base#generate
+      # @param [String, nil] filename
+      # @return [String, nil]
       def generate(filename = nil)
         draw_report
         filename ? @document.render_file(filename) : @document.render
       end
 
-    private
+      def default_layout
+        report.default_layout
+      end
+
+      private
 
       def draw_report
         report.pages.each do |page|
@@ -52,13 +52,12 @@ module Thinreports
         @drawers[format.identifier] ||= Drawer::Page.new(@document, format)
       end
     end
-
   end
 end
 
-require 'thinreports/generator/pdf/prawn_ext'
-require 'thinreports/generator/pdf/document'
-require 'thinreports/generator/pdf/drawer/base'
-require 'thinreports/generator/pdf/drawer/page'
-require 'thinreports/generator/pdf/drawer/list'
-require 'thinreports/generator/pdf/drawer/list_section'
+require_relative 'pdf/prawn_ext'
+require_relative 'pdf/document'
+require_relative 'pdf/drawer/base'
+require_relative 'pdf/drawer/page'
+require_relative 'pdf/drawer/list'
+require_relative 'pdf/drawer/list_section'

data/lib/thinreports/generator/pdf/document.rb

@@ -1,131 +1,130 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-require 'thinreports/generator/pdf/document/font'
-require 'thinreports/generator/pdf/document/parse_color'
-require 'thinreports/generator/pdf/document/graphics'
-require 'thinreports/generator/pdf/document/draw_shape'
-require 'thinreports/generator/pdf/document/draw_template_items'
-require 'thinreports/generator/pdf/document/page'
+require_relative 'document/font'
+require_relative 'document/parse_color'
+require_relative 'document/graphics'
+require_relative 'document/draw_shape'
+require_relative 'document/draw_template_items'
+require_relative 'document/page'
 
 module Thinreports
   module Generator
-
-    class PDF::Document
-      include Utils
-
-      include PDF::Font
-      include PDF::ParseColor
-      include PDF::Graphics
-      include PDF::DrawShape
-      include PDF::DrawTemplateItems
-      include PDF::Page
-
-      # @return [Prawn::Document]
-      attr_reader :pdf
-
-      # @param options (see Thinreports::Generator::PDF#initialize)
-      # @param [Hash] metadata
-      # @option metadata [String] :Title
-      def initialize(options = {}, metadata = {})
-        @pdf = Prawn::Document.new(
-          skip_page_creation: true,
-          margin: [0, 0],
-          info: {CreationDate: Time.now,
-                      Creator: 'Thinreports Generator for Ruby ' +
-                                        Thinreports::VERSION}.merge(metadata)
-        )
-        # Setup to Prawn::Document.
-        setup_fonts
-        setup_custom_graphic_states
-
-        # Encrypts the document.
-        if options[:security]
-          @pdf.encrypt_document(options[:security])
+    class PDF
+      class Document
+        include Utils
+
+        include PDF::Font
+        include PDF::ParseColor
+        include PDF::Graphics
+        include PDF::DrawShape
+        include PDF::DrawTemplateItems
+        include PDF::Page
+
+        # @return [Prawn::Document]
+        attr_reader :pdf
+
+        # @param [String] title (nil)
+        # @param [Hash] security (nil)
+        def initialize(title: nil, security: nil)
+          @pdf = Prawn::Document.new(
+            skip_page_creation: true,
+            margin: [0, 0],
+            info: {
+              CreationDate: Time.now,
+              Creator: 'Thinreports Generator for Ruby ' + Thinreports::VERSION,
+              Title: title
+            }
+          )
+          # Setup to Prawn::Document.
+          setup_fonts
+          setup_custom_graphic_states
+
+          # Encrypts the document.
+          @pdf.encrypt_document(security) if security
         end
-      end
 
-      # Delegate to Prawn::Document#render
-      # @see Prawn::Document#render
-      def render
-        result = pdf.render
-        finalize
-        result
-      end
+        # Delegate to Prawn::Document#render
+        # @see Prawn::Document#render
+        def render
+          result = pdf.render
+          finalize
+          result
+        end
 
-      # Delegate to Prawn::Document#render_file
-      # @see Prawn::Document#render_file
-      def render_file(*args)
-        finalize
-        pdf.render_file(*args)
-      end
+        # Delegate to Prawn::Document#render_file
+        # @see Prawn::Document#render_file
+        def render_file(*args)
+          finalize
+          pdf.render_file(*args)
+        end
 
-      # @param [Numeric, String] x
-      # @param [Numeric, String] y
-      def translate(x, y, &block)
-        x, y = rpos(x, y)
-        pdf.translate(x, y, &block)
-      end
+        # @param [Numeric, String] x
+        # @param [Numeric, String] y
+        def translate(x, y, &block)
+          x, y = rpos(x, y)
+          pdf.translate(x, y, &block)
+        end
 
-      # @param [String] stamp_id
-      # @param [Array<Numeric>] at (nil)
-      def stamp(stamp_id, at = nil)
-        unless at.nil?
-          pdf.stamp_at(stamp_id, rpos(*at))
-        else
-          pdf.stamp(stamp_id)
+        # @param [String] stamp_id
+        # @param [Array<Numeric>] at (nil)
+        def stamp(stamp_id, at = nil)
+          if at.nil?
+            pdf.stamp(stamp_id)
+          else
+            pdf.stamp_at(stamp_id, rpos(*at))
+          end
         end
-      end
 
-      # Delegate to Prawn::Document#create_stamp
-      # @param [String] id
-      # @see Prawn::Document#create_stamp
-      def create_stamp(id, &block)
-        pdf.create_stamp(id, &block)
-      end
+        # Delegate to Prawn::Document#create_stamp
+        # @param [String] id
+        # @see Prawn::Document#create_stamp
+        def create_stamp(id, &block)
+          pdf.create_stamp(id, &block)
+        end
 
-      # @see #pdf
-      def internal
-        @pdf
-      end
+        # @see #pdf
+        def internal
+          @pdf
+        end
 
-    private
+        private
 
-      def finalize
-        clean_temp_images
-      end
+        def finalize
+          clean_temp_images
+        end
 
-      # @param [Array<String, Numeric>] values
-      # @return [Numeric, Array<Numeric>, nil]
-      def s2f(*values)
-        return nil if values.empty?
-
-        if values.size == 1
-          value = values.first
-          return nil unless value
-          value.is_a?(::Numeric) ? value : value.to_f
-        else
-          values.map {|v| s2f(v) }
+        # @param [Array<String, Numeric>] values
+        # @return [Numeric, Array<Numeric>, nil]
+        def s2f(*values)
+          return nil if values.empty?
+
+          if values.size == 1
+            value = values.first
+            return nil unless value
+            value.is_a?(::Numeric) ? value : value.to_f
+          else
+            values.map { |v| s2f(v) }
+          end
         end
-      end
 
-      # @param [Numeric, String] x
-      # @param [Numeric, String] y
-      # @return [Array<Float>]
-      def map_to_upper_left_relative_position(x, y)
-        x, y = s2f(x, y)
-        [x, -y]
-      end
-      alias_method :rpos, :map_to_upper_left_relative_position
-
-      # @param [Numeric, String] x
-      # @param [Numeric, String] y
-      # @return [Array<Float>]
-      def map_to_upper_left_position(x, y)
-        x, y = s2f(x, y)
-        [x, pdf.bounds.height - y]
+        # @param [Numeric, String] x
+        # @param [Numeric, String] y
+        # @return [Array<Float>]
+        def map_to_upper_left_relative_position(x, y)
+          x, y = s2f(x, y)
+          [x, -y]
+        end
+        alias rpos map_to_upper_left_relative_position
+
+        # @param [Numeric, String] x
+        # @param [Numeric, String] y
+        # @return [Array<Float>]
+        def map_to_upper_left_position(x, y)
+          x, y = s2f(x, y)
+          [x, pdf.bounds.height - y]
+        end
+        alias pos map_to_upper_left_position
       end
-      alias_method :pos, :map_to_upper_left_position
     end
-
   end
 end