thinreports 0.6.0.pre3 → 0.7.0

data/lib/thinreports/core/utils.rb

@@ -5,14 +5,6 @@ module ThinReports
     
     # @private
     module Utils
-      def in_utf8(&block)
-        original = $KCODE
-        $KCODE = 'u'
-        block.call
-      ensure
-        $KCODE = original
-      end
-      
       def block_exec_on(context, &block)
         return context unless block_given?
         

data/lib/thinreports/generator.rb

@@ -8,7 +8,7 @@ module ThinReports
     # @param options (see ThinReports::Generator::Base#initialize)
     def self.new(type, report, options = {})
       unless generator = registry[type]
-        raise ThinReports::Errors::UnknownGeneratorType
+        raise ThinReports::Errors::UnknownGeneratorType.new(type)
       end
       generator.new(report, options)
     end
@@ -25,6 +25,6 @@ module ThinReports
   end
 end
 
+require 'thinreports/generator/configuration'
 require 'thinreports/generator/base'
-require 'thinreports/generator/pxd'
 require 'thinreports/generator/pdf'

data/lib/thinreports/generator/configuration.rb

@@ -0,0 +1,30 @@
+# coding: utf-8
+
+module ThinReports
+  module Generator
+    
+    class Configuration
+      # @return [Symbol]
+      attr_reader :default
+      
+      def initialize
+        @default = :pdf
+      end
+      
+      # @return [ThinReports::Generator::PDF::Configuration]
+      def pdf
+        @pdf ||= PDF::Configuration.new
+      end
+      
+      # @param [Symbol] type
+      # @return [void]
+      def default=(type)
+        unless Generator.registry.key?(type)
+          raise ThinReports::Errors::UnknownGeneratorType.new(type)
+        end
+        @default = type
+      end
+    end
+    
+  end
+end

data/lib/thinreports/generator/pdf.rb

@@ -1,20 +1,26 @@
 # coding: utf-8
 
-require 'prawn'
+begin
+  gem 'prawn', '0.12.0'
+  require 'prawn'
+rescue LoadError
+  puts 'ThinReports requires Prawn = 0.12.0. ' +
+       'Please `gem install prawn -v 0.12.0` and try again.'
+end
 
 module ThinReports
   module Generator
     
-    class Pdf < Base
+    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
-        @pdf     = Document.new(options)
+        @pdf = Document.new(options, :Title => default_layout.format.report_title)
+        
         @drawers = {}
-        @current_format = nil
       end
       
       # @see ThinReports::Generator::Base#generate
@@ -41,12 +47,8 @@ module ThinReports
         return @pdf.add_blank_page if page.blank?
         
         format = page.layout.format
-        # On format change.
-        unless @current_format == format.identifier
-          @pdf.start_new_page(format)
-        else
-          @pdf.start_new_page
-        end
+        @pdf.start_new_page(format)
+        
         drawer(format).draw(page.manager)
       end
       
@@ -58,6 +60,7 @@ module ThinReports
   end
 end
 
+require 'thinreports/generator/pdf/configuration'
 require 'thinreports/generator/pdf/prawn_ext'
 require 'thinreports/generator/pdf/document'
 require 'thinreports/generator/pdf/drawer'

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

@@ -0,0 +1,28 @@
+# coding: utf-8
+
+module ThinReports
+  module Generator
+    
+    class PDF::Configuration
+      # @return [Array]
+      attr_reader :eudc_fonts
+      
+      def initialize
+        @eudc_fonts = []
+      end
+      
+      # @param [String, Array<String>] fonts
+      def eudc_fonts=(fonts)
+        fonts = [fonts] unless fonts.is_a?(::Array)
+        
+        fonts.each do |f|
+          unless File.extname(f.to_s) == '.ttf'
+            raise ArgumentError, 'The EUDC Fonts can specify only the TTF file.'
+          end
+        end
+        @eudc_fonts = fonts
+      end
+    end
+    
+  end
+end

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

@@ -5,28 +5,31 @@ 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/parse_svg'
+require 'thinreports/generator/pdf/document/page'
 
 module ThinReports
   module Generator
     
     # @private
-    class Pdf::Document
-      include Pdf::Font
-      include Pdf::ParseColor
-      include Pdf::Graphics
-      include Pdf::DrawShape
-      include Pdf::ParseSVG
-      
-      # @param options (see ThinReports::Generator::Pdf#initialize)
-      def initialize(options = {})
+    class PDF::Document
+      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)
+      # @param [Hash] metadata
+      # @option metadata [String] :Title
+      def initialize(options = {}, metadata = {})
         @pdf = Prawn::Document.new(
           :skip_page_creation => true,
           :margin => [0, 0],
-          :info   => {:Creator => 'ThinReports Generator for Ruby ' +
-                                  ThinReports::VERSION}
+          :info   => {:CreationDate => Time.now, 
+                      :Creator      => 'ThinReports Generator for Ruby ' +
+                                        ThinReports::VERSION}.merge(metadata)
         )
