thinreports 0.7.6 → 0.7.7

data/lib/thinreports/report/internal.rb

@@ -68,17 +68,19 @@ module ThinReports
         @finalized
       end
       
-      def load_layout(layout)
-        return @default_layout if layout.nil?
+      def load_layout(id_or_filename)
+        return @default_layout if id_or_filename.nil?
         
-        case layout
+        layout = case id_or_filename
         when Symbol
-          layout_registry[layout]
+          layout_registry[id_or_filename]
         when String
-          prepare_layout(layout)
+          prepare_layout(id_or_filename)
         else
           raise ArgumentError, 'Invalid argument for layout.'
         end
+        @default_layout = layout unless @default_layout
+        layout
       end
       
     private

data/lib/thinreports/version.rb

@@ -2,5 +2,5 @@
 
 module ThinReports
   # The current version.
-  VERSION = '0.7.6'
+  VERSION = '0.7.7'
 end

data/tasks/doc.rake

@@ -5,7 +5,6 @@ require 'yard'
 YARD::Rake::YardocTask.new(:doc) do |yard|
   yard.files   = Dir['lib/**/*.rb']
   yard.options = [
-    '--no-private', 
     '--readme',     'README.rdoc',
     '--output-dir', 'doc/yardoc', 
     '--template-path', 'doc/yardoc_templates'

data/test/case/character_spacing/character_spacing.rb

@@ -1,7 +1,8 @@
 # coding: utf-8
 
-CaseRunner.current :character_spacing
+testcase :character_spacing, 'Sets the character spacing in the Editor' do
+  report = ThinReports::Report.new :layout => layout_filename
+  report.start_new_page
 
-ThinReports::Report.generate_file(CaseRunner.output_file, :layout => CaseRunner.layout_file) do
-  start_new_page
+  report.generate :filename => output_filename
 end

data/test/case/dynamic_image/dynamic_image.rb

@@ -2,40 +2,40 @@
 
 require 'open-uri'
 
-CaseRunner.current :dynamic_image
-
-image50x50    = CaseRunner.case_resource('img50x50.png')
-image200x100  = CaseRunner.case_resource('img200x100.png')
-matsukei_logo = open('http://www.matsukei.co.jp/common/image/logo.jpg')
-
-ThinReports::Report.generate_file(:pdf, CaseRunner.output_file) do |r|
-  r.use_layout(CaseRunner.layout_file)
-  
-  r.start_new_page
-  
-  r.page.values(:pos_top_left       => image50x50,
-                :pos_top_center     => image50x50,
-                :pos_top_right      => image50x50,
-                :pos_center_left    => image50x50,
-                :pos_center_center  => image50x50,
-                :pos_center_right   => image50x50,
-                :pos_bottom_left    => image50x50,
-                :pos_bottom_center  => image50x50,
-                :pos_bottom_right   => image50x50)
-  
-  r.page.item(:overflow).src(image200x100)
-  
-  # It cannot do as follows:
-  # 
-  #   r.page.item(:logo1).src(matsukei_logo)
-  #   r.page.item(:logo2).value(matsukei_logo)
-  #   
-  r.page.item(:logo1).src(matsukei_logo.path)
-  r.page.item(:logo2).value(matsukei_logo.path)
-  
-  r.page.item(:thinreports_logo).src(open('http://www.thinreports.org/media/i/logo.png'))
+testcase :dynamic_image, 'Show images dynamically' do
+  image50x50    = resource('img50x50.png')
+  image200x100  = resource('img200x100.png')
+  matsukei_logo = open('http://www.matsukei.co.jp/common/image/logo.jpg')
   
-  r.page.list(:list) do |list|
-    3.times { list.add_row :in_list => image50x50 }
+  ThinReports::Report.generate :filename => output_filename do |r|
+    r.use_layout(layout_filename)
+    
+    r.start_new_page
+    
+    r.page.values(:pos_top_left       => image50x50,
+                  :pos_top_center     => image50x50,
+                  :pos_top_right      => image50x50,
+                  :pos_center_left    => image50x50,
+                  :pos_center_center  => image50x50,
+                  :pos_center_right   => image50x50,
+                  :pos_bottom_left    => image50x50,
+                  :pos_bottom_center  => image50x50,
+                  :pos_bottom_right   => image50x50)
+    
+    r.page.item(:overflow).src(image200x100)
+    
+    # It cannot do as follows:
+    # 
+    #   r.page.item(:logo1).src(matsukei_logo)
+    #   r.page.item(:logo2).value(matsukei_logo)
+    #   
+    r.page.item(:logo1).src(matsukei_logo.path)
+    r.page.item(:logo2).value(matsukei_logo.path)
+    
+    r.page.item(:thinreports_logo).src(open('http://www.thinreports.org/assets/images/thinreports-logo.png'))
+    
+    r.page.list(:list) do |list|
+      3.times { list.add_row :in_list => image50x50 }
+    end
   end
 end

data/test/case/dynamic_style/dynamic_style.rb

@@ -1,154 +1,154 @@
 # coding: utf-8
 
-CaseRunner.current :dynamic_style
-
-image = CaseRunner.case_resource('image.png')
-setup_values = Proc.new do |page|
-  # The Basic Style
-  page.values(:basic_show5 => 'TextBlock',
-              :basic_show6 => image,
-              :basic_hide5 => 'TextBlock',
-              :basic_hide6 => image)
-  # The Text Style
-  page.values(:text_b3 => 'To bold',
-              :text_b4 => 'To normal',
-              :text_i3 => 'To italic',
-              :text_i4 => 'To normal',
-              :text_u3 => 'To underline',
-              :text_u4 => 'To none',
-              :text_l3 => 'To line-through',
-              :text_l4 => 'To none')
-  page.values(:text_a2 => 'To right align',
-              :text_a3 => "To right align\n右寄せ",
-              :text_va2 => "To bottom align\n下揃え",
-              :text_color2 => '赤色')
-end
-
-ThinReports::Report.generate_file(CaseRunner.output_file,
-                                  :layout => CaseRunner.layout_file) do |r|
-  # In case of using "dynamic_style.tlf"
-  
-  # Create raw-page.
-  r.start_new_page
-  r.page.item(:title).value('Original Page')
-  
-  setup_values.call(r.page)
-  
-  # Create styled-page.
-  r.start_new_page
-  
-  setup_values.call(r.page)
-  r.page.item(:title).value('Styled Page')
-  
-  # The Basic Style
-  6.times do |i|
-    r.page.item("basic_show#{i + 1}").style(:visible, true)
-    r.page.item("basic_hide#{i + 1}").style(:visible, false)
-  end
-  
-  # The Graphic Style
-  r.page.item(:graphic_bcolor1).style(:border_color, '#ff0000')
-  r.page.item(:graphic_bcolor2).style(:border_color, 'red')
-  # [WARNING] :stroke is deprecated.
-  r.page.item(:graphic_bcolor3).style(:stroke, 'ff0000')
-  # nil or 'none'.
-  r.page.item(:graphic_bcolor4).style(:border_color, nil)
-  
-  r.page.item(:graphic_bwidth1).style(:border_width, 5)
-  r.page.item(:graphic_bwidth2).style(:border_width, 5)
-  r.page.item(:graphic_bwidth3).style(:border_width, 5)
-  r.page.item(:graphic_bwidth4).style(:border_width, 2)
-  r.page.item(:graphic_bwidth5).style(:border_width, 0)
-  
-  r.page.item(:graphic_fcolor1).style(:fill_color, '#ff0000')
-  # [WARNING] :fill is deprecated.
-  r.page.item(:graphic_fcolor2).style(:fill, 'red')
-  # nil or 'none'
-  r.page.item(:graphic_fcolor3).style(:fill_color, 'none')
-  r.page.item(:graphic_fcolor4).style(:fill_color, 'ff0000')
-  
-  # The Text Style
-  [1, 3].each do |i|
-    r.page.item("text_b#{i}").style(:bold, true)
-    r.page.item("text_i#{i}").style(:italic, true)
-    r.page.item("text_u#{i}").style(:underline, true)
-    r.page.item("text_l#{i}").style(:linethrough, true)
-  end
-  [2, 4].each do |i|
-    r.page.item("text_b#{i}").style(:bold, false)
-    r.page.item("text_i#{i}").style(:italic, false)
-    r.page.item("text_u#{i}").style(:underline, false)
-    r.page.item("text_l#{i}").style(:linethrough, false)
-  end
-  
-  3.times do |i|
-    r.page.item("text_a#{i + 1}").style(:align, :right)
-  end
-  2.times do |i|
-    r.page.item("text_va#{i + 1}").style(:valign, :bottom)
-  end
-  
-  2.times do |i|
-    r.page.item("text_color#{i + 1}").style(:color, 'ff0000')
-  end
-  
-  # In case of using "dynamic_style_in_list.tlf"
-  r.start_new_page(:layout => CaseRunner.case_resource('dynamic_style_in_list.tlf'))
-  
-  # Settings for Header.
-  r.page.list(:list).header do |header|
-    header.item(:rect).styles(:border_color => nil,
-                              :fill_color   => 'ff00ff')
-    header.item(:text).styles(:align  => :center,
-                              :valign => :center,
-                              :bold   => true)
-    header.item(:tblock).styles(:align       => :center,
-                                :valign      => :center,
-                                :color       => 'red',
-                                :linethrough => true)
+testcase :dynamic_style, 'Change styles of the object dynamically' do |t|
+  image = t.resource('image.png')
+  setup_values = Proc.new do |page|
+    # The Basic Style
+    page.values(:basic_show5 => 'TextBlock',
+                :basic_show6 => image,
+                :basic_hide5 => 'TextBlock',
+                :basic_hide6 => image)
+    # The Text Style
+    page.values(:text_b3 => 'To bold',
+                :text_b4 => 'To normal',
+                :text_i3 => 'To italic',
+                :text_i4 => 'To normal',
+                :text_u3 => 'To underline',
+                :text_u4 => 'To none',
+                :text_l3 => 'To line-through',
+                :text_l4 => 'To none')
+    page.values(:text_a2 => 'To right align',
+                :text_a3 => "To right align\n右寄せ",
+                :text_va2 => "To bottom align\n下揃え",
+                :text_color2 => '赤色')
   end
   
-  1.step(10, 1) do |i|
-    # Flag of overflowed list-page.
-    is_overflowed = r.page.list(:list).overflow?
+  ThinReports::Report.generate(:filename => t.output_filename,
+                               :layout => t.layout_filename) do |r|
+    # In case of using dynamic_style.tlf
     
-    # Add details.
-    r.page.list(:list).add_row do |row|
-      case
-      when i % 2 == 0
-        row.item(:rect).styles(:border_color => 'ff0000',
-                               :border_width => 3,
-                               :fill_color   => '0000ff')
-        row.item(:text).styles(:color => 'red',
-                               :align => :left,
-                               :valign => :center)
-        row.item(:tblock).styles(:color => 'blue',
+    # Create raw-page.
+    r.start_new_page
+    r.page.item(:title).value('Original Page')
+    
+    setup_values.call(r.page)
+    
+    # Create styled-page.
+    r.start_new_page
+    
+    setup_values.call(r.page)
+    r.page.item(:title).value('Styled Page')
+    
+    # The Basic Style
+    6.times do |i|
+      r.page.item("basic_show#{i + 1}").style(:visible, true)
+      r.page.item("basic_hide#{i + 1}").style(:visible, false)
+    end
+    
+    # The Graphic Style
+    r.page.item(:graphic_bcolor1).style(:border_color, '#ff0000')
+    r.page.item(:graphic_bcolor2).style(:border_color, 'red')
+    # [WARNING] :stroke is deprecated.
+    r.page.item(:graphic_bcolor3).style(:stroke, 'ff0000')
+    # nil or 'none'.
+    r.page.item(:graphic_bcolor4).style(:border_color, nil)
+    
+    r.page.item(:graphic_bwidth1).style(:border_width, 5)
+    r.page.item(:graphic_bwidth2).style(:border_width, 5)
+    r.page.item(:graphic_bwidth3).style(:border_width, 5)
+    r.page.item(:graphic_bwidth4).style(:border_width, 2)
+    r.page.item(:graphic_bwidth5).style(:border_width, 0)
+    
+    r.page.item(:graphic_fcolor1).style(:fill_color, '#ff0000')
+    # [WARNING] :fill is deprecated.
+    r.page.item(:graphic_fcolor2).style(:fill, 'red')
+    # nil or 'none'
+    r.page.item(:graphic_fcolor3).style(:fill_color, 'none')
+    r.page.item(:graphic_fcolor4).style(:fill_color, 'ff0000')
+    
+    # The Text Style
+    [1, 3].each do |i|
+      r.page.item("text_b#{i}").style(:bold, true)
+      r.page.item("text_i#{i}").style(:italic, true)
+      r.page.item("text_u#{i}").style(:underline, true)
+      r.page.item("text_l#{i}").style(:linethrough, true)
+    end
+    [2, 4].each do |i|
+      r.page.item("text_b#{i}").style(:bold, false)
+      r.page.item("text_i#{i}").style(:italic, false)
+      r.page.item("text_u#{i}").style(:underline, false)
+      r.page.item("text_l#{i}").style(:linethrough, false)
+    end
+    
+    3.times do |i|
+      r.page.item("text_a#{i + 1}").style(:align, :right)
+    end
+    2.times do |i|
+      r.page.item("text_va#{i + 1}").style(:valign, :bottom)
+    end
+    
+    2.times do |i|
+      r.page.item("text_color#{i + 1}").style(:color, 'ff0000')
+    end
+    
+    # In case of using "dynamic_style_in_list.tlf"
+    r.start_new_page(:layout => t.resource('dynamic_style_in_list.tlf'))
+    
+    # Settings for Header.
+    r.page.list(:list).header do |header|
+      header.item(:rect).styles(:border_color => nil,
+                                :fill_color   => 'ff00ff')
+      header.item(:text).styles(:align  => :center,
+                                :valign => :center,
+                                :bold   => true)
+      header.item(:tblock).styles(:align       => :center,
+                                  :valign      => :center,
+                                  :color       => 'red',
+                                  :linethrough => true)
+    end
+    
+    1.step(10, 1) do |i|
+      # Flag of overflowed list-page.
+      is_overflowed = r.page.list(:list).overflow?
+      
+      # Add details.
+      r.page.list(:list).add_row do |row|
+        case
+        when i % 2 == 0
+          row.item(:rect).styles(:border_color => 'ff0000',
+                                 :border_width => 3,
+                                 :fill_color   => '0000ff')
+          row.item(:text).styles(:color => 'red',
                                  :align => :left,
                                  :valign => :center)
-      when i % 3 == 0
-        row.item(:rect).style(:visible, false)
-        row.item(:text).styles(:color => '0000ff',
-                               :align => :right,
-                               :valign => :bottom)
-        row.item(:tblock).styles(:color => 'ff0000',
+          row.item(:tblock).styles(:color => 'blue',
+                                   :align => :left,
+                                   :valign => :center)
+        when i % 3 == 0
+          row.item(:rect).style(:visible, false)
+          row.item(:text).styles(:color => '0000ff',
                                  :align => :right,
                                  :valign => :bottom)
+          row.item(:tblock).styles(:color => 'ff0000',
+                                   :align => :right,
+                                   :valign => :bottom)
+        end
       end
+      
+      # Change header styles when list-page was overflowed.
+      if is_overflowed
+        r.page.list(:list).header do |header|
+          header.item(:rect).styles(:border_color => 'black',
+                                    :fill_color   => '#ffffff')
+          header.item(:text).styles(:align  => :left,
+                                    :valign => :top,
+                                    :bold   => false)
+          header.item(:tblock).styles(:align       => :left,
+                                      :valign      => :top,
+                                      :color       => '#000000',
+                                      :linethrough => false)
+        end
+      end    
     end
-    
-    # Change header styles when list-page was overflowed.
-    if is_overflowed
-      r.page.list(:list).header do |header|
-        header.item(:rect).styles(:border_color => 'black',
-                                  :fill_color   => '#ffffff')
-        header.item(:text).styles(:align  => :left,
-                                  :valign => :top,
-                                  :bold   => false)
-        header.item(:tblock).styles(:align       => :left,
-                                    :valign      => :top,
-                                    :color       => '#000000',
-                                    :linethrough => false)
-      end
-    end    
   end
 end

data/test/case/eudc/eudc.rb

@@ -1,20 +1,20 @@
 # coding: utf-8
 
-CaseRunner.current :eudc
-
-ThinReports.configure do |config|
-  config.generator.pdf.eudc_fonts = CaseRunner.case_resource('eudc.ttf')
-end
-
-ThinReports::Report.generate_file(:pdf, CaseRunner.output_file) do
-  use_layout(CaseRunner.layout_file)
+testcase :eudc, 'Show External Characters' do |t|
+  ThinReports.configure do |config|
+    config.generator.pdf.eudc_fonts = t.resource('eudc.ttf')
+  end
   
-  start_new_page
-  
-  page.item(:eudc).value('日本で生まれ世界が育てた言語 Ruby')
-  page.values(:eudc_bold        => '太字',
-              :eudc_italic      => '斜体',
-              :eudc_bold_italic => '太字斜体')
-end
+  ThinReports::Report.generate(:filename => t.output_filename) do
+    use_layout t.layout_filename
+    
+    start_new_page
+    
+    page.item(:eudc).value('日本で生まれ世界が育てた言語 Ruby')
+    page.values(:eudc_bold        => '太字',
+                :eudc_italic      => '斜体',
+                :eudc_bold_italic => '太字斜体')
+  end
 
-ThinReports.config.generator.pdf.eudc_fonts = []
+  ThinReports.config.generator.pdf.eudc_fonts = []
+end