rgviz-rails 0.11 → 0.12

data/rails/init.rb

@@ -15,6 +15,7 @@ config.after_initialize do
           reqId = '0'
           version = '0.6'
           responseHandler = 'google.visualization.Query.setResponse'
+          out = 'json'
           pieces.each do |p|
             key_value = p.split ':'
             if key_value.length == 2
@@ -25,6 +26,8 @@ config.after_initialize do
                 version = key_value[1]
               when 'responseHandler'
                 responseHandler = key_value[1]
+              when 'out'
+                out = key_value[1]
               end
             end
           end
@@ -34,10 +37,24 @@ config.after_initialize do
             options = {}
             options[:conditions] = conditions if conditions
             table = executor.execute options
-            original_render :text => "#{responseHandler}({reqId:'#{reqId}',status:'ok',version:'#{version}',table:#{table.to_json}});" 
+            
+            if out == 'json'
+              original_render :text => "#{responseHandler}({reqId:'#{reqId}',status:'ok',version:'#{version}',table:#{table.to_json}});"
+            elsif out == 'html'
+              original_render :text => Rgviz::HtmlRenderer.render(table)
+            else
+              original_render :text => "#{responseHandler}({reqId:'#{reqId}',status:'error',version:'#{version}',errors:[{reason:'not_supported', message:'Unsupported output type: #{out}'}]});"
+            end
           rescue ParseException => e
             msg = e.message.gsub("'", "\\'")
-            original_render :text => "#{responseHandler}({reqId:'#{reqId}',status:'error',version:'#{version}',errors:[{reason:'invalid_query', message:'#{msg}'}]});" 
+            
+            if out == 'json'
+              original_render :text => "#{responseHandler}({reqId:'#{reqId}',status:'error',version:'#{version}',errors:[{reason:'invalid_query', message:'#{msg}'}]});"
+            elsif out == 'html'
+              original_render :text => "<b>Error:</b> #{msg}"
+            else
+              original_render :text => "<b>Unsupported output type:</b> #{out}"
+            end
           end
         end
       else

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz-rails
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 11
-  version: "0.11"
+  - 12
+  version: "0.12"
 platform: ruby
 authors: 
 - Ary Borenszweig