suranyami-tuftify 0.1.4 → 0.1.5

data/README

@@ -1,4 +1,6 @@
 = Tuftify
 
-A graphing library.
+A wonderful graphing library.
 
+A testing from ianzola
+This is a test.

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake'
 $:.unshift(File.dirname(__FILE__) + "/lib")
 require 'hoe'
 require 'echoe'
-require 'tuftify'
+require 'lib/tuftify'
 
 Echoe.new('tuftify', '0.1.4') do |p|
   p.description = 'A graphing library.'
@@ -18,9 +18,11 @@ end
 desc "Generate a sample file, to test that it's working."
 task :sample do
   values = []
-  (1..10).each {|i| values << [i, rand(100)]}
-  g = Tuftify::Graph.new(500, 300, values)
+  (1..10).each {|i| values << ["key #{i}", rand(100)]}
+  g = Tuftify::Graph.new(500, 300)
+  g.add_layer(values)
   canvas = g.draw
+  FileUtils.mkdir 'samples' if !File..directory?('samples')
   canvas.write('samples/sample.jpg')
 end
 

data/lib/playing_around.rb

@@ -1,13 +1,14 @@
 require 'rubygems'
 require 'RMagick'
-require 'graph'
+require 'tuftify/graph'
 
 include Magick
 
 values = []
 (1..10).each {|i| values << [i, rand(100)]}
 
-g = Graph.new(500, 300, values)
+g = Tuftify::Graph.new(500, 300)
+g.add_layer(values,{:categories => ['uno','dos','tres','cuatro','cinco','seis','siete','ocho','nueve','diez']})
 canvas = g.draw
 
 canvas.write('rectangle.jpg')

data/lib/tuftify/graph.rb

@@ -1,18 +1,19 @@
-require 'rubygems'
-require 'RMagick'
+require 'tuftify/graph_layer'
 
 module Tuftify
   # Basic Graph class.
   class Graph
     include Magick
-    attr_accessor :width, :height, :values
+
+    attr_accessor :width, :height
     attr_accessor :font_size, :resolution
     attr_accessor :canvas
-  
-    def initialize(width, height, values = nil)
+    attr_accessor  :title
+
+
+    def initialize(width, height)
       @width = width
       @height = height
-      @values = values
       @font_size = 9
       @resolution = 72.0
       d = "#{@resolution}x#{@resolution}"
@@ -22,40 +23,23 @@ module Tuftify
         self.density = d
       }
 
-      @drawing = Magick::Draw.new
-      @drawing.font_family = 'Helvetica'
-      @drawing.fill = 'black'
-      @drawing.pointsize = 12
-      @drawing.gravity = NorthGravity
+      @details = {:canvas => @canvas, :height => height, :width => width}
+
+      @graph_layer = []
     end
 
+    def add_layer(data, options = {})
+      @graph_layer << Tuftify::GraphLayer.new(data, @details, options)
+    end
+    
     def draw
-      max_value = @values.collect {|v| v[1]}.max
-      barwidth = @width / @values.length
-      x = 0
-      lh = label_height
-      draw_height = @height - lh
-      @values.each do |key, value|
-        h = draw_height / max_value * value
-        @drawing.fill('black')
-        @drawing.stroke('white')
-        @drawing.rectangle(x, draw_height, x + barwidth, draw_height - h)
-        @drawing.annotate(@canvas, barwidth, lh, x, draw_height, key.to_s)
-        x += barwidth
+      @graph_layer.each do |layer|
+        layer.draw
       end
-      @drawing.draw(@canvas)
-      return @canvas
-    end
-
-    def label_height
-      h = 0
-      @values.each {|key, value|
 
-        m = @drawing.get_type_metrics(key.to_s)
-        h = m.height if m.height > h
-      }
-      return h
+      return @canvas
     end
+    
   end
 end
 #

data/lib/tuftify.rb

@@ -1,2 +1,5 @@
+require 'rubygems'
+require 'RMagick'
+
 require 'tuftify'
 require 'tuftify/graph'

data/tuftify.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tuftify}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Parry, Ingrid Anzola"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: suranyami-tuftify
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - David Parry, Ingrid Anzola
@@ -48,6 +48,7 @@ files:
 - tuftify.gemspec
 has_rdoc: false
 homepage: http://github.com/suranyami/tuftify
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -73,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tuftify
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A graphing library.