thinreports 0.7.7 → 0.8.0

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

@@ -3,9 +3,9 @@
 require 'tempfile'
 require 'base64'
 
-module ThinReports
+module Thinreports
   module Generator
-    
+
     module PDF::Graphics
       # @param [String] filename
       # @param [Numeric, Strng] x
@@ -14,9 +14,9 @@ module ThinReports
       # @param [Numeric, Strng] h
       def image(filename, x, y, w, h)
         w, h = s2f(w, h)
-        pdf.image(filename, :at => pos(x, y), :width  => w, :height => h)
+        pdf.image(filename, at: pos(x, y), width: w, height: h)
       end
-      
+
       # @param [String] base64
       # @param [Numeric, Strng] x
       # @param [Numeric, Strng] y
@@ -26,7 +26,7 @@ module ThinReports
         image = create_temp_imagefile(base64)
         image(image.path, x, y, w, h)
       end
-      
+
       # @param file (see Prawn#image)
       # @param [Numeric, Strng] x
       # @param [Numeric, Strng] y
@@ -37,23 +37,23 @@ module ThinReports
       # @option options [:top, :center, :bottom] :position_y (:top)
       def image_box(file, x, y, w, h, options = {})
         w, h = s2f(w, h)
-        pdf.bounding_box(pos(x, y), :width => w, :height => h) do
-          pdf.image(file, :position  => options[:position_x] || :left,
-                          :vposition => options[:position_y] || :top,
-                          :auto_fit  => [w, h])
+        pdf.bounding_box(pos(x, y), width: w, height: h) do
+          pdf.image(file, position: options[:position_x] || :left,
+                          vposition: options[:position_y] || :top,
+                          auto_fit: [w, h])
         end
       end
-      
+
     private
-      
+
       def clean_temp_images
         temp_image_registry.each {|tmp| tmp.unlink }
       end
-      
+
       def temp_image_registry
         @temp_image_registry ||= []
       end
-      
+
       # @param [String] base64
       # @return [Tempfile]
       def create_temp_imagefile(base64)
@@ -64,8 +64,8 @@ module ThinReports
         file
       ensure
         file.close
-      end      
+      end
     end
-    
+
   end
 end

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

@@ -1,8 +1,8 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Generator
-    
+
     module PDF::Graphics
       # @param [String] content
       # @param [Numeric, String] x
@@ -24,32 +24,31 @@ module ThinReports
       # @option attrs [:none, :break_word] :word_wrap (:none)
       def text_box(content, x, y, w, h, attrs = {})
         w, h = s2f(w, h)
-        box_attrs = text_box_attrs(x, y, w, h, :single   => attrs.delete(:single), 
-                                               :overflow => attrs[:overflow])
+        box_attrs = text_box_attrs(x, y, w, h, single: attrs.delete(:single),
+                                               overflow: attrs[:overflow])
         # Do not break by word unless :word_wrap is :break_word
         content = text_without_line_wrap(content) if attrs[:word_wrap] == :none
-        
+
         with_text_styles(attrs) do |built_attrs, font_styles|
-          pdf.formatted_text_box([{:text   => content,
-                                   :styles => font_styles}],
-                                 built_attrs.merge(box_attrs))
+          pdf.formatted_text_box([{ text: content, styles: font_styles }],
+            built_attrs.merge(box_attrs))
         end
       rescue Prawn::Errors::CannotFit => e
         # Nothing to do.
-        # 
+        #
         # When the area is too small compared
         # with the content and the style of the text.
         #   (See prawn/core/text/formatted/line_wrap.rb#L185)
       end
-      
+
       # @see #text_box
       def text(content, x, y, w, h, attrs = {})
         # Set the :overflow property to :shirink_to_fit.
-        text_box(content, x, y, w, h, {:overflow => :shrink_to_fit}.merge(attrs))
+        text_box(content, x, y, w, h, { overflow: :shirink_to_fit }.merge(attrs))
       end
-      
+
     private
-      
+
       # @param x (see #text_box)
       # @param y (see #text_box)
       # @param w (see #text_box)
@@ -59,15 +58,15 @@ module ThinReports
       # @option states [Symbold] :overflow
       # @return [Hash]
       def text_box_attrs(x, y, w, h, states = {})
