reportbuilder 0.2.0 → 1.0.0

data/lib/reportbuilder/generator/text.rb

@@ -9,20 +9,19 @@ class ReportBuilder
         @out=""
       end
       def parse
-        @out="Report: #{@builder.name}\n"
+        @out="#{@builder.name}\n" unless @builder.no_title
         parse_cycle(@builder)
-        @out << "\n"
       end
-      def add_text(t)
-        ws=" "*parse_level*2
+      def text(t)
+        ws=" "*((parse_level-1)*2)
         @out << ws << t << "\n"
       end
-      def add_preformatted(t)
-        @out << t
+      def preformatted(t)
+        @out << t << "\n"
       end
-      def add_html(t)
+      def html(t)
         # Nothing printed
       end
     end
   end
-end
+end

data/lib/reportbuilder/image.rb

@@ -1,4 +1,5 @@
-# Creates a Section
+# Creates an Image
+# 
 class ReportBuilder::Image
   @@n=1
   attr_reader :name
@@ -20,12 +21,12 @@ class ReportBuilder::Image
     @filename=filename
   end
   # Based on http://rubyquiz.com/quiz50.html
-  def to_reportbuilder_text(generator)
+  def report_building_text(generator)
     require 'RMagick'
-    
-    
+
+
     img = Magick::Image.read(@filename).first
-    
+
     # Resize too-large images. The resulting image is going to be
     # about twice the size of the input, so if the original image is too
     # large we need to make it smaller so the ASCII version won't be too
@@ -38,7 +39,7 @@ class ReportBuilder::Image
     img.change_geometry('320x320>') do |cols, rows|
       img.resize!(cols, rows) if cols != img.columns || rows != img.rows
     end
-    
+
     # Compute the image size in ASCII "pixels" and resize the image to have
     # those dimensions. The resulting image does not have the same aspect
     # ratio as the original, but since our "pixels" are twice as tall as
@@ -46,10 +47,10 @@ class ReportBuilder::Image
     pr = img.rows / @options[:font_rows]
     pc = img.columns / @options[:font_cols]
     img.resize!(pc, pr)
-    
+
     img = img.quantize(@options[:chars].size, Magick::GRAYColorspace)
     img = img.normalize
-    
+
     out=""
     # Draw the image surrounded by a border. The `view' method is slow but
     # it makes it easy to address individual pixels. In grayscale images,
@@ -62,17 +63,24 @@ class ReportBuilder::Image
       pr.times do |i|
         out+= '|'
         pc.times do |j|
-          out+= @options[:chars][view[i][j].red / (2**16/@options[:chars].size)] 
+          out+= @options[:chars][view[i][j].red / (2**16/@options[:chars].size)]
         end
         out+= '|'+"\n"
       end
     end
     out+= border
-    generator.add_raw(out)
+    generator.preformatted(out)
   end
-  
-  def to_reportbuilder_html(generator)
-    src=generator.add_image(@filename)
-    generator.add_raw("<img src='#{src}' alt='#{@options[:alt]}' />")
+
+  def report_building_html(generator)
+    basedir=generator.directory+"/images"
+    out=basedir+"/"+File.basename(@filename)
+    if(File.exists? @filename)
+      if !File.exists? out
+        FileUtils.mkdir_p basedir
+        FileUtils.cp @filename, out
+      end
+    end
+    generator.html("<img src='images/#{File.basename(@filename)}' alt='#{@options[:alt]}' />")
   end
 end

data/lib/reportbuilder/section.rb

@@ -1,16 +1,22 @@
-# Creates a Section
+# Creates a Section.
+# A section have a name and contains other elements.
+# Sections could be nested inside anothers
+
 class ReportBuilder::Section
   @@n=1
   attr_reader :parent, :elements, :name
-  def initialize(options={})
+  def initialize(options=Hash.new, &block)
     if !options.has_key? :name
-      @name="Section #{@nn}"
-      @nn+=1
+      @name="Section #{@@n}"
+      @@n+=1
     else
       @name=options[:name]
     end
     @parent = nil
     @elements = []
+    if block
+      add(block)
+    end
   end
   def parent=(sect)
     if sect.is_a? ReportBuilder::Section
@@ -19,20 +25,20 @@ class ReportBuilder::Section
       raise ArgumentError("Parent should be a Section")
     end
   end
-  
-  def to_reportbuilder_text(generator)
-    generator.add_text(("="*generator.parse_level)+" "+name)
+
+  def report_building_text(generator)
+    generator.text(("="*generator.parse_level)+" "+name)
     generator.parse_cycle(self)
   end
-  
-  def to_reportbuilder_html(generator)
+
+  def report_building_html(generator)
     htag="h#{generator.parse_level+1}"
-    anchor=generator.add_toc_entry(name)
-    generator.add_html "<div class='section'><#{htag}>#{name}</#{htag}><a name='#{anchor}'></a>"
+    anchor=generator.toc_entry(name)
+    generator.html "<div class='section'><#{htag}>#{name}</#{htag}><a name='#{anchor}'></a>"
     generator.parse_cycle(self)
-    generator.add_html "</div>"
+    generator.html "</div>"
   end
-  
+
   def add(element)
     if element.is_a? ReportBuilder::Section
       element.parent=self

data/lib/reportbuilder/table.rb

@@ -2,11 +2,11 @@ class ReportBuilder
   # Creates a table.
   # Use:
   #   table=ReportBuilder::Table.new(:header =>["id","city","name","code1","code2"])
-  #   table.add_row([1, Table.rowspan("New York",3), "Ringo", Table.colspan("no code",2),nil])
-  #   table.add_row([2, nil,"John", "ab-1","ab-2"])
-  #   table.add_row([3, nil,"Paul", "ab-3"])
-  #   table.add_hr
-  #   table.add_row([4, "London","George", Table.colspan("ab-4",2),nil])
+  #   table.row([1, Table.rowspan("New York",3), "Ringo", Table.colspan("no code",2),nil])
+  #   table.row([2, nil,"John", "ab-1","ab-2"])
+  #   table.row([3, nil,"Paul", "ab-3"])
+  #   table.hr
+  #   table.row([4, "London","George", Table.colspan("ab-4",2),nil])
   #   puts table
   #     ==>
   #   -----------------------------------------
@@ -20,7 +20,7 @@ class ReportBuilder
   #   -----------------------------------------
   class Table
     @@n=1 # :nodoc:
-    
+
     DEFAULT_OPTIONS={
       :header =>  [],
       :name   =>   nil
@@ -35,7 +35,7 @@ class ReportBuilder
     # Options: :name, :header
     # Use:
     #   table=ReportBuilder::Table.new(:header =>["var1","var2"])
-    def initialize(opts=Hash.new)
+    def initialize(opts=Hash.new, &block)
       raise ArgumentError,"opts should be a Hash" if !opts.is_a? Hash
       opts=DEFAULT_OPTIONS.merge opts
       if opts[:name].nil?
@@ -47,18 +47,21 @@ class ReportBuilder
       @header=opts[:header]
       @rows=[]
       @max_cols=[]
+      if block
+        block.arity<1 ? self.instance_eval(&block) : block.call(self)
+      end
     end
     # Adds a row
     #   table.add_row(%w{1 2})
-    def add_row(row)
+    def row(row)
       @rows.push(row)
     end
     # Adds a horizontal rule
     #   table.add_hr
-    def add_hr
+    def hr
       @rows.push(:hr)
     end
-    alias_method  :add_horizontal_line, :add_hr
+    alias_method  :horizontal_line, :hr
     # Adds a rowspan on a cell
     #   table.add_row(["a",table.rowspan("b",2)])
     def rowspan(data,n)
@@ -66,72 +69,76 @@ class ReportBuilder
     end
     # Adds a colspan on a cell
     #   table.add_row(["a",table.colspan("b",2)])
-    
+
     def colspan(data,n)
       Colspan.new(data,n)
     end
     def calculate_widths # :nodoc:
-    @max_cols=[]
-    rows_cal=[header]+@rows
-    rows_cal.each{|row|
-      next if row==:hr
-      row.each_index{|i|
+      @max_cols=[]
+      rows_cal=[header]+@rows
+      rows_cal.each{|row|
+        next if row==:hr
+        row.each_index{|i|
           if row[i].nil?
-              next
+            next
           elsif row[i].is_a? Colspan
-              size_total=row[i].data.to_s.size
-              size_per_column=(size_total / row[i].cols)+1
-              for mi in i...i+row[i].cols
-                  @max_cols[mi] = size_per_column if @max_cols[mi].nil? or @max_cols[mi]<size_per_column
-              end
+            size_total=row[i].data.to_s.size
+            size_per_column=(size_total / row[i].cols)+1
+            for mi in i...i+row[i].cols
+              @max_cols[mi] = size_per_column if @max_cols[mi].nil? or @max_cols[mi]<size_per_column
+            end
           elsif row[i].is_a? Rowspan
-              size=row[i].data.to_s.size
-              @max_cols[i]= size if @max_cols[i].nil? or @max_cols[i] < size
+            size=row[i].data.to_s.size
+            @max_cols[i]= size if @max_cols[i].nil? or @max_cols[i] < size
           else
-              
-              size=row[i].to_s.size
-              @max_cols[i]= size if @max_cols[i].nil? or @max_cols[i] < size
+
+            size=row[i].to_s.size
+            @max_cols[i]= size if @max_cols[i].nil? or @max_cols[i] < size
           end
+        }
       }
-    }
     end
-    def to_reportbuilder_text(generator)
+    def report_building_text(generator)
       require 'reportbuilder/table/textgenerator'
       table_generator=ReportBuilder::Table::TextGenerator.new( generator, self)
       table_generator.generate
     end
-    def to_reportbuilder_html(generator)
+    def report_building_html(generator)
       require 'reportbuilder/table/htmlgenerator'
       table_generator=ReportBuilder::Table::HtmlGenerator.new(generator, self)
       table_generator.generate
     end
 
     def total_width # :nodoc:
-      @max_cols.inject(0){|a,v| a+(v+3)}+1
+      if @max_cols.size>0
+        @max_cols.inject(0){|a,v| a+(v+3)}+1
+      else
+        0
+      end
     end
-######################
-#  INTERNAL CLASSES  #
-######################
-  
+    ######################
+    #  INTERNAL CLASSES  #
+    ######################
+
     class Rowspan # :nodoc:
       attr_accessor :data, :rows
       def initialize(data,rows)
-          @data=data
-          @rows=rows
+        @data=data
+        @rows=rows
       end
       def to_s
-          @data.to_s
+        @data.to_s
       end
     end
-    
+
     class Colspan # :nodoc:
       attr_accessor :data, :cols
       def initialize(data,cols)
-          @data=data
-          @cols=cols
+        @data=data
+        @cols=cols
       end
       def to_s
-          @data.to_s
+        @data.to_s
       end
     end
   end

data/lib/reportbuilder/table/htmlgenerator.rb

@@ -1,17 +1,17 @@
 class ReportBuilder
   class Table
     class HtmlGenerator < ElementGenerator
-        def generate()
-          t=@element
-          anchor=@generator.add_table_entry(t.name)
-          out="<a name='#{anchor}'></a><table><caption>#{t.name}</caption>"
-          @rowspans=[]
-          if t.header.size>0
-            out+="<thead>"+parse_row(t,t.header,"th")+"</thead>\n"
-          end
-          out+="<tbody>\n"
-          next_class=""
-          t.rows.each{|row|
+      def generate()
+        t=@element
+        anchor=@generator.table_entry(t.name)
+        out="<a name='#{anchor}'></a><table><caption>#{t.name}</caption>"
+        @rowspans=[]
+        if t.header.size>0
+          out+="<thead>"+parse_row(t,t.header,"th")+"</thead>\n"
+        end
+        out+="<tbody>\n"
+        next_class=""
+        t.rows.each{|row|
           if row==:hr
             next_class="top"
           else
@@ -19,32 +19,32 @@ class ReportBuilder
             out+="<tr#{class_tag}>"+parse_row(t,row)+"</tr>\n"
             next_class=""
           end
-          }
-          out+="</tbody>\n</table>\n"
-          @generator.add_html(out)
-        end
-        def parse_row(t,row,tag="td")
-          row_ary=[]
-          colspan_i=0
-          row.each_index do |i|
-            if !@rowspans[i].nil? and @rowspans[i]>0
-              @rowspans[i]-=1
-            elsif colspan_i>0
-              colspan_i-=1
-            elsif row[i].is_a? Table::Colspan
-              row_ary.push(sprintf("<%s colspan=\"%d\">%s</%s>",tag, row[i].cols, row[i].data,tag))
-              colspan_i=row[i].cols-1
-            elsif row[i].nil?
-              row_ary.push("<#{tag}></#{tag}>")
-            elsif row[i].is_a? Table::Rowspan
-              row_ary.push(sprintf("<%s rowspan=\"%d\">%s</%s>", tag, row[i].rows, row[i].data, tag))
-              @rowspans[i]=row[i].rows-1
-            else
-              row_ary.push("<#{tag}>#{row[i]}</#{tag}>")
-            end
+        }
+        out+="</tbody>\n</table>\n"
+        @generator.html(out)
+      end
+      def parse_row(t,row,tag="td")
+        row_ary=[]
+        colspan_i=0
+        row.each_index do |i|
+          if !@rowspans[i].nil? and @rowspans[i]>0
+            @rowspans[i]-=1
+          elsif colspan_i>0
+            colspan_i-=1
+          elsif row[i].is_a? Table::Colspan
+            row_ary.push(sprintf("<%s colspan=\"%d\">%s</%s>",tag, row[i].cols, row[i].data,tag))
+            colspan_i=row[i].cols-1
+          elsif row[i].nil?
+            row_ary.push("<#{tag}></#{tag}>")
+          elsif row[i].is_a? Table::Rowspan
+            row_ary.push(sprintf("<%s rowspan=\"%d\">%s</%s>", tag, row[i].rows, row[i].data, tag))
+            @rowspans[i]=row[i].rows-1
+          else
+            row_ary.push("<#{tag}>#{row[i]}</#{tag}>")
           end
-          row_ary.join("")
         end
+        row_ary.join("")
+      end
     end
   end
 end

data/lib/reportbuilder/table/textgenerator.rb

@@ -1,26 +1,28 @@
 class ReportBuilder
   class Table
     class TextGenerator < ElementGenerator
-        
+
       def generate()
         t=@element
         t.calculate_widths
         total_width=t.total_width
-        out="Table: #{t.name}\n"
-        if t.header.size>0
-          out+=parse_hr(total_width)+"\n"                
-          out+=parse_row(t,t.header)+"\n"
-          out+=parse_hr(total_width)+"\n"
-        end
-        t.rows.each do |row|
-          if row==:hr
+        out="#{t.name}\n"
+        if total_width>0
+          if t.header.size>0
+            out+=parse_hr(total_width)+"\n"
+            out+=parse_row(t,t.header)+"\n"
             out+=parse_hr(total_width)+"\n"
-          else
-            out+=parse_row(t,row)+"\n"
           end
+          t.rows.each do |row|
+            if row==:hr
+              out+=parse_hr(total_width)+"\n"
+            else
+              out+=parse_row(t,row)+"\n"
+            end
+          end
+          out+=parse_hr(total_width)+"\n"
         end
-        out+=parse_hr(total_width)+"\n"
-        @generator.add_text(out)
+        @generator.text(out)
       end
       # Parse a row
       def parse_row(t,row)
@@ -48,6 +50,6 @@ class ReportBuilder
       def parse_hr(l)
         "-"*l
       end
-      end
     end
+  end
 end