thinreports 0.6.0.pre3 → 0.7.0

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

@@ -3,7 +3,7 @@
 module ThinReports
   module Generator
     
-    module Pdf::Graphics
+    module PDF::Graphics
       # @param [Numeric, String] x1
       # @param [Numeric, String] y1
       # @param [Numeric, String] x2

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

@@ -6,7 +6,7 @@ require 'base64'
 module ThinReports
   module Generator
     
-    module Pdf::Graphics
+    module PDF::Graphics
       # @param [String] filename
       # @param [Numeric, Strng] x
       # @param [Numeric, Strng] y
@@ -24,6 +24,23 @@ module ThinReports
         image(image.path, x, y, w, h)
       end
       
+      # @param file (see Prawn#image)
+      # @param [Numeric, Strng] x
+      # @param [Numeric, Strng] y
+      # @param [Numeric, Strng] w
+      # @param [Numeric, Strng] h
+      # @param [Hash] options
+      # @option options [:left, :center, :right] :position_x (:left)
+      # @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])
+        end
+      end
+      
     private
       
       def clean_temp_images

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

@@ -3,7 +3,7 @@
 module ThinReports
   module Generator
     
-    module Pdf::Graphics
+    module PDF::Graphics
       # @param [String] content
       # @param [Numeric, String] x
       # @param [Numeric, String] y
@@ -19,15 +19,22 @@ module ThinReports
       # @option attrs [:top, :center, :bottom] :valign (:top)
       # @option attrs [Numeric, String] :line_height The total height of an text line.
       # @option attrs [Numeric, String] :letter_spacing
+      # @option attrs [Boolean] :single (false)
       def text_box(content, x, y, w, h, attrs = {})
         w, h = s2f(w, h)
+        box_attrs = text_box_attrs(x, y, w, h, attrs.delete(:single))
+        
         with_text_styles(attrs) do |built_attrs, font_styles|
           pdf.formatted_text_box([{:text   => text_without_line_wrap(content),
                                    :styles => font_styles}],
-                                 built_attrs.merge(:at     => pos(x, y),
-                                                   :width  => w,
-                                                   :height => h))
+                                 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
@@ -38,6 +45,22 @@ module ThinReports
       
     private
       
+      # @param x (see #text_box)
+      # @param y (see #text_box)
+      # @param w (see #text_box)
+      # @param h (see #text_box)
+      # @param [Boolean, nil] single
+      # @return [Hash]
+      def text_box_attrs(x, y, w, h, single = nil)
+        attrs = {:at    => pos(x, y),
+                 :width => s2f(w)}
+        if single
+          attrs.merge(:single_line => true)
+        else
+          attrs.merge(:height => s2f(h))
+        end
+      end
+      
       # @param attrs (see #text)
       # @yield [built_attrs, font_styles]
       # @yieldparam [Hash] built_attrs The finalized attributes.
@@ -104,7 +127,7 @@ module ThinReports
         end
         
         # Emulate bold style.
-        if manual.include?(:bold)
+        if manual && manual.include?(:bold)
           pdf.stroke_color(font[:color])
           pdf.line_width(font[:size] * 0.025)
           
@@ -113,7 +136,7 @@ module ThinReports
         end
         
         # Emulate italic style.
-        if manual.include?(:italic)
+        if manual && manual.include?(:italic)
           # FIXME
           # pdf.transformation_matrix(1, 0, 0.26, 1, 0, 0)
         end

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

@@ -0,0 +1,70 @@
+# coding: utf-8
+
+module ThinReports
+  module Generator
+    
+    # @private
+    module PDF::Page
+      
+      # @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
+          format.identifier
+        else
+          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'} : {})
+      end
+      
+    private
+      
+      # @return [ThinReports::Layout::Format]
+      attr_reader :current_page_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
+      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
+      # @return [Hash]
+      def new_basic_page_options(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
+        options
+      end
+    end
+    
+  end
+end

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

@@ -4,7 +4,7 @@ module ThinReports
   module Generator
     
     # @private
-    module Pdf::ParseColor
+    module PDF::ParseColor
       # @param [String] color
       # @return [String]
       def parse_color(color)

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

@@ -6,7 +6,7 @@ module ThinReports
   module Generator
     
     # @private
-    module Pdf::ParseSVG
+    module PDF::ParseSVG
       # @param [String] source
       # @param [String] base_path
       def parse_svg(source, base_path)

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

@@ -4,7 +4,7 @@ module ThinReports
   module Generator
     
     # @private
-    module Pdf::Drawer
+    module PDF::Drawer
     end
     
   end

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

@@ -5,8 +5,8 @@ module ThinReports
     
     # @abstract
     # @private
-    class Pdf::Drawer::Base
-      # @param [ThinReports::Generator::Pdf::Document] pdf
+    class PDF::Drawer::Base
+      # @param [ThinReports::Generator::PDF::Document] pdf
       # @param [ThinReports::Core::Shape::Manager::Format] format
       def initialize(pdf, format)
         @pdf     = pdf
@@ -30,13 +30,11 @@ module ThinReports
       
       # @see #pdf_stamp_id
       def shape_stamp_id(shape)
-        id = shape.id.dup
-        id << shape.attrs.values_at('fill', 'stroke').join unless shape.attrs.empty?
-        id.gsub(/#/, '')
+        "#{shape.id}#{shape.style.identifier}"
       end
       
-      # @overload pdf_stamp('stamp_id')
-      #   @param [String] shape
+      # @overload pdf_stamp(shape_id)
+      #   @param [String] shape_id
       # @overload pdf_stamp(shape)
       #   @param [ThinReports::Core::Shape::Base::Internal] shape
       def pdf_stamp(shape)

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

@@ -4,8 +4,8 @@ module ThinReports
   module Generator
     
     # @private
-    class Pdf::Drawer::List < Pdf::Drawer::Base
-      # @param (see Pdf::Drawer::Base#initialize)
+    class PDF::Drawer::List < PDF::Drawer::Base
+      # @param (see PDF::Drawer::Base#initialize)
       def initialize(pdf, format)
         super
         @sections = {}
@@ -28,10 +28,10 @@ module ThinReports
       end
       
       # @param [ThinReports::Core::Shape::List::SectionInternal] section
-      # @return [ThinReports::Generator::Pdf::Drawer::ListSection]
+      # @return [ThinReports::Generator::PDF::Drawer::ListSection]
       def drawer(section)
         @sections[section.section_name] ||=
-          Pdf::Drawer::ListSection.new(@pdf, section)
+          PDF::Drawer::ListSection.new(@pdf, section)
       end
     end
     

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

@@ -4,8 +4,8 @@ module ThinReports
   module Generator
     
     # @private
-    class Pdf::Drawer::ListSection < Pdf::Drawer::Page
-      # @param pdf (see Pdf::Drawer::Page#initialize)
+    class PDF::Drawer::ListSection < PDF::Drawer::Page
+      # @param pdf (see PDF::Drawer::Page#initialize)
       # @param section [ThinReports::Core::Shape::List::SectionInternal] section
       def initialize(pdf, section)
         super(pdf, section.format)
@@ -36,10 +36,15 @@ module ThinReports
         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      
+      def draw_iblock_shape(shape)
+        @pdf.translate(*@draw_at) { super }
+      end
     end
     
   end

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

@@ -4,8 +4,8 @@ module ThinReports
   module Generator
     
     # @private
-    class Pdf::Drawer::Page < Pdf::Drawer::Base
-      # @param see Pdf::Drawer::Base#initialize)
+    class PDF::Drawer::Page < PDF::Drawer::Base
+      # @param see PDF::Drawer::Base#initialize)
       def initialize(pdf, format)
         super
         @lists = {}
@@ -29,6 +29,8 @@ module ThinReports
           draw_tblock_shape(shape)
         when shape.type_of?(:list)
           draw_list_shape(shape)
+        when shape.type_of?(:iblock)
+          draw_iblock_shape(shape)
         else
           id = shape_stamp_id(shape)
           unless @stamps.include?(id)
@@ -41,7 +43,7 @@ module ThinReports
       
       # @see #draw_shape
       def draw_list_shape(shape)
-        drawer = @lists[shape.id] ||= Pdf::Drawer::List.new(@pdf, shape.format)
+        drawer = @lists[shape.id] ||= PDF::Drawer::List.new(@pdf, shape.format)
         drawer.draw(shape)
       end
       
@@ -50,6 +52,11 @@ module ThinReports
         @pdf.draw_shape_tblock(shape)
       end
       
+      # @see #draw_shape
+      def draw_iblock_shape(shape)
+        @pdf.draw_shape_iblock(shape)
+      end
+      
       # @param [ThinReports::Core::Shape::Base::Internal] shape
       def create_basic_shape_stamp(shape)
         case

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

@@ -2,35 +2,30 @@
 
 # @private
 module Prawn
-  # Patch for issue {https://github.com/sandal/prawn/issues/245 #245}.
-  # @private
-  class Font::TTF
-    def character_width_by_code(code)    
-        return 0 unless cmap[code]
-        return 0.0 if code == 10
-        @char_widths[code] ||= Integer(hmtx.widths[cmap[code]] * scale_factor)
-    end    
-  end
-  
   # @private
   class Document
     # Create around alias.
     alias_method :original_width_of, :width_of
     
-    # For Ruby 1.8
-    ruby_18 do
-      def width_of(string, options={})
-        str_length = in_utf8 { string.split(//).size }
-        font.compute_width_of(string, options) + character_spacing * (str_length - 1)
-      end
+    def width_of(string, options={})
+      font.compute_width_of(string, options) +
+        (character_spacing * (font.character_count(string) - 1))
     end
     
-    # For Ruby 1.9
-    ruby_19 do
-      def width_of(string, options={})
-        font.compute_width_of(string, options) + character_spacing * (string.length - 1)
+  private
+    # Create around alias.
+    alias_method :original_calc_image_dimensions, :calc_image_dimensions
+    
+    def calc_image_dimensions(info, options)
+      if options[:auto_fit]
+        w, h = info.width, info.height
+        sw, sh = options.delete(:auto_fit)
+        
+        if w > sw || h > sh
+          options[:fit] = [sw, sh]
+        end
       end
+      original_calc_image_dimensions(info, options)
     end
   end
-
 end

data/lib/thinreports/layout/format.rb

@@ -8,7 +8,7 @@ module ThinReports
     # @private
     class Format < Core::Shape::Manager::Format
       config_reader :last_version        => %w( version )
-      config_reader :report_title        => %w( title )
+      config_reader :report_title        => %w( config title )
       config_reader :page_paper_type     => %w( config page paper-type ),
                     :page_width          => %w( config page width ),
                     :page_height         => %w( config page height ),
@@ -35,7 +35,7 @@ module ThinReports
             # Check the compatibility of specified layout file.
             unless ThinReports::Layout::Version.compatible?(raw_format['version'])
               info = [filename, raw_format['version'],
-                      ThinReports::Layout::Version.required_rules_inspect]
+                      ThinReports::Layout::Version.inspect_required_rules]
               raise ThinReports::Errors::IncompatibleLayoutFormat.new(*info)
             end
             

data/lib/thinreports/layout/version.rb

@@ -5,7 +5,7 @@ module ThinReports
     
     # @private
     module Version
-      REQUIRED_RULES = ["== #{ThinReports::VERSION}"]
+      REQUIRED_RULES = ['>= 0.6.0.pre3', '< 0.8.0']
       
       # @param [String] version
       # @return [Boolean]
@@ -24,7 +24,7 @@ module ThinReports
       end
       
       # @return [String]
-      def self.required_rules_inspect
+      def self.inspect_required_rules
         '(' + REQUIRED_RULES.join(' and ') + ')'
       end
       

data/lib/thinreports/report/base.rb

@@ -10,6 +10,7 @@ module ThinReports
       
       class << self
         # @param options (see #initialize)
+        # @option options (see #initialize)
         # @yield [report]
         # @yieldparam [ThinReports::Report::Base] report
         # @return [ThinReports::Report::Base]
@@ -24,39 +25,61 @@ module ThinReports
           report
         end
         
-        # @param [Symbol] type
-        # @param [Hash] options
-        # @option options [Hash] :report Options for Report (see #initialize)
-        # @option options [Hash] :generator Options for Generator.
-        # @yield (see #create)
+        # @overload generate(type, options = {}, &block)
+        #   @param [Symbol] type
+        #   @param [Hash] options
+        #   @option options [Hash] :report ({}) Options for Report.
+        #   @option options [Hash] :generator ({}) Options for Generator.
+        # @overload generate(options = {}, &block)
+        #   @param [Hash] options
+        #   @option options [Hash] :report ({}) Options for Report.
+        #   @option options [Hash] :generator ({}) Options for Generator.
+        # @yield (see .create)
+        # @yieldparam (see .create)
         # @return [String]
-        def generate(type, options = {}, &block)
-          init_generate_params(options, &block)
+        def generate(*args, &block)
+          raise ArgumentError, '#generate requires a block' unless block_given?
           
-          create(options[:report], &block).generate(type, options[:generator])
+          report_opts, generator_opts = extract_options!(args)
+          
+          report = create(report_opts, &block)
+          report.generate(*args.push(generator_opts))
         end
         
-        # @param [Symbol] type
-        # @param [String] filename
-        # @param options (see #generate)
-        # @yield (see #create)
-        def generate_file(type, filename, options = {}, &block)
-          init_generate_params(options, &block)
+        # @overload generate_file(type, filename, options = {}, &block)
+        # @overload generate_file(filename, options = {}, &block)
+        # @param filename (see #generate_file)
+        # @yield (see .create)
+        # @yieldparam (see .create)
+        # @see .generate
+        # @return [void]
+        def generate_file(*args, &block)
+          raise ArgumentError, '#generate_file requires a block' unless block_given?
+          
+          report_opts, generator_opts = extract_options!(args)
           
-          create(options[:report], &block).
-              generate_file(type, filename, options[:generator])
+          report = create(report_opts, &block)
+          report.generate_file(*args.push(generator_opts))
         end
         
       private
         
-        # @param (see #generate)
-        # @private
-        def init_generate_params(options, &block)
-          unless block_given?
-            raise ArgumentError, '#generate or #generate_file requires a block'
+        # @param [Array] args
+        # @return [Array<Hash>]
+        def extract_options!(args)
+          if args.last.is_a?(::Hash)
+            options = args.pop
+          
+            generator = options.delete(:generator) || {}
+            report    = options.delete(:report) || {}
+            
+            if options.key?(:layout)
+              report[:layout] = options.delete(:layout)
+            end
+            [report, generator.merge(options)]
+          else
+            [{}, {}]
           end
-          options[:report]    ||= {}
-          options[:generator] ||= {}
         end
       end
       
@@ -66,19 +89,20 @@ module ThinReports
         @internal = Report::Internal.new(self, options)
       end
       
-      # @param [String] path of layout-file.
+      # @param [String] layout path to layout-file.
       # @param [Hash] options
       # @option options [Boolean] :default (true)
       # @option options [Symbol] :id (nil)
-      # @yield [config,]
+      # @yield [config]
       # @yieldparam [ThinReports::Layout::Configuration] config
+      # @return [void]
       def use_layout(layout, options = {}, &block)
         internal.register_layout(layout, options, &block)
       end
       
       # @param [Hash] options
       # @option options [String, Symbol] :layout (nil)
-      # @yield [page,]
+      # @yield [page]
       # @yieldparam [ThinReports::Core::Page] page
       # @return [ThinReports::Core::Page]
       def start_new_page(options = {}, &block)
@@ -115,17 +139,29 @@ module ThinReports
         internal.default_layout
       end
       
-      # @param [Symbol] type
-      # @param options (see ThinReports::Generator)
+      # @overload generate(type, options = {})
+      #   Specify the generator type.
+      #   @param [Symbol] type
+      # @overload generate(options = {})
+      #   Using the default generator type.
+      # @param [Hash] options ({})
       # @return [String]
-      def generate(type, options = {})
+      def generate(*args)
+        options = args.last.is_a?(::Hash) ? args.pop : {}
+        type    = args.first || ThinReports.config.generator.default
         ThinReports::Generator.new(type, self, options).generate
       end
       
-      # @param type (see #generate)
+      # @overload generate_file(type, filename, options = {})
+      #   @param type (#generate)
+      # @overload generate_file(filename, options = {})
       # @param [String] filename
       # @param options (see #generate)
-      def generate_file(type, filename, options = {})
+      # @return [void]
+      def generate_file(*args)
+        options = args.last.is_a?(::Hash) ? args.pop : {}
+        args.unshift(ThinReports.config.generator.default) if args.size == 1
+        type, filename = args
         ThinReports::Generator.new(type, self, options).generate_file(filename)
       end
       
@@ -144,6 +180,7 @@ module ThinReports
         internal.page_count
       end
       
+      # @return [void]
       # @private
       def finalize
         internal.finalize