-        @format_stamp_registry = []
-        
         # Setup to Prawn::Document.
         setup_fonts
         setup_custom_graphic_states
@@ -37,38 +40,6 @@ module ThinReports
         end
       end
       
-      # @param [ThinReports::Layout::Format] format (nil)
-      def start_new_page(format = nil)
-        options   = {}
-        format_id = format.identifier
-        
-        if format
-          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
-          end
-        end
-        
-        pdf.start_new_page(options)
-        
-        # @note
-        #   The best way is to create a template for each layout.
-        #   However, in the latest Prawn library, because of problems handling
-        #   the template that you want supported by future releases.
-        # @see https://github.com/sandal/prawn/issues/199
-        unless format_stamp_registry.include?(format_id)
-          create_format_stamp(format)
-        end
-        # Apply the static shapes of current format.
-        stamp(format_id.to_s)
-      end
-      
-      def add_blank_page
-        pdf.start_new_page(pdf.page_count.zero? ? {:size => 'A4'} : {})
-      end
-      
       # Delegate to Prawn::Document#render
       # @see Prawn::Document#render
       def render
@@ -119,21 +90,10 @@ module ThinReports
       # @return [Prawn::Document]
       attr_reader :pdf
       
-      # @return [Array<Symbol>]
-      attr_reader :format_stamp_registry
-      
       def finalize
         clean_temp_images
       end
       
-      # @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      
-      
       # @param [Array<String, Numeric>] values
       # @return [Numeric, Array<Numeric>, nil]
       def s2f(*values)

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

@@ -4,25 +4,43 @@ module ThinReports
   module Generator
     
     # @private
-    module Pdf::DrawShape
-      # @param [ThinReports::Core::Shape::Tblock::Internal] shape
+    module PDF::DrawShape
+      # @param [ThinReports::Core::Shape::TextBlock::Internal] shape
       def draw_shape_tblock(shape)
         x, y, w, h = shape.box.values_at('x', 'y', 'width', 'height')
         
         content = shape.real_value.to_s
-        unless shape.multiple?
-          content = content.gsub(/\n/, ' ')
+        unless content.empty?
+          attrs = shape_text_attrs(shape)
+          
+          unless shape.multiple?
+            content = content.gsub(/\n/, ' ')
+            attrs[:single] = true
+          end
+          text_box(content, x, y, w, h, attrs)
         end
-        text_box(content, x, y, w, h, common_text_attrs(shape.attributes))
       end
       
       # @param [ThinReports::Core::Shape::Basic::Internal] shape
       def draw_shape_image(shape)
-        x, y, w, h = shape.svg_attrs.values_at('x', 'y', 'width', 'height')
-        base64image(extract_base64_string(shape.svg_attrs['xlink:href']),
+        x, y, w, h = shape.style.svg_attrs.values_at('x', 'y', 'width', 'height')
+        base64image(extract_base64_string(shape.style.svg_attrs['xlink:href']),
                     x, y, w, h)
       end
       
+      # @param [ThinReports::Core::Shape::ImageBlock::Internal] shape
+      def draw_shape_iblock(shape)
+        x, y, w, h = shape.box.values_at('x', 'y', 'width', 'height')
+        unless shape.src.blank?
+          posx = shape.format.position_x
+          posy = shape.format.position_y
+          
+          image_box(shape.src, x, y, w, h,
+                    :position_x => posx ? posx.to_sym : nil,
+                    :position_y => posy ? posy.to_sym : nil)
+        end
+      end
+      
       # @param [ThinReports::Core::Shape::Text::Internal] shape
       def draw_shape_text(shape)
         x, y, w, h = shape.box.values_at('x', 'y', 'width', 'height')
@@ -32,39 +50,39 @@ module ThinReports
       
       # @param [ThinReports::Core::Shape::Basic::Internal] shape
       def draw_shape_ellipse(shape)
-        args = shape.svg_attrs.values_at('cx', 'cy', 'rx', 'ry')
-        args << common_graphic_attrs(shape.attributes)
+        args = shape.style.svg_attrs.values_at('cx', 'cy', 'rx', 'ry')
+        args << common_graphic_attrs(shape.style.svg_attrs)
         ellipse(*args)
       end
       
       # @param [ThinReports::Core::Shape::Basic::Internal] shape
       def draw_shape_line(shape)
-        args = shape.svg_attrs.values_at('x1', 'y1', 'x2', 'y2')
-        args << common_graphic_attrs(shape.attributes)
+        args = shape.style.svg_attrs.values_at('x1', 'y1', 'x2', 'y2')
+        args << common_graphic_attrs(shape.style.svg_attrs)
         line(*args)
       end
       
       # @param [ThinReports::Core::Shape::Basic::Internal] shape
       def draw_shape_rect(shape)
-        args = shape.svg_attrs.values_at('x', 'y', 'width', 'height')
-        args << common_graphic_attrs(shape.attributes) do |attrs|
-          attrs[:radius] = shape.svg_attrs['rx']
+        args = shape.style.svg_attrs.values_at('x', 'y', 'width', 'height')
+        args << common_graphic_attrs(shape.style.svg_attrs) do |attrs|
+          attrs[:radius] = shape.style.svg_attrs['rx']
         end
         rect(*args)
       end
     
     private
       
-      # @param [ThinReports::Core::Shape::Text::Internal]
+      # @param [ThinReports::Core::Shape::Text::Internal, ThinReports::Core::Shape::TextBlock::Internal]
       # @return [Hash]
       def shape_text_attrs(shape)
         format = shape.format
         
-        common_text_attrs(shape.attributes) do |attrs|
+        common_text_attrs(shape.style.svg_attrs) do |attrs|
           # Set the :line_height option.
           attrs[:line_height] = format.line_height unless format.line_height.blank?
           # Set the :valign option.
-          attrs[:valign]      = text_valign(format.valign)
+          attrs[:valign]      = shape.style.valign
         end
       end
       

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

@@ -4,7 +4,7 @@ module ThinReports
   module Generator
     
     # @private
-    module Pdf::Font
+    module PDF::Font
       FONT_STORE = File.join(ThinReports::ROOTDIR, 'resources', 'fonts')
       
       BUILTIN_FONTS = {
@@ -20,14 +20,21 @@ module ThinReports
         # Install built-in fonts.
         pdf.font_families.update(BUILTIN_FONTS)
         
-        # Install fall-back font that IPAMincho.
-        fallback_font = BUILTIN_FONTS['IPAMincho'][:normal]
-        pdf.font_families['FallbackFont'] = {:normal      => fallback_font,
-                                             :bold        => fallback_font,
-                                             :italic      => fallback_font,
-                                             :bold_italic => fallback_font}
-        # Setup fallback font.
-        pdf.fallback_fonts(['FallbackFont'])
+        fallback_fonts = []
+        
+        # Install EUDC fonts.
+        ThinReports.config.generator.pdf.eudc_fonts.each_with_index do |eudc, i|
+          eudc_name = "EUDC#{i}"
+          install_font_family(eudc_name, eudc)
+          fallback_fonts << eudc_name
+        end
+        
+        # Install fall-back font(default font) that IPAMincho.
+        install_font_family('DefaultFont', BUILTIN_FONTS['IPAMincho'][:normal])
+        fallback_fonts << 'DefaultFont'
+        
+        # Setup fallback fonts.
+        pdf.fallback_fonts(fallback_fonts)
         
         # Create aliases from the font list provided by Prawn.
         pdf.font_families.update(
@@ -36,6 +43,15 @@ module ThinReports
         )
       end
       
+      # @param [String] name
+      # @param [String] file
+      def install_font_family(name, file)
+        pdf.font_families[name] = {:normal      => file,
+                                   :bold        => file,
+                                   :italic      => file,
+                                   :bold_italic => file}
+      end
+      
       # @return [String]
       def default_family
         'Helvetica'

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

@@ -4,7 +4,7 @@ module ThinReports
   module Generator
     
     # @private
-    module Pdf::Graphics
+    module PDF::Graphics
       
       BASE_LINE_WIDTH = 0.9
       

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

@@ -3,7 +3,7 @@
 module ThinReports
   module Generator
     
-    module Pdf::Graphics
+    module PDF::Graphics
       # @param [Hash] svg_attrs
       # @yield [attrs]
       # @yieldparam [Hash] attrs
@@ -36,9 +36,17 @@ module ThinReports
                  :color  => svg_attrs['fill'],
                  :align  => text_align(svg_attrs['text-anchor']),
                  :styles => font_styles(svg_attrs)}
-        # Letter Spacing.
-        if space = svg_attrs['letter-spacing']
-          attrs[:letter_spacing] = space unless space == 'normal'
+        
+        # The Letter Spacing Property.
+        # 
+        # When the version of Layout is
+        #   smaller then 0.6.0: 
+        #     Use letter-spacing attribute (normal is none).
+        #   0.6.0 or more:
+        #     Use kerning attribute (auto is none).
+        # 
+        if space = text_letter_spacing(svg_attrs['kerning'] || svg_attrs['letter-spacing'])
+          attrs[:letter_spacing] = space
         end
         block.call(attrs) if block_given?
         attrs
@@ -59,6 +67,12 @@ module ThinReports
         styles
       end
       
+      # @param [String] space
+      # @return [String, nil]
+      def text_letter_spacing(space)
+        %w( normal auto ).include?(space) ? nil : space
+      end
+      
       # @param [String] svg_align
       # @return [Symbol]
       def text_align(svg_align)