prawn 0.1.2 → 0.2.0

data/lib/prawn/font/wrapping.rb

@@ -6,40 +6,42 @@
 #
 # This is free software. Please see the LICENSE and COPYING files for details.
 module Prawn
-  module Font #:nodoc:
-    module Wrapping #:nodoc:
+  class Font #:nodoc:
+    module Wrapping #:nodoc:                
+      ruby_18 { $KCODE="U" }
       
       # TODO: Replace with TeX optimal algorithm
       def naive_wrap(string, line_width, font_size, options = {})
-        output = ""
-        string.lines.each do |line|
-          accumulated_width = 0
-          segments = line.scan(/\S+|\s+/)
+        accumulated_width = 0
+        scan_pattern = options[:mode] == :character ? /./ : /\S+|\s+/                                    
+        
+        output = ""                
+        string.lines.each do |line|         
+          segments = line.scan(scan_pattern)
                                         
           segments.each do |segment|    
             segment_width = string_width(segment, font_size, 
               :kerning => options[:kerning]) 
       
             if (accumulated_width + segment_width).round > line_width.round
-              output << "\n"
+              output = "#{output.rstrip}\n"
               
-              if segment =~ /\s/
+              if segment =~ /\s/           
                 accumulated_width = 0
               else
                 output << segment
                 accumulated_width = segment_width
               end
-            else
+            else                           
               output << segment
               accumulated_width += segment_width
             end
-          end
+          end    
         end
   
         output
       end
       
-    end
-  
+    end  
   end
 end

data/lib/prawn/graphics.rb

@@ -7,7 +7,8 @@
 # This is free software. Please see the LICENSE and COPYING files for details.
 
 require "enumerator"
-require "prawn/graphics/cell"
+require "prawn/graphics/cell"   
+require "prawn/graphics/color"
 
 module Prawn
 
@@ -17,9 +18,10 @@ module Prawn
   # This file lifts and modifies several of PDF::Writer's graphics functions
   # ruby-pdf.rubyforge.org
   #
-  module Graphics 
-      
-      
+  module Graphics  
+    
+    include Color
+           
     #######################################################################
     # Low level drawing operations must translate to absolute coords!     #
     #######################################################################
@@ -84,8 +86,12 @@ module Prawn
 
     # The current line thickness
     #
-    def line_width
-      @line_width || 1
+    def line_width(width=nil)
+      if width
+        self.line_width = width
+      else
+        @line_width || 1
+      end
     end
        
     # Draws a line from one point to another. Points may be specified as 
@@ -104,7 +110,7 @@ module Prawn
     # current <tt>y</tt> position.
     #
     def horizontal_line(x1,x2)
-      line(x1,y,x2,y)
+      line(x1,y-bounds.absolute_bottom,x2,y-bounds.absolute_bottom)
     end
 
     # Draws a horizontal line from the left border to the right border of the
@@ -191,95 +197,38 @@ module Prawn
         line_to(*p2)
       end
     end
-                                      
-    # Sets the fill color.  6 digit HTML color codes are used.
-    # 
-    #   pdf.fill_color "f0ffc1"
-    #
-    def fill_color(color=nil)
-      return @fill_color unless color
-      @fill_color = color
-      set_fill_color     
-    end 
-    
-    alias_method :fill_color=, :fill_color                                                                     
     
-    # Sets the line stroking color.  6 digit HTML color codes are used.
-    #
-    #   pdf.stroke_color "cc2fde"
-    #
-    def stroke_color(color=nil) 
-      return @stroke_color unless color
-      @stroke_color = color
-      set_stroke_color
-    end   
-    
-    alias_method :stroke_color=, :stroke_color
-    
-    # Strokes and closes the current path.
+    # Strokes and closes the current path. See Graphic::Color for color details
     #
     def stroke
       yield if block_given?
       add_content "S"
     end
 
-    # Fills and closes the current path
+    # Fills and closes the current path. See Graphic::Color for color details
     #
     def fill               
       yield if block_given?
       add_content "f"
     end
-    
-    # Fills, strokes, and closes the current path.
+
+    # Fills, strokes, and closes the current path. See Graphic::Color for color details
     #
     def fill_and_stroke  
       yield if block_given?
       add_content "b" 
-    end     
-    
-    # Provides the following shortcuts:
-    #
-    #    stroke_some_method(*args) #=> some_method(*args); stroke
-    #    fill_some_method(*args) #=> some_method(*args); fill
-    #
-    def method_missing(id,*args,&block)
-      case(id.to_s) 
-      when /^fill_and_stroke_(.*)/
-        send($1,*args,&block); fill_and_stroke
-      when /^stroke_(.*)/
-        send($1,*args,&block); stroke 
-      when /^fill_(.*)/
-        send($1,*args,&block); fill
-      else
-        super
-      end
-    end                    
+    end                                                       
     
