rgviz-rails 0.26 → 0.28

data/lib/rgviz_rails.rb

@@ -1,4 +1,6 @@
 require 'rgviz_rails/executor.rb'
+require 'rgviz_rails/js_renderer.rb'
+require 'rgviz_rails/tqx.rb'
 require 'rgviz_rails/adapters/mysql_adapter.rb'
 require 'rgviz_rails/adapters/postgresql_adapter.rb'
 require 'rgviz_rails/adapters/sqlite_adapter.rb'

data/lib/rgviz_rails/executor.rb

@@ -6,6 +6,7 @@ module Rgviz
     def initialize(model_class, query)
       @model_class = model_class
       @query = query
+      @query = Parser.new(query).parse unless query.kind_of?(Query)
       @selects = []
       @joins = {}
       @labels = {}

data/lib/rgviz_rails/js_renderer.rb

@@ -0,0 +1,19 @@
+module Rgviz
+  module JsRenderer
+    def self.render(table, tqx)
+      response_handler = tqx['responseHandler']
+      req_id = tqx['reqId']
+      version = tqx['version']
+      "#{response_handler}({reqId:'#{req_id}',status:'ok',version:'#{version}',table:#{table.to_json}});"
+    end
+    
+    def self.render_error(reason, message, tqx)
+      reason = reason.gsub("'", "\\'")
+      message = message.gsub("'", "\\'")
+      response_handler = tqx['responseHandler']
+      req_id = tqx['reqId']
+      version = tqx['version']
+      "#{response_handler}({reqId:'#{req_id}',status:'error',version:'#{version}',errors:[{reason:'#{reason}', message:'#{message}'}]});"
+    end
+  end
+end

data/lib/rgviz_rails/tqx.rb

@@ -0,0 +1,22 @@
+module Rgviz
+  module Tqx
+    def self.parse(tqx)
+      tqx ||= ''
+      pieces = tqx.split ';'
+      
+      map = {
+        'reqId' => '0', 
+        'version' => '0.6', 
+        'responseHandler' => 'google.visualization.Query.setResponse',
+        'out' => 'json'
+        }
+        
+      pieces.each do |p|
+        key_value = p.split ':'
+        map[key_value[0]] = key_value[1] if key_value.length == 2
+      end
+      
+      map
+    end
+  end
+end

data/rails/init.rb

@@ -15,29 +15,8 @@ config.after_initialize do
           conditions = hash[:conditions]
           query = params[:tq]
           tqx = params[:tqx] || ''
-          pieces = tqx.split ';'
-          reqId = '0'
-          version = '0.6'
-          responseHandler = 'google.visualization.Query.setResponse'
-          out = 'json'
-          outFileName = nil
-          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]
-              when 'out'
-                out = key_value[1]
-              when 'outFileName'
-                outFileName = key_value[1]
-              end
-            end
-          end
+          
+          tqx = Rgviz::Tqx.parse(tqx)
           
           begin
             executor = Rgviz::Executor.new model, Rgviz::Parser.new(query).parse
@@ -45,31 +24,31 @@ config.after_initialize do
             options[:conditions] = conditions if conditions
             table = executor.execute options
             
-            case out
+            yield table if block_given?
+            
+            case tqx['out']
             when 'json'
-              original_render :text => "#{responseHandler}({reqId:'#{reqId}',status:'ok',version:'#{version}',table:#{table.to_json}});"
+              original_render :text => Rgviz::JsRenderer.render(table, tqx)
             when 'html'
               original_render :text => Rgviz::HtmlRenderer.render(table)
             when 'csv'
               csv_output = Rgviz::CsvRenderer.render(table)
-              if outFileName
+              if tqx['outFileName']
                 send_data csv_output, :filename => outFileName, :type => 'text/csv'
               else
                 original_render :text => csv_output
               end
             else
-              original_render :text => "#{responseHandler}({reqId:'#{reqId}',status:'error',version:'#{version}',errors:[{reason:'not_supported', message:'Unsupported output type: #{out}'}]});"
+              original_render :text => Rgviz::JsRenderer.render_error('not_supported', "Unsupported output type: #{out}", tqx)
             end
           rescue ParseException => e
-            msg = e.message.gsub("'", "\\'")
-            
             case out
             when 'json'
-              original_render :text => "#{responseHandler}({reqId:'#{reqId}',status:'error',version:'#{version}',errors:[{reason:'invalid_query', message:'#{msg}'}]});"
+              original_render :text => Rgviz::JsRenderer.render_error('invalid_query', e.message)
             when 'html'
-              original_render :text => "<b>Error:</b> #{msg}"
+              original_render :text => "<b>Error:</b> #{e.message}"
             when 'csv'
-              original_render :text => "Error: #{msg}"
+              original_render :text => "Error: #{e.message}"
             else
               original_render :text => "<b>Unsupported output type:</b> #{out}"
             end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz-rails
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 51
   prerelease: false
   segments: 
   - 0
-  - 26
-  version: "0.26"
+  - 28
+  version: "0.28"
 platform: ruby
 authors: 
 - Ary Borenszweig
@@ -29,6 +29,8 @@ extra_rdoc_files:
 files: 
 - lib/rgviz_rails.rb
 - lib/rgviz_rails/executor.rb
+- lib/rgviz_rails/js_renderer.rb
+- lib/rgviz_rails/tqx.rb
 - lib/rgviz_rails/view_helper.rb
 - lib/rgviz_rails/adapters/mysql_adapter.rb
 - lib/rgviz_rails/adapters/postgresql_adapter.rb