rgviz-rails 0.51 → 0.52

data/lib/rgviz_rails/view_helper.rb

@@ -1,35 +1,12 @@
 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 value.kind_of? Array
-            @s << '['
-            value.each_with_index do |val, i|
-              @s << ',' if i > 0
-              if val.kind_of? String
-                val = val.gsub('"', '\"')
-                @s << "\"#{val}\""
-              else
-                @s << val.to_s
-              end
-            end
-            @s << ']'
-          elsif special_keys.include?(key) || !value.kind_of?(String)
-            @s << value.to_s
-          else
-            value = value.gsub('"', '\"')
-            @s << "\"#{value}\""
-          end
-          i += 1
+      def get_package(name)
+        down = name.downcase
+        case down
+        when 'gauge', 'geochart', 'table', 'treemap' then down
+        else 'corechart'
         end
-        @s << '}'
       end
 
       options = options.with_indifferent_access
@@ -66,29 +43,37 @@ module Rgviz
 
       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]}')"
+          s = "rgviz_get_value('#{source[:id]}')"
+          def s.encode_json(options = {})
+            self
+          end
+          opts[key] = s
           uses_rgviz_get_value = true
         when :js
-          opts[key] = "#{source[:id]}()"
+          s = "#{source[:id]}()"
+          def s.encode_json(options = {})
+            self
+          end
+          opts[key] = s
         when :param
-          opts[key] = "param_#{source[:id]}"
+          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
 
-      opts = opts_to_json(opts, special_keys)
+      opts = opts.to_json
 
       raise "Must specify an :id" unless id
       raise "Must specify a :kind" unless kind
@@ -161,7 +146,7 @@ module Rgviz
       end
 
       # Load visualizations and the package, if not already loaded
-      pack = kind.downcase
+      pack = get_package kind
       @packages ||= []
       unless @packages.include?(pack)
         out << "google.load(\"visualization\", \"1\", {'packages':['#{pack}']});\n"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgviz-rails
 version: !ruby/object:Gem::Version
-  version: '0.51'
+  version: '0.52'
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgviz
-  requirement: &70132136604300 !ruby/object:Gem::Requirement
+  requirement: &70279841786980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70132136604300
+  version_requirements: *70279841786980
 description: 
 email: aborenszweig@manas.com.ar
 executables: []