gerbilcharts 0.7.4 → 0.8.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2d029786a988fb9db2da4f048c2aaf142e34dbc5
+  data.tar.gz: dfb2ae9401f4e592b87cf400216c209af55212b7
+SHA512:
+  metadata.gz: 3de4722ffee541a1c66559e933c28dd9ac48b341517ea3e557208c6a035ba77cf8b8eeaf748389a118af18fe5c75d08dbe237c5d16e7216569ee5457ca79b120
+  data.tar.gz: 57297f9eca55aeb093caabc91df9059a97e399ab98ed95f877c9135236bc6833a3d066dbb11adb0ef2689eb2beae9398a7e55839f5f7bf63bcfb4f519a140562

data/lib/gerbilcharts/models/bucketized_timeseries_graph_model.rb

@@ -14,12 +14,18 @@ class BucketizedTimeSeriesGraphModel < TimeSeriesGraphModel
   attr_reader   :behavior			# :average or :max or :sum
   attr_reader   :last_sweep_pos			# :nodoc:
   
-  def initialize(name,bucketsec, opt={:behavior => :average})
+  def initialize(name,bucketsec, opt={:behavior => :average, :vartype => :bits_per_sec })
     super(name,opt)
     @bucket_size_secs=bucketsec
     @samp_count =0
     @behavior = opt[:behavior]
     @last_sweep_pos=0
+	@aggregation_factor = case opt[:vartype]
+		when :bits_per_sec ;  @bucket_size_secs / 8.0 
+		when :per_sec ; @bucket_size_secs
+		when :counter ; 1.0
+		else ;  @bucket_size_secs / 8.0 
+	end
   end
   
   def sweep_interval

data/lib/gerbilcharts/models/monotonous_graph_model.rb

@@ -10,6 +10,7 @@ class MonotonousGraphModel < GraphModel
   attr_reader :yarr						    # the y values 
   attr_reader :xrange,:yrange				# raw ranges
   attr_reader :rounderx, :roundery			# rounded ranges according to presets
+  attr_reader :aggregation_factor		    # how to aggregate? bits/bytes*bucketsize 
   
   def initialize(name,opt={})
     super(name)
@@ -19,6 +20,7 @@ class MonotonousGraphModel < GraphModel
     @roundery = RoundRange
     @xarr=[]
     @yarr=[]
+	@aggregation_factor=1
   end
  
   # add a tuple, apply a transformer lambda is supplied by the user
@@ -159,7 +161,7 @@ class MonotonousGraphModel < GraphModel
   #  todo :  5 = stddev  
   #  todo : support :ninety_fifth
   #
-  def get_statistical_analysis(mode = :normal)
+  def get_statistical_analysis()
   	return [0,0,0,0,0] if @yarr.size==0
 
   	a = []
@@ -170,6 +172,7 @@ class MonotonousGraphModel < GraphModel
 	@yarr.each do |v|
 		a[3] = a[3] + v
 	end
+	a[3] = a[3] * @aggregation_factor 
 	a[2] = a[3]/@yarr.size
 	a[4] = latest_val
 	return a

data/lib/gerbilcharts/surfaces/bubble_surface.rb

@@ -12,8 +12,8 @@ module GerbilCharts::Surfaces
 class BubbleSurface  < Surface
 
 	BUBGRAINS = [1e+9,1e+8,1e+7,1000000,100000,10000,1000,100,10,1]
-	SHAPESZ   = [40,  36,  35,  34,     31,    30,   20,  16, 12,8]
-	RSCALE    = 0.50 
+	SHAPESZ   = [60,  55,  50,  45,     40,    35,   30 ,  25, 20,8]
+	SHAPETXT  = ['1G',  '100M',  '10M',  '1M',     '100K',    '10K',   '1K' ,  '100', '10', '']
 
     def initialize(opts={})
       super(opts)
@@ -51,6 +51,7 @@ class BubbleSurface  < Surface
 			rbub.translate_x xpos
 
             parent.modelgroup.each_model_with_index do | mod, i|
+
               val =  mod.sweep(sweep_pos)
 			  allshapes << valtocircles(val)
             end
@@ -66,7 +67,9 @@ class BubbleSurface  < Surface
 
 
 			  ai.each do |shp|
-			  	shp.x = rbub.left + rand*(rbub.width)
+			  	shp.x = rbub.left + rand(50)
+				shp.x = rbub.left+10  if shp.x < rbub.left 
+				shp.x = rbub.right-10  if shp.x > rbub.right  
 				shp.y = rbub.bottom - rand*(rbub.height*0.75)
               	g.addshape(shp, opts)
 			  end
