rgviz-rails 0.6 → 0.7

data/rails/init.rb

@@ -9,12 +9,33 @@ config.after_initialize do
         else
           model = hash[:rgviz]
           query = params[:tq]
-          version = hash[:version]
-          reqId = hash[:reqId]
-          sig = hash[:sig]
-          executor = Rgviz::Executor.new model, Rgviz::Parser.new(query).parse
-          table = executor.execute
-          original_render :text => "google.visualization.Query.setResponse({version:'#{version}',reqId:'#{reqId}',status:'ok',sig:'#{sig}',table:#{table.to_json}});" 
+          tqx = params[:tqx] || ''
+          pieces = tqx.split ';'
+          reqId = '0'
+          version = '0.6'
+          responseHandler = 'google.visualization.Query.setResponse'
+          pieces.each do |p|
+            key_value = p.split ':'
+            if key_value.length == 2
+              case key_value[0]
+              when 'reqId'
+                reqId = key_value[1]
+              when 'version'
+                version = key_value[1]
+              when 'responseHandler'
+                responseHandler = key_value[1]
+              end
+            end
+          end
+          
+          begin
+            executor = Rgviz::Executor.new model, Rgviz::Parser.new(query).parse
+            table = executor.execute
+            original_render :text => "#{responseHandler}({reqId:'#{reqId}',status:'ok',version:'#{version}',table:#{table.to_json}});" 
+          rescue ParseException => e
+            msg = e.message.gsub("'", "\\'")
+            original_render :text => "#{responseHandler}({reqId:'#{reqId}',status:'error',version:'#{version}',errors:[{reason:'invalid_query', message:'#{msg}'}]});" 
+          end
         end
       else
         original_render *args, &block

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz-rails
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
-  - 6
-  version: "0.6"
+  - 7
+  version: "0.7"
 platform: ruby
 authors: 
 - Ary Borenszweig