rgviz-rails 0.58 → 0.59

data/lib/rgviz_rails/executor.rb

@@ -368,7 +368,7 @@ module Rgviz
           self
         end
         def value.encode_json(*)
-          "new Date(#{strftime('%Y, %d, %m')})"
+          "new Date(#{strftime('%Y,%d,%m')})"
         end
         value
       when :datetime
@@ -377,7 +377,7 @@ module Rgviz
           self
         end
         def value.encode_json(*)
-          "new Date(#{strftime('%Y, %d, %m, %H, %M, %S')})"
+          "new Date(#{strftime('%Y,%d,%m,%H,%M,%S')})"
         end
         value
       when :timeofday
@@ -386,7 +386,7 @@ module Rgviz
           self
         end
         def value.encode_json(*)
-          "new Date(#{strftime('0, 0, 0, %H, %M, %S')})"
+          "new Date(#{strftime('0,0,0,%H,%M,%S')})"
         end
         value
       else

data/lib/rgviz_rails/view_helper.rb

@@ -83,7 +83,7 @@ module Rgviz
       raise "Must specify a :kind" unless kind
       raise "Must specify a :url" unless url
 
-      custom_executor = (url.is_a?(Class) and url < ActiveRecord::Base) || url.respond_to?(:execute) || url.is_a?(Rgviz::Table)
+      custom_executor = (url.is_a?(Class) and url < ActiveRecord::Base) || url.respond_to?(:execute) || url.is_a?(Rgviz::Table) || url.is_a?(Array)
       url = url_for url unless custom_executor
 
       # Parse the query
@@ -189,18 +189,22 @@ module Rgviz
       end
 
       if custom_executor
-        executor_options = {}
-        executor_options[:conditions] = conditions if conditions
-        executor_options[:extensions] = extensions if extensions
-
-        table = if url.is_a?(Class) and url < ActiveRecord::Base
-                  Rgviz::Executor.new(url).execute(query, executor_options)
-                elsif url.respond_to?(:execute)
-                  url.execute(query, executor_options)
-                else
-                  url
-                end
-        out << "    rgviz_#{id}_data = new google.visualization.DataTable(#{table.to_json});\n"
+        if url.is_a?(Array)
+          out << "    rgviz_#{id}_data = google.visualization.arrayToDataTable(#{url.to_json});\n"
+        else
+          executor_options = {}
+          executor_options[:conditions] = conditions if conditions
+          executor_options[:extensions] = extensions if extensions
+
+          table = if url.is_a?(Class) and url < ActiveRecord::Base
+                    Rgviz::Executor.new(url).execute(query, executor_options)
+                  elsif url.respond_to?(:execute)
+                    url.execute(query, executor_options)
+                  else
+                    url
+                  end
+          out << "    rgviz_#{id}_data = new google.visualization.DataTable(#{table.to_json});\n"
+        end
       else
         out << "    rgviz_#{id}_data = response.getDataTable();\n"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgviz-rails
 version: !ruby/object:Gem::Version
-  version: '0.58'
+  version: '0.59'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000Z
+date: 2012-01-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgviz
-  requirement: &70259916198240 !ruby/object:Gem::Requirement
+  requirement: &70318309307160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259916198240
+  version_requirements: *70318309307160
 description: 
 email: aborenszweig@manas.com.ar
 executables: []