pdf_gen 0.7.1 → 0.8

data/CHANGES

@@ -0,0 +1,4 @@
+Version 0.8
+    - Fix draw borders for a div
+    - Add samples
+    - Method cell (in the SmartTable) supports blocks

data/README.rdoc

@@ -178,6 +178,21 @@ We can set the width of each column
     cell data[2], :width => av_width * 1/4
   end
 
+Method cell supports blocks, for example:
+
+  body do
+    ds.each do |datarow|
+      row do
+        cell datarow[1], :width => av_width / 2
+        cell datarow[2], :width => av_width / 4
+        cell :div, :width => av_width / 4, :paddings => 0.2.cm do
+              image(open(File.expand_path("example_image.png"), "rb") { |file| file.read }, :width => av_width / 2)
+        end
+      end
+    end
+  end
+
+In this case the first arguments can be ":div", ":span", ":table" and others
 
 == Credits
 

data/VERSION

@@ -0,0 +1 @@
+0.8

data/lib/base_region.rb

@@ -61,8 +61,12 @@ module PDFGen
         document.pdf.stroke_color! background_color
         document.pdf.stroke_style! PDF::Writer::StrokeStyle::SOLID
         document.pdf.fill_color! background_color
-        document.pdf.rectangle(pos[0], pos[1] - height, width, height).fill.stroke
-
+        document.pdf.rectangle(
+          pos[0] + border_width / 2.0,
+          pos[1] - height + border_width / 2.0,
+          width - border_width, 
+          height - border_width
+        ).fill.stroke
         document.pdf.restore_state
       end
     end

data/lib/containers/caption_container.rb

@@ -5,7 +5,7 @@ module PDFGen
     def caption(text = nil, style = nil)
       caption = Caption.new self
       caption.text = text if text
-      caption.width = self.width - self.pad_left - self.pad_right
+      caption.width = self.av_width
       caption.set_properties style unless style.nil?
       self.add_region(caption)
     end

data/lib/containers/div_container.rb

@@ -4,7 +4,7 @@ module PDFGen
 
     def div(style = nil, &initialization_block)
       div = Div.new(self)
-      div.width = self.width - self.pad_left - self.pad_right
+      div.width = self.av_width
       div.set_properties style unless style.nil?
       div.instance_eval(&initialization_block) if initialization_block
       self.add_region(div)

data/lib/containers/span_container.rb

@@ -4,7 +4,7 @@ module PDFGen
 
     def span(style = nil, &initialization_block)
       span = Span.new self
-      span.width = self.width - self.pad_left - self.pad_right
+      span.width = self.av_width
       span.set_properties style unless style.nil?
       span.instance_eval(&initialization_block) if initialization_block
       self.add_region(span)

data/lib/div.rb

@@ -55,12 +55,12 @@ module PDFGen
     end
 
     def calculate_minimal_height
-      height = 0
-      regions.each do |region|
-        height += region.height
-        height += horizontal_interval unless region == regions.last
+      sum_height = regions.inject(0) do |sum, region|
+        h = region.height
+        h += horizontal_interval unless region == regions.last
+        sum + h
       end
-      height + pad_top + pad_bottom
+      sum_height + pad_top + pad_bottom
     end
 
     def render_regions(pos, av_height, test=false)
@@ -76,7 +76,7 @@ module PDFGen
         self.fit_width(region)
         if pos_y >= region.height
           @count_rendered_region += 1 unless test
-          
+
           region_height = region.render([pos_x, pos_y], pos_y, test)[0]
 
           @rendered_height += region_height
@@ -118,13 +118,14 @@ module PDFGen
     def render(pos, av_height, test=false)
       pos_x, pos_y = pos
       fill(pos)
-      add_border_top(pos_x, pos_y) if @rendered_height.zero?      
+      add_border_top(pos_x, pos_y) if @rendered_height.zero?
       status = render_regions([pos_x, pos_y], av_height, test)
       pos_y -= status[0]
 
       if (status[1])
-        add_border_bottom(pos_x, pos_y)
-        add_border_sides(pos_x, av_height, pos_y)
+        bottom = (av_height - self.height) > 0 ? (av_height - self.height) : pos_y
+        add_border_bottom(pos_x, bottom)
+        add_border_sides(pos_x, av_height, bottom)
       else
         add_border_sides(pos_x, av_height, 0)
       end