-    private    
+    private       
     
     def translate(*point)
       x,y = point.flatten
       [@bounding_box.absolute_left + x, @bounding_box.absolute_bottom + y]
-    end     
-                                                                        
-    def set_fill_color
-      r,g,b = [@fill_color[0..1], @fill_color[2..3], @fill_color[4..5]].
-              map { |e| e.to_i(16) }       
-      add_content "%.3f %.3f %.3f rg" %  [r / 255.0, g / 255.0, b / 255.0]   
-    end
-    
-    def set_stroke_color
-      r,g,b = [@stroke_color[0..1], @stroke_color[2..3], @stroke_color[4..5]].
-              map { |e| e.to_i(16) }     
-      add_content "%.3f %.3f %.3f RG" %  [r / 255.0, g / 255.0, b / 255.0]       
-    end                                       
+    end    
     
-    def update_colors 
-      @fill_color   ||= "000000"
-      @stroke_color ||= "000000"                                       
-      set_fill_color
-      set_stroke_color
-    end
+    def translate!(point)
+      point.replace(translate(point))
+    end                                                                        
 
   end
 end

data/lib/prawn/graphics/cell.rb

@@ -54,7 +54,8 @@ module Prawn
         @document     = options[:document]
         @text         = options[:text].to_s
         @width        = options[:width]
-        @border       = options[:border] || 1
+        @borders      = options[:borders]
+        @border_width = options[:border_width] || 1
         @border_style = options[:border_style] || :all               
         @background_color = options[:background_color] 
         @align            = options[:align] || :left
@@ -67,9 +68,10 @@ module Prawn
         end
       end
 
-      attr_accessor :point, :border_style, :border, :background_color,
-                    :document, :horizontal_padding, :vertical_padding,
-                    :align
+      attr_accessor :point, :border_style, :border_width, :background_color,
+                    :document, :horizontal_padding, :vertical_padding, :align,
+                    :borders
+                    
       attr_writer   :height, :width #:nodoc:   
            
       # Returns the cell's text as a string.
@@ -87,22 +89,20 @@ module Prawn
       # The width of the cell in PDF points
       #
       def width
-        @width || (@document.font_metrics.string_width(@text,
-          @document.font_size)) + 2*@horizontal_padding
+        @width || (@document.font.metrics.string_width(@text,
+          @document.font.size)) + 2*@horizontal_padding
       end
 
       # The height of the cell in PDF points
       #
-      def height
+      def height  
         @height || text_area_height + 2*@vertical_padding
       end
 
       # The height of the text area excluding the vertical padding
       #
       def text_area_height
-        @document.font_metrics.string_height(@text, 
-         :font_size  => @document.font_size, 
-         :line_width => text_area_width) 
+        @document.font.height_of(@text, :line_width => text_area_width) 
       end
 
       # Draws the cell onto the PDF document
@@ -113,32 +113,33 @@ module Prawn
         if @background_color    
           @document.mask(:fill_color) do
             @document.fill_color @background_color  
-            h  = borders.include?(:bottom) ? height - border : height + border / 2.0
-            @document.fill_rectangle [rel_point[0] + border / 2.0, 
-                                      rel_point[1] - border / 2.0 ], 
-                width - border, h  
+            h  = borders.include?(:bottom) ? 
+              height - border_width : height + border_width / 2.0
+            @document.fill_rectangle [rel_point[0] + border_width / 2.0, 
+                                      rel_point[1] - border_width / 2.0 ], 
+                width - border_width, h  
           end
         end
 
-        if @border > 0
+        if @border_width > 0
           @document.mask(:line_width) do
-            @document.line_width = @border
+            @document.line_width = @border_width
 
             if borders.include?(:left)
-              @document.stroke_line [rel_point[0], rel_point[1] + (@border / 2.0)], 
-                [rel_point[0], rel_point[1] - height - @border / 2.0 ]
+              @document.stroke_line [rel_point[0], rel_point[1] + (@border_width / 2.0)], 
+                [rel_point[0], rel_point[1] - height - @border_width / 2.0 ]
             end
 
             if borders.include?(:right)
               @document.stroke_line( 
-                [rel_point[0] + width, rel_point[1] + (@border / 2.0)],
-                [rel_point[0] + width, rel_point[1] - height - @border / 2.0] )
+                [rel_point[0] + width, rel_point[1] + (@border_width / 2.0)],
+                [rel_point[0] + width, rel_point[1] - height - @border_width / 2.0] )
             end
 
             if borders.include?(:top)
               @document.stroke_line(
-                [ rel_point[0] + @border / 2.0, rel_point[1] ], 
-                [ rel_point[0] - @border / 2.0 + width, rel_point[1] ])
+                [ rel_point[0] + @border_width / 2.0, rel_point[1] ], 
+                [ rel_point[0] - @border_width / 2.0 + width, rel_point[1] ])
             end
 
             if borders.include?(:bottom)
@@ -214,13 +215,17 @@ module Prawn
         @document.y = y - @height
       end
 
-      def border
-        @cells[0].border
+      def border_width
+        @cells[0].border_width
       end
 
       def border_style=(s)
         @cells.each { |e| e.border_style = s }
-      end                 
+      end    
+      
+      def align=(align) 
+        @cells.each { |e| e.align = align } 
+      end           
       
       def border_style
         @cells[0].border_style

data/lib/prawn/graphics/color.rb

@@ -0,0 +1,132 @@
+module Prawn
+  module Graphics
+    module Color   
+      
+      # Sets the fill color.  
+      #
+      # If a single argument is provided, it should be a 6 digit HTML color 
+      # code.
+      # 
+      #   pdf.fill_color "f0ffc1"
+      #
+      # If 4 arguments are provided, the color is assumed to be a CMYK value
+      # Values range from 0 - 100.
+      # 
+      #   pdf.fill_color 0, 99, 95, 0
+      #
+      def fill_color(*color)  
+        return @fill_color if color.empty? 
+        @fill_color = process_color(*color) 
+        set_fill_color
+      end 
+
+      alias_method :fill_color=, :fill_color                                                                     
+
+      # Sets the line stroking color.  6 digit HTML color codes are used.
+      #
+      # If a single argument is provided, it should be a 6 digit HTML color 
+      # code.
+      # 
+      #   pdf.fill_color "f0ffc1"
+      #
+      # If 4 arguments are provided, the color is assumed to be a CMYK value
+      # Values range from 0 - 100.
+      # 
+      #   pdf.fill_color 0, 99, 95, 0
+      #
+      def stroke_color(*color)   
+        return @stroke_color if color.empty?
+        @stroke_color = process_color(*color)
+        set_stroke_color
+      end
+
+      alias_method :stroke_color=, :stroke_color
+
+      # Provides the following shortcuts:
+      #
+      #    stroke_some_method(*args) #=> some_method(*args); stroke
+      #    fill_some_method(*args) #=> some_method(*args); fill
+      #
+      def method_missing(id,*args,&block)
+        case(id.to_s) 
+        when /^fill_and_stroke_(.*)/
+          send($1,*args,&block); fill_and_stroke
+        when /^stroke_(.*)/
+          send($1,*args,&block); stroke 
+        when /^fill_(.*)/
+          send($1,*args,&block); fill
+        else
+          super
+        end
+      end   
+      
+      module_function
+        
+      # Converts RGB value array to hex string suitable for use with fill_color 
+      # and stroke_color  
+      #
+      #   >> Prawn::Graphics::Color.rgb2hex([255,120,8])
+      #   => "ff7808"     
+      #
+      def rgb2hex(rgb)
+        rgb.map { |e| "%02x" % e }.join
+      end  
+       
+      # Converts hex string into RGB value array:
+      #
+      #  >> Prawn::Graphics::Color.hex2rgb("ff7808")
+      #  => [255, 120, 8]
+      #
+      def hex2rgb(hex)
+        r,g,b = hex[0..1], hex[2..3], hex[4..5]
+        [r,g,b].map { |e| e.to_i(16) }
+      end 
+      
+      private
+      
+      def process_color(*color)   
+        case(color.size)
+        when 1    
+          color[0]    
+        when 4
+          color
+        else
+          raise ArgumentError, 'wrong number of arguments supplied'    
+        end
+      end  
+      
+      def set_fill_color             
+        case @fill_color
+        when String
+          r,g,b = hex2rgb(@fill_color)
+          add_content "%.3f %.3f %.3f rg" % 
+             [r / 255.0, g / 255.0, b / 255.0]
+        when Array     
+          c,m,y,k = *@fill_color
+          add_content "%.3f %.3f %.3f %.3f k" % 
+            [c / 100.0, m / 100.0, y / 100.0, k / 100.0]
+        end
+      end
+
+      def set_stroke_color       
+        case @stroke_color
+        when String
+          r,g,b = hex2rgb(@stroke_color)
+          add_content "%.3f %.3f %.3f RG" %  
+            [r / 255.0, g / 255.0, b / 255.0]
+        when Array
+          c,m,y,k = *@stroke_color
+          add_content "%.3f %.3f %.3f %.3f K" %  
+            [c / 100.0, m / 100.0, y / 100.0, k / 100.0]
+        end
+      end                                       
+
+      def update_colors 
+        @fill_color   ||= "000000"
+        @stroke_color ||= "000000"
+        set_fill_color
+        set_stroke_color
+      end     
+    end
+  end
+end