rgviz-rails 0.74 → 0.75

data/README.markdown

@@ -44,7 +44,7 @@ To make a method in your controller be a visualization api endpoint:
 
 So for example if <ttPperson</tt> has <tt>name</tt> and <tt>age</tt>, pointing your browser to:
 
-    http://localhost:3000/viz/person?select name where age > 20 limit 5
+    http://localhost:3000/viz/person?tq=select name where age > 20 limit 5
 
 would render the necessary javascript code that implements the google visualization api wire protocol.
 
@@ -89,6 +89,10 @@ or also:
 
     render :rgviz => Person, :conditions => 'age > 20'
 
+or (Rails 3 only):
+
+    render :rgviz => Person.where('age > ?', 20)
+
 Preprocessing
 -------------
 
@@ -132,7 +136,7 @@ For example, in your controller you put:
 
     render :rgviz => Person, :virtual_columns => {
         'age_range' => {
-            :sql => "case when age < 20 then 'young' else 'old' end", 
+            :sql => "case when age < 20 then 'young' else 'old' end",
             :type => :string
         }
     }

data/lib/rgviz_rails/view_helper.rb

@@ -1,16 +1,6 @@
 module Rgviz
   module ViewHelper
     def rgviz(options = {})
-      def get_package(name)
-        down = name.downcase
-        case down
-        when 'areachart', 'barchart', 'bubblechart', 'candlestickchart',
-          'columnchart', 'combochart', 'linechart', 'piechart',
-          'scatterchart', 'steppedareachart' then 'corechart'
-        else down
-        end
-      end
-
       options = options.with_indifferent_access
 
       id = options[:id]
@@ -47,40 +37,12 @@ module Rgviz
       opts[:height] = 480 unless opts[:height]
 
       params = []
-      uses_rgviz_get_value = false
-      uses_rgviz_append = false
+      uses_rgviz_get_value = [false]
+      uses_rgviz_append = [false]
 
       visitor = MagicNamesVisitor.new(html_prefix, js_prefix, param_prefix)
 
-      opts.each do |key, value|
-        next unless value.kind_of?(String)
-
-        source = visitor.get_source(value, false)
-        next unless source[:source]
-
-        case source[:source]
-        when :html
-          s = "rgviz_get_value('#{source[:id]}')"
-          def s.encode_json(options = {})
-            self
-          end
-          opts[key] = s
-          uses_rgviz_get_value = true
-        when :js
-          s = "#{source[:id]}()"
-          def s.encode_json(options = {})
-            self
-          end
-          opts[key] = s
-        when :param
-          s = "param_#{source[:id]}"
-          def s.encode_json(options = {})
-            self
-          end
-          opts[key] = s
-          params << source[:id].to_i unless params.include?(source[:id])
-        end
-      end
+      Rgviz::ViewHelper.process_options opts, params, visitor, uses_rgviz_get_value, uses_rgviz_append
 
       opts = opts.to_json
 
@@ -99,8 +61,8 @@ module Rgviz
       query_builder = visitor.query_builder
       query_builder_var = visitor.query_builder_var
 
-      uses_rgviz_get_value |= visitor.uses_rgviz_get_value?
-      uses_rgviz_append |= visitor.uses_rgviz_append?
+      uses_rgviz_get_value[0] |= visitor.uses_rgviz_get_value?
+      uses_rgviz_append[0] |= visitor.uses_rgviz_append?
 
       visitor.params.each{|p| params << p unless params.include?(p)}
       params = params.sort!.map{|i| "param_#{i}"}
@@ -127,7 +89,7 @@ module Rgviz
       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
+      if uses_rgviz_get_value[0] && !@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"
@@ -148,7 +110,7 @@ module Rgviz
       end
 
       # Define a function to append the value of a magic something
-      if uses_rgviz_append && !@defined_rgviz_append
+      if uses_rgviz_append[0] && !@defined_rgviz_append
         out << "function rgviz_append(s, b, a) {\n"
           out << "var q = '';\n"
           out << "if (s.length == 0) {\n"
@@ -218,7 +180,7 @@ module Rgviz
 
       if load != :auto && load_package
         # Load visualizations and the package, if not already loaded
-        package ||= get_package(kind)
+        package ||= Rgviz::ViewHelper.get_package(kind)
 
         @packages ||= []
         unless @packages.include?(package)
@@ -261,6 +223,67 @@ module Rgviz
     end
 
     module_function :rgviz
+
+    def self.get_package(name)
+      down = name.downcase
+      case down
+      when 'areachart', 'barchart', 'bubblechart', 'candlestickchart',
+        'columnchart', 'combochart', 'linechart', 'piechart',
+        'scatterchart', 'steppedareachart' then 'corechart'
+      else down
+      end
+    end
+
+    def self.process_options(opts, params, visitor, uses_rgviz_get_value, uses_rgviz_append)
+      if opts.is_a?(Array)
+        i = 0
+        opts.each do |value|
+          opts[i] = process_option(value, params, visitor, uses_rgviz_get_value, uses_rgviz_append)
+          i += 1
+        end
+      elsif opts.is_a?(Hash)
+        opts.each do |key, value|
+          opts[key] = process_option(value, params, visitor, uses_rgviz_get_value, uses_rgviz_append)
+        end
+      end
+      opts
+    end
+
+    def self.process_option(value, params, visitor, uses_rgviz_get_value, uses_rgviz_append)
+      if value.is_a?(Hash) || value.is_a?(Array)
+        return process_options value, params, visitor, uses_rgviz_get_value, uses_rgviz_append
+      end
+
+      return value unless value.kind_of?(String)
+
+      source = visitor.get_source(value, false)
+      return value unless source[:source]
+
+      case source[:source]
+      when :html
+        s = "rgviz_get_value('#{source[:id]}')"
+        def s.encode_json(options = {})
+          self
+        end
+        uses_rgviz_get_value[0] = true
+        return s
+      when :js
+        s = "#{source[:id]}()"
+        def s.encode_json(options = {})
+          self
+        end
+        return s
+      when :param
+        s = "param_#{source[:id]}"
+        def s.encode_json(options = {})
+          self
+        end
+        params << source[:id].to_i unless params.include?(source[:id])
+        return s
+      end
+
+      return value
+    end
   end
 
   class MagicNamesVisitor < Visitor

metadata

@@ -1,55 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rgviz-rails
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 74
-  version: "0.74"
+version: !ruby/object:Gem::Version
+  version: '0.75'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ary Borenszweig
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-29 00:00:00 -03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rgviz
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 46
-        version: "0.46"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.46'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.46'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: aborenszweig@manas.com.ar
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - lib/rgviz_rails.rb
 - lib/rgviz_rails/executor.rb
 - lib/rgviz_rails/js_renderer.rb
@@ -62,35 +62,28 @@ files:
 - lib/rgviz_rails/init.rb
 - rails/init.rb
 - README.markdown
-has_rdoc: false
 homepage: http://github.com/asterite/rgviz-rails
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: rgviz for rails
 test_files: []
-