data/lib/image.rb

@@ -32,8 +32,8 @@ module PDFGen
     def render(pos, av_height, test=false)
       self.check_fit_in_height
       if av_height >= self.height
-        document.pdf.add_image(@image, pos[0]+pad_left, pos[1]-height+pad_bottom,
-                               width-pad_left-pad_right, height-pad_top-pad_bottom)
+        document.pdf.add_image(@image, pos[0] + pad_left, pos[1] - height + pad_bottom,
+                               width - pad_left - pad_right, height-pad_top - pad_bottom)
         super
         [self.height, true]
       else

data/lib/smart_table.rb

@@ -21,11 +21,14 @@ module PDFGen
         parent.data_source
       end
 
-      def cell(region=nil,style=nil)
-        if region.is_a?(Array)
-          @cells << region.last #todo
-          region.delete(region.last)
-        else  
+      def cell(region=nil,style=nil,&initialization_block)
+        if initialization_block
+          cell = PDFGen.const_get(region.to_s.capitalize).new(self)
+          cell.border_left = true
+          cell.set_properties style unless style.nil?
+          cell.instance_eval(&initialization_block)
+          @cells << cell
+        else
           caption = Caption.new(parent)
           caption.text = region
           caption.border_left = true
@@ -59,7 +62,7 @@ module PDFGen
       @body = RowsContainer.new(self)
       @footer = RowsContainer.new(self)
 
-      init_width(parent)
+      self.width = parent.av_width
       
       @data_source = nil
       @header_data = nil

data/lib/span.rb

@@ -45,7 +45,7 @@ module PDFGen
           end
         else
           if vertical_align && !test
-            region.height = height
+            region.height = self.height - self.pad_top - self.pad_bottom
           end
           region.render([(x + content_width), (y - pad_top)], y-pad_top) unless test
 

data/lib/table.rb

@@ -14,16 +14,13 @@ module PDFGen
       @header = Div.new(self)
       @body = Div.new(self)
       @footer = Div.new(self)
-      
-      init_width(parent)
+
+      self.width = parent.av_width
       
       @repeat_header_on_each_page = false
       @repeat_footer_on_each_page = false
     end
     
-    def init_width(parent)
-      self.width = parent.width - parent.pad_left - parent.pad_right
-    end
     
     def width=(value)
       [@title,@header,@body,@footer].each do |region|
@@ -70,7 +67,7 @@ module PDFGen
 
       footer_height = @footer.render([pos_x, pos_y], pos_y, true)
       if footer_height[0] > pos[1]
-        return [av_height-pos_y, false]
+        return [av_height - pos_y, false]
       end
 
       if status[1]
@@ -84,7 +81,7 @@ module PDFGen
       end
       pos_y -= footer_status[0] if footer_status
 
-      [av_height-pos_y, status[1] && footer_status[1]]
+      [av_height - pos_y, status[1] && footer_status[1]]
     end
 
 

data/samples/table.rb

@@ -1,7 +1,6 @@
 $:.unshift(File.expand_path(File.dirname(__FILE__) + "/../"))
 require "lib/pdf_gen"
 
-image_data = open(File.expand_path('ruby_logo.jpg'), "rb") { |file| file.read }
 
 PDFGen::document PDF::Writer.new, 2.cm do
   div :paddings => 15 do

data/test/span_test.rb

@@ -75,7 +75,7 @@ describe "New span" do
     caption1.set_properties(:width => 50)
 
     span_el.add_region(caption1)
-    span_el.render_regions
+    span_el.render_regions(0, 500, false)
     caption1.height.should == 100
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: pdf_gen
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 27
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 1
-  version: 0.7.1
+  - 8
+  version: "0.8"
 platform: ruby
 authors: 
 - Sphere Consulting Inc.
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 +02:00
+date: 2010-11-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,6 +42,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- CHANGES
 - lib/base_region.rb
 - lib/caption.rb
 - lib/containers/caption_container.rb
@@ -94,6 +94,7 @@ files:
 - test/shared_examples.rb
 - test/span_test.rb
 - test/table_test.rb
+- VERSION
 has_rdoc: true
 homepage: https://github.com/SphereConsultingInc/pdf_gen/
 licenses: []