-        attrs = {:at    => pos(x, y),
-                 :width => s2f(w)}
+        attrs = {at: pos(x, y),
+                 width: s2f(w)}
         if states[:single]
-          states[:overflow] != :expand ? attrs.merge(:single_line => true) : attrs
+          states[:overflow] != :expand ? attrs.merge(single_line: true) : attrs
         else
-          attrs.merge(:height => s2f(h))
+          attrs.merge(height: s2f(h))
         end
       end
-      
+
       # @param attrs (see #text)
       # @yield [built_attrs, font_styles]
       # @yieldparam [Hash] built_attrs The finalized attributes.
@@ -75,48 +74,48 @@ module ThinReports
       def with_text_styles(attrs, &block)
         # When no color is given, do not draw.
         return unless attrs.key?(:color) && attrs[:color] != 'none'
-        
+
         save_graphics_state
-        
-        fontinfo = {:name  => attrs.delete(:font).to_s,
-                    :color => parse_color(attrs.delete(:color)),
-                    :size  => s2f(attrs.delete(:size))}
-        
+
+        fontinfo = {name: attrs.delete(:font).to_s,
+                    color: parse_color(attrs.delete(:color)),
+                    size: s2f(attrs.delete(:size))}
+
         # Add the specified value to :leading option.
         if line_height = attrs.delete(:line_height)
           attrs[:leading] = text_line_leading(s2f(line_height),
-                                              :name => fontinfo[:name],
-                                              :size => fontinfo[:size])
+                                              name: fontinfo[:name],
+                                              size: fontinfo[:size])
         end
-        
+
         # Set the :character_spacing option.
         if space = attrs.delete(:letter_spacing)
           attrs[:character_spacing] = s2f(space)
         end
-        
+
         # Or... with_font_styles(attrs, fontinfo, &block)
         with_font_styles(attrs, fontinfo) do |modified_attrs, styles|
           block.call(modified_attrs, styles)
         end
-        
+
         restore_graphics_state
       end
-      
+
       # @param [Numeric] line_height
       # @param [Hash] font
       # @option font [String] :name Name of font.
       # @option font [Numeric] :size Size of font.
       # @return [Numeric]
       def text_line_leading(line_height, font)
-        line_height - pdf.font(font[:name], :size => font[:size]).height
+        line_height - pdf.font(font[:name], size: font[:size]).height
       end
-      
+
       # @param [String] content
       # @return [String]
       def text_without_line_wrap(content)
         content.gsub(/ /, Prawn::Text::NBSP)
       end
-      
+
       # @param [Hash] attrs
       # @param [Hash] font
       # @option font [String] :color
@@ -132,29 +131,29 @@ module ThinReports
             [:bold, :italic].include?(style) && !font_has_style?(font[:name], style)
           end
         end
-        
+
         # Emulate bold style.
         if manual && manual.include?(:bold)
           pdf.stroke_color(font[:color])
           pdf.line_width(font[:size] * 0.025)
-          
+
           # Change rendering mode to :fill_stroke.
           attrs[:mode] = :fill_stroke
         end
-        
+
         # Emulate italic style.
         if manual && manual.include?(:italic)
           # FIXME
           # pdf.transformation_matrix(1, 0, 0.26, 1, 0, 0)
         end
-        
-        pdf.font(font[:name], :size => font[:size]) do
+
+        pdf.font(font[:name], size: font[:size]) do
           pdf.fill_color(font[:color])
           block.call(attrs, styles || [])
         end
-      end      
-      
+      end
+
     end
-    
+
   end
 end

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

@@ -1,22 +1,21 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Generator
-    
-    # @private
+
     module PDF::Page
       # Add JIS-B4,B5 page geometry
-      Prawn::Document::PageGeometry::SIZES.update(
+      ::PDF::Core::PageGeometry::SIZES.update(
         'B4_JIS' => [728.5, 1031.8],
         'B5_JIS' => [515.9, 728.5]
       )
-      
-      # @param [ThinReports::Layout::Format] format
+
+      # @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
@@ -25,43 +24,43 @@ 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]
@@ -80,6 +79,6 @@ module ThinReports
         options
       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