analytica 0.0.7 → 0.0.8

data/lib/analytica.rb

@@ -4,17 +4,27 @@ require File.join(File.dirname(__FILE__), 'computation')
 require File.join(File.dirname(__FILE__), 'visualization')
 
 module Analytica
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 
   include Strict
 
+  dataset_array_handler = proc do |data, context|
+    enforce_primitive!(Array, data, context)
+    data.each {|item| enforce_primitive!(DataSet, item, context)}
+  end
+
+  register_supertype(:dataset_array, dataset_array_handler)
+
   class DataSet < Array
     include Analytica::Computation
-    include Analytica::Visualization
+    include Analytica::Visualization::DataSet
 
     def initialize(datapoints=[])
       enforce!(:numeric_array, datapoints)
 
+      @labels = []
+      @labels_set = false
+
       super datapoints
     end
 
@@ -33,4 +43,32 @@ module Analytica
       super other
     end
   end
+
+  class DataSystem < Array
+    include Analytica::Visualization::DataSystem
+
+    def initialize(datasets=[])
+      enforce!(:dataset_array, datasets)
+
+      super datasets
+    end
+
+    def <<(object)
+      enforce_primitive!(DataSet, object)
+
+      super object
+    end
+
+    def concat(other)
+      enforce!(:dataset_array, other)
+
+      super datasets
+    end
+
+    def +(other)
+      enforce!(:dataset_array, other)
+
+      super other
+    end
+  end
 end

data/lib/visualization.rb

@@ -1,67 +1,281 @@
 require 'typestrict'
-require 'gchart'
-
-class GChart::Base
-  def to_html
-    "<img src=\"#{self.to_url}\" />"
-  end
-end
+require 'googlecharts'
 
 module Analytica
   module Visualization
-    include Strict
+    def default_bar_settings
+      {:width => 25, :spacing => 10, :group_spacing => 12}
+    end
 
-    def set_labels(labels)
-    enforce!(:string_array, labels)
+    module DataSet
+      include Strict
 
-      @labels = labels
-    end
+      def set_labels(labels)
+      enforce!(:string_array, labels)
+
+        @labels = labels
+        @labels_set = true
+      end
+
+      def datamax
+      (max > 0) ? (1.25*max) : 1
+      end
+
+      def to_linegraph(params)
+        enforce_map!({
+          :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 = {}
+
+        base = {
+          :data => self,
+          :max_value => datamax,
+          :size => "#{params[:width]}x#{params[:height]}",
+          :format => 'image_tag'
+        }
+
+        options.merge!(base)
+
+        title = {
+          :title => params[:title],
+          :title_color => params[:title_color],
+          :title_size => params[:title_size]
+        }
+
+        #options.merge!(title)
+
+        color = {
+          :line_colors => params[:color],
+          :background => params[:background_color],
+          :chart_background => params[:background_color]
+        }
+
+        options.merge!(color)
+
+        label = {
+          :legend => ['x', 'y'], # TODO number of datasets
+          :axis_with_labels => ['x','r'], #TODO number of datasets
+          :axis_labels => [[],[]] # TODO
+        }
+        
+        
+        #options.merge!(label)
+
+        Gchart.line(options)
+      end
+
+      def to_sparkline(params)
+        enforce_map!({
+          :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 = {}
+
+        base = {
+          :data => self,
+          :max_value => datamax,
+          :size => "#{params[:width]}x#{params[:height]}",
+          :format => 'image_tag'
+        }
+
+        options.merge!(base)
+
+        title = {
+          :title => params[:title],
+          :title_color => params[:title_color],
+          :title_size => params[:title_size]
+        }
+
+        #options.merge!(title)
+
+        color = {
+          :line_colors => params[:color],
+          :background => params[:background_color],
+          :chart_background => params[:background_color]
+        }
+
+        options.merge!(color)
+
+        label = {
+          :legend => ['x', 'y'], # TODO number of datasets
+          :axis_with_labels => ['x','r'], #TODO number of datasets
+          :axis_labels => [[],[]] # TODO
+        }
+        
+        #options.merge!(label)
+
+        Gchart.sparkline(options)
+      end
+
+
+      def to_bargraph(params)
+        enforce_map!({
+          :width => :natural_number,
+          :height => :natural_number,
+          :orientation => [:vertical, :horizontal],
+          :background_color => :hex_color,
+          :color => :hex_color}, params)
+
+        options = {}
+
+        base = {
+          :data => self,
+          :max_value => datamax,
+          :size => "#{params[:width]}x#{params[:height]}",
+          :orientation => params[:orientation].to_s,
+          :stacked => params[:stacked],
+          :bar_width_and_spacing => Analytica::Visualization::default_bar_settings,
+          :format => 'image_tag'
+        }
+
+        options.merge!(base)
+
+        title = {
+          :title => params[:title],
+          :title_color => params[:title_color],
+          :title_size => params[:title_size]
+        }
+
+        #options.merge!(title)
+
+        color = {
+          :bar_colors => params[:color],
+          :background => params[:background_color],
+          :chart_background => params[:background_color]
+        }
+
+        options.merge!(color)
+
+        label = {
+          :legend => ['x', 'y'], # TODO number of datasets
+          :axis_with_labels => ['x','r'], #TODO number of datasets
+          :axis_labels => [[],[]] # TODO
+        }
+
+        #options.merge!(label)
 
-    def datamax
-    (max > 0) ? max : 1
-    end
 
-    def to_linegraph(params)
-      enforce_map!({
-        :width => :natural_number,
-        :height => :natural_number,
-        :background_color => :hex_color,
-        :color => :hex_color}, params)
-
-      GChart.line do |g|
-        g.data = self
-        g.extras = {
-            'chm' => 'N*cUSD0*,000000,0,-1,11', 
-            'chbh' => '18,38',
-            'chds' => "0,#{datamax}"
-          }
-          g.size = "#{(params[:width]).to_i}x#{(params[:height]).to_i}"
-          g.entire_background = params[:background_color].to_s
-          g.colors = params[:color].to_s
-          g.axis(:bottom) {|a| a.labels = @labels}
-        end
+        return Gchart.bar(options)
+      end
     end
 
-    def to_bargraph(params)
-      enforce_map!({
-        :width => :natural_number,
-        :height => :natural_number,
-        :orientation => [:vertical, :horizontal],
-        :background_color => :hex_color,
-        :color => :hex_color}, params)
-
-      GChart.bar do |g|
-        g.data = self
-        g.extras = {
-          'chm' => 'N*cUSD0*,000000,0,-1,11', 
-          'chbh' => '45,30',
-          'chds' => "0,#{datamax}"
-        }
-        g.size = "#{(params[:width]).to_i}x#{(params[:height]).to_i}"
-        g.entire_background = params[:background_color].to_s
-        g.colors = params[:color].to_s
-        g.orientation = params[:orientation]
-        g.axis(:bottom) {|a| a.labels = @labels}
+    module DataSystem
+      def datamax
+        (self.map{|dset| dset.datamax}).max
+      end
+
+      def to_linegraph(params)
+        enforce_map!({
+          :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
+
+
+        options = {}
+
+        base = {
+          :data => self,
+          :max_value => datamax,
+          :size => "#{params[:width]}x#{params[:height]}",
+          :format => 'image_tag'
+        }
+
+        options.merge!(base)
+
+        title = {
+          :title => params[:title],
+          :title_color => params[:title_color],
+          :title_size => params[:title_size]
+        }
+
+        #options.merge!(title)
+
+        color = {
+          :line_colors => params[:colors],
+          :background => params[:background_color],
+          :chart_background => params[:background_color]
+        }
+
+        options.merge!(color)
+
+        label = {
+          :legend => ['x', 'y'], # TODO number of datasets
+          :axis_with_labels => ['x','r'], #TODO number of datasets
+          :axis_labels => [[],[]] # TODO
+        }
+
+        Gchart.line(options)
+      end
+
+      def to_bargraph(params)
+        enforce_map!({
+          :width => :natural_number,
+          :height => :natural_number,
+          :orientation => [:vertical, :horizontal],
+          :stacked => :boolean,
+          :background_color => :hex_color,
+          :colors => :hex_color_array}, params)
+
+        options = {}
+
+        base = {
+          :data => self,
+          :max_value => datamax,
+          :size => "#{params[:width]}x#{params[:height]}",
+          :orientation => params[:orientation].to_s,
+          :stacked => params[:stacked],
+          :bar_width_and_spacing => Analytica::Visualization::default_bar_settings,
+          :format => 'image_tag'
+        }
+
+        options.merge!(base)
+
+        title = {
+          :title => params[:title],
+          :title_color => params[:title_color],
+          :title_size => params[:title_size]
+        }
+
+        #options.merge!(title)
+
+        color = {
+          :bar_colors => params[:colors],
+          :background => params[:background_color],
+          :chart_background => params[:background_color]
+        }
+
+        options.merge!(color)
+
+        label = {
+          :legend => ['x', 'y'], # TODO number of datasets
+          :axis_with_labels => ['x','r'], #TODO number of datasets
+          :axis_labels => [[],[]] # TODO
+        }
+
+        #options.merge!(label)
+
+
+        return Gchart.bar(options)
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: analytica
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Raeez Lorgat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-09 00:00:00 -04:00
+date: 2010-08-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency