rgviz-rails 0.32 → 0.34

data/lib/rgviz_rails/view_helper.rb

@@ -31,6 +31,10 @@ module Rgviz
       hidden = options[:hidden]
       extensions = options[:extensions]
       
+      rgviz_events, google_events = events.partition{|x| x.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
+      
       html_prefix = (options[:html_prefix] || 'html').to_s
       js_prefix = (options[:js_prefix] || 'js').to_s
       param_prefix = (options[:param_prefix] || 'param').to_s
@@ -166,17 +170,19 @@ 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"
-          events.each do |name, handler|
+          google_events.each do |name, handler|
             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 << "}\n"
       

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz-rails
 version: !ruby/object:Gem::Version 
-  hash: 75
+  hash: 79
   prerelease: false
   segments: 
   - 0
-  - 32
-  version: "0.32"
+  - 34
+  version: "0.34"
 platform: ruby
 authors: 
 - Ary Borenszweig
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-20 00:00:00 +07:00
+date: 2010-08-23 00:00:00 +07:00
 default_executable: 
 dependencies: []