analytica 0.0.19 → 0.0.20

data/lib/analytica.rb

@@ -4,7 +4,7 @@ require File.join(File.dirname(__FILE__), 'computation')
 require File.join(File.dirname(__FILE__), 'visualization')
 
 module Analytica
-  VERSION = '0.0.19'
+  VERSION = '0.0.20'
 
   include Strict
 

data/lib/visualization.rb

@@ -38,10 +38,14 @@ module Analytica
       end
 
       def set_title(params)
+        enforce_map_defaults!({
+          :text => ' ',
+          :size => 11,
+          :color => "000000"}, params)
         enforce_map!({
-          :title => :string,
-          :title_size => :natural_number,
-          :title_color => :hex_color}, params)
+          :text => :string,
+          :size => :natural_number,
+          :color => :hex_color}, params)
 
         @title = params
         @title_set = true
@@ -58,7 +62,7 @@ module Analytica
       def generate_title
         options = {}
         if @title_set
-          options.merge!(@title)
+          options.merge!({:title => @title[:text], :title_size => @title[:size], :title_color => @title[:color]})
         end
         options
       end
@@ -114,9 +118,7 @@ module Analytica
 
       def to_linegraph(params={})
         enforce_map_defaults!({
-          :title => ' ',
-          :title_size => 12,
-          :title_color => '000000',
+          :title => {:text => ' ', :color => "000000", :size => 12},
           :color => 'ffffff',
           :background_color => '000000',
           :width => 600,
@@ -125,15 +127,14 @@ module Analytica
           :bar_settings => {}}, params)
 
         enforce_map!({
-          :title => :string,
-          :title_size => :natural_number,
-          :title_color => :hex_color,
+          :title => :hash_map,
           :width => :natural_number,
           :height => :natural_number,
           :background_color => :hex_color,
           :format => [:url, :image_tag],
           :color => :hex_color}, params)
 
+        set_title(params[:title])
 
         options = {}
 
@@ -162,9 +163,7 @@ module Analytica
 
       def to_sparkline(params={})
         enforce_map_defaults!({
-          :title => ' ',
-          :title_size => 12,
-          :title_color => '000000',
+          :title => {:text => ' ', :color => "000000", :size => 12},
           :color => '0000ff',
           :background_color => 'ffffff',
           :width => 600,
@@ -173,19 +172,14 @@ module Analytica
           :bar_settings => {}}, params)
 
         enforce_map!({
-          :title => :string,
-          :title_size => :natural_number,
-          :title_color => :hex_color,
+          :title => :hash_map,
           :width => :natural_number,
           :height => :natural_number,
           :background_color => :hex_color,
           :format => [:url, :image_tag],
           :color => :hex_color}, params)
 
-        params[:title] = '' unless params.has_key? :title
-        params[:title_size] = 12 unless params.has_key? :title_size
-        params[:title_color] = '000000' unless params.has_key? :title_color
-
+        set_title(params[:title])
 
         options = {}
 
@@ -215,9 +209,7 @@ module Analytica
 
       def to_bargraph(params={})
         enforce_map_defaults!({
-          :title => ' ',
-          :title_size => 12,
-          :title_color => '000000',
+          :title => {:text => ' ', :color => "000000", :size => 12},
           :orientation => :vertical,
           :color => '00bb00',
           :background_color => 'ffffff',
@@ -229,9 +221,7 @@ module Analytica
           :bar_settings => {}}, params)
 
         enforce_map!({
-          :title => :string,
-          :title_size => :natural_number,
-          :title_color => :hex_color,
+          :title => :hash_map,
           :width => :natural_number,
           :height => :natural_number,
           :orientation => [:vertical, :horizontal],
@@ -240,6 +230,8 @@ module Analytica
           :color => :hex_color,
           :format => [:url, :image_tag],
           :bar_settings => :hash_map}, params)
+        
+        set_title(params[:title])
 
         options = {}
 
@@ -278,9 +270,7 @@ module Analytica
 
       def to_linegraph(params={})
         enforce_map_defaults!({
-          :title => ' ',
-          :title_size => 12,
-          :title_color => '000000',
+          :title => {:text => ' ', :color => "000000", :size => 12},
           :color => 'ffffff',
           :width => 600,
           :height => 280,
@@ -288,15 +278,15 @@ module Analytica
           :background_color => '000000'}, params)
 
         enforce_map!({
-          :title => :string,
-          :title_size => :natural_number,
-          :title_color => :hex_color,
+          :title => :hash_map,
           :width => :natural_number,
           :height => :natural_number,
           :background_color => :hex_color,
           :format => [:url, :image_tag],
           :color => :hex_color}, params)
 
+        set_title(params[:title])
+
         options = {}
 
         options.merge!({:format => 'image_tag'}) if params[:format] == :image_tag
@@ -324,9 +314,7 @@ module Analytica
 
       def to_bargraph(params={})
         enforce_map_defaults!({
-          :title => ' ',
-          :title_size => 12,
-          :title_color => '000000',
+          :title => {:text => ' ', :color => "000000", :size => 12},
           :orientation => :vertical,
           :color => 'ffffff',
           :background_color => '000000',
@@ -337,9 +325,7 @@ module Analytica
           :bar_settings => {}}, params)
 
         enforce_map!({
-          :title => :string,
-          :title_size => :natural_number,
-          :title_color => :hex_color,
+          :title => :hash_map,
           :width => :natural_number,
           :height => :natural_number,
           :orientation => [:vertical, :horizontal],
@@ -349,6 +335,8 @@ module Analytica
           :format => [:url, :image_tag],
           :bar_settings => :hash_map}, params)
 
+        set_title(params[:title])
+
         options = {}
 
         options.merge!({:format => 'image_tag'}) if params[:format] == :image_tag

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: analytica
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 0
-  - 19
-  version: 0.0.19
+  - 20
+  version: 0.0.20
 platform: ruby
 authors: 
 - Raeez Lorgat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-21 00:00:00 -07:00
+date: 2010-08-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency