draw_shape.rb in thinreports-0.8.0

- old
+ new

@@ -1,20 +1,19 @@
 # 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
           end
           text_box(content, x, y, w, h, attrs)
@@ -22,84 +21,84 @@
       end
 
       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|
           attrs[:radius] = shape.style.svg_attrs['rx']
         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)
             # Set the :word_wrap option
             attrs[:word_wrap] = text_word_wrap(format.word_wrap)
           end
         end
       end
     end
-    
+
   end
 end