google_visualr 2.0.1 → 2.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    google_visualr (2.0)
+    google_visualr (2.0.2)
 
 GEM
   remote: http://rubygems.org/

data/lib/google_visualr/data_table.rb

@@ -43,6 +43,7 @@ module GoogleVisualr
     #
     #   * v               [Optional] The cell value. The data type should match the column data type.
     #   * f               [Optional] A string version of the v value, formatted strictly for display only. If omitted, a string version of v will be used.
+    #   * p               [Optional] An object that is a map of custom values applied to the cell. Example: :p => { :style => 'border: 1px solid green;' }.
     #
     #   Cells in the row array should be in the same order as their column descriptions in cols.
     #
@@ -74,7 +75,7 @@ module GoogleVisualr
     #     - 'boolean'   : Boolean value ('true' or 'false'). Example values: v: true
     #   * label           [Optional] A string value that some visualizations display for this column. Example: label:'Height'
     #   * id              [Optional] A unique (basic alphanumeric) string ID of the column. Be careful not to choose a JavaScript keyword. Example: id:'col_1'
-    def new_column(type, label="", id ="")
+    def new_column(type, label=nil, id =nil)
       @cols << { :type => type, :label => label, :id => id }
     end
 
@@ -199,12 +200,16 @@ module GoogleVisualr
       js = "var data_table = new google.visualization.DataTable();"
 
       @cols.each do |column|
-        js << "data_table.addColumn('#{column[:type]}', '#{column[:label]}', '#{column[:id]}');"
+        js << "data_table.addColumn('"
+        js << "#{column[:type]}'"
+        js << ", '#{column[:label]}'" unless column[:label].nil?
+        js << ", '#{column[:id]}'"    unless column[:id].nil?
+        js << ");"
       end
 
       @rows.each do |row|
         js << "data_table.addRow("
-        js << "[ #{row.collect { |cell| cell.to_js }.join(", ")} ]" unless row.empty?
+        js << "[#{row.collect { |cell| cell.to_js }.join(", ")}]" unless row.empty?
         js << ");"
       end
 
@@ -240,7 +245,6 @@ module GoogleVisualr
       end
     end
 
-
     class Cell
       include GoogleVisualr::ParamHelpers
 
@@ -261,10 +265,12 @@ module GoogleVisualr
       end
 
       def to_js
+        return "null" if @v.nil? && @f.nil? && @p.nil?
+
         js  = "{"
         js << "v: #{typecast(@v)}"
-        js << ", f: '#{@f}'"  unless @f.nil?
-        js << ", p: #{@p}"    unless @p.nil?
+        js << ", f: '#{@f}'"          unless @f.nil?
+        js << ", p: #{typecast(@p)}"  unless @p.nil?
         js << "}"
 
         js

data/lib/google_visualr/version.rb

@@ -1,3 +1,3 @@
 module GoogleVisualr
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/spec/google_visualr/data_table_spec.rb

@@ -48,7 +48,7 @@ describe GoogleVisualr::DataTable do
     it "initializes a new column with only type param" do
       dt = GoogleVisualr::DataTable.new
       dt.new_column('string')
-      dt.cols.first.should == {:id => '', :label => '', :type => 'string'}
+      dt.cols.first.should == {:id => nil, :label => nil, :type => 'string'}
     end
 
     it "initializes a new column with all params" do
@@ -208,6 +208,24 @@ describe GoogleVisualr::DataTable do
   end
 
   describe "#to_js" do
+    context "cols" do
+      it "includes :id and :label when these are specified" do
+        data_table = GoogleVisualr::DataTable.new()
+        data_table.new_column("Total", "Total", "1")
+        data_table.add_row([1])
+
+        data_table.to_js.should == "var data_table = new google.visualization.DataTable();data_table.addColumn('Total', 'Total', '1');data_table.addRow([{v: 1}]);"
+      end
+
+      it "excludes :id and :label when these are not specified" do
+        data_table = GoogleVisualr::DataTable.new()
+        data_table.new_column("Total")
+        data_table.add_row([1])
+
+        data_table.to_js.should == "var data_table = new google.visualization.DataTable();data_table.addColumn('Total');data_table.addRow([{v: 1}]);"
+      end
+    end
+
     it "converts object to js string" do
       dt = valid_object
       js = dt.to_js
@@ -221,14 +239,14 @@ describe GoogleVisualr::DataTable do
     describe "#new" do
       it "initializes with a value" do
         cell = GoogleVisualr::DataTable::Cell.new(1)
-        cell.v.should == 1 
+        cell.v.should == 1
       end
 
       it "initializes with a hash" do
-        cell = GoogleVisualr::DataTable::Cell.new({:v => 1, :f => "1.0", :p => "{style: 'border: 1px solid green;'}"})
+        cell = GoogleVisualr::DataTable::Cell.new( { :v => 1, :f => "1.0", :p => {:style => 'border: 1px solid green;'} } )
         cell.v.should == 1
         cell.f.should == "1.0"
-        cell.p.should == "{style: 'border: 1px solid green;'}"
+        cell.p.should == {:style => 'border: 1px solid green;'}
       end
     end
 
@@ -238,13 +256,23 @@ describe GoogleVisualr::DataTable do
           cell = GoogleVisualr::DataTable::Cell.new(1)
           cell.to_js.should == "{v: 1}"
         end
+
+        it "returns 'null' when v is nil" do
+          cell = GoogleVisualr::DataTable::Cell.new(nil)
+          cell.to_js.should == "null"
+        end
       end
 
       context "initialized with a hash" do
-        it "returns a json string" do
-          cell = GoogleVisualr::DataTable::Cell.new({:v => 1, :f => "1.0", :p => "{style: 'border: 1px solid green;'}"})
+        it "returns a json string when v is present" do
+          cell = GoogleVisualr::DataTable::Cell.new( { :v => 1, :f => "1.0", :p => {:style => 'border: 1px solid green;'} } )
           cell.to_js.should == "{v: 1, f: '1.0', p: {style: 'border: 1px solid green;'}}"
         end
+
+        it "returns a json string when v is nil" do
+          cell = GoogleVisualr::DataTable::Cell.new( { :v => nil, :f => "-", :p => {:style => 'border: 1px solid red;'} } )
+          cell.to_js.should == "{v: null, f: '-', p: {style: 'border: 1px solid red;'}}"
+        end
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: google_visualr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - Winston Teo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 Z
+date: 2011-07-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler