google_visualr 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9e5ef85f15735729d999bbc550dc078ce306a82
-  data.tar.gz: d00153d2e742e7f679114ce0a676dc6030f40149
+  metadata.gz: c619ef5e478b69cae31b6633f12bd0538ae28d1f
+  data.tar.gz: c8b933d1ab6b6fd1f8d6ffee52d510b4f63ff5d8
 SHA512:
-  metadata.gz: 8a2a3b6c8d47e5692030c241dc60a2fe9bd649fca44a4e0026b05d895bdbaf1a5dfd5e1b35c1dc6c3e593d26162c976f307ff92cdc8dc115ac303696399757b8
-  data.tar.gz: f8bd40ffd09089f9eb9cb1809dd3f8f55c6dd7b10c61a1bcf2c3f11be6647484383efadaab389e5e88fcd39e91f57db08cf4296173caa4c3e036d8f4e4527453
+  metadata.gz: 0709add89f814b1af09c975333cfe3beacda8dd989e300388d341d5c7a14de18198265c55cdf8e7d85b50dc8636cb9909b4bd786f5dbfaf49f7e44e116ce0e63
+  data.tar.gz: b19ad8a044a5a91916d51c745d4f1b42b54e6dfb1851b1f59be2c9aef924f64d5d775929754e9d0e5c2ce898f87c92c576f9d0efa78e95009439cf211a501239

data/README.markdown

@@ -88,6 +88,11 @@ I would like to collect some data about who's using this Gem. [Please drop me a
 
 ## Change Log
 
+<em>Version 2.3.0</em>
+
+* [Issue 69](https://github.com/winston/google_visualr/pull/69) Support generating chart Javascript without <script> tag
+* Split `base_chart#to_js` into 3 methods - `to_js`, `load_js` and `draw_js` which can be used on their own.
+
 <em>Version 2.2.0</em>
 
 * [Issue 64](https://github.com/winston/google_visualr/pull/64) Works with Turbolinks.

data/lib/google_visualr/app/helpers/view_helper.rb

@@ -1,21 +1,23 @@
 module GoogleVisualr
-
   module Rails
-
     module ViewHelper
-
       extend ActiveSupport::Concern
 
       included do
         helper_method "render_chart"
       end
 
-      def render_chart(chart, dom)
-        chart.to_js(dom).html_safe
+      def render_chart(chart, dom, options={})
+        script_tag = options.fetch(:script_tag) { true }
+        if script_tag
+          chart.to_js(dom).html_safe
+        else
+          html = ""
+          html << chart.load_js(dom)
+          html << chart.draw_js(dom)
+          html.html_safe
+        end
       end
-
     end
-
   end
-
 end

data/lib/google_visualr/base_chart.rb

@@ -36,10 +36,29 @@ module GoogleVisualr
     #
     # Parameters:
     #  *div_id            [Required] The ID of the DIV element that the Google Chart should be rendered in.
-
     def to_js(element_id)
-      js  = "\n<script type='text/javascript'>"
-      js << "\n  google.load('visualization','1', {packages: ['#{package_name}'], callback: #{chart_function_name(element_id)}});"
+      js =  ""
+      js << "\n<script type='text/javascript'>"
+      js << load_js(element_id)
+      js << draw_js(element_id)
+      js << "\n</script>"
+      js
+    end
+
+    # Generates JavaScript for loading the appropriate Google Visualization package, with callback to render chart.
+    #
+    # 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','1', {packages: ['#{package_name}'], callback: #{chart_function_name(element_id)}});"
+    end
+
+    # Generates JavaScript function for rendering the chart.
+    #
+    # Parameters:
+    #  *div_id            [Required] The ID of the DIV element that the Google Chart should be rendered in.
+    def draw_js(element_id)
+      js = ""
       js << "\n  function #{chart_function_name(element_id)}() {"
       js << "\n    #{@data_table.to_js}"
       js << "\n    var chart = new google.visualization.#{chart_name}(document.getElementById('#{element_id}'));"
@@ -48,7 +67,6 @@ module GoogleVisualr
       end
       js << "\n    chart.draw(data_table, #{js_parameters(@options)});"
       js << "\n  };"
-      js << "\n</script>"
       js
     end
   end

data/lib/google_visualr/version.rb

@@ -1,3 +1,3 @@
 module GoogleVisualr
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

data/spec/google_visualr/app/helpers/view_helper_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe "ApplicationController" do
-
   describe "#render_chart" do
-
     it "has method" do
       ApplicationController.instance_methods.should include :render_chart
     end
@@ -18,6 +16,10 @@ describe "ApplicationController" do
       js.should == base_chart_js("div_chart")
     end
 
+    it "returns html_safe javascript without script tag" do
+      controller = ApplicationController.new
+      js = controller.render_chart base_chart, "div_chart", script_tag: false
+      js.should == base_chart_js_without_script_tag("div_chart")
+    end
   end
-
 end

data/spec/google_visualr/base_chart_spec.rb

@@ -48,6 +48,7 @@ describe GoogleVisualr::BaseChart do
     it "generates JS" do
       js = @chart.to_js("body")
       js.should == base_chart_js("body")
+      js.should include("<script")
     end
 
     it "generates JS with listeners" do

data/spec/google_visualr/data_table_spec.rb

@@ -209,14 +209,14 @@ describe GoogleVisualr::DataTable do
         it "accepts BigDecimal as number" do
           expect {
             dt.set_cell(0, 1, BigDecimal.new(42))
-          }.to_not raise_exception(ArgumentError)
+          }.to_not raise_exception
         end
       end
 
       it "accepts 'nil' for all column types" do
         expect {
           dt.set_cell(0, 0, nil)
-        }.to_not raise_exception(ArgumentError)
+        }.to_not raise_exception
       end
     end
 

data/spec/support/common.rb

@@ -17,18 +17,23 @@ def base_chart(data_table=data_table)
   GoogleVisualr::BaseChart.new(data_table, { :legend => "Test Chart", :width => 800, :is3D => true })
 end
 
-def base_chart_js(div_class="div_class")
-  js = "\n<script type='text/javascript'>"
-  js << "\n  google.load('visualization','1', {packages: ['basechart'], callback: draw_#{div_class}});"
+
+def base_chart_js_without_script_tag(div_class="div_class")
+  js =  "\n  google.load('visualization','1', {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    chart.draw(data_table, {legend: \"Test Chart\", width: 800, is3D: true});"
   js << "\n  };"
+end
+
+def base_chart_js(div_class="div_class")
+  js =  "\n<script type='text/javascript'>"
+  js << base_chart_js_without_script_tag(div_class)
   js << "\n</script>"
 end
 
 def base_chart_with_listener_js(div_class="div_class")
-  js = "\n<script type='text/javascript'>"
+  js =  "\n<script type='text/javascript'>"
   js << "\n  google.load('visualization','1', {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}'));"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_visualr
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Winston Teo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler