google_visualr 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 762cd55fa47b092ed0ce4efbe9dfa17d37e787f8
-  data.tar.gz: 92c5ef41f18dcb711fa9b9a4a42d539a57a9adb6
+  metadata.gz: 26841661bff6a29726756d54160ca355717083cd
+  data.tar.gz: a1c0aae26ae4cef3d89c4bb24e07c9d255c7aa19
 SHA512:
-  metadata.gz: 39bc89ba661c876461e9245758f7b06308df4967841f02146086294299a2524f28c4e94e7adcd8fe0fe36fe0ecaae9a6a4a2a1164162d6893cd5976a0e66e2a7
-  data.tar.gz: f01987a2e6f447dfebf6bd4347f4a6bcc8b51a3f40a43558bc9cd3984c43e8b46b903e9f7f4375388e8da2e0d2e1b7f909e24c73bce7aa54544fa1c3b63ce6c1
+  metadata.gz: 1ec5cb6ef95d5e87d95c183ebfa9c2ce721a8b33053fc2b606e35c051697ac75a0345393c4f575ffae4f46188e783014fa734cece4aa7053f69b04baabf649d1
+  data.tar.gz: 42908dc139fecc4a98aa4678ca45fe38d247472c0700f92fcc2a57f9cae02aa3fe8ee0de0cdcce17e6b853f4f699042715f591647dc21a02a0c96133ab3e8c63

data/lib/google_visualr/base_chart.rb

@@ -11,7 +11,7 @@ module GoogleVisualr
       @data_table  = data_table
       @listeners   = []
       @version     = options.delete(:version)  || DEFAULT_VERSION
-      @language    = options.delete(:language) || "en"
+      @language    = options.delete(:language)
       @material    = options.delete(:material) || false
       send(:options=, options)
     end
@@ -74,7 +74,9 @@ module GoogleVisualr
     # Parameters:
     #  *div_id            [Required] The ID of the DIV element that the Google Chart should be rendered in.
     def load_js(element_id)
-      "\n  google.load('visualization', '#{version}', {packages: ['#{package_name}'], language: '#{language}', callback: #{chart_function_name(element_id)}});"
+      language_opt = ", language: '#{language}'" if language
+
+      "\n  google.load('visualization', '#{version}', {packages: ['#{package_name}']#{language_opt}, callback: #{chart_function_name(element_id)}});"
     end
 
     # Generates JavaScript function for rendering the chart.

data/lib/google_visualr/version.rb

@@ -1,3 +1,3 @@
 module GoogleVisualr
-  VERSION = "2.5.0"
+  VERSION = "2.5.1"
 end

data/spec/google_visualr/base_chart_spec.rb

@@ -13,6 +13,7 @@ describe GoogleVisualr::BaseChart do
       @chart.version.should    == GoogleVisualr::BaseChart::DEFAULT_VERSION
       @chart.material.should   == false
       @chart.options.should    == { "legend" => "Test Chart", "width" => 800, "is3D" => true }
+      @chart.language.should   == nil
     end
 
     it "accepts version attribute" do
@@ -98,6 +99,11 @@ describe GoogleVisualr::BaseChart do
       js.should include("<script")
     end
 
+    it "generates JS without any locale as default" do
+      js = @chart.to_js("body")
+      js.should == base_chart_js("body", nil)
+    end
+
     it "generates JS of a different locale" do
       @chart.language = "ja"
 

data/spec/support/common.rb

@@ -17,15 +17,17 @@ def base_chart(data_table = data_table())
   GoogleVisualr::BaseChart.new(data_table, { :legend => "Test Chart", :width => 800, :is3D => true })
 end
 
-def base_chart_js_without_script_tag(div_class = "div_class", language = "en")
-  js =  "\n  google.load('visualization', '1.0', {packages: ['basechart'], language: '#{language}', callback: draw_#{div_class}});"
+def base_chart_js_without_script_tag(div_class = "div_class", language = nil)
+  language_opt = ", language: '#{language}'" if language
+
+  js =  "\n  google.load('visualization', '1.0', {packages: ['basechart']#{language_opt}, callback: draw_#{div_class}});"
   js << "\n  function draw_#{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    chart.draw(data_table, {legend: \"Test Chart\", width: 800, is3D: true});"
   js << "\n  };"
 end
 
-def base_chart_js(div_class = "div_class", language = "en")
+def base_chart_js(div_class = "div_class", language = nil)
   js =  "\n<script type='text/javascript'>"
   js << base_chart_js_without_script_tag(div_class, language)
   js << "\n</script>"
@@ -33,7 +35,7 @@ end
 
 def base_chart_with_listener_js(div_class = "div_class")
   js =  "\n<script type='text/javascript'>"
-  js << "\n  google.load('visualization', '1.0', {packages: ['basechart'], language: 'en', callback: draw_#{div_class}});"
+  js << "\n  google.load('visualization', '1.0', {packages: ['basechart'], callback: draw_#{div_class}});"
   js << "\n  function draw_#{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);});"
@@ -44,7 +46,7 @@ end
 
 def material_chart(div_class = "div_class")
   js =  "\n<script type='text/javascript'>"
-  js << "\n  google.load('visualization', '1.0', {packages: ['basechart'], language: 'en', callback: draw_#{div_class}});"
+  js << "\n  google.load('visualization', '1.0', {packages: ['basechart'], callback: draw_#{div_class}});"
   js << "\n  function draw_#{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.charts.Base(document.getElementById('#{div_class}'));"
   js << "\n    chart.draw(data_table, {legend: \"Test Chart\", width: 800, is3D: true});"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_visualr
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Winston Teo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-08-29 00:00:00.000000000 Z
 dependencies: []
 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