analytica 0.0.14 → 0.0.15

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.14'
+  VERSION = '0.0.15'
 
   include Strict
 

data/lib/visualization.rb

@@ -3,10 +3,6 @@ require 'typestrict'
 
 module Analytica
   module Visualization
-    def self.default_bar_settings
-      {:width => 25, :spacing => 10, :group_spacing => 12}
-    end
-
     module Common
       def set_title(params)
         enforce_map!({
@@ -48,21 +44,38 @@ module Analytica
         @labels_set = true
       end
 
+      def bar_settings(bar_settings)
+        enforce_map_optional!({
+          :width => :natural_number,
+          :spacing => :natural_number,
+          :group_spacing => :natural_number}, bar_settings)
+        bar_settings
+      end
+
       def datamax
       (max > 0) ? (1.25*max) : 1
       end
 
       def to_linegraph(params={})
+        enforce_map_defaults!({
+          :title => ' ',
+          :title_size => 12,
+          :title_color => '000000',
+          :color => 'ffffff',
+          :background_color => '000000',
+          :width => 600,
+          :height => 280,
+          :bar_settings => {}}, params)
+
         enforce_map!({
+          :title => :string,
+          :title_size => :natural_number,
+          :title_color => :hex_color,
           :width => :natural_number,
           :height => :natural_number,
           :background_color => :hex_color,
           :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
-
 
         options = {}
 
@@ -89,7 +102,20 @@ module Analytica
       end
 
       def to_sparkline(params={})
+        enforce_map_defaults!({
+          :title => ' ',
+          :title_size => 12,
+          :title_color => '000000',
+          :color => '0000ff',
+          :background_color => 'ffffff',
+          :width => 600,
+          :height => 280,
+          :bar_settings => {}}, params)
+
         enforce_map!({
+          :title => :string,
+          :title_size => :natural_number,
+          :title_color => :hex_color,
           :width => :natural_number,
           :height => :natural_number,
           :background_color => :hex_color,
@@ -126,12 +152,29 @@ module Analytica
 
 
       def to_bargraph(params={})
+        enforce_map_defaults!({
+          :title => ' ',
+          :title_size => 12,
+          :title_color => '000000',
+          :orientation => :vertical,
+          :color => 'ffffff',
+          :background_color => '000000',
+          :stacked => false,
+          :width => 600,
+          :height => 280,
+          :bar_settings => {}}, params)
+
         enforce_map!({
+          :title => :string,
+          :title_size => :natural_number,
+          :title_color => :hex_color,
           :width => :natural_number,
           :height => :natural_number,
           :orientation => [:vertical, :horizontal],
+          :stacked => :boolean,
           :background_color => :hex_color,
-          :color => :hex_color}, params)
+          :color => :hex_color,
+          :bar_settings => :hash_map}, params)
 
         options = {}
 
@@ -141,7 +184,7 @@ module Analytica
           :size => "#{params[:width]}x#{params[:height]}",
           :orientation => params[:orientation].to_s,
           :stacked => params[:stacked],
-          :bar_width_and_spacing => Analytica::Visualization::default_bar_settings,
+          :bar_width_and_spacing => bar_settings(params[:bar_settings]),
           :format => 'image_tag'
         }
 
@@ -156,13 +199,21 @@ module Analytica
         options.merge!(color)
 
         options.merge!(common_options)
-
+        
         return Gchart.bar(options)
       end
     end
 
     module DataSystem
 
+      def bar_settings(bar_settings)
+        enforce_map_optional!({
+          :width => :natural_number,
+          :spacing => :natural_number,
+          :group_spacing => :natural_number}, bar_settings)
+        bar_settings
+      end
+
       def set_labels(labels)
         enforce!(:string_array, labels)
 
@@ -175,16 +226,24 @@ module Analytica
       end
 
       def to_linegraph(params={})
+        enforce_map_defaults!({
+          :title => ' ',
+          :title_size => 12,
+          :title_color => '000000',
+          :color => 'ffffff',
+          :width => 600,
+          :height => 280,
+          :background_color => '000000'}, params)
+
+
         enforce_map!({
+          :title => :string,
+          :title_size => :natural_number,
+          :title_color => :hex_color,
           :width => :natural_number,
           :height => :natural_number,
           :background_color => :hex_color,
-          :colors => :hex_color_array}, 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
-
+          :color => :hex_color}, params)
 
         options = {}
 
@@ -211,13 +270,28 @@ module Analytica
       end
 
       def to_bargraph(params={})
+        enforce_map_defaults!({
+          :title => ' ',
+          :title_size => 12,
+          :title_color => '000000',
+          :orientation => :vertical,
+          :color => 'ffffff',
+          :background_color => '000000',
+          :width => 600,
+          :height => 280,
+          :bar_settings => {}}, params)
+
         enforce_map!({
+          :title => :string,
+          :title_size => :natural_number,
+          :title_color => :hex_color,
           :width => :natural_number,
           :height => :natural_number,
           :orientation => [:vertical, :horizontal],
           :stacked => :boolean,
           :background_color => :hex_color,
-          :colors => :hex_color_array}, params)
+          :colors => :hex_color_array,
+          :bar_settings => :hash_map}, params)
 
         options = {}
 
@@ -227,7 +301,7 @@ module Analytica
           :size => "#{params[:width]}x#{params[:height]}",
           :orientation => params[:orientation].to_s,
           :stacked => params[:stacked],
-          :bar_width_and_spacing => Analytica::Visualization::default_bar_settings,
+          :bar_width_and_spacing => bar_settings(params[:bar_settings]),
           :format => 'image_tag'
         }
 

data/test/test_analytica.rb

@@ -3,6 +3,7 @@ require "analytica"
 
 class TestAnalytica < Test::Unit::TestCase
   def test_sanity
-    puts "not tests written!"
+    a = Analytica::DataSet.new([3, 8, 3, 9, 2, 7])
+    puts a.to_bargraph(:width => 500, :height => 230, :color => 'ffffff', :background_color => '000000', :orientation => :vertical).gsub("\"", "'").inspect
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: analytica
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 0
-  - 14
-  version: 0.0.14
+  - 15
+  version: 0.0.15
 platform: ruby
 authors: 
 - Raeez Lorgat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-14 00:00:00 -07:00
+date: 2010-08-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency