chartify 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2834dda187765cd93ca5b20ee4a4900fb5f0b085
-  data.tar.gz: d4aa5598e2faea952db1281122aa9292aa9c5363
+  metadata.gz: 99adce276ba3286967a95fb4e69945856a37d36e
+  data.tar.gz: cd16d06e9a0c70b42fa6296fb17dac5879d12d25
 SHA512:
-  metadata.gz: b82ace017a115dcb3b20596d80f3e68aed491c53168e47c57a97bdeb2b4135f5500b134b63e9b5932b0a35b0fc7af4b9cb7bedd1eb501e5da54a29633d166a4b
-  data.tar.gz: 572584f6b9f0b1a91ddc0d6090dd10ebd607420f0f6bab3996268eb1e5f8cd7da5978415520645ca39ca3cd967cdee655ce8a943b5651133d4cd7feed5fb4670
+  metadata.gz: 6636b438419a0e2b0fdc1b2b1ad33e6848ff2446414a2a79ad3b6949812d2bb64b1e37266f885894b985aac322e6e8c64ee876628325b7750c146fb0878b3b9c
+  data.tar.gz: 22bef703c2f0fac5dc28bef9c9e9a5120b733e94b8160850ae7a9eeb0e1848fbd18cbf9f89402063feae75cfc4614a046d91bad9d8002774612f0665fada6ecf

data/lib/chartify/chart_base.rb

@@ -24,9 +24,8 @@ module Chartify
       chart = "Chartify::WebChart::#{api_name.camelize}::#{class_name}".constantize.new
       chart.data, chart.columns, chart.label_column = self.data, self.columns, self.label_column
       html = <<-HTML
-      #{chart.include_js if chart.respond_to?(:include_js)}
       <script type="application/javascript" class="chart_script">
-        #{chart.render(html_dom_id)}
+          #{chart.render(html_dom_id)}
       </script>
       HTML
       html.html_safe
@@ -90,8 +89,8 @@ module Chartify
 
     # Amount should be a decimal between 0 and 1. Lower means darker
     def darken_color(hex_color, amount=0.4)
-      hex_color = hex_color.gsub('#','')
-      rgb = hex_color.scan(/../).map {|color| color.hex}
+      hex_color = hex_color.gsub('#', '')
+      rgb = hex_color.scan(/../).map { |color| color.hex }
       rgb[0] = (rgb[0].to_i * amount).round
       rgb[1] = (rgb[1].to_i * amount).round
       rgb[2] = (rgb[2].to_i * amount).round
@@ -100,8 +99,8 @@ module Chartify
 
     # Amount should be a decimal between 0 and 1. Higher means lighter
     def lighten_color(hex_color, amount=0.6)
-      hex_color = hex_color.gsub('#','')
-      rgb = hex_color.scan(/../).map {|color| color.hex}
+      hex_color = hex_color.gsub('#', '')
+      rgb = hex_color.scan(/../).map { |color| color.hex }
       rgb[0] = [(rgb[0].to_i + 255 * amount).round, 255].min
       rgb[1] = [(rgb[1].to_i + 255 * amount).round, 255].min
       rgb[2] = [(rgb[2].to_i + 255 * amount).round, 255].min

data/lib/chartify/version.rb

@@ -1,3 +1,3 @@
 module Chartify
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/chartify/web_chart/google_chart/area_chart.rb

@@ -9,12 +9,12 @@ module Chartify
 
         def render(html_dom_id)
           js = <<-JS
-            google.load("visualization", "1", {packages:["corechart"]});
-            google.setOnLoadCallback(function () {
+            google.load("visualization", "1", {packages:["corechart"], callback:drawChart#{timestamp}});
+            function drawChart#{timestamp}() {
               var data = google.visualization.arrayToDataTable(#{array_data_table.to_json});
               var chart = new google.visualization.AreaChart(document.getElementById('#{html_dom_id}'));
               chart.draw(data, #{chart_options.to_json});
-            });
+            }
           JS
           js.html_safe
         end

data/lib/chartify/web_chart/google_chart/bar_chart.rb

@@ -9,12 +9,12 @@ module Chartify
 
         def render(html_dom_id)
           js = <<-JS
-            google.load("visualization", "1", {packages:["corechart"]});
-            google.setOnLoadCallback(function () {
+            google.load("visualization", "1", {packages:["corechart"], callback:drawChart#{timestamp}});
+            function drawChart#{timestamp}() {
               var data = google.visualization.arrayToDataTable(#{array_data_table.to_json});
               var chart = new google.visualization.BarChart(document.getElementById('#{html_dom_id}'));
               chart.draw(data, #{chart_options.to_json});
-            });
+            }
           JS
           js.html_safe
         end

data/lib/chartify/web_chart/google_chart/column_chart.rb

@@ -9,12 +9,12 @@ module Chartify
 
         def render(html_dom_id)
           js = <<-JS
-            google.load("visualization", "1", {packages:["corechart"]});
-            google.setOnLoadCallback(function () {
+            google.load("visualization", "1", {packages:["corechart"], callback:drawChart#{timestamp}});
+            function drawChart#{timestamp}() {
               var data = google.visualization.arrayToDataTable(#{array_data_table.to_json});
               var chart = new google.visualization.ColumnChart(document.getElementById('#{html_dom_id}'));
               chart.draw(data, #{chart_options.to_json});
-            });
+            }
           JS
           js.html_safe
         end

data/lib/chartify/web_chart/google_chart/google_chart_module.rb

@@ -28,9 +28,12 @@ module Chartify
           end
         end
 
+        def timestamp
+          @timestamp ||= Time.now.to_i
+        end
+
         def include_js
-          %q{<script type="text/javascript" src="https://www.google.com/jsapi?autoload={'modules':[{'name':'visualization',
-       'version':'1','packages':['timeline']}]}"></script>}
+          %q{<script type="text/javascript" src="https://www.google.com/jsapi"></script>}
         end
       end
     end

data/lib/chartify/web_chart/google_chart/line_chart.rb

@@ -9,12 +9,12 @@ module Chartify
 
         def render(html_dom_id)
           js = <<-JS
-            google.load("visualization", "1", {packages:["corechart"]});
-            google.setOnLoadCallback(function () {
+            google.load("visualization", "1", {packages:["corechart"], callback:drawChart#{timestamp}});
+            function drawChart#{timestamp}() {
               var data = google.visualization.arrayToDataTable(#{array_data_table.to_json});
               var chart = new google.visualization.LineChart(document.getElementById('#{html_dom_id}'));
               chart.draw(data, #{chart_options.to_json});
-            });
+            }
           JS
           js.html_safe
         end

data/lib/chartify/web_chart/google_chart/pie_chart.rb

@@ -28,12 +28,12 @@ module Chartify
           datasets.insert 0, column_names
 
           js = <<-JS
-            google.load("visualization", "1", {packages:["corechart"]});
-            google.setOnLoadCallback(function () {
+            google.load("visualization", "1", {packages:["corechart"], callback:drawChart#{timestamp}});
+            function drawChart#{timestamp}() {
               var data = google.visualization.arrayToDataTable(#{datasets.to_json});
               var chart = new google.visualization.PieChart(document.getElementById('#{html_dom_id}'));
               chart.draw(data, #{chart_options.to_json});
-            });
+            }
           JS
           js.html_safe
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartify
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - A.K.M. Ashrafuzzaman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gruff