prawn-graph 0.0.3 → 0.0.4

data/README.markdown

@@ -20,21 +20,15 @@ be in early alpha state at best. It's not recommended for use in
 a production environment unless you're happy to put up with bugs and
 are willing to help fix them!
 
-## Branches
-
-The master branch of this repository tracks edge Prawn and will
-be updated to reflect any changes there. If you need to work on
-a version which is compatible with the current stable release,
-0.7.*, then please use the <tt>stable-compat</tt> branch instead.
-
 ## Installing & Using through RubyGems
 
 Installing and running prawn-graph is very easy:
 
-  * <tt>gem install prawn prawn-graph</tt>
+  * <tt>gem install prawn-graph</tt>
 
-Will give you the latest 'stable' version of Prawn and the latest
-compatible version of prawn-graph. 
+Gem version 0.3 is compatible with the latest 0.8 stable release
+of prawn. If you're still using 0.7, then install version 0.2 of
+prawn-graph.
 
 Using graphs in your PDF is as straightforward as:
 
@@ -50,3 +44,21 @@ Using graphs in your PDF is as straightforward as:
     bar_graph data at => [10,10]
   end
 </pre>
+
+## Using Themes
+
+At the moment, work is underway on implementing 'Themes' within
+Prawn::Graph, which are hugely inspired by (and are indeed based on
+the actual themes from) Gruff. 
+
+To find the list of available themes, use:
+
+    Prawn::Chart::Themes.list 
+
+The default theme which will be used for rendering is:
+
+    Prawn::Chart::Theme.monochrome
+
+This in-line with the design decision of Prawn::Graph to render in
+monochrome by default, since most of our users are likely to be 
+printing these documents!

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake'
 require "rake/gempackagetask" 
 require "rake/rdoctask"
 
-PRAWN_GRAPH_VERSION = '0.0.3'
+PRAWN_GRAPH_VERSION = '0.0.4'
 
 spec = Gem::Specification.new do |spec|
   spec.name = "prawn-graph"

data/examples/graph/advanced_bar_chart.rb

@@ -5,7 +5,7 @@ options = {
             :title => 'Average litter size per kind of animal',
             :label_x => 'Kind of animal',
             :label_y => 'Average litter size',
-            :at => [10,10],
+            :at => [10,10]
           }
 
 data =    [

data/examples/graph/bar_chart.pdf

@@ -0,0 +1,185 @@
+%PDF-1.3
+%����
+1 0 obj
+<< /Creator (Prawn)
+/Producer (Prawn)
+>>
+endobj
+2 0 obj
+<< /Count 1
+/Type /Pages
+/Kids [5 0 R]
+>>
+endobj
+3 0 obj
+<< /Pages 2 0 R
+/Type /Catalog
+>>
+endobj
+4 0 obj
+<< /Length 1307
+>>
+stream
+/DeviceRGB cs
+0.000 0.000 0.000 scn
+/DeviceRGB CS
+0.000 0.000 0.000 SCN
+q
+0.000 0.000 0.000 scn
+46.000 46.000 500.000 200.000 re
+b
+1.000 1.000 1.000 SCN
+61.000 66.000 m
+0.5 w
+546.000 66.000 l
+S
+61.000 86.000 m
+0.5 w
+546.000 86.000 l
+S
+61.000 106.000 m
+0.5 w
+546.000 106.000 l
+S
+61.000 126.000 m
+0.5 w
+546.000 126.000 l
+S
+61.000 146.000 m
+0.5 w
+546.000 146.000 l
+S
+61.000 166.000 m
+0.5 w
+546.000 166.000 l
+S
+61.000 186.000 m
+0.5 w
+546.000 186.000 l
+S
+61.000 206.000 m
+0.5 w
+546.000 206.000 l
+S
+61.000 226.000 m
+0.5 w
+546.000 226.000 l
+S
+61.000 246.000 m
+0.5 w
+546.000 246.000 l
+S
+61.000 46.000 m
+2 w
+61.000 246.000 l
+S
+61.000 46.000 m
+2 w
+546.000 46.000 l
+S
+61.000 246.000 m
+0.000 0.000 0.000 SCN
+1 w
+61.000 46.000 m
+
+BT
+47 247.0 Td
+/F1.0 5 Tf
+[<3435>] TJ
+ET
+
+
+BT
+47 47.0 Td
+/F1.0 5 Tf
+[<30>] TJ
+ET
+
+
+BT
+122 32.0 Td
+/F1.0 5 Tf
+[<43617473>] TJ
+ET
+
+
+BT
+243 32.0 Td
+/F1.0 5 Tf
+[<446f6773>] TJ
+ET
+
+
+BT
+364 32.0 Td
+/F1.0 5 Tf
+[<48616d7374657273>] TJ
+ET
+
+
+BT
+485 32.0 Td
+/F1.0 5 Tf
+[<476f6c6466697368>] TJ
+ET
+
+60 w
+88.000 47.000 m
+0.408 0.525 0.706 SCN
+88.000 135.000 l
+S
+209.000 47.000 m
+0.992 0.847 0.306 SCN
+209.000 207.000 l
+S
+330.000 47.000 m
+0.447 0.682 0.431 SCN
+330.000 247.000 l
+S
+451.000 47.000 m
+0.820 0.412 0.369 SCN
+451.000 69.000 l
+S
+1 w
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+61.000 46.000 m
+Q
+
+endstream
+endobj
+5 0 obj
+<< /Contents 4 0 R
+/Type /Page
+/Parent 2 0 R
+/Resources << /Font << /F1.0 6 0 R
+>>
+/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+>>
+/MediaBox [0 0 612.0 792.0]
+>>
+endobj
+6 0 obj
+<< /Encoding /WinAnsiEncoding
+/Subtype /Type1
+/Type /Font
+/BaseFont /Helvetica
+>>
+endobj
+xref
+0 7
+0000000000 65535 f 
+0000000015 00000 n 
+0000000071 00000 n 
+0000000128 00000 n 
+0000000177 00000 n 
+0000001536 00000 n 
+0000001714 00000 n 
+trailer
+<< /Root 3 0 R
+/Info 1 0 R
+/Size 7
+>>
+startxref
+1811
+%%EOF

data/examples/graph/line_chart.pdf

@@ -0,0 +1,219 @@
+%PDF-1.3
+%����
+1 0 obj
+<< /Creator (Prawn)
+/Producer (Prawn)
+>>
+endobj
+2 0 obj
+<< /Count 1
+/Type /Pages
+/Kids [5 0 R]
+>>
+endobj
+3 0 obj
+<< /Pages 2 0 R
+/Type /Catalog
+>>
+endobj
+4 0 obj
+<< /Length 2391
+>>
+stream
+/DeviceRGB cs
+0.000 0.000 0.000 scn
+/DeviceRGB CS
+0.000 0.000 0.000 SCN
+q
+1.000 0.278 0.643 scn
+46.000 46.000 500.000 200.000 re
+b
+1.000 1.000 1.000 SCN
+61.000 66.000 m
+0.5 w
+546.000 66.000 l
+S
+61.000 86.000 m
+0.5 w
+546.000 86.000 l
+S
+61.000 106.000 m
+0.5 w
+546.000 106.000 l
+S
+61.000 126.000 m
+0.5 w
+546.000 126.000 l
+S
+61.000 146.000 m
+0.5 w
+546.000 146.000 l
+S
+61.000 166.000 m
+0.5 w
+546.000 166.000 l
+S
+61.000 186.000 m
+0.5 w
+546.000 186.000 l
+S
+61.000 206.000 m
+0.5 w
+546.000 206.000 l
+S
+61.000 226.000 m
+0.5 w
+546.000 226.000 l
+S
+61.000 246.000 m
+0.5 w
+546.000 246.000 l
+S
+61.000 46.000 m
+2 w
+61.000 246.000 l
+S
+61.000 46.000 m
+2 w
+546.000 46.000 l
+S
+61.000 246.000 m
+0.000 0.000 0.000 SCN
+1 w
+61.000 46.000 m
+
+BT
+47 247.0 Td
+/F1.0 5 Tf
+[<3435>] TJ
+ET
+
+
+BT
+47 47.0 Td
+/F1.0 5 Tf
+[<30>] TJ
+ET
+
+
+BT
+122 32.0 Td
+/F1.0 5 Tf
+[<4a> 20 <616e> 10 <756172> -30 <79>] TJ
+ET
+
+
+BT
+243 32.0 Td
+/F1.0 5 Tf
+[<46> 30 <656272> -15 <756172> -30 <79>] TJ
+ET
+
+
+BT
+364 32.0 Td
+/F1.0 5 Tf
+[<4d61726368>] TJ
+ET
+
+
+BT
+485 32.0 Td
+/F1.0 5 Tf
+[<417072> -15 <696c>] TJ
+ET
+
+60 w
+148.000 47.000 m
+0.125 0.125 0.125 scn
+149.000 135.000 m
+149.000 135.552 148.552 136.000 148.000 136.000 c
+147.448 136.000 147.000 135.552 147.000 135.000 c
+147.000 134.448 147.448 134.000 148.000 134.000 c
+148.552 134.000 149.000 134.448 149.000 135.000 c
+148.000 135.000 m
+f
+269.000 47.000 m
+0.125 0.125 0.125 scn
+270.000 207.000 m
+270.000 207.552 269.552 208.000 269.000 208.000 c
+268.448 208.000 268.000 207.552 268.000 207.000 c
+268.000 206.448 268.448 206.000 269.000 206.000 c
+269.552 206.000 270.000 206.448 270.000 207.000 c
+269.000 207.000 m
+f
+390.000 47.000 m
+0.125 0.125 0.125 scn
+391.000 247.000 m
+391.000 247.552 390.552 248.000 390.000 248.000 c
+389.448 248.000 389.000 247.552 389.000 247.000 c
+389.000 246.448 389.448 246.000 390.000 246.000 c
+390.552 246.000 391.000 246.448 391.000 247.000 c
+390.000 247.000 m
+f
+511.000 47.000 m
+0.125 0.125 0.125 scn
+512.000 69.000 m
+512.000 69.552 511.552 70.000 511.000 70.000 c
+510.448 70.000 510.000 69.552 510.000 69.000 c
+510.000 68.448 510.448 68.000 511.000 68.000 c
+511.552 68.000 512.000 68.448 512.000 69.000 c
+511.000 69.000 m
+f
+2 w
+0.125 0.125 0.125 SCN
+62.000 47.000 m
+148.000 135.000 l
+S
+148.000 135.000 m
+269.000 207.000 l
+S
+269.000 207.000 m
+390.000 247.000 l
+S
+390.000 247.000 m
+511.000 69.000 l
+S
+1 w
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+61.000 46.000 m
+Q
+
+endstream
+endobj
+5 0 obj
+<< /Contents 4 0 R
+/Type /Page
+/Parent 2 0 R
+/Resources << /Font << /F1.0 6 0 R
+>>
+/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+>>
+/MediaBox [0 0 612.0 792.0]
+>>
+endobj
+6 0 obj
+<< /Encoding /WinAnsiEncoding
+/Subtype /Type1
+/Type /Font
+/BaseFont /Helvetica
+>>
+endobj
+xref
+0 7
+0000000000 65535 f 
+0000000015 00000 n 
+0000000071 00000 n 
+0000000128 00000 n 
+0000000177 00000 n 
+0000002620 00000 n 
+0000002798 00000 n 
+trailer
+<< /Root 3 0 R
+/Info 1 0 R
+/Size 7
+>>
+startxref
+2895
+%%EOF

data/examples/graph/themed_bar_chart.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+#
+require "#{File.dirname(__FILE__)}/../example_helper.rb"
+
+# Simplest bar chart example
+# 
+
+data =  [
+          ['Cats',20],
+          ['Dogs',36],
+          ['Hamsters',45],
+          ['Goldfish', 5]
+        ]
+
+Prawn::Document.generate('bar_chart.pdf') do
+  bar_chart data, :at => [10, 10], :theme => Prawn::Chart::Themes.keynote
+end
+

data/examples/graph/themed_line_chart.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+#
+require "#{File.dirname(__FILE__)}/../example_helper.rb"
+
+# Simplest line chart example
+# 
+
+data =  [
+          ['January',20],
+          ['February',36],
+          ['March',45],
+          ['April', 5]
+        ]
+
+Prawn::Document.generate('line_chart.pdf') do
+  line_chart data, :at => [10, 10], :theme => Prawn::Chart::Themes.odeo
+end
+

data/lib/prawn/graph.rb

@@ -6,11 +6,14 @@ require File.dirname(__FILE__) + '/graph/base'
 require File.dirname(__FILE__) + '/graph/grid'
 require File.dirname(__FILE__) + '/graph/bar'
 require File.dirname(__FILE__) + '/graph/line'
+require File.dirname(__FILE__) + '/graph/themes'
 
 module Prawn
 
   class Document
 
+    Prawn::Chart::Themes.initialize_themes
+
     # Draws a fairly simple bar chart. Data should be passed in as an array of
     # arrays, much like how Tables are dealt with:
     #

data/lib/prawn/graph/bar.rb

@@ -53,11 +53,7 @@ module Prawn
         @values.each do |value|
           @document.move_to [base_x + last_position, base_y]
           bar_height = calculate_point_height_from value
-          if @colour
-            @document.stroke_color [rand(255), rand(255), rand(255), 0]
-          else
-            @document.stroke_color 'AAAAAA'
-          end
+          @document.stroke_color @theme.next_colour
           @document.stroke_line_to [base_x + last_position, base_y + bar_height]
           last_position += point_spacing
         end

data/lib/prawn/graph/base.rb

@@ -41,23 +41,28 @@ module Prawn
       #  :label_y, a label to be shown along the Y axis of he graph, rendered centered
       #  on the grid and rotated to be perpendicular to the axis.
       #
+      # :theme, the theme to be used to draw this graph, defaults to monochrome.
+      #
       def initialize(data, document, options = {})
         if options[:at].nil? || options[:at].empty?
           raise Prawn::Errors::NoGraphStartSet,
-            "you must specify options[:at] as the coordinates wher you" +
+            "you must specify options[:at] as the coordinates where you" +
             " wish this graph to be drawn from."
         end
-        opts = { :width => 500, :height => 200, :spacing => 20 }.merge(options)
+        opts = { :theme => Prawn::Chart::Themes.monochrome, :width => 500, :height => 200, :spacing => 20 }.merge(options)
         (@headings, @values, @highest_value) = process_the data
         (grid_x_start, grid_y_start, grid_width, grid_height) = parse_sizing_from opts 
         @colour = (!opts[:use_color].nil? || !opts[:use_colour].nil?)
         @document = document
-        @grid = Prawn::Chart::Grid.new(grid_x_start, grid_y_start, grid_width, grid_height, opts[:spacing], document)
+        @theme = opts[:theme]
+        off = 20
+        @grid = Prawn::Chart::Grid.new(grid_x_start, grid_y_start, grid_width, grid_height, opts[:spacing], document, @theme)
       end
   
       # Draws the graph on the document which we have a reference to.
       #
       def draw
+        draw_bounding_box
         @grid.draw
         label_axes
         if @title
@@ -74,8 +79,15 @@ module Prawn
       end
 
       private
-    
+
+      def draw_bounding_box
+        @document.fill_color @theme.background_colour
+        @document.fill_and_stroke_rectangle [(@point.first - 10), (@point.last + ( @total_height + 40 ))], @document.bounds.width, (@total_height + 40)
+        @document.fill_color '000000'
+      end   
+ 
       def label_axes
+        @document.fill_color @theme.font_colour
         base_x = @grid.start_x + 1
         base_y = @grid.start_y + 1
 
@@ -92,24 +104,31 @@ module Prawn
           @document.draw_text heading, :at => [last_position, base_y - 15 ], :size => 5
           last_position += point_spacing
         end
+        @document.fill_color @theme.background_colour
       end
 
       def draw_title
+        @document.fill_color @theme.font_colour
         x_coord = calculate_x_axis_center_point(@title, 10)
         y_coord = @grid.start_y + @grid.height + 10
         @document.draw_text @title, :at => [x_coord, y_coord] ,:size => 10
+        @document.fill_color @theme.background_colour
       end
 
       def draw_x_axis_label
+        @document.fill_color @theme.font_colour
         x_coord = calculate_x_axis_center_point(@x_label, 8)
         y_coord = @grid.start_y - 30
         @document.draw_text @x_label, :at => [x_coord, y_coord] ,:size => 8
+        @document.fill_color @theme.background_colour
       end
 
       def draw_y_axis_label
+        @document.fill_color @theme.font_colour
         y_coord = calculate_y_axis_center_point(@y_label, 8)
         x_coord = @grid.start_x - 30
         @document.draw_text @y_label, :at => [x_coord, y_coord] ,:size => 8, :rotate => 90
+        @document.fill_color @theme.background_colour
       end
       
       # All subclasses of Prawn::Chart::Base must implement thier own plot_values
@@ -140,6 +159,10 @@ module Prawn
         move_y_up = 0
         grid_width = o[:width]
         grid_height = o[:height]
+      
+        @total_width = o[:width]
+        @total_height = o[:height]
+        @point = o[:at].dup 
 
         # Make room for the title if we're choosing to Render it.
         #
@@ -162,10 +185,11 @@ module Prawn
           @y_label = o[:label_y]
           x_offset += 15
         end
-    
+
+ 
         # Return the values calculated here.
         #
-        [ (o[:at][0] + x_offset), (o[:at][1] + move_y_up), (grid_width - x_offset), (grid_height - y_offset) ]
+        [ (o[:at][0] + x_offset), (o[:at][1] + move_y_up + 20), (grid_width - (x_offset - 20)), (grid_height - y_offset) ]
       end
 
       def process_the(data_array)
@@ -204,4 +228,4 @@ module Prawn
 
     end
   end
-end
+end

data/lib/prawn/graph/grid.rb

@@ -9,12 +9,13 @@ module Prawn
 
       attr_accessor :width, :height, :point, :spacing, :document
 
-      def initialize(grid_x_start, grid_y_start, grid_width, grid_height, spacing, document)
+      def initialize(grid_x_start, grid_y_start, grid_width, grid_height, spacing, document, theme)
         @point = [grid_x_start, grid_y_start]
         @width = grid_width
         @height = grid_height
         @spacing = spacing
         @document = document
+        @theme = theme
       end
 
       def start_x; @point.first; end
@@ -23,16 +24,17 @@ module Prawn
       # Draws the Grid on the specified Prawn::Document
       #
       def draw
-        @document.stroke_color 'CCCCCC'
-        (@height / @spacing).times do |x|
-          offset = @spacing * (x + 1)
-          @document.move_to [@point.first, (@point.last + offset)]
-          @document.line_width(0.5)
-          @document.stroke_line_to([(@point.first + @width), (@point.last + offset)])
+        @document.stroke_color @theme.marker_colour
+        if @theme.stroke_grid_markers?
+          (@height / @spacing).times do |x|
+            offset = @spacing * (x + 1)
+            @document.move_to [@point.first, (@point.last + offset)]
+            @document.line_width(0.5)
+            @document.stroke_line_to([(@point.first + @width), (@point.last + offset)])
+          end
         end
         @document.move_to @point
         @document.line_width(2)
-        @document.stroke_color '000000'
         @document.stroke_line_to([@point.first, @point.last + @height])
         @document.move_to @point
         @document.line_width(2)

data/lib/prawn/graph/line.rb

@@ -56,20 +56,12 @@ module Prawn
           bar_height = calculate_point_height_from value
           point = [base_x + last_position, base_y + bar_height]
           p << point
-          if @colour
-            @document.fill_color '00DD00'
-          else
-            @document.fill_color 'AAAAAA'
-          end
+          @document.fill_color @theme.colours.first
           @document.fill_circle_at point, :radius => 1
           last_position += point_spacing
         end
         @document.line_width 2
-        if @colour
-          @document.stroke_color '00DD00'
-        else
-          @document.stroke_color 'AAAAAA'
-        end
+        @document.stroke_color @theme.colours.first
         p.each_with_index do |point,i|
           next if point == p.last
           @document.move_to point

data/lib/prawn/graph/themes.rb

@@ -0,0 +1,116 @@
+require 'yaml'
+
+module Prawn
+  module Chart
+
+    # Themes serves as a point of interaction between the user and the underlying
+    # collection of themes made available to Prawn::Graph.
+    #
+    class Themes
+
+      # Called once when Prawn::Graph is loaded, initializes the list of
+      # themes currently bundled. If you have your own custom theme you'd
+      # like to use instead, use _register_theme and give it the path to
+      # your theme file.
+      #
+      def self.initialize_themes
+        path = File.expand_path(File.dirname(__FILE__) + '/themes/')
+        Dir.open(path) do |dir|
+          dir.each do |file|
+            _register_theme(path + '/' + file) if file.include?('.yml')
+          end
+        end
+      end
+
+      # Adds the theme defined by the yaml file specified to the mapping of
+      # registered themes stored in +@@_themes_list+. Converts the YAML object
+      # into a Theme object for use in the application.
+      #
+      def self._register_theme(theme_file_path)
+        theme = Theme.new(YAML.load(IO.read(File.expand_path(theme_file_path))))
+        if !defined? @@_themes_list
+          @@_themes_list = {}
+        end
+        @@_themes_list[theme.name.to_sym] = theme
+      end    
+
+      # Returns an array of the themes currently registered.
+      #
+      def self.list
+        @@_themes_list.keys
+      end
+      
+      protected 
+
+      # Hook into method_missing to allow us to do things like:
+      #   Prawn::Chart::Themes.theme_name
+      # To return the theme object being looked for.
+      #
+      def self.method_missing(method, *args)
+        if @@_themes_list.keys.include?(method)
+          return @@_themes_list[method]
+        end
+      end
+ 
+  
+      class Theme
+        attr_accessor :name, :title, :colours, :font_colour, :background_colour, :marker_colour
+
+        # Creates a new theme from a theme hash. The hash comes from the 
+        # library parsing YAML definitions of a theme. 
+        #
+        def initialize(theme_hash)
+          @name = theme_hash['name']
+          @title = theme_hash['title']
+
+          if theme_hash.keys.include?('colours') 
+            @colours = theme_hash['colours']        
+          elsif theme_hash.keys.include?('colors')
+            @colours = theme_hash['colors']        
+          end
+
+          if theme_hash.keys.include?('font_colour') 
+            @font_colour = theme_hash['font_colour']        
+          elsif theme_hash.keys.include?('font_color')
+            @font_colour = theme_hash['font_color']        
+          end
+
+          if theme_hash.keys.include?('background_colour') 
+            @background_colour = theme_hash['background_colour']        
+          elsif theme_hash.keys.include?('background_color')
+            @background_colour = theme_hash['background_color']        
+          end
+
+          if theme_hash.keys.include?('marker_colour') 
+            @marker_colour = theme_hash['marker_colour']        
+          elsif theme_hash.keys.include?('marker_color')
+            @marker_colour = theme_hash['marker_color']        
+          end
+
+          @stroke_grid_markers = theme_hash['stroke_grid_markers'].to_i
+        end
+      
+        # Returns the next colour in the array of colours associated
+        # with this theme. If it gets to the end, it starts again from
+        # the beginning.
+        #
+        def next_colour
+          unless @current_colour
+            @current_colour = 0
+            return @colours[0]
+          end
+          @current_colour += 1
+          @current_colour = 0 if @current_colour == @colours.nitems
+          @colours[@current_colour]
+        end
+        alias next_color next_colour
+
+        def stroke_grid_markers?
+          @stroke_grid_markers == 1
+        end
+
+      end
+    end
+
+  end
+end

data/lib/prawn/graph/themes/37signals.yml

@@ -0,0 +1,14 @@
+name: 37signals
+title: 37 Signals Theme
+font_color: 'FFFFFF'
+marker_color: 'FFFFFF'
+background_colour: 'D1EDF5'
+stroke_grid_markers: 0
+colours:
+ - '339933'
+ - 'cc99cc'
+ - '336699'
+ - 'FFF804'
+ - 'ff0000'
+ - 'cf5910'
+ - '000000'

data/lib/prawn/graph/themes/keynote.yml

@@ -0,0 +1,14 @@
+name: keynote
+title: Keynote Theme
+font_color: 'FFFFFF'
+background_colour: '000000'
+marker_colour: 'FFFFFF'
+stroke_grid_markers: 0
+colours:
+ - '6886B4'
+ - 'FDD84E'
+ - '72AE6E'
+ - 'D1695E'
+ - '8A6EAF'
+ - 'EFAA43'
+ - 'FFFFFF'

data/lib/prawn/graph/themes/monochome.yml

@@ -0,0 +1,8 @@
+name: monochrome
+title: Monochrome Theme
+font_color: '000000'
+marker_color: '000000'
+background_colour: 'FFFFFF'
+stroke_grid_markers: 1
+colours:
+ - 'AAAAAA'

data/lib/prawn/graph/themes/odeo.yml

@@ -0,0 +1,14 @@
+name: odeo
+title: Odeo Theme
+font_color: 'FFFFFF'
+marker_color: 'FFFFFF'
+stroke_grid_markers: 0
+background_colour: 'FF47A4'
+colours:
+ - '202020'
+ - 'FFFFFF'
+ - 'A21764'
+ - '8AB438'
+ - '999999'
+ - '3A5B87'
+ - '000000'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: prawn-graph
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Ryan Stenhouse
@@ -9,19 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-22 00:00:00 +00:00
+date: 2010-02-27 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: prawn
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: "  An extension to Prawn that provides the ability to draw basic graphs and charts natively in your PDFs.\n"
 email: " ryan@ryanstenhouse.eu"
 executables: []
@@ -33,15 +40,23 @@ extra_rdoc_files:
 files: 
 - examples/example_helper.rb
 - examples/graph/advanced_bar_chart.rb
+- examples/graph/bar_chart.pdf
 - examples/graph/bar_chart.rb
+- examples/graph/line_chart.pdf
 - examples/graph/line_chart.rb
+- examples/graph/themed_bar_chart.rb
+- examples/graph/themed_line_chart.rb
 - lib/prawn/graph/bar.rb
 - lib/prawn/graph/base.rb
 - lib/prawn/graph/chart.rb
 - lib/prawn/graph/errors.rb
 - lib/prawn/graph/grid.rb
 - lib/prawn/graph/line.rb
-- lib/prawn/graph/theme.rb
+- lib/prawn/graph/themes/37signals.yml
+- lib/prawn/graph/themes/keynote.yml
+- lib/prawn/graph/themes/monochome.yml
+- lib/prawn/graph/themes/odeo.yml
+- lib/prawn/graph/themes.rb
 - lib/prawn/graph.rb
 - Rakefile
 - README.markdown
@@ -62,18 +77,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: prawn
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: An extension to Prawn that provides the ability to draw basic graphs and charts natively in your PDFs.

data/lib/prawn/graph/theme.rb

@@ -1,24 +0,0 @@
-module Prawn
-  module Chart
-    
-    class Theme
-      attr_accessor :red, :green, :blue, :orange, :yellow, :purple, :black, :white
-    end
-    
-    class Themes
-      
-      def self.register(theme)
-        if theme.is_a? Theme
-          unless defined? @@_themes
-            @@_themes = []
-          end
-          @@_themes << theme
-        end
-      end
-      
-      
-      
-    end
-    
-  end
-