google_visualr 2.0.4 → 2.0.5

data/Gemfile.lock

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

data/lib/google_visualr/data_table.rb

@@ -238,12 +238,12 @@ module GoogleVisualr
           raise ArgumentError, "cell value '#{v}' is not a String", caller              unless v.is_a?(String)
         when type == "number"
           raise ArgumentError, "cell value '#{v}' is not an Integer or a Float", caller unless v.is_a?(Integer)   || v.is_a?(Float)
-        when type == "date"
-          raise ArgumentError, "cell value '#{v}' is not a Date", caller                unless v.is_a?(Date)
-        when type == 'datetime'
-          raise ArgumentError, "cell value '#{v}' is not a DateTime", caller            unless v.is_a?(DateTime)
         when type == "boolean"
           raise ArgumentError, "cell value '#{v}' is not a Boolean", caller             unless v.is_a?(TrueClass) || v.is_a?(FalseClass)
+        when type == 'datetime'
+          raise ArgumentError, "cell value '#{v}' is not a DateTime", caller            unless v.is_a?(DateTime)  || v.is_a?(Time)
+        when type == "date"
+          raise ArgumentError, "cell value '#{v}' is not a Date", caller                unless v.is_a?(Date)
       end
     end
 

data/lib/google_visualr/param_helpers.rb

@@ -32,10 +32,10 @@ module GoogleVisualr
           return value
         when value.is_a?(TrueClass) || value.is_a?(FalseClass)
           return "#{value}"
-        when value.is_a?(Date)
-          return "new Date(#{value.year}, #{value.month-1}, #{value.day})"
         when value.is_a?(DateTime)  ||  value.is_a?(Time)
           return "new Date(#{value.year}, #{value.month-1}, #{value.day}, #{value.hour}, #{value.min}, #{value.sec})"
+        when value.is_a?(Date)
+          return "new Date(#{value.year}, #{value.month-1}, #{value.day})"
         when value.nil?
           return "null"
         when value.is_a?(Hash)

data/lib/google_visualr/version.rb

@@ -1,3 +1,3 @@
 module GoogleVisualr
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 end

data/spec/google_visualr/data_table_spec.rb

@@ -155,17 +155,17 @@ describe GoogleVisualr::DataTable do
   context "cell value" do
     before do
       @dt = GoogleVisualr::DataTable.new
-      @dt.new_columns( [ {:type => 'number'}, {:type => 'string'} ] )
+      @dt.new_columns( [ {:type => 'string'}, {:type => 'number'}, {:type => 'boolean'}, {:type => 'datetime'}, {:type => 'date'} ] )
       @dt.add_row
     end
 
 
     describe "#set_cell" do
       it "sets cell" do
-        @dt.set_cell(0, 0, 1000)
-        @dt.set_cell(0, 1, 'ABCD')
+        @dt.set_cell(0, 0, {:v => 'ABCD'})
+        @dt.set_cell(0, 1, 1000)
 
-        @dt.get_row(0).should == [1000, 'ABCD']
+        @dt.get_row(0).should == ['ABCD', 1000]
       end
 
       it "raises an exception if the row_index or column_index specified is out of range" do
@@ -178,31 +178,45 @@ describe GoogleVisualr::DataTable do
         }.to raise_exception(RangeError)
       end
 
-      it "raises an exception if the value does not correspond to its column type" do
-        expect {
-          @dt.set_cell(0, 0, 'ABCD')
-        }.to raise_exception(ArgumentError)
+      describe "#verify_against_column_type" do
+        def assert_raises_exception(col, value)
+          expect {
+            @dt.set_cell(0, col, value)
+          }.to raise_exception(ArgumentError)
+        end
 
-        expect {
-          @dt.set_cell(0, 1, 1234)
-        }.to raise_exception(ArgumentError)
+        it "raises an exception if value is not string" do
+          assert_raises_exception(0, 1234)
+        end
+
+        it "raises an exception if value is not number" do
+          assert_raises_exception(1, 'ABCD')
+        end
+
+        it "raises an exception if value is not boolean" do
+          assert_raises_exception(2, 'ABCD')
+        end
+
+        it "raises an exception if value is not datetime or time" do
+          assert_raises_exception(3, 'ABCD')
+        end
+
+        it "raises an exception if value is not date" do
+          assert_raises_exception(4, 'ABCD')
+        end
       end
 
       it "accepts 'nil' for all column types" do
         expect {
           @dt.set_cell(0, 0, nil)
         }.to_not raise_exception(ArgumentError)
-
-        expect {
-          @dt.set_cell(0, 1, nil)
-        }.to_not raise_exception(ArgumentError)
       end
     end
 
     describe "#get_cell" do
       it "gets cell" do
-        @dt.set_cell(0, 0, 1000)
-        @dt.get_cell(0, 0).should == 1000
+        @dt.set_cell(0, 0, 'ABCD')
+        @dt.get_cell(0, 0).should == 'ABCD'
       end
 
       it "raises an exception if the row_index or column_index specified is out of range" do

data/spec/google_visualr/param_helpers_spec.rb

@@ -0,0 +1,81 @@
+require 'spec_helper'
+
+describe "GoogleVisualr::ParamsHelper" do
+  module GoogleVisualr
+    class Mock
+      include GoogleVisualr::ParamHelpers
+    end
+  end
+
+  before do
+    @klass = GoogleVisualr::Mock.new
+  end
+
+  describe "#stringify" do
+    it "converts symbol keys to string keys" do
+      options = @klass.stringify_keys!({:a => 1})
+      options.should == {"a" => 1}
+    end
+  end
+
+  describe "#js_parameters" do
+    it "converts params to be js-ready string" do
+      options = @klass.js_parameters({:a => 1})
+      options.should == "{a: 1}"
+
+      options = @klass.js_parameters({:a => {:b=> 1}})
+      options.should == "{a: {b: 1}}"
+    end
+
+    it "returns empty string for nil options" do
+      options = @klass.js_parameters(nil)
+      options.should == ""
+    end
+  end
+
+  describe "#typecast" do
+    def assert_equal(input, expected)
+      options = @klass.typecast(input)
+      options.should == expected
+    end
+
+    it "returns string" do
+      assert_equal("a's", "'a\\'s'")
+    end
+
+    it "returns number" do
+      assert_equal(1, 1)
+    end
+
+    it "returns boolean" do
+      assert_equal(true , "true" )
+      assert_equal(false, "false")
+    end
+
+    it "returns datetime" do
+      date     = DateTime.now
+      expected = "new Date(#{date.year}, #{date.month-1}, #{date.day}, #{date.hour}, #{date.min}, #{date.sec})"
+      assert_equal(date, expected)
+    end
+
+    it "returns time" do
+      date     = Time.now
+      expected = "new Date(#{date.year}, #{date.month-1}, #{date.day}, #{date.hour}, #{date.min}, #{date.sec})"
+      assert_equal(date, expected)
+    end
+
+    it "returns date" do
+      date     = Date.today
+      expected = "new Date(#{date.year}, #{date.month-1}, #{date.day})"
+      assert_equal(date, expected)
+    end
+
+    it "returns null" do
+      assert_equal(nil, "null")
+    end
+
+    it "recursively calls js_parameters" do
+      assert_equal({:a => {:b => {:c => 1}}}, "{a: {b: {c: 1}}}")
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: google_visualr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors: 
 - Winston Teo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-06 00:00:00 Z
+date: 2011-07-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -83,6 +83,7 @@ files:
 - spec/google_visualr/base_chart_spec.rb
 - spec/google_visualr/data_table_spec.rb
 - spec/google_visualr/formatters_spec.rb
+- spec/google_visualr/param_helpers_spec.rb
 - spec/spec_helper.rb
 - test/google_visualr_spec.rb
 - test/helper.rb