rgviz-rails 0.48 → 0.49

data/README.rdoc

@@ -1,6 +1,6 @@
 == Rgviz-rails
 
-This library makes it easy to implement a Visualization data source so that you can easily chart or visualize your data from ActiveRecord[http://ar.rubyonrails.org/] models. The library implements the {Google Visualization API wire protocol}[http://code.google.com/apis/visualization/documentation/dev/implementing_data_source.html].
+This library makes it easy to implement a Visualization data source so that you can easily chart or visualize your data from ActiveRecord[http://ar.rubyonrails.org/] models or from in-memory arrays. The library implements the {Google Visualization API wire protocol}[http://code.google.com/apis/visualization/documentation/dev/implementing_data_source.html].
 
 It also allows you to {render the visualizations in a view template}[https://github.com/asterite/rgviz-rails/wiki/Showing-a-visualization-in-a-view] in a very simple but powerful way.
 
@@ -102,6 +102,21 @@ You can invoke the rgviz method in your views. {Read more about this}[https://gi
 
 You can always do it the {old way}[http://code.google.com/apis/visualization/documentation/using_overview.html].
 
+=== Executing queries over in-memory arrays
+
+You can also apply a query over an array of arrays that contains your "records" to be queried.
+
+  types = [[:id, :number], [:name, :string], [:age, :number]]
+  records = [
+    [1, 'John', 23],
+    [2, 'Pete', 36]
+  ]
+  executor = Rgviz::MemoryExecutor.new records, types
+
+  render :rgviz => executor
+
+This is very useful if you need to present visualizations against data coming from a CSV file.
+
 === Current Limitations
 * The *format* clause is ignored (If someone knows of a working icu library for ruby, please tell me)
 * Only supports MySQL, PostgreSQL and SQLite adapters

data/lib/rgviz_rails/executor.rb

@@ -15,7 +15,7 @@ module Rgviz
       when 'sqlite'
         require File.dirname(__FILE__) + '/adapters/sqlite_adapter.rb'
         @adapter = SqliteAdapter.new
-      when 'mysql'
+      when 'mysql', 'mysql2'
         require File.dirname(__FILE__) + '/adapters/mysql_adapter.rb'
         @adapter = MySqlAdapter.new
       when 'postgresql'
@@ -334,6 +334,33 @@ module Rgviz
         i == f ? i : f
       when :boolean
         value == 1 || value == '1' ? true : false
+      when :date
+        value = Time.parse(value).to_date if value.is_a? String
+        def value.as_json(options = {})
+          self
+        end
+        def value.encode_json(*)
+          "new Date(#{strftime('%Y, %d, %m')})"
+        end
+        value
+      when :datetime
+        value = Time.parse(value) if value.is_a? String
+        def value.as_json(*)
+          self
+        end
+        def value.encode_json(*)
+          "new Date(#{strftime('%Y, %d, %m, %H, %M, %S')})"
+        end
+        value
+      when :timeofday
+        value = Time.parse(value) if value.is_a? String
+        def value.as_json(*)
+          self
+        end
+        def value.encode_json(*)
+          "new Date(#{strftime('0, 0, 0, %H, %M, %S')})"
+        end
+        value
       else
         value.to_s
       end
@@ -394,15 +421,15 @@ module Rgviz
     end
 
     def visit_date_column(node)
-      @string += escaped_string(node.value.to_s)
+      @string += "date #{escaped_string(node.value.to_s)}"
     end
 
     def visit_date_time_column(node)
-      @string += escaped_string(node.value.strftime("%Y-%m-%d %H:%M:%S"))
+      @string += "timestamp #{escaped_string(node.value.strftime("%Y-%m-%d %H:%M:%S"))}"
     end
 
     def visit_time_of_day_column(node)
-      @string += escaped_string(node.value.strftime("%H:%M:%S"))
+      @string += "time #{escaped_string(node.value.strftime("%H:%M:%S"))}"
     end
 
     def visit_scalar_function_column(node)

data/lib/rgviz_rails/init.rb

@@ -25,7 +25,7 @@ module Rgviz
               elsif model.respond_to? :execute
                 executor = model
               else
-                raise "The parameter to :rgviz => ... must extend from ActiveRecord::Base or respond to execute"
+                raise "The argument to render :rgviz => ... must extend from ActiveRecord::Base or respond to execute"
               end
               options = {}
               options[:conditions] = conditions if conditions

data/lib/rgviz_rails/view_helper.rb

@@ -251,7 +251,11 @@ module Rgviz
 
     def visit_query(node)
       @s << "var q = '"
-      node.select.accept self if node.select
+      if node.select && node.select.columns && node.select.columns.length > 0
+        node.select.accept self
+      else
+        @s << 'select * '
+      end
       node.where.accept self if node.where
       node.group_by.accept self if node.group_by
       node.pivot.accept self if node.pivot

data/spec/rgviz/executor_spec.rb

@@ -14,15 +14,15 @@ describe Executor do
   end
 
   def format_datetime(date)
-    date.strftime "%Y-%m-%d %H:%M:%S"
+    date.strftime "new Date(%Y, %m, %d, %H, %M, %S)"
   end
 
   def format_date(date)
-    date.strftime "%Y-%m-%d"
+    date.strftime "new Date(%Y, %m, %d)"
   end
 
-  def self.it_processes_single_select_column(query, id, type, value, label, options = {})
-    it "processes select #{query}" do
+  def self.it_processes_single_select_column(query, id, type, value, label, options = {}, test_options = {})
+    it "processes select #{query}", test_options do
       if block_given?
         yield
       else
@@ -63,8 +63,8 @@ describe Executor do
     table.rows[0].c.length.should == 7
 
     i = 0
-    [p.id, p.name, p.age, format_date(p.birthday),
-      format_datetime(p.created_at), format_datetime(p.updated_at), p.city.id].each do |val|
+    [p.id, p.name, p.age, p.birthday,
+      p.created_at, p.updated_at, p.city.id].each do |val|
       table.rows[0].c[i].v.should == val
       i += 1
     end
@@ -79,9 +79,9 @@ describe Executor do
   it_processes_single_select_column '"hello"', 'c0', :string, 'hello', "'hello'"
   it_processes_single_select_column 'false', 'c0', :boolean, false, 'false'
   it_processes_single_select_column 'true', 'c0', :boolean, true, 'true'
-  it_processes_single_select_column 'date "2010-01-02"', 'c0', :date, '2010-01-02', "date '2010-01-02'"
-  it_processes_single_select_column 'datetime "2010-01-02 10:11:12"', 'c0', :datetime, '2010-01-02 10:11:12', "datetime '2010-01-02 10:11:12'"
-  it_processes_single_select_column 'timeofday "10:11:12"', 'c0', :timeofday, '10:11:12', "timeofday '10:11:12'"
+  it_processes_single_select_column 'date "2010-01-02"', 'c0', :date, Time.parse('2010-01-02').to_date, "date '2010-01-02'"
+  it_processes_single_select_column 'datetime "2010-01-02 10:11:12"', 'c0', :datetime, Time.parse('2010-01-02 10:11:12'), "datetime '2010-01-02 10:11:12'"
+  it_processes_single_select_column 'timeofday "10:11:12"', 'c0', :timeofday, Time.parse('10:11:12'), "timeofday '10:11:12'"
 
   it_processes_single_select_column '1 + 2', 'c0', :number, 3, '1 + 2'
   it_processes_single_select_column '3 - 2', 'c0', :number, 1, '3 - 2'
@@ -250,9 +250,9 @@ describe Executor do
 #    Person.make :created_at => Time.parse('2006-05-02 3:04:09')
 #  end
 
-  it_processes_single_select_column "toDate('2008-03-13')", 'c0', :date, Date.parse('2008-03-13').to_s, "toDate('2008-03-13')"
+  it_processes_single_select_column "toDate('2008-03-13')", 'c0', :date, Time.parse("2008-03-13").to_date, "toDate('2008-03-13')"
 
-  it_processes_single_select_column "toDate(created_at)", 'c0', :date, Date.parse('2008-03-13').to_s, "toDate(created_at)" do
+  it_processes_single_select_column "toDate(created_at)", 'c0', :date, Time.parse("2008-03-13").to_date, "toDate(created_at)" do
     Person.make :created_at => Time.parse('2008-03-13 3:04:09')
   end
 
@@ -386,8 +386,8 @@ describe Executor do
 
     i = 0
     [
-      ['2000-01-12', nil, 1, 10, nil],
-      [nil, '2001-02-12', 2, nil, 20],
+      [Time.parse('2000-01-12').to_date, nil, 1, 10, nil],
+      [nil, Time.parse('2001-02-12').to_date, 2, nil, 20],
     ].each do |values|
       table.rows[i].c.length.should == 5
       values.each_with_index do |v, j|
@@ -459,8 +459,8 @@ describe Executor do
 
     i = 0
     [
-      ['2000-01-12', nil, 10, nil],
-      [nil, '2001-02-12', nil, 20],
+      [Time.parse('2000-01-12').to_date, nil, 10, nil],
+      [nil, Time.parse('2001-02-12').to_date, nil, 20],
     ].each do |values|
       table.rows[i].c.length.should == 4
       values.each_with_index do |v, j|

data/spec/spec_helper.rb

@@ -5,8 +5,8 @@ require 'logger'
 
 require 'active_record'
 
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
-#ActiveRecord::Base.establish_connection(:adapter => 'mysql', :database => 'rgviz_rails', :username => 'root', :password => '###')
+#ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+ActiveRecord::Base.establish_connection(:adapter => 'mysql2', :database => 'rgviz_rails', :username => 'root', :password => '')
 #ActiveRecord::Base.establish_connection(:adapter => 'postgresql', :database => 'rgviz_rails', :username => 'postgres', :password => '###', :host => '/var/run/postgresql/')
 
 ActiveRecord::Schema.define do

metadata

@@ -1,43 +1,34 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rgviz-rails
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 48
-  version: "0.48"
+version: !ruby/object:Gem::Version
+  version: '0.49'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ary Borenszweig
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-08 00:00:00 -03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-17 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rgviz
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70297488435440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70297488435440
 description: 
 email: aborenszweig@manas.com.ar
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - lib/rgviz_rails.rb
 - lib/rgviz_rails/executor.rb
 - lib/rgviz_rails/js_renderer.rb
@@ -56,37 +47,28 @@ files:
 - spec/models/person.rb
 - spec/rgviz/executor_spec.rb
 - README.rdoc
-has_rdoc: true
 homepage: http://code.google.com/p/rgviz-rails
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: rgviz for rails
 test_files: []
-