@@ -84,14 +87,13 @@ class BubbleSurface  < Surface
 		splitup=BUBGRAINS.collect do |grain_size|
 			n=(val/grain_size)
 			val = val%grain_size
-			(n*RSCALE).to_i 
+			n.to_i 
 		end
 
-		
 		ret=[]
 		shapes=SHAPESZ.each_with_index do |s,i|
 			splitup[i].times do  |t|
-              ret << GerbilCharts::SVGDC::SVGCircle.new(0, 0, s) 
+              ret << GerbilCharts::SVGDC::SVGCircleText.new(0, 0, s, SHAPETXT[i] ) 
 			end
 		end
 

data/lib/gerbilcharts/surfaces/detailed_legend.rb

@@ -4,8 +4,8 @@ module GerbilCharts::Surfaces
 # legend panel shows names/colors of items in a separate box (transparent)
 class DetailedLegend < GraphElement
   
-	WIDTH_MAX = 500
-	STAT_TABLE_OFFSET=120
+	WIDTH_MAX = 600
+	STAT_TABLE_SIZE=300
 
     attr_reader   :width
     attr_reader   :showvalues
@@ -62,7 +62,7 @@ class DetailedLegend < GraphElement
       rbox.bottom = rbox.top+10
        
 
-	  stat_label_pos = rbox.right + STAT_TABLE_OFFSET
+	  stat_label_pos = @bounds.right -  STAT_TABLE_SIZE
 	  lab = %w(Max Min Avg Latest Total).inject("") { |m,ai| m += ai.rjust(9)}  
 	  if @show_stats
       	g.textout(stat_label_pos, rbox.bottom-2, lab, {'xml:space' => 'preserve', :class => "legendstats"} )
@@ -83,17 +83,17 @@ class DetailedLegend < GraphElement
 		boxopts = { :id => "item#{i}" }
 		boxopts.store(:fill , color_for_id(i)) if i > 10
         g.rectangle_r(rbox, boxopts )
-        g.textout(rbox.right+5, rbox.bottom-2, mod.name,opts)
+        g.textout(rbox.right+5, rbox.bottom-2, mod.name.slice(0..40),opts)
 
 		stat_ana = mod.get_statistical_analysis
-		bucketsize = mod.respond_to?(:bucket_size_secs)? mod.bucket_size_secs: 1
+		bucketsize = mod.respond_to?(:bucket_size_secs)? mod.bucket_size_secs: 8
+
 
-	  	stat_label_pos = rbox.right + STAT_TABLE_OFFSET
 		outs = mod.formatted_val(stat_ana[1]).to_s.rjust(9) +
 			   mod.formatted_val(stat_ana[0]).to_s.rjust(9) +
 			   mod.formatted_val(stat_ana[2]).to_s.rjust(9) +
 			   mod.formatted_val(stat_ana[4]).to_s.rjust(9) +
-			   fmt_prefix_2(stat_ana[3]*bucketsize/8).to_s.rjust(9) 
+			   fmt_prefix_2(stat_ana[3]).to_s.rjust(9) 
 		if @show_stats
         	g.textout(stat_label_pos, rbox.bottom-2, outs, {'xml:space' => 'preserve', :class => 'legendstats'} )
 		end

data/lib/gerbilcharts/svgdc/svg_circle.rb

@@ -19,4 +19,23 @@ class SVGCircle < SVGShape
   
 end
 
+
+class SVGCircleText < SVGCircle
+
+  attr_accessor :txt
+
+  def initialize(x,y,r,text)
+  	super(x,y,r)
+	@txt=text 
+  end
+  
+  def render(xfrag)
+  	super(xfrag)
+    h = { "text-anchor" => "middle" , :x => @x, :y => @y, :class => 'legendtext'  }
+    xfrag.text(@txt,  h ) 
+  end
+
+end
+
+
 end

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: gerbilcharts
 version: !ruby/object:Gem::Version
-  version: 0.7.4
-  prerelease: 
+  version: 0.8.0
 platform: ruby
 authors:
 - vivek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Gerbilcharts is a server side charting library that outputs SVG text
@@ -83,6 +74,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
+- LICENSE.txt
+- README.rdoc
 - lib/gerbilcharts.rb
 - lib/gerbilcharts/charts.rb
 - lib/gerbilcharts/charts/area_chart.rb
@@ -163,34 +156,28 @@ files:
 - lib/gerbilcharts/svgdc/svgdc.rb
 - lib/gerbilcharts/svgdc/transformations.rb
 - lib/gerbilcharts/version.rb
-- LICENSE.txt
-- README.rdoc
 homepage: http://github.com/vivekrajan/gerbilcharts
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 216602382949750896
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: SVG timeseries charting
 test_files: []