google_visualr 2.1.6 → 2.1.7

data/Gemfile.lock

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

data/README.rdoc

@@ -96,6 +96,9 @@ Please submit all feedback, bugs and feature-requests to {GitHub Issues Tracker}
 
 = Change Log
 
+<em>Version 2.1.7</em>
+* {Issue 56}[https://github.com/winston/google_visualr/issues/56] Typecast to proper JSON strings.
+
 <em>Version 2.1.6</em>
 * {Issue 54}[https://github.com/winston/google_visualr/issues/54] Allow apostrophes in labels.
 * {Pull Request 55}[https://github.com/winston/google_visualr/pull/55] Added support to accept BigDecimal as number.

data/lib/google_visualr/data_table.rb

@@ -273,7 +273,7 @@ module GoogleVisualr
 
         js  = "{"
         js << "v: #{typecast(@v)}"
-        js << ", f: '#{@f}'"          unless @f.nil?
+        js << ", f: #{typecast(@f)}"  unless @f.nil?
         js << ", p: #{typecast(@p)}"  unless @p.nil?
         js << "}"
 

data/lib/google_visualr/formatters.rb

@@ -60,10 +60,10 @@ module GoogleVisualr
     def to_js
       super do |js|
         @ranges.each do |r|
-          js << "\nformatter.addRange(#{typecast(r[:from])}, #{typecast(r[:to])}, '#{r[:color]}', '#{r[:bgcolor]}');"
+          js << "\nformatter.addRange(#{typecast(r[:from])}, #{typecast(r[:to])}, #{typecast(r[:color])}, #{typecast(r[:bgcolor])});"
         end
         @gradient_ranges.each do |r|
-          js << "\nformatter.addGradientRange(#{typecast(r[:from])}, #{typecast(r[:to])}, '#{r[:color]}', '#{r[:fromBgColor]}', '#{r[:toBgColor]}');"
+          js << "\nformatter.addGradientRange(#{typecast(r[:from])}, #{typecast(r[:to])}, #{typecast(r[:color])}, #{typecast(r[:fromBgColor])}, #{typecast(r[:toBgColor])});"
         end
       end
     end

data/lib/google_visualr/param_helpers.rb

@@ -28,7 +28,7 @@ module GoogleVisualr
     def typecast(value)
       case
         when value.is_a?(String)
-          return "'#{value.gsub(/[']/, '\\\\\'')}'"
+          return value.to_json
         when value.is_a?(Integer)   || value.is_a?(Float)
           return value
         when value.is_a?(TrueClass) || value.is_a?(FalseClass)

data/lib/google_visualr/version.rb

@@ -1,3 +1,3 @@
 module GoogleVisualr
-  VERSION = "2.1.6"
+  VERSION = "2.1.7"
 end

data/spec/google_visualr/data_table_spec.rb

@@ -205,7 +205,7 @@ describe GoogleVisualr::DataTable do
         it "raises an exception if value is not date" do
           assert_raises_exception(4, 'ABCD')
         end
-        
+
         it "accepts BigDecimal as number" do
           expect {
             dt.set_cell(0, 1, BigDecimal.new(42))
@@ -258,14 +258,14 @@ describe GoogleVisualr::DataTable do
         dt.new_column('string', nil, nil, 'interval', 'pattern')
         dt.add_row(['interval'])
 
-        dt.to_js.should == "var data_table = new google.visualization.DataTable();data_table.addColumn({\"type\":\"string\",\"role\":\"interval\",\"pattern\":\"pattern\"});data_table.addRow([{v: 'interval'}]);"
+        dt.to_js.should == "var data_table = new google.visualization.DataTable();data_table.addColumn({\"type\":\"string\",\"role\":\"interval\",\"pattern\":\"pattern\"});data_table.addRow([{v: \"interval\"}]);"
       end
-      
+
       it "escapes labels with apostrophes properly" do
         dt.new_column('number', 'Winston\'s')
         dt.add_row([1])
 
-        dt.to_js.should == "var data_table = new google.visualization.DataTable();data_table.addColumn({\"type\":\"number\",\"label\":\"Winston's\"});data_table.addRow([{v: 1}]);"        
+        dt.to_js.should == "var data_table = new google.visualization.DataTable();data_table.addColumn({\"type\":\"number\",\"label\":\"Winston's\"});data_table.addRow([{v: 1}]);"
       end
     end
 
@@ -288,10 +288,10 @@ describe GoogleVisualr::DataTable do
       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.f.should == "1.0"
+        cell.p.should == {:style => "border: 1px solid green;"}
       end
     end
 
@@ -299,24 +299,29 @@ describe GoogleVisualr::DataTable do
       context "initialized with a value" do
         it "returns a json string" do
           cell = GoogleVisualr::DataTable::Cell.new(1)
-          cell.to_js.should == '{v: 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'
+          cell.to_js.should == "null"
         end
       end
 
       context "initialized with a hash" do
         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;'}}"
+          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;'}}"
+          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
+
+        it "returns a valid json string when there are apostrophes in v or f" do
+          cell = GoogleVisualr::DataTable::Cell.new( { :v => "I'm \"Winston\"", :f => "Winston<div style='color:red; font-style:italic'>Nice Guy</div>" } )
+          cell.to_js.should == "{v: \"I'm \\\"Winston\\\"\", f: \"Winston<div style='color:red; font-style:italic'>Nice Guy</div>\"}"
         end
       end
     end

data/spec/google_visualr/formatters_spec.rb

@@ -50,7 +50,7 @@ describe GoogleVisualr::Formatter do
       it "works" do
         formatter = GoogleVisualr::BarFormat.new(:base => 100, :colorNegative => 'red', :colorPositive => 'green', :drawZeroLine => false, :max => 1000, :min => -1000, :showValue => false,  :width => '150px')
         formatter.columns(1)
-        formatter.to_js.should == "\nvar formatter = new google.visualization.BarFormat({base: 100, colorNegative: 'red', colorPositive: 'green', drawZeroLine: false, max: 1000, min: -1000, showValue: false, width: '150px'});\nformatter.format(data_table, 1);"
+        formatter.to_js.should == "\nvar formatter = new google.visualization.BarFormat({base: 100, colorNegative: \"red\", colorPositive: \"green\", drawZeroLine: false, max: 1000, min: -1000, showValue: false, width: \"150px\"});\nformatter.format(data_table, 1);"
       end
     end
   end
@@ -78,7 +78,7 @@ describe GoogleVisualr::Formatter do
         formatter.add_range(0, 1000, 'red', '#000000')
         formatter.add_gradient_range(2000, nil, 'blue', '#FFFFFF', '#333333')
         formatter.columns(1)
-        formatter.to_js.should == "\nvar formatter = new google.visualization.ColorFormat();\nformatter.addRange(0, 1000, 'red', '#000000');\nformatter.addGradientRange(2000, null, 'blue', '#FFFFFF', '#333333');\nformatter.format(data_table, 1);"
+        formatter.to_js.should == "\nvar formatter = new google.visualization.ColorFormat();\nformatter.addRange(0, 1000, \"red\", \"#000000\");\nformatter.addGradientRange(2000, null, \"blue\", \"#FFFFFF\", \"#333333\");\nformatter.format(data_table, 1);"
       end
     end
   end
@@ -88,7 +88,7 @@ describe GoogleVisualr::Formatter do
       it "works" do
         formatter = GoogleVisualr::DateFormat.new(:formatType => 'long', :timeZone => 8)
         formatter.columns(1)
-        formatter.to_js.should == "\nvar formatter = new google.visualization.DateFormat({formatType: 'long', timeZone: 8});\nformatter.format(data_table, 1);"
+        formatter.to_js.should == "\nvar formatter = new google.visualization.DateFormat({formatType: \"long\", timeZone: 8});\nformatter.format(data_table, 1);"
       end
     end
   end
@@ -98,7 +98,7 @@ describe GoogleVisualr::Formatter do
       it "works" do
         formatter = GoogleVisualr::NumberFormat.new(:decimalSymbol => '.', :fractionDigits => 4, :groupingSymbol => ',', :negativeColor => 'red', :negativeParens => false, :prefix => 'USD$', :suffix => '-')
         formatter.columns(1)
-        formatter.to_js.should == "\nvar formatter = new google.visualization.NumberFormat({decimalSymbol: '.', fractionDigits: 4, groupingSymbol: ',', negativeColor: 'red', negativeParens: false, prefix: 'USD$', suffix: '-'});\nformatter.format(data_table, 1);"
+        formatter.to_js.should == "\nvar formatter = new google.visualization.NumberFormat({decimalSymbol: \".\", fractionDigits: 4, groupingSymbol: \",\", negativeColor: \"red\", negativeParens: false, prefix: \"USD$\", suffix: \"-\"});\nformatter.format(data_table, 1);"
       end
     end
   end

data/spec/google_visualr/param_helpers_spec.rb

@@ -40,7 +40,7 @@ describe "GoogleVisualr::ParamsHelper" do
     end
 
     it "returns string" do
-      assert_equal("a's", "'a\\'s'")
+      assert_equal("I'm \"AWESOME\"", "I'm \"AWESOME\"".to_json)
     end
 
     it "returns number" do
@@ -75,7 +75,7 @@ describe "GoogleVisualr::ParamsHelper" do
     end
 
     it "returns array of strings" do
-      assert_equal({:colors => ['a', 'b']}, "{colors: ['a','b']}")
+      assert_equal({:colors => ['a', 'b']}, "{colors: [\"a\",\"b\"]}")
     end
 
     it "recursively calls js_parameters" do

data/spec/support/common.rb

@@ -20,8 +20,8 @@ end
 def base_chart_js(div_class="div_class")
   js  = "\n<script type='text/javascript'>"
   js << "\n  google.load('visualization','1', {packages: ['basechart'], callback: function() {"
-  js << "\n    var data_table = new google.visualization.DataTable();data_table.addColumn({\"type\":\"string\",\"label\":\"Year\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Sales\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Expenses\"});data_table.addRow([{v: '2004'}, {v: 1000}, {v: 400}]);data_table.addRow([{v: '2005'}, {v: 1200}, {v: 450}]);data_table.addRow([{v: '2006'}, {v: 1500}, {v: 600}]);data_table.addRow([{v: '2007'}, {v: 800}, {v: 500}]);\n    var chart = new google.visualization.BaseChart(document.getElementById('#{div_class}'));"
-  js << "\n    chart.draw(data_table, {legend: 'Test Chart', width: 800, is3D: true});"
+  js << "\n    var data_table = new google.visualization.DataTable();data_table.addColumn({\"type\":\"string\",\"label\":\"Year\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Sales\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Expenses\"});data_table.addRow([{v: \"2004\"}, {v: 1000}, {v: 400}]);data_table.addRow([{v: \"2005\"}, {v: 1200}, {v: 450}]);data_table.addRow([{v: \"2006\"}, {v: 1500}, {v: 600}]);data_table.addRow([{v: \"2007\"}, {v: 800}, {v: 500}]);\n    var chart = new google.visualization.BaseChart(document.getElementById('#{div_class}'));"
+  js << "\n    chart.draw(data_table, {legend: \"Test Chart\", width: 800, is3D: true});"
   js << "\n  }});"
   js << "\n</script>"
 end
@@ -29,9 +29,9 @@ end
 def base_chart_with_listener_js(div_class="div_class")
   js  = "\n<script type='text/javascript'>"
   js << "\n  google.load('visualization','1', {packages: ['basechart'], callback: function() {"
-  js << "\n    var data_table = new google.visualization.DataTable();data_table.addColumn({\"type\":\"string\",\"label\":\"Year\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Sales\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Expenses\"});data_table.addRow([{v: '2004'}, {v: 1000}, {v: 400}]);data_table.addRow([{v: '2005'}, {v: 1200}, {v: 450}]);data_table.addRow([{v: '2006'}, {v: 1500}, {v: 600}]);data_table.addRow([{v: '2007'}, {v: 800}, {v: 500}]);\n    var chart = new google.visualization.BaseChart(document.getElementById('#{div_class}'));"
+  js << "\n    var data_table = new google.visualization.DataTable();data_table.addColumn({\"type\":\"string\",\"label\":\"Year\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Sales\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Expenses\"});data_table.addRow([{v: \"2004\"}, {v: 1000}, {v: 400}]);data_table.addRow([{v: \"2005\"}, {v: 1200}, {v: 450}]);data_table.addRow([{v: \"2006\"}, {v: 1500}, {v: 600}]);data_table.addRow([{v: \"2007\"}, {v: 800}, {v: 500}]);\n    var chart = new google.visualization.BaseChart(document.getElementById('#{div_class}'));"
   js << "\n    google.visualization.events.addListener(chart, 'select', function() {test_event(chart);});"
-  js << "\n    chart.draw(data_table, {legend: 'Test Chart', width: 800, is3D: true});"
+  js << "\n    chart.draw(data_table, {legend: \"Test Chart\", width: 800, is3D: true});"
   js << "\n  }});"
   js << "\n</script>"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_visualr
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-19 00:00:00.000000000 Z
+date: 2013-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70104206018240 !ruby/object:Gem::Requirement
+  requirement: &70327695181240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.5
   type: :development
   prerelease: false
-  version_requirements: *70104206018240
+  version_requirements: *70327695181240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70104206017740 !ruby/object:Gem::Requirement
+  requirement: &70327695180740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70104206017740
+  version_requirements: *70327695180740
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70104206017280 !ruby/object:Gem::Requirement
+  requirement: &70327695179980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 3.2.8
   type: :development
   prerelease: false
-  version_requirements: *70104206017280
+  version_requirements: *70327695179980
 description: This Ruby gem, GoogleVisualr, is a wrapper around the Google Chart Tools
   that allows anyone to create the same beautiful charts with just Ruby; you don't
   have to write any JavaScript at all.