rgviz-rails 0.53 → 0.54

data/lib/rgviz_rails/view_helper.rb

@@ -20,7 +20,7 @@ module Rgviz
       hidden = options[:hidden]
       extensions = options[:extensions]
 
-      rgviz_events, google_events = events.partition{|x| x.to_s.start_with? 'rgviz'}
+      rgviz_events, google_events = events.partition{|x| x[0].to_s.start_with? 'rgviz'}
       rgviz_events = rgviz_events.inject(Hash.new){|h, y| h[y[0]] = y[1]; h}
       rgviz_events = rgviz_events.with_indifferent_access
 
@@ -167,20 +167,21 @@ module Rgviz
 
       # And define the callback
       out << "function #{callback}(#{params.join(', ')}) {\n"
-        out << "#{rgviz_events[:rgviz_start]}('#{id}');\n" if rgviz_events[:rgviz_start]
-        out << "var query = new google.visualization.Query('#{url}');\n"
-        out << "#{query_builder}\n"
-        out << "alert(#{query_builder_var});\n" if debug
-        out << "query.setQuery(#{query_builder_var});\n"
-        out << "query.send(function(response) {\n"
-          out << "rgviz_#{id} = new google.visualization.#{kind}(document.getElementById('#{id}'));\n"
+        out << "  #{rgviz_events[:rgviz_start]}('#{id}');\n" if rgviz_events[:rgviz_start]
+        out << "  var query = new google.visualization.Query('#{url}');\n"
+        out << "  #{query_builder}\n"
+        out << "  alert(#{query_builder_var});\n" if debug
+        out << "  query.setQuery(#{query_builder_var});\n"
+        out << "  query.send(function(response) {\n"
+          out << "    rgviz_#{id} = new google.visualization.#{kind}(document.getElementById('#{id}'));\n"
           google_events.each do |name, handler|
-            out << "google.visualization.events.addListener(rgviz_#{id}, '#{name}', #{handler});\n"
+            out << "    google.visualization.events.addListener(rgviz_#{id}, '#{name}', #{handler});\n"
           end
-          out << "rgviz_#{id}_data = response.getDataTable();\n"
-          out << "rgviz_#{id}.draw(rgviz_#{id}_data, #{opts});\n"
-          out << "#{rgviz_events[:rgviz_end]}('#{id}');\n" if rgviz_events[:rgviz_end]
-        out << "});\n"
+          out << "    rgviz_#{id}_data = response.getDataTable();\n"
+          out << "    #{rgviz_events[:rgviz_before_draw]}(rgviz_#{id}, rgviz_#{id}_data);\n" if rgviz_events[:rgviz_before_draw]
+          out << "    rgviz_#{id}.draw(rgviz_#{id}_data, #{opts});\n"
+          out << "    #{rgviz_events[:rgviz_end]}('#{id}');\n" if rgviz_events[:rgviz_end]
+        out << "  });\n"
       out << "}\n"
 
       out << "</script>\n"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgviz-rails
 version: !ruby/object:Gem::Version
-  version: '0.53'
+  version: '0.54'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000Z
+date: 2012-01-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgviz
-  requirement: &70094420919240 !ruby/object:Gem::Requirement
+  requirement: &70276898913000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70094420919240
+  version_requirements: *70276898913000
 description: 
 email: aborenszweig@manas.com.ar
 executables: []