thinreports 0.7.7 → 0.8.0

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

@@ -1,18 +1,17 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Generator
-    
-    # @private
+
     module PDF::DrawShape
-      # @param [ThinReports::Core::Shape::TextBlock::Internal] shape
+      # @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 content.empty?
           attrs = shape_text_attrs(shape)
-          
+
           unless shape.multiple?
             content = content.gsub(/\n/, ' ')
             attrs[:single] = true
@@ -24,52 +23,52 @@ module ThinReports
       def draw_shape_pageno(shape, page_no, page_count)
         x, y, w, h = shape.box.values_at('x', 'y', 'width', 'height')
 
-        text_box(shape.build_format(page_no, page_count), x, y, w, h, 
+        text_box(shape.build_format(page_no, page_count), x, y, w, h,
                  common_text_attrs(shape.style.svg_attrs))
       end
-      
-      # @param [ThinReports::Core::Shape::Basic::Internal] shape
+
+      # @param [Thinreports::Core::Shape::Basic::Internal] shape
       def draw_shape_image(shape)
         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
+
+      # @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?
+        unless blank_value?(shape.src)
           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)
+                    position_x: posx ? posx.to_sym : nil,
+                    position_y: posy ? posy.to_sym : nil)
         end
       end
-      
-      # @param [ThinReports::Core::Shape::Text::Internal] shape
+
+      # @param [Thinreports::Core::Shape::Text::Internal] shape
       def draw_shape_text(shape)
         x, y, w, h = shape.box.values_at('x', 'y', 'width', 'height')
-        text(shape.text.join("\n"), x, y, w, h, 
+        text(shape.text.join("\n"), x, y, w, h,
              shape_text_attrs(shape))
       end
-      
-      # @param [ThinReports::Core::Shape::Basic::Internal] shape
+
+      # @param [Thinreports::Core::Shape::Basic::Internal] shape
       def draw_shape_ellipse(shape)
         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
+
+      # @param [Thinreports::Core::Shape::Basic::Internal] shape
       def draw_shape_line(shape)
         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
+
+      # @param [Thinreports::Core::Shape::Basic::Internal] shape
       def draw_shape_rect(shape)
         args = shape.style.svg_attrs.values_at('x', 'y', 'width', 'height')
         args << common_graphic_attrs(shape.style.svg_attrs) do |attrs|
@@ -77,20 +76,20 @@ module ThinReports
         end
         rect(*args)
       end
-    
+
     private
-      
-      # @param [ThinReports::Core::Shape::Text::Internal, ThinReports::Core::Shape::TextBlock::Internal] shape
+
+      # @param [Thinreports::Core::Shape::Text::Internal, Thinreports::Core::Shape::TextBlock::Internal] shape
       # @return [Hash]
       def shape_text_attrs(shape)
         format = shape.format
-        
+
         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?
+          attrs[:line_height] = format.line_height unless blank_value?(format.line_height)
           # Set the :valign option.
           attrs[:valign]      = shape.style.valign
-          
+
           if shape.type_of?(:tblock)
             # Set the :overflow option.
             attrs[:overflow] = text_overflow(format.overflow)
@@ -100,6 +99,6 @@ module ThinReports
         end
       end
     end
-    
+
   end
 end

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

@@ -1,75 +1,84 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Generator
-    
-    # @private
+
     module PDF::Font
-      FONT_STORE = File.join(ThinReports::ROOTDIR, 'resources', 'fonts')
-      
+      FONT_STORE = File.join(Thinreports::ROOT, 'fonts')
+
       BUILTIN_FONTS = {
-        'IPAMincho'  => {:normal => File.join(FONT_STORE, 'ipam.ttf')},
-        'IPAPMincho' => {:normal => File.join(FONT_STORE, 'ipamp.ttf')},
-        'IPAGothic'  => {:normal => File.join(FONT_STORE, 'ipag.ttf')},
-        'IPAPGothic' => {:normal => File.join(FONT_STORE, 'ipagp.ttf')}
+        'IPAMincho'  => { normal: File.join(FONT_STORE, 'ipam.ttf') },
+        'IPAPMincho' => { normal: File.join(FONT_STORE, 'ipamp.ttf') },
+        'IPAGothic'  => { normal: File.join(FONT_STORE, 'ipag.ttf') },
+        'IPAPGothic' => { normal: File.join(FONT_STORE, 'ipagp.ttf') }
+      }
+
+      DEFAULT_FALLBACK_FONTS = %w( Helvetica IPAMincho )
+
+      PRAWN_BUINTIN_FONT_ARIASES = {
+        'Courier New' => 'Courier',
+        'Times New Roman' => 'Times-Roman'
       }
-      
-    private
-      
+
       def setup_fonts
         # Install built-in fonts.
         pdf.font_families.update(BUILTIN_FONTS)
-        
+
+        # Create aliases from the font list provided by Prawn.
+        PRAWN_BUINTIN_FONT_ARIASES.each do |alias_name, name|
+          pdf.font_families[alias_name] = pdf.font_families[name]
+        end
+
+        # Setup custom fallback fonts
         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
+        # For compatible to v0.7 or less
+        fallback_fonts |= Thinreports.config.generator.pdf.eudc_fonts
+        fallback_fonts |= Thinreports.config.fallback_fonts
+        fallback_fonts.uniq!
+
+        fallback_fonts.map!.with_index do |font, i|
+          unless pdf.font_families.key?(font)
+            install_font "Custom-fallback-font#{i}", font
+          else
+            font
+          end
         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(
-          'Courier New'     => pdf.font_families['Courier'],
-          'Times New Roman' => pdf.font_families['Times-Roman']
-        )
+
+        # Set fallback fonts
+        pdf.fallback_fonts(fallback_fonts + DEFAULT_FALLBACK_FONTS)
       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}
+      # @return [String] installed font name
+      def install_font(name, file)
+        raise Errors::FontFileNotFound unless File.exists?(file)
+
+        pdf.font_families[name] = {normal: file,
+                                   bold: file,
+                                   italic: file,
+                                   bold_italic: file}
+        name
       end
-      
+
       # @return [String]
       def default_family
         'Helvetica'
       end
-      
+
       # @param [String] family
       # @return [String]
       def default_family_if_missing(family)
         pdf.font_families.key?(family) ? family : default_family
       end
-      
+
       # @param [String] font
       # @param [Symbol] style
       # @return [Boolean]
       def font_has_style?(font, style)
         (f = pdf.font_families[font]) && f.key?(style)
-      end      
+      end
     end
-    
+
   end
-end
+end

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/graphics/attributes.rb

@@ -1,23 +1,23 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Generator
-    
+
     module PDF::Graphics
       # @param [Hash] svg_attrs
       # @yield [attrs]
       # @yieldparam [Hash] attrs
       # @return [Hash]
       def common_graphic_attrs(svg_attrs, &block)
-        attrs = {:stroke       => svg_attrs['stroke'],
-                 :stroke_width => svg_attrs['stroke-width'],
-                 :fill         => svg_attrs['fill']}
-        
+        attrs = {stroke: svg_attrs['stroke'],
+                 stroke_width: svg_attrs['stroke-width'],
+                 fill: svg_attrs['fill']}
+
         # Set 0 to stroke_width if stroke_opacity is '0'.
         if svg_attrs['stroke-opacity'] == '0'
           attrs[:stroke_width] = 0
         end
-        
+
         # Setting for stroke dash.
         if (dash = svg_attrs['stroke-dasharray']) && dash != 'none'
           attrs[:stroke_dash] = dash.split(',')
@@ -25,40 +25,40 @@ module ThinReports
         block.call(attrs) if block_given?
         attrs
       end
-      
+
       # @param [Hash] svg_attrs
       # @yield [attrs]
       # @yieldparam [Hash] attrs
       # @return [Hash]
       def common_text_attrs(svg_attrs, &block)
-        attrs = {:font   => default_family_if_missing(svg_attrs['font-family']),
-                 :size   => svg_attrs['font-size'],
-                 :color  => svg_attrs['fill'],
-                 :align  => text_align(svg_attrs['text-anchor']),
-                 :styles => font_styles(svg_attrs)}
-        
+        attrs = {font: default_family_if_missing(svg_attrs['font-family']),
+                 size: svg_attrs['font-size'],
+                 color: svg_attrs['fill'],
+                 align: text_align(svg_attrs['text-anchor']),
+                 styles: font_styles(svg_attrs)}
+
         # The Letter Spacing Property.
-        # 
+        #
         # When the version of Layout is
-        #   smaller then 0.6.0: 
+        #   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
       end
-      
+
       # @param [Hash] svg_attrs
       # @return [Array<Symbol>]
       def font_styles(svg_attrs)
         styles = []
         styles << :bold   if svg_attrs['font-weight'] == 'bold'
         styles << :italic if svg_attrs['font-style'] == 'italic'
-        
+
         if (deco = svg_attrs['text-decoration']) && deco != 'none'
           deco = deco.split(' ')
           styles << :underline     if deco.include?('underline')
@@ -66,13 +66,13 @@ module ThinReports
         end
         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)
@@ -83,7 +83,7 @@ module ThinReports
         else :left
         end
       end
-      
+
       # @param [String] svg_valign
       # @return [Symbol]
       def text_valign(svg_valign)
@@ -94,7 +94,7 @@ module ThinReports
         else :top
         end
       end
-      
+
       # @param [String] overflow
       # @return [Symbol]
       def text_overflow(overflow)
@@ -114,13 +114,13 @@ module ThinReports
         else :none
         end
       end
-        
+
       # @param [String] xlink
       # @return [String]
       def extract_base64_string(xlink)
         xlink.sub(%r{^data:image/[a-z]+?;base64,}, '')
       end
     end
-    
+
   end
 end

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

@@ -1,8 +1,8 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Generator
-    
+
     module PDF::Graphics
       # @param [Numeric, String] x1
       # @param [Numeric, String] y1
@@ -17,7 +17,7 @@ module ThinReports
           pdf.line(pos(x1, y1), pos(x2, y2))
         end
       end
-      
+
       # @param [Numeric, String] x
       # @param [Numeric, String] y
       # @param [Numeric, String] w width
@@ -31,7 +31,7 @@ module ThinReports
       def rect(x, y, w, h, attrs = {})
         w, h   = s2f(w, h)
         radius = s2f(attrs[:radius])
-        
+
         with_graphic_styles(attrs) do
           if radius && !radius.zero?
             pdf.rounded_rectangle(pos(x, y), w, h, radius)
@@ -40,7 +40,7 @@ module ThinReports
           end
         end
       end
-      
+
       # @param [Numeric, String] x center-x
       # @param [Numeric, String] y center-y
       # @param [Numeric, String] rx
@@ -52,30 +52,30 @@ module ThinReports
       # @option attrs [String] :fill
       def ellipse(x, y, rx, ry, attrs = {})
         rx, ry = s2f(rx, ry)
-        
+
         with_graphic_styles(attrs) do
           pdf.ellipse(pos(x, y), rx, ry)
         end
       end
-      
+
     private
-      
+
       # @param [Hash] attrs
       def with_graphic_styles(attrs, &block)
         stroke = build_stroke_styles(attrs)
         fill   = build_fill_styles(attrs)
-        
+
         # Do not draw if no colors given.
         return unless fill || stroke
-        
+
         save_graphics_state
 
         # Apply stroke-dashed.
         if stroke && stroke[:dash]
           length, space = stroke[:dash]
-          pdf.dash(length, :space => space)
+          pdf.dash(length, space: space)
         end
-        
+
         case
         # Draw with fill and stroke.
         when fill && stroke
@@ -99,34 +99,34 @@ module ThinReports
             block.call
           }
         end
-        
+
         restore_graphics_state
-      end      
-      
+      end
+
       # @param [Hash] styles
       # @return [Hash, nil]
       def build_stroke_styles(styles)
         color = styles[:stroke]
         width = styles[:stroke_width]
-        
+
         if color && color != 'none' && width && width != 0
-          {:color => parse_color(color),
-           :width => s2f(width),
-           :dash  => s2f(*styles[:stroke_dash])}
+          {color: parse_color(color),
+           width: s2f(width),
+           dash: s2f(*styles[:stroke_dash])}
         end
       end
-      
+
       # @param [Hash] styles
       # @return [Hash, nil]
       def build_fill_styles(styles)
         color = styles[:fill]
-        
+
         if color && color != 'none'
-          {:color => parse_color(color)}
+          {color: parse_color(color)}
         end
-      end      
-      
+      end
+
     end
-    
+
   end
 end