reportbuilder 1.2.3 → 1.2.4

data/History.txt

@@ -1,3 +1,6 @@
+=== 1.2.4 / 2010-04-30
+* Bug fix on Rtf Builder for tables. Creation of hr generates an error
+
 === 1.2.3 / 2010-04-13
 * Source code repository moved to http://github.com/clbustos/reportbuilder
 

data/Rakefile

@@ -5,7 +5,7 @@ $:.unshift(File.dirname(__FILE__)+"/lib")
 require 'rubygems'
 require 'hoe'
 require 'reportbuilder'
-
+Hoe.plugin :git
 Hoe.spec 'reportbuilder' do
   self.testlib=:minitest
   self.version=ReportBuilder::VERSION
@@ -16,11 +16,4 @@ Hoe.spec 'reportbuilder' do
   self.extra_dev_deps << ["nokogiri", "~>1.4"] 
 end
 
-task :release  do 
-  version="v#{ReportBuilder::VERSION}"
-  sh %(git commit -a -m "Release #{version}")
-  sh %(git tag "#{version}")
-  sh %(git push origin --tags)
-end
-
 # vim: syntax=ruby

data/lib/reportbuilder.rb

@@ -51,7 +51,7 @@ class ReportBuilder
   # Doesn't print a title if set to true
   attr_accessor :no_title
   # ReportBuilder version
-  VERSION = '1.2.3'
+  VERSION = '1.2.4'
   
   FormatNotFound=Class.new(Exception)
   # Available formats
@@ -87,7 +87,7 @@ class ReportBuilder
     end
   end
   # Create a new Report
-  def initialize(options=Hash.new,&block)
+  def initialize(options=Hash.new, &block)
     options[:name]||="Report "+Time.new.to_s
     @no_title=options.delete :no_title
     @name=options.delete :name 

data/lib/reportbuilder/table.rb

@@ -75,6 +75,9 @@ class ReportBuilder
     def n_rows_no_hr
       @rows.inject(0) {|ac,v| ac+(v==:hr ? 0 : 1)}
     end
+    def n_rows
+      @rows.size
+    end
     # Adds a colspan on a cell
     #   table.add_row(["a",table.colspan("b",2)])
     def colspan(data,n)
@@ -128,7 +131,7 @@ class ReportBuilder
         0
       end
     end
-    
+
 
 
     ######################

data/lib/reportbuilder/table/rtfbuilder.rb

@@ -5,57 +5,66 @@ class ReportBuilder
       def generate()
         @t=@element
         @rtf=@builder.rtf
-        
+
         # Title
-        
+
         @builder.header(6,@t.name)
-        
+
         max_cols=@t.calculate_widths
         n_rows=@t.n_rows_no_hr+(@t.header.size>0 ? 1: 0)
         args=[n_rows, @t.n_columns]+max_cols.map{|m| m*@builder.options[:font_size]*10}
         @table=@rtf.table(*args)
         @table.border_width=@builder.options[:table_border_width]
         @rowspans=[]
+        row_i=0
         if @t.header.size>0
+          row_i=1
           @t.header.each_with_index do |th,i|
             @table[0][i] << th
           end
+          add_hr_on_bottom(0)
         end
         next_with_hr=false
-        @t.rows.each_with_index{|row, row_i|
+
+        @t.rows.each_with_index{|row|
           if row==:hr
             next_with_hr=true
             # Nothing
           else
             parse_row(row,row_i)
             if next_with_hr
-              create_hr(row_i)
+              add_hr_on_top(row_i)
               next_with_hr=false
             end
-            #row_i+=1
+            row_i+=1
           end
         }
-        
+
       end
-      def create_hr(row_i)
+      def add_hr_on_top(row_i)
         (0...@t.n_columns).each {|i|
           @table[row_i][i].top_border_width=@builder.options[:table_hr_width]
         }
       end
-      
+      def add_hr_on_bottom(row_i)
+        (0...@t.n_columns).each {|i|
+          @table[row_i][i].bottom_border_width=@builder.options[:table_hr_width]
+        }
+      end
+
       def parse_row(row,row_i)
         t=@element
         row_ary=[]
         real_i=0
         colspan_i=0
         row.each_index do |i|
-          extra=1 
+          extra=1
           while !@rowspans[real_i].nil? and @rowspans[real_i]>0
             @rowspans[real_i]-=1
             real_i+=1
           end
           if row[i].is_a? Table::Colspan
-            @table[row_i][real_i] << row[i].data            
+            @table[row_i][real_i] << row[i].data
             colspan_i=row[i].cols-1
             extra=row[i].cols
           elsif row[i].nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: reportbuilder
 version: !ruby/object:Gem::Version 
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors: 
 - Claudio Bustos
@@ -30,7 +30,7 @@ cert_chain:
   rpP0jjs0
   -----END CERTIFICATE-----
 
-date: 2010-04-13 00:00:00 -04:00
+date: 2010-04-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency