analytica 0.0.18 → 0.0.19

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.18'
+  VERSION = '0.0.19'
 
   include Strict
 

data/lib/visualization.rb

@@ -7,7 +7,7 @@ module Analytica
     module Representation
       def set_labels(params={})
         enforce_map_defaults!({
-          :data => nil,
+          :data => [],
           :type => :x_axis,
           :prefix => ' ',
           :postfix => ' ',
@@ -15,7 +15,7 @@ module Analytica
           :color => '000000',
           :size => 10}, params)
 
-        enforce_weak_primitives!([Array, NilClass], params[:data])
+        enforce_primitive!(Array, params[:data])
 
         enforce_map!({
           :type => [:axis, :x_axis, :y_axis, :data],
@@ -83,13 +83,13 @@ module Analytica
           elsif @labels[:x_axis]
             x_axis_label = {
               :axis_with_labels => 'x',
-              :axis_labels => @labels[:x_axis][:data].nil? ? self.map{|n|"#{n}"} : @labels[:x_axis][:data]
+              :axis_labels => @labels[:x_axis][:data].size == 0 ? self.map{|n|"#{n}"} : @labels[:x_axis][:data]
             }
             options.merge!(x_axis_label)
           elsif @labels[:y_axis]
             y_axis_label = {
               :axis_with_labels => 'y',
-              :axis_labels => @labels[:y_axis][:data].nil? ? ["#{0}", "#{(datamax*0.5).to_i}",  "#{datamax.to_i}"] : @labels[:y_axis][:data]
+              :axis_labels => @labels[:y_axis][:data].size == 0 ? ["#{0}", "#{(datamax*0.5).to_i}",  "#{datamax.to_i}"] : @labels[:y_axis][:data]
             }
             options.merge!(y_axis_label)
           end
@@ -121,6 +121,7 @@ module Analytica
           :background_color => '000000',
           :width => 600,
           :height => 280,
+          :format => :image_tag,
           :bar_settings => {}}, params)
 
         enforce_map!({
@@ -130,16 +131,18 @@ module Analytica
           :width => :natural_number,
           :height => :natural_number,
           :background_color => :hex_color,
+          :format => [:url, :image_tag],
           :color => :hex_color}, params)
 
 
         options = {}
 
+        options.merge!({:format => 'image_tag'}) if params[:format] == :image_tag
+
         base = {
           :data => self,
           :max_value => datamax,
-          :size => "#{params[:width]}x#{params[:height]}",
-          :format => 'image_tag'
+          :size => "#{params[:width]}x#{params[:height]}"
         }
 
         options.merge!(base)
@@ -166,6 +169,7 @@ module Analytica
           :background_color => 'ffffff',
           :width => 600,
           :height => 180,
+          :format => :image_tag,
           :bar_settings => {}}, params)
 
         enforce_map!({
@@ -175,6 +179,7 @@ module Analytica
           :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
@@ -184,11 +189,12 @@ module Analytica
 
         options = {}
 
+        options.merge!({:format => 'image_tag'}) if params[:format] == :image_tag
+
         base = {
           :data => self,
           :max_value => datamax,
-          :size => "#{params[:width]}x#{params[:height]}",
-          :format => 'image_tag'
+          :size => "#{params[:width]}x#{params[:height]}"
         }
 
         options.merge!(base)
@@ -219,6 +225,7 @@ module Analytica
           :width => 600,
           :height => 280,
           :stacked => false,
+          :format => :image_tag,
           :bar_settings => {}}, params)
 
         enforce_map!({
@@ -231,18 +238,20 @@ module Analytica
           :stacked => :boolean,
           :background_color => :hex_color,
           :color => :hex_color,
+          :format => [:url, :image_tag],
           :bar_settings => :hash_map}, params)
 
         options = {}
 
+        options.merge!({:format => 'image_tag'}) if params[:format] == :image_tag
+
         base = {
           :data => self,
           :max_value => datamax,
           :size => "#{params[:width]}x#{params[:height]}",
           :orientation => params[:orientation].to_s,
           :stacked => params[:stacked],
-          :bar_width_and_spacing => bar_settings(params[:bar_settings]),
-          :format => 'image_tag'
+          :bar_width_and_spacing => bar_settings(params[:bar_settings])
         }
 
         options.merge!(base)
@@ -275,9 +284,9 @@ module Analytica
           :color => 'ffffff',
           :width => 600,
           :height => 280,
+          :format => :image_tag,
           :background_color => '000000'}, params)
 
-
         enforce_map!({
           :title => :string,
           :title_size => :natural_number,
@@ -285,15 +294,17 @@ module Analytica
           :width => :natural_number,
           :height => :natural_number,
           :background_color => :hex_color,
+          :format => [:url, :image_tag],
           :color => :hex_color}, params)
 
         options = {}
 
+        options.merge!({:format => 'image_tag'}) if params[:format] == :image_tag
+
         base = {
           :data => self,
           :max_value => datamax,
-          :size => "#{params[:width]}x#{params[:height]}",
-          :format => 'image_tag'
+          :size => "#{params[:width]}x#{params[:height]}"
         }
 
         options.merge!(base)
@@ -322,6 +333,7 @@ module Analytica
           :width => 600,
           :height => 280,
           :stacked => false,
+          :format => :image_tag,
           :bar_settings => {}}, params)
 
         enforce_map!({
@@ -334,18 +346,20 @@ module Analytica
           :stacked => :boolean,
           :background_color => :hex_color,
           :colors => :hex_color_array,
+          :format => [:url, :image_tag],
           :bar_settings => :hash_map}, params)
 
         options = {}
 
+        options.merge!({:format => 'image_tag'}) if params[:format] == :image_tag
+
         base = {
           :data => self,
           :max_value => datamax,
           :size => "#{params[:width]}x#{params[:height]}",
           :orientation => params[:orientation].to_s,
           :stacked => params[:stacked],
-          :bar_width_and_spacing => bar_settings(params[:bar_settings]),
-          :format => 'image_tag'
+          :bar_width_and_spacing => bar_settings(params[:bar_settings])
         }
 
         options.merge!(base)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: analytica
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 0
-  - 18
-  version: 0.0.18
+  - 19
+  version: 0.0.19
 platform: ruby
 authors: 
 - Raeez Lorgat