rgviz-rails 0.54 → 0.55

data/lib/rgviz_rails/init.rb

@@ -20,17 +20,19 @@ module Rgviz
             tqx = Rgviz::Tqx.parse(tqx)
 
             begin
-              if model.is_a? Class and model < ActiveRecord::Base
-                executor = Rgviz::Executor.new model
-              elsif model.respond_to? :execute
-                executor = model
-              else
-                raise "The argument to render :rgviz => ... must extend from ActiveRecord::Base or respond to execute"
-              end
               options = {}
               options[:conditions] = conditions if conditions
               options[:extensions] = extensions if extensions
-              table = executor.execute query, options
+
+              table = if model.is_a?(Class) && model < ActiveRecord::Base
+                        Rgviz::Executor.new(model).execute query, options
+                      elsif model.respond_to? :execute
+                        model.execute query, options
+                      elsif model.is_a? Rgviz::Table
+                        model
+                      else
+                        raise "The argument to render :rgviz => ... must extend from ActiveRecord::Base, respond to execute or be an Rgviz::Table"
+                      end
 
               yield table if block_given?
 

data/lib/rgviz_rails/view_helper.rb

@@ -19,6 +19,7 @@ module Rgviz
       html = options[:html] || {}
       hidden = options[:hidden]
       extensions = options[:extensions]
+      conditions = options[:conditions]
 
       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}
@@ -79,7 +80,8 @@ module Rgviz
       raise "Must specify a :kind" unless kind
       raise "Must specify a :url" unless url
 
-      url = url_for url
+      custom_executor = (url.is_a?(Class) and url < ActiveRecord::Base) || url.respond_to?(:execute) || url.is_a?(Rgviz::Table)
+      url = url_for url unless custom_executor
 
       # Parse the query
       query = Parser.parse query, :extensions => extensions
@@ -167,21 +169,41 @@ 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 << "  #{rgviz_events[:rgviz_start]}('#{id}');\n" if rgviz_events[:rgviz_start]
+      unless custom_executor
         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"
-          end
-          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"
+      end
+      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"
+      end
+
+      if custom_executor
+        executor_options = {}
+        executor_options[:conditions] = conditions if conditions
+        executor_options[:extensions] = extensions if extensions
+
+        table = if url.is_a?(Class) and url < ActiveRecord::Base
+                  Rgviz::Executor.new(url).execute(query, executor_options)
+                elsif url.respond_to?(:execute)
+                  url.execute(query, executor_options)
+                else
+                  url
+                end
+        out << "    rgviz_#{id}_data = new google.visualization.DataTable(#{table.to_json});\n"
+      else
+        out << "    rgviz_#{id}_data = response.getDataTable();\n"
+      end
+      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]
+      unless custom_executor
+        out << "});\n"
+      end
       out << "}\n"
 
       out << "</script>\n"

metadata

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