rgviz-rails 0.28 → 0.29

data/lib/rgviz_rails/view_helper.rb

@@ -1,6 +1,25 @@
 module Rgviz
   module ViewHelper
     def rgviz(options = {})
+      def opts_to_json(opts, special_keys)
+        @s = '{'
+        i = 0
+        opts.each do |key, value|
+          key = key.to_s.gsub('"', '\"')
+           
+          @s << ',' if i > 0
+          @s << "\"#{key}\":"
+          if special_keys.include?(key) || !value.kind_of?(String)
+            @s << value.to_s
+          else
+            value = value.gsub('"', '\"')
+            @s << "\"#{value}\""
+          end
+          i += 1
+        end
+        @s << '}'
+      end
+    
       options = options.with_indifferent_access
     
       id = options[:id]
@@ -23,7 +42,36 @@ module Rgviz
       opts = options[:options] || {}
       opts[:width] = 640 unless opts[:width]
       opts[:height] = 480 unless opts[:height]
-      opts = opts.to_json
+      
+      params = []
+      uses_rgviz_get_value = false
+      uses_rgviz_append = false
+      
+      visitor = MagicNamesVisitor.new(html_prefix, js_prefix, param_prefix)
+      
+      special_keys = []
+      
+      opts.each do |key, value|
+        next unless value.kind_of?(String)
+      
+        source = visitor.get_source(value, false)
+        next unless source[:source]
+        
+        special_keys << key
+        
+        case source[:source]
+        when :html
+          opts[key] = "rgviz_get_value('#{source[:id]}')"      
+          uses_rgviz_get_value = true     
+        when :js
+          opts[key] = "#{source[:id]}()"
+        when :param
+          opts[key] = "param_#{source[:id]}"
+          params << source[:id].to_i unless params.include?(source[:id])
+        end 
+      end
+      
+      opts = opts_to_json(opts, special_keys)
       
       raise "Must specify an :id" unless id
       raise "Must specify a :kind" unless kind
@@ -35,11 +83,14 @@ module Rgviz
       query = Parser.new(query).parse
       
       # And replace the html_ and javascript_ magic names
-      visitor = MagicNamesVisitor.new(html_prefix, js_prefix, param_prefix)
       query.accept visitor
       query_builder = visitor.query_builder
       query_builder_var = visitor.query_builder_var
-      params = visitor.params
+      
+      uses_rgviz_get_value |= visitor.uses_rgviz_get_value?
+      uses_rgviz_append |= visitor.uses_rgviz_append?
+      
+      visitor.params.each{|p| params << p unless params.include?(p)}
       params = params.sort!.map{|i| "param_#{i}"}
       
       out = ''
@@ -49,11 +100,49 @@ module Rgviz
       if @first_time == 1
         out << "<script type=\"text/javascript\" src=\"http://www.google.com/jsapi\"></script>\n"
       end
-      @first_time = 0
-      
       # Now the real script
       out << "<script type=\"text/javascript\">\n"
       
+      # Define a function to get the value of an html element
+      if uses_rgviz_get_value && !@defined_rgviz_get_value        
+        out << "function rgviz_get_value(id) {\n"
+          out << "var e = document.getElementById(id);\n"
+          out << "var n = e.tagName.toLowerCase();\n"
+          out << "var s = null;\n"
+          out << "if (n == 'select' && e.multiple) {\n"
+            out << "var s = [];\n" 
+            out << "var o = e.options;\n"
+            out << "for(var i = 0; i < o.length; i++)\n"
+              out << "if (o[i].selected) s.push(o[i].value);\n"
+          out << "} else if (n == 'input' && e.type.toLowerCase() == 'checkbox') {\n"
+            out << "s = [e.checked];\n"
+          out << "} else {\n"
+            out << "s = [e.value];\n"
+          out << "}\n"
+          out << "return s;\n"
+        out << "}\n"
+        @defined_rgviz_get_value = true
+      end
+        
+      # Define a function to append the value of a magic something
+      if uses_rgviz_append && !@defined_rgviz_append
+        out << "function rgviz_append(s, b, a) {\n"
+          out << "var q = '';\n"
+          out << "if (s.length == 0) {\n"
+            out << "q += '1 = 2';\n";
+          out << "} else {\n"
+            out << "if (s.length > 1) q += '(';\n"
+            out << "for(var i = 0; i < s.length; i++) {\n";
+              out << "if (i > 0) q += ' or ';\n"
+              out << "q += b + s[i] + a;\n"
+            out << "}";
+            out << "if (s.length > 1) q += ')';\n"
+          out << "}\n"
+          out << "return q;\n"
+        out << "}\n"
+        @defined_rgviz_append = true
+      end
+      
       # Load visualizations and the package, if not already loaded
       pack = kind.downcase      
       @packages ||= []
@@ -99,6 +188,8 @@ module Rgviz
       end
       out << "></div>\n"
       
+      @first_time = 0
+      
       out
     end
     
@@ -126,8 +217,15 @@ module Rgviz
       @params
     end
     
+    def uses_rgviz_get_value?
+      @uses_rgviz_get_value
+    end
+    
+    def uses_rgviz_append?
+      @uses_rgviz_append
+    end
+    
     def visit_query(node)
-      @s << "var e = null;\n"
       @s << "var q = '"
       node.select.accept self if node.select
       node.where.accept self if node.where
@@ -229,24 +327,10 @@ module Rgviz
           @s << "';\n"
           case source[:source]
           when :html
-            @s << "e = document.getElementById('#{source[:id]}');\n"
-            @s << "if (e.tagName.toLowerCase() == 'select' && e.multiple) {\n"
-              @s << "var s = [];\n" 
-              @s << "var o = e.options;\n"
-              @s << "for(var i = 0; i < o.length; i++) {\n"
-                @s << "if (o[i].selected)\n";
-                  @s << "s.push(o[i].value);\n" 
-              @s << "}\n"
-              append_selections node, source
-            @s << "} else {\n"
-              @s << "q += '"
-              node.left.accept self
-              @s << " #{node.operator} "
-              @s << "';\n"
-              append_before_source_type source[:type]
-              @s << "e.value"
-              append_after_source_type source[:type]
-            @s << "}\n";
+            @s << "var s = rgviz_get_value('#{source[:id]}');\n"
+            append_selections node, source
+            
+            @uses_rgviz_get_value = true
           when :js
             @s << "var s = #{source[:id]}();\n"
             @s << "if (typeof(s) != 'object') s = [s];\n"
@@ -284,23 +368,19 @@ module Rgviz
       when nil
         @s << "`#{node.name}`"
       when :html
-        @s << "';\n"
         append_before_source_type source[:type]
-        @s << "document.getElementById('#{source[:id]}').value"
+        @s << " + rgviz_get_value('#{source[:id]}') + "
         append_after_source_type source[:type]
-        @s << "q += '"
+        
+        @uses_rgviz_get_value = true
       when :js
-        @s << "';\n"
         append_before_source_type source[:type]
-        @s << "#{source[:id]}()"
+        @s << " + #{source[:id]}() + "
         append_after_source_type source[:type]
-        @s << "q += '"
       when :param
-        @s << "';\n"
         append_before_source_type source[:type]
-        @s << "param_#{source[:id]}"
+        @s << " + param_#{source[:id]} + "
         append_after_source_type source[:type]
-        @s << "q += '"
         @params << source[:id].to_i unless @params.include?(source[:id])
       end
     end
@@ -310,7 +390,8 @@ module Rgviz
     end
     
     def visit_string_column(node)
-      @s << node.value
+      value = node.value.gsub('"', '\"')
+      @s << "\"#{value}\""
     end
     
     def visit_boolean_column(node)
@@ -361,13 +442,25 @@ module Rgviz
       end
     end
     
-    def get_source(name)
+    def get_source(name, include_type = true)
       if name.start_with?(@html_prefix)
-        get_source_type :html, name[@html_prefix.length .. -1]
+        if include_type
+          get_source_type :html, name[@html_prefix.length .. -1]
+        else
+          {:source => :html, :id => name[@html_prefix.length .. -1]}
+        end
       elsif name.start_with?(@js_prefix)
-        get_source_type :js, name[@js_prefix.length .. -1]
+        if include_type
+          get_source_type :js, name[@js_prefix.length .. -1]
+        else
+          {:source => :js, :id => name[@js_prefix.length .. -1]}
+        end
       elsif name.start_with?(@param_prefix)
-        get_source_type :param, name[@param_prefix.length .. -1]
+        if include_type
+          get_source_type :param, name[@param_prefix.length .. -1]
+        else
+          {:source => :param, :id => name[@param_prefix.length .. -1]}
+        end
       else
         {}
       end
@@ -392,15 +485,15 @@ module Rgviz
     def append_before_source_type(type)
       case type
       when :number
-        @s << "q += "
+        return
       when :string
-        @s << "q += \"'\" +"
+        @s << "\"'"
       when :date
-        @s << "q += \"date '\" + "
+        @s << "date \"'"
       when :datetime
-        @s << "q += \"datetime '\" + "
+        @s << "datetime \"'"
       when :timeofday
-        @s << "q += \"timeofday '\" + "
+        @s << "timeofday \"'"
       end
     end
     
@@ -409,27 +502,19 @@ module Rgviz
       when :number
         return
       else
-        @s << " + \"'\";\n"
+        @s << "'\""
       end
     end
     
     def append_selections(node, source)
-      @s << "if (s.length == 0) {\n"
-        @s << "q += '1 = 2';\n";
-      @s << "} else {\n"
-        @s << "q += '(';\n"
-        @s << "for(var i = 0; i < s.length; i++) {\n";
-          @s << "if (i > 0) q += ' or ';\n"
-          @s << "q += '"
-          node.left.accept self
-          @s << " #{node.operator} "
-          @s << "';\n"
-          append_before_source_type source[:type]
-          @s << "s[i]"
-          append_after_source_type source[:type]
-        @s << "}";
-        @s << "q += ')';\n"
-      @s << "}\n"
+      @s << "q += rgviz_append(s, '";
+      node.left.accept self
+      @s << " #{node.operator} "
+      append_before_source_type source[:type]
+      @s << ", "
+      append_after_source_type source[:type]
+      @s << "');\n"
+      @uses_rgviz_append = true
     end
     
     def has_magic_name?(node)

data/rails/init.rb

@@ -42,9 +42,9 @@ config.after_initialize do
               original_render :text => Rgviz::JsRenderer.render_error('not_supported', "Unsupported output type: #{out}", tqx)
             end
           rescue ParseException => e
-            case out
+            case tqx['out']
             when 'json'
-              original_render :text => Rgviz::JsRenderer.render_error('invalid_query', e.message)
+              original_render :text => Rgviz::JsRenderer.render_error('invalid_query', e.message, tqx)
             when 'html'
               original_render :text => "<b>Error:</b> #{e.message}"
             when 'csv'

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz-rails
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: false
   segments: 
   - 0
-  - 28
-  version: "0.28"
+  - 29
+  version: "0.29"
 platform: ruby
 authors: 
 - Ary Borenszweig
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-19 00:00:00 +07:00
+date: 2010-08-20 00:00:00 +07:00
 default_executable: 
 dependencies: []