thinreports 0.7.6 → 0.8.0

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

@@ -1,38 +1,37 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Generator
-    
-    # @private
+
     module PDF::Graphics
-      
+
       BASE_LINE_WIDTH = 0.9
-      
+
     private
 
       # Change the default graphic states defined by Prawn.
       def setup_custom_graphic_states
         pdf.line_width(BASE_LINE_WIDTH)
       end
-      
+
       # @param [Numeric] width
       def line_width(width)
         pdf.line_width(width * BASE_LINE_WIDTH)
       end
-      
+
       # Delegate to Prawn::Document#save_graphic_state
       # @see Prawn::Document#save_graphics_state
       def save_graphics_state
         pdf.save_graphics_state
       end
-      
+
       # Delegate to Prawn::Document#restore_graphic_state
       # @see Prawn::Document#restore_graphics_state
       def restore_graphics_state
         pdf.restore_graphics_state
       end
     end
-    
+
   end
 end
 

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

@@ -1,17 +1,21 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Generator
-    
-    # @private
+
     module PDF::Page
-      
-      # @param [ThinReports::Layout::Format] format
+      # Add JIS-B4,B5 page geometry
+      ::PDF::Core::PageGeometry::SIZES.update(
+        'B4_JIS' => [728.5, 1031.8],
+        'B5_JIS' => [515.9, 728.5]
+      )
+
+      # @param [Thinreports::Layout::Format] format
       def start_new_page(format)
         format_id = if change_page_format?(format)
           pdf.start_new_page(new_basic_page_options(format))
           @current_page_format = format
-          
+
           unless format_stamp_registry.include?(format.identifier)
             create_format_stamp(format)
           end
@@ -20,51 +24,61 @@ module ThinReports
           pdf.start_new_page(new_basic_page_options(current_page_format))
           current_page_format.identifier
         end
-        
+
         stamp(format_id.to_s)
       end
-      
+
       def add_blank_page
-        pdf.start_new_page(pdf.page_count.zero? ? {:size => 'A4'} : {})
+        pdf.start_new_page(pdf.page_count.zero? ? {size: 'A4'} : {})
       end
-      
+
     private
-      
-      # @return [ThinReports::Layout::Format]
+
+      # @return [Thinreports::Layout::Format]
       attr_reader :current_page_format
-      
-      # @param [ThinReports::Layout::Format] new_format
+
+      # @param [Thinreports::Layout::Format] new_format
       # @return [Boolean]
       def change_page_format?(new_format)
         !current_page_format ||
           current_page_format.identifier != new_format.identifier
       end
-      
-      # @param [ThinReports::Layout::Format] format
+
+      # @param [Thinreports::Layout::Format] format
       def create_format_stamp(format)
         create_stamp(format.identifier.to_s) do
           parse_svg(format.layout, '/svg/g')
         end
         format_stamp_registry << format.identifier
       end
-      
+
       # @return [Array]
       def format_stamp_registry
         @format_stamp_registry ||= []
       end
-      
-      # @param [ThinReports::Layout::Format] format
+
+      # @param [Thinreports::Layout::Format] format
       # @return [Hash]
       def new_basic_page_options(format)
-        options = {:layout => format.page_orientation.to_sym}
+        options = {layout: format.page_orientation.to_sym}
+
         options[:size] = if format.user_paper_type?
           [format.page_width.to_f, format.page_height.to_f]
         else
-          format.page_paper_type
+          case format.page_paper_type
+          # Convert B4(5)_ISO to B4(5)
+          when 'B4_ISO', 'B5_ISO'
+            format.page_paper_type.delete('_ISO')
+          # Convert B4(5) to B4(5)_JIS
+          when 'B4', 'B5'
+            "#{format.page_paper_type}_JIS"
+          else
+            format.page_paper_type
+          end
         end
         options
       end
     end
-    
+
   end
-end
+end

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

@@ -1,24 +1,23 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Generator
-    
-    # @private
+
     module PDF::ParseColor
       # @param [String] color
       # @return [String]
       def parse_color(color)
         color = color.downcase
-        
+
         unless color =~ /^#?[\da-f]{6}$/
           find_color_from_name(color)
         else
           color.delete('#')
         end
       end
-    
+
     private
-      
+
       # Supported only SAFE COLORS.
       SUPPORTED_COLOR_NAMES = {
         'red'     => 'ff0000',
@@ -38,14 +37,14 @@ module ThinReports
         'silver'  => 'c0c0c0',
         'white'   => 'ffffff'
       }
-      
+
       def find_color_from_name(name)
         unless color = SUPPORTED_COLOR_NAMES[name]
-          raise ThinReports::Errors::UnsupportedColorName, name
+          raise Thinreports::Errors::UnsupportedColorName, name
         end
         color
       end
     end
-    
+
   end
-end
+end

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

@@ -2,16 +2,15 @@
 
 require 'rexml/document'
 
-module ThinReports
+module Thinreports
   module Generator
-    
-    # @private
+
     module PDF::ParseSVG
       # @param [String] source
       # @param [String] base_path
       def parse_svg(source, base_path)
         svg = REXML::Document.new(clean_svg(source))
-        
+
         svg.elements[base_path].each do |elm|
           case elm.attributes['class']
           when 's-text'    then draw_svg_text(elm)
@@ -23,15 +22,15 @@ module ThinReports
         end
         svg = nil
       end
-      
+
     private
-      
+
       # @param [String] source
       # @return [String]
       def clean_svg(source)
         source.gsub(/<%.+?%>/, '')
       end
-      
+
       # @param [REXML::Element] elm
       # @param [Array<String>] keys
       # @return [Array<String>]
@@ -41,7 +40,7 @@ module ThinReports
           values << attrs[key]
         end
       end
-      
+
       # @param [REXML::Element] elm
       def draw_svg_rect(elm)
         x, y, w, h = element_attributes_values_at(elm, 'x', 'y', 'width', 'height')
@@ -50,21 +49,21 @@ module ThinReports
         end
         rect(x, y, w, h, attributes)
       end
-      
+
       # @see #draw_svg_rect
       def draw_svg_ellipse(elm)
         x, y, rx, ry = element_attributes_values_at(elm, 'cx', 'cy', 'rx', 'ry')
         ellipse(x, y, rx, ry,
                 common_graphic_attrs(elm.attributes))
       end
-      
+
       # @see #draw_svg_rect
       def draw_svg_line(elm)
         x1, y1, x2, y2 = element_attributes_values_at(elm, 'x1', 'y1', 'x2', 'y2')
         line(x1, y1, x2, y2,
              common_graphic_attrs(elm.attributes))
       end
-      
+
       # @see #draw_svg_rect
       def draw_svg_text(elm)
         x, y, w, h = element_attributes_values_at(elm, 'x-left', 'x-top',
@@ -75,14 +74,14 @@ module ThinReports
         end
         text(content.join("\n"), x, y, w, h, svg_text_attrs(elm.attributes))
       end
-      
+
       # @see #draw_svg_rect
       def draw_svg_image(elm)
         x, y, w, h = element_attributes_values_at(elm, 'x', 'y', 'width', 'height')
         base64image(extract_base64_string(elm.attributes['xlink:href']),
                     x, y, w, h)
       end
-    
+
       # @param [Hash] attributes
       # @return [Hash]
       def svg_text_attrs(attributes)
@@ -95,8 +94,8 @@ module ThinReports
           attrs[:valign] = text_valign(attributes['x-valign'])
         end
       end
-      
+
     end
-    
+
   end
 end

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

@@ -7,39 +7,43 @@ require 'thinreports/generator/pdf/document/draw_shape'
 require 'thinreports/generator/pdf/document/parse_svg'
 require 'thinreports/generator/pdf/document/page'
 
-module ThinReports
+module Thinreports
   module Generator
-    
-    # @private
+
     class PDF::Document
+      include Utils
+
       include PDF::Font
       include PDF::ParseColor
       include PDF::Graphics
       include PDF::DrawShape
       include PDF::ParseSVG
       include PDF::Page
-      
-      # @param options (see ThinReports::Generator::PDF#initialize)
+
+      # @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)
+          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])
         end
       end
-      
+
       # Delegate to Prawn::Document#render
       # @see Prawn::Document#render
       def render
@@ -47,21 +51,21 @@ module ThinReports
         finalize
         result
       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 [String] stamp_id
       # @param [Array<Numeric>] at (nil)
       def stamp(stamp_id, at = nil)
@@ -71,34 +75,30 @@ module ThinReports
           pdf.stamp(stamp_id)
         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
-      
-      # @private
+
       # @see #pdf
       def internal
         @pdf
       end
-      
+
     private
-      
-      # @return [Prawn::Document]
-      attr_reader :pdf
-      
+
       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
           if value = values.first
             value.is_a?(::Numeric) ? value : value.to_f
@@ -107,7 +107,7 @@ module ThinReports
           values.map {|v| s2f(v) }
         end
       end
-      
+
       # @param [Numeric, String] x
       # @param [Numeric, String] y
       # @return [Array<Float>]
@@ -116,7 +116,7 @@ module ThinReports
         [x, -y]
       end
       alias_method :rpos, :map_to_upper_left_relative_position
-      
+
       # @param [Numeric, String] x
       # @param [Numeric, String] y
       # @return [Array<Float>]
@@ -126,6 +126,6 @@ module ThinReports
       end
       alias_method :pos, :map_to_upper_left_position
     end
-    
+
   end
 end

data/lib/thinreports/generator/pdf/drawer/base.rb

@@ -1,54 +1,48 @@
 # coding: utf-8
 
-module ThinReports
-  module Generator
-    
+module Thinreports
+  module Generator::PDF::Drawer
+
     # @abstract
-    # @private
-    class PDF::Drawer::Base
-      # @param [ThinReports::Generator::PDF::Document] pdf
-      # @param [ThinReports::Core::Shape::Manager::Format] format
+    class Base
+      # @param [Thinreports::Generator::PDF::Document] pdf
+      # @param [Thinreports::Core::Shape::Manager::Format] format
       def initialize(pdf, format)
         @pdf     = pdf
         @format  = format
         @stamps  = []
         @draw_at = nil
       end
-      
+
       # @abstract
       def draw
         raise NotImplementedError
       end
-      
+
     private
-      
-      # @param [ThinReports::Core::Shape::Base::Internal] shape
+
+      # @param [Thinreports::Core::Shape::Base::Internal] shape
       # @return [String]
       def pdf_stamp_id(shape)
-        "#{@format.identifier}#{shape_stamp_id(shape)}"
+        "#{@format.identifier}#{shape.identifier}"
       end
-      
-      # @see #pdf_stamp_id
-      def shape_stamp_id(shape)
-        "#{shape.id}#{shape.style.identifier}"
-      end
-      
+
       # @overload pdf_stamp(shape_id)
       #   @param [String] shape_id
       # @overload pdf_stamp(shape)
-      #   @param [ThinReports::Core::Shape::Base::Internal] shape
+      #   @param [Thinreports::Core::Shape::Base::Internal] shape
       def pdf_stamp(shape)
         unless shape.is_a?(::String)
           shape = pdf_stamp_id(shape)
         end
         @pdf.stamp(shape, @draw_at)
       end
-      
-      # @param [ThinReports::Core::Shape::Base::Internal] shape
+
+      # @param [Thinreports::Core::Shape::Base::Internal] shape
       def create_pdf_stamp(shape, &block)
         @pdf.create_stamp(pdf_stamp_id(shape), &block)
       end
     end
-    
+
   end
 end

data/lib/thinreports/generator/pdf/drawer/list.rb

@@ -1,39 +1,57 @@
 # coding: utf-8
 
-module ThinReports
-  module Generator
-    
-    # @private
-    class PDF::Drawer::List < PDF::Drawer::Base
+module Thinreports
+  module Generator::PDF::Drawer
+
+    class List < Base
       # @param (see PDF::Drawer::Base#initialize)
       def initialize(pdf, format)
         super
         @sections = {}
       end
-      
-      # @param [ThinReports::Core::Shape::List::PageState] list
-      def draw(list)
-        draw_section(list.header) if list.header
-        list.rows.each do |row|
+
+      # @param [Thinreports::Core::Shape::List::PageState] list_page
+      def draw(list_page)
+        draw_section(list_page.header) if list_page.header
+        list_page.rows.each do |row|
           draw_section(row)
         end
+
+        # Returns Thinreports::Report::Page object
+        manager = list_page.parent.manager
+
+        list_id = list_page.id.to_s
+        manager.format.shapes.each do |id, shape|
+          next unless list_pageno?(list_id, shape)
+
+          shape = manager.final_shape(id)
+          @pdf.draw_shape_pageno(shape.internal,
+                                 list_page.no, list_page.manager.page_count)
+        end
       end
-      
-    private  
-      
-      # @param [ThinReports::Core::Shape::List::SectionInterface] section
+
+    private
+
+      # @param [String] list_id
+      # @param [Thinreports::Core::Shape::Base::Format] shape
+      # @return [Boolean]
+      def list_pageno?(list_id, shape)
+        shape.type == Thinreports::Core::Shape::PageNumber::TYPE_NAME &&
+        shape.target == list_id
+      end
+
+      # @param [Thinreports::Core::Shape::List::SectionInterface] section
       def draw_section(section)
         internal = section.internal
-        drawer(internal).draw(section.manager, internal.relative_position)
+        drawer(internal).draw(section, internal.relative_position)
       end
-      
-      # @param [ThinReports::Core::Shape::List::SectionInternal] section
-      # @return [ThinReports::Generator::PDF::Drawer::ListSection]
+
+      # @param [Thinreports::Core::Shape::List::SectionInternal] section
+      # @return [Thinreports::Generator::PDF::Drawer::ListSection]
       def drawer(section)
-        @sections[section.section_name] ||=
-          PDF::Drawer::ListSection.new(@pdf, section)
+        @sections[section.section_name] ||= ListSection.new(@pdf, section)
       end
     end
-    
+
   end
 end

data/lib/thinreports/generator/pdf/drawer/list_section.rb

@@ -1,31 +1,30 @@
 # coding: utf-8
 
-module ThinReports
-  module Generator
-    
-    # @private
-    class PDF::Drawer::ListSection < PDF::Drawer::Page
+module Thinreports
+  module Generator::PDF::Drawer
+
+    class ListSection < Page
       # @param pdf (see PDF::Drawer::Page#initialize)
-      # @param section [ThinReports::Core::Shape::List::SectionInternal] section
+      # @param section [Thinreports::Core::Shape::List::SectionInternal] section
       def initialize(pdf, section)
         super(pdf, section.format)
         @section       = section
         @stamp_created = false
       end
-      
-      # @param [ThinReports::Core::Shape::Manager::Internal] manager
+
+      # @param [Thinreports::Core::Shape::List::SectionInternal] section
       # @param [Array<Numeric>] at
-      def draw(manager, at)
+      def draw(section, at)
         @draw_at = at
         draw_section
-        super(manager)
+        super(section)
       end
-      
+
     private
-      
+
       def draw_section
         id = @format.identifier.to_s
-        
+
         unless @stamp_created
           @pdf.create_stamp(id) do
             @pdf.parse_svg('<svg xmlns:xlink="http://www.w3.org/1999/xlink">' +
@@ -35,17 +34,17 @@ module ThinReports
         end
         pdf_stamp(id)
       end
-      
-      # @see ThinReports::Generator::PDF::Drawer::Page#draw_tblock_shape      
+
+      # @see Thinreports::Generator::PDF::Drawer::Page#draw_tblock_shape
       def draw_tblock_shape(shape)
         @pdf.translate(*@draw_at) { super }
       end
-      
-      # @see ThinReports::Generator::PDF::Drawer::Page#draw_iblock_shape      
+
+      # @see Thinreports::Generator::PDF::Drawer::Page#draw_iblock_shape
       def draw_iblock_shape(shape)
         @pdf.translate(*@draw_at) { super }
       end
     end
-    
+
   end
 end