grosser-db_graph 0.1.4 → 0.1.5

data/README.markdown

@@ -3,9 +3,8 @@ Gem/Rails plugin to generate graphs from all your date fields, beautifully simpl
 Examples
 ========
 Weeks and months  
-![weeks](http://chart.apis.google.com/chart?chxl=0:|0||||||||||10||||||||||20||||||||||30||||||||||40||||||||||50|||1:|6|16|25|35|45|54|64|74|83|93&cht=lc&chs=445x400&chdl=Product+created_at|Product+updated_at&chd=s:JTKPKLKMUNPQHQSKRNLGPPLKUHNNPFJLLPNJINQex19u5xrrNFKLD,HLJMONLJLNHPQNOLNPMMINNKPMPGKLFJLRQLKOOtsxxvw137MHOLF&chco=333300,bbbb33&chxt=x,y)
-![months](http://chart.apis.google.com/chart?chxl=0:|1|2|3|4|5|6|7|8|9|10|11|12|1:|67|98|130|161|193|224|256|287|319|350&cht=lc&chs=445x400&chdl=Product+created_at|Product+updated_at&chd=s:QOQROONPM92L,OMPPOOMPO77N&chco=884466,22dddd&chxt=x,y)
-
+![weeks](http://chart.apis.google.com/chart?chxl=0:|0||||||||||10||||||||||20||||||||||30||||||||||40||||||||||50|||1:|5|14|24|33|42|52|61|70|80|89&cht=lc&chs=445x400&chd=s:MOQLIKNMKMQNROTLIMLMNPPOKPJKKLNORNJKKOOo281ztr1yTROND,IMQJORQJKPMKNNOLONKKMKLMNNVMPKNLQONMKORkv3t7v609JGLNH&chco=dd0099,aa9944&chxt=x,y)
+![months](http://chart.apis.google.com/chart?chxl=0:|1|2|3|4|5|6|7|8|9|10|11|12|1:|68|100|133|165|198|230|263|295|328|360&cht=lc&chs=445x400&chdl=Product+created_at|Product+updated_at&chd=s:PMQNOOMON9yQ,OMONNNQPQ34L&chco=dd0099,aa9944&chxt=x,y)
 
 Install
 =======

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 1
-:patch: 4
+:patch: 5
 :major: 0

data/lib/db_graph/line.rb

@@ -33,7 +33,7 @@ module DBGraph
       size = @options[:size] || '600x500'
       GoogleChart::LineChart.new(size, nil, false) do |line|
         for name, hash in data
-          line.data(name, self.class.filled_and_sorted_values(hash, x_values), random_color)
+          line.data(name, klass.filled_and_sorted_values(hash, x_values), klass.color_for(name))
         end
         line.axis :x, :labels => x_labels
         line.axis :y, :labels => y_labels
@@ -51,7 +51,7 @@ module DBGraph
 
     def y_labels
       values = []
-      data.each{|name,hash|values += self.class.filled_and_sorted_values(hash, x_values)}
+      data.each{|name,hash|values += klass.filled_and_sorted_values(hash, x_values)}
       distribute_evently(values, NUM_Y_LABELS)
     end
 
@@ -63,6 +63,10 @@ module DBGraph
 
     private
 
+    def klass
+      self.class
+    end
+
     def x_values
       case @style
       when :minutes then 0..59
@@ -74,15 +78,20 @@ module DBGraph
       end.to_a
     end
 
-    def random_color
-      [1,2,3].map{ (('0'..'9').to_a + ('a'..'f').to_a)[rand(16)] * 2 } * ''
+    #determines a unique color based on a name
+    def self.color_for(name)
+      name = name.inspect + "some randomness for fun"
+      hash = (name.hash % 1_000_000_000).to_s #get a hash of a constant size
+      colors = [hash[0..1], hash[2..3], hash[4..5]].map{|c| c.to_f / 100.0 * 16} #use 3 parts of the hash to get numbers from 0 to 15.99
+      palette = ('0'..'9').to_a + ('a'..'f').to_a #hex values 0..f
+      colors.map{|c| palette[c.floor].to_s * 2} * '' #each color is duplicated and the joined
     end
     
     def interval_for(time)
       interval_word = {:minutes=>:hour,:hours=>:day,:days=>:month,:weeks=>:year,:months=>:year}[@style]
       raise "style #{@style} is not supported" unless interval_word
 
-      start = self.class.at_beginning_of_interval(time, interval_word)
+      start = klass.at_beginning_of_interval(time, interval_word)
       ende = start + 1.send(interval_word) - 1.second
       [start, ende]
     end

data/spec/db_graph/line_spec.rb

@@ -205,14 +205,23 @@ describe DBGraph::Line do
     end
   end
 
-  describe :random_color do
-    before do
-      @line = DBGraph::Line.new(:months)
+  describe :color_for do
+    it "returns the same color for the same names" do
+      c1 = DBGraph::Line.send(:color_for,'User found_at')
+      c2 = DBGraph::Line.send(:color_for,'User found_at')
+      c1.should == c2
+    end
+
+    it "returns different colors for different names" do
+      c1 = DBGraph::Line.send(:color_for,'User found_at')
+      c2 = DBGraph::Line.send(:color_for,'User created_at')
+      c1.should_not == c2
     end
 
-    it "includes pairs of colors" do
-      @line.should_receive(:rand).and_return 0,2,10
-      @line.send(:random_color).should == '0022aa'
+    it "returns a color for empty/nil/[] names" do
+      [nil,[],'',' '].each do |value|
+        DBGraph::Line.send(:color_for,value).length.should == 6
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grosser-db_graph
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Michael Grosser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-29 00:00:00 -07:00
+date: 2009-06-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency