rgviz-rails 0.46 → 0.47

data/lib/rgviz_rails/executor.rb

@@ -2,7 +2,7 @@ module Rgviz
   class Executor
     attr_reader :model_class
     attr_reader :adapter
-  
+
     def initialize(model_class, query)
       @model_class = model_class
       @query = query
@@ -14,55 +14,58 @@ module Rgviz
       @original_columns = []
       case ActiveRecord::Base.connection.adapter_name.downcase
       when 'sqlite'
+        require File.dirname(__FILE__) + '/adapters/sqlite_adapter.rb'
         @adapter = SqliteAdapter.new
       when 'mysql'
+        require File.dirname(__FILE__) + '/adapters/mysql_adapter.rb'
         @adapter = MySqlAdapter.new
       when 'postgresql'
+        require File.dirname(__FILE__) + '/adapters/postgresql_adapter.rb'
         @adapter = PostgreSqlAdapter.new
       end
     end
-    
+
     def execute(options = {})
       @query = Parser.parse(@query, options) unless @query.kind_of?(Query)
-    
+
       @table = Table.new
       @extra_conditions = options[:conditions]
-      
+
       process_pivot
       process_labels
-      
+
       generate_columns
       generate_conditions
       generate_group
       generate_order
-      
+
       generate_rows
-      
+
       @table
     end
-    
+
     def process_labels
       return unless @query.labels.present?
-      
+
       @query.labels.each do |label|
         @labels[label.column.to_s] = label.label
       end
     end
-    
+
     def process_pivot
       if @query.pivot
         @query.pivot.columns.each do |column|
           @pivots[column.to_s] = true
         end
       end
-      
+
       if @query.group_by
         @query.group_by.columns.each do |column|
           @group_bys[column.to_s] = true
         end
       end
     end
-    
+
     def add_joins(joins)
       map = @joins
       joins.each do |join|
@@ -72,14 +75,14 @@ module Rgviz
         map = map[key]
       end
     end
-    
+
     def generate_columns
       if @query.select && @query.select.columns.present?
         # Select the specified columns
         i = 0
         @query.select.columns.each do |col|
           col_to_s = col.to_s
-        
+
           @table.cols << (Column.new :id => column_id(col, i), :type => column_type(col), :label => column_label(col_to_s))
           @selects << "(#{column_select(col)}) as c#{i}"
           @original_columns << col_to_s
@@ -95,26 +98,26 @@ module Rgviz
           i += 1
         end
       end
-      
+
       # Select pivot columns and group by columns
       if @query.pivot
         @max_before_pivot_columns = @original_columns.length
-      
+
         @query.pivot.columns.each do |col|
           col_to_s = col.to_s
-        
+
           @table.cols << (Column.new :id => column_id(col, i), :type => column_type(col), :label => column_label(col_to_s))
-          @selects << "(#{column_select(col)}) as c#{i}"          
+          @selects << "(#{column_select(col)}) as c#{i}"
           @original_columns << col_to_s
           i += 1
         end
-        
+
         @max_original_columns = @original_columns.length
-        
+
         if @query.group_by
           @query.group_by.columns.each do |col|
             col_to_s = col.to_s
-          
+
             @table.cols << (Column.new :id => column_id(col, i), :type => column_type(col), :label => column_label(col_to_s))
             @selects << "(#{column_select(col)}) as c#{i}"
             i += 1
@@ -122,28 +125,28 @@ module Rgviz
         end
       end
     end
-    
+
     def generate_conditions
       @conditions = to_string @query.where, WhereVisitor if @query.where
     end
-    
+
     def generate_group
       @group = to_string @query.group_by, ColumnVisitor if @query.group_by
       pivot = to_string @query.pivot, ColumnVisitor if @query.pivot
-      
+
       if pivot.present?
         if @group.present?
-          @group += ',' + pivot 
+          @group += ',' + pivot
         else
           @group = pivot
         end
       end
     end
-    
+
     def generate_order
       @order = to_string @query.order_by, OrderVisitor if @query.order_by
     end
-    
+
     def generate_rows
       conditions = @conditions
       if @extra_conditions
@@ -151,14 +154,14 @@ module Rgviz
           if @extra_conditions.kind_of? String
             conditions = "(#{conditions}) AND #{@extra_conditions}"
           elsif @extra_conditions.kind_of? Array
-            conditions = ["(#{conditions}) AND #{@extra_conditions[0]}", *@extra_conditions[1 .. -1]] 
+            conditions = ["(#{conditions}) AND #{@extra_conditions[0]}", *@extra_conditions[1 .. -1]]
           end
         else
           conditions = @extra_conditions
         end
       end
-    
-      results = @model_class.send :all, 
+
+      results = @model_class.send :all,
         :select => @selects.join(','),
         :conditions => conditions,
         :group => @group,
@@ -166,15 +169,15 @@ module Rgviz
         :limit => @query.limit,
         :offset => @query.offset,
         :joins => @joins
-      
+
       if @pivots.empty? || results.empty?
         @table.cols = @table.cols[0 ... @max_before_pivot_columns] if @pivots.present?
-      
+
         # Simple, just convert the results to a table
         results.each do |result|
           row = Row.new
           @table.rows << row
-          
+
           i = 0
           @table.cols.each do |col|
             hash = {}
@@ -185,26 +188,26 @@ module Rgviz
         end
       else
         # A little more complicated...
-        
+
         # This is grouping => pivot => [selections]
         fin = ActiveSupport::OrderedHash.new
-        
+
         # The uniq pivot values
         uniq_pivots = []
-      
+
         # Fill fin and uniq_pivots
         results.each do |result|
           # The grouping key of this result
           grouped_by = []
-          
+
           # The pivots of this result
           pivots = []
-          
+
           # The selections of this result
           selections = []
-          
+
           # Fill grouped_by, pivots and selections, as well as uniq_pivots
-          @table.cols.each_with_index do |col, i| 
+          @table.cols.each_with_index do |col, i|
             val = column_value(col, result.send("c#{i}"))
             if i >= @max_original_columns || @group_bys.include?(@original_columns[i])
               grouped_by << val
@@ -214,44 +217,44 @@ module Rgviz
               selections << val
             end
           end
-          
+
           uniq_pivots << pivots unless uniq_pivots.include? pivots
-          
+
           # Now put all this info into fin
           fin[grouped_by] = {} unless fin[grouped_by]
           fin[grouped_by][pivots] = selections
         end
-        
+
         # Sort the uniq pivots so the results will be sorted for a human
         uniq_pivots.sort!
-        
+
         # Regenerate the columns info: the current info has the values
-        # we needed to get the info we needed 
+        # we needed to get the info we needed
         col_i = 0
         new_cols = []
         @original_columns.each_with_index do |original_column, i|
           break if i >= @max_original_columns
-        
-          old_col = @table.cols[i] 
+
+          old_col = @table.cols[i]
           if @group_bys.include?(original_column)
             old_col.id = "c#{col_i}"
             new_cols << @table.cols[i]
             col_i += 1
           elsif !@pivots.include?(original_column)
             uniq_pivots.each do |uniq_pivot|
-              new_cols << (Column.new :id => "c#{col_i}", :type => old_col.type, :label => "#{uniq_pivot.join(', ')} #{old_col.label}") 
+              new_cols << (Column.new :id => "c#{col_i}", :type => old_col.type, :label => "#{uniq_pivot.join(', ')} #{old_col.label}")
               col_i += 1
             end
           end
         end
-        
+
         @table.cols = new_cols
-        
+
         # Create the rows
         fin.each do |key, value|
           row = Row.new
           @table.rows << row
-        
+
           group_i = 0
           value_i = 0
           @original_columns.each_with_index do |original_column, i|
@@ -264,7 +267,7 @@ module Rgviz
               uniq_pivots.each do |uniq_pivot|
                 v = value[uniq_pivot]
                 v = v[value_i] if v
-              
+
                 hash = {}
                 hash[:v] = v unless @query.options && @query.options.no_values
                 row.c << (Cell.new hash)
@@ -275,7 +278,7 @@ module Rgviz
         end
       end
     end
-    
+
     def column_id(col, i)
       case col
       when IdColumn
@@ -284,7 +287,7 @@ module Rgviz
         "c#{i}"
       end
     end
-    
+
     def column_type(col)
       case col
       when IdColumn
@@ -312,96 +315,96 @@ module Rgviz
         when ScalarFunctionColumn::Upper, ScalarFunctionColumn::Lower, ScalarFunctionColumn::Concat
           :string
         else
-          :number 
+          :number
         end
       when AggregateColumn
         :number
       end
     end
-    
+
     def column_select(col)
       to_string col, ColumnVisitor
     end
-    
+
     def column_value(col, value)
       case col.type
       when :number
         i = value.to_i
-        f = value.to_f 
+        f = value.to_f
         i == f ? i : f
       when :boolean
-        value == '1' ? true : false
+        value == 1 || value == '1' ? true : false
       else
         value.to_s
       end
     end
-    
+
     def column_label(string)
       @labels[string] || string
     end
-    
+
     def to_string(node, visitor_class)
       visitor = visitor_class.new self
       node.accept visitor
       visitor.string
     end
-    
+
     def rails_column_type(col)
       case col.type
-      when :integer
+      when :integer, :float, :decimal
         :number
       else
         col.type
       end
     end
   end
-  
+
   class ColumnVisitor < Rgviz::Visitor
     attr_reader :string
-    
+
     def initialize(executor)
       @string = ''
       @executor = executor
     end
-    
+
     def <<(string)
       @string += string
     end
-    
+
     def visit_id_column(node)
       klass, rails_col, joins = Rgviz::find_rails_col @executor.model_class, node.name
       raise "Unknown column '#{node.name}'" unless rails_col
       @string += ActiveRecord::Base.connection.quote_column_name(klass.table_name)
       @string += '.'
       @string += ActiveRecord::Base.connection.quote_column_name(rails_col.name)
-      
+
       @executor.add_joins joins
     end
-    
+
     def visit_number_column(node)
       @string += node.value.to_s
     end
-    
+
     def visit_string_column(node)
       @string += escaped_string(node.value)
     end
-    
+
     def visit_boolean_column(node)
       @string += node.value ? '1' : '0'
     end
-    
+
     def visit_date_column(node)
       @string += 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"))
     end
-    
+
     def visit_time_of_day_column(node)
       @string += escaped_string(node.value.strftime("%H:%M:%S"))
     end
-    
+
     def visit_scalar_function_column(node)
       case node.function
       when ScalarFunctionColumn::Sum, ScalarFunctionColumn::Difference,
@@ -416,7 +419,7 @@ module Rgviz
       end
       false
     end
-    
+
     def visit_aggregate_column(node)
       @string += node.function.to_s
       @string += '('
@@ -424,7 +427,7 @@ module Rgviz
       @string += ')'
       false
     end
-    
+
     def visit_group_by(node)
       node.columns.each_with_index do |c, i|
         @string += ',' if i > 0
@@ -432,7 +435,7 @@ module Rgviz
       end
       false
     end
-    
+
     def visit_pivot(node)
       node.columns.each_with_index do |c, i|
         @string += ',' if i > 0
@@ -440,25 +443,25 @@ module Rgviz
       end
       false
     end
-    
+
     def visit_label(node)
       false
     end
-    
+
     def visit_format(node)
       false
     end
-    
+
     def visit_option(node)
       false
     end
-    
+
     def escaped_string(str)
       str = str.gsub("'", "''")
       "'#{str}'"
     end
   end
-  
+
   class WhereVisitor < ColumnVisitor
     def visit_logical_expression(node)
       @string += "("
@@ -469,14 +472,14 @@ module Rgviz
       @string += ")"
       false
     end
-  
+
     def visit_binary_expression(node)
       node.left.accept self
       @string += " #{node.operator} "
       node.right.accept self
       false
     end
-    
+
     def visit_unary_expression(node)
       case node.operator
       when UnaryExpression::Not
@@ -493,7 +496,7 @@ module Rgviz
       false
     end
   end
-  
+
   class OrderVisitor < ColumnVisitor
     def visit_order_by(node)
       node.sorts.each_with_index do |sort, i|
@@ -502,34 +505,34 @@ module Rgviz
       end
       false
     end
-    
+
     def visit_sort(node)
       node.column.accept self
       @string += node.order == Sort::Asc ? ' asc' : ' desc'
       false
     end
   end
-  
+
   def self.find_rails_col(klass, name)
     joins = []
-  
+
     while true
       col = klass.send(:columns).select{|x| x.name == name}.first
       return [klass, col, joins] if col
-      
+
       idx = name.index '_'
       return nil if not idx
-      
+
       before = name[0 ... idx]
       name = name[idx + 1 .. -1]
-      
+
       assoc = klass.send :reflect_on_association, before.to_sym
       raise "Unknown association #{before}" unless assoc
       klass = assoc.klass
       joins << assoc
     end
   end
-  
+
   class NotSupported < ::Exception
   end
 end

data/lib/rgviz_rails.rb

@@ -2,6 +2,3 @@ require 'rgviz_rails/init.rb'
 require 'rgviz_rails/executor.rb'
 require 'rgviz_rails/js_renderer.rb'
 require 'rgviz_rails/tqx.rb'
-require 'rgviz_rails/adapters/mysql_adapter.rb'
-require 'rgviz_rails/adapters/postgresql_adapter.rb'
-require 'rgviz_rails/adapters/sqlite_adapter.rb'

data/spec/rgviz/executor_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
-require 'rgviz'
+#require 'rgviz'
 
 include Rgviz
 
@@ -7,20 +7,20 @@ describe Executor do
   before :each do
     [Person, City, Country].each &:delete_all
   end
-  
+
   def exec(query, options = {})
     exec = Executor.new Person, query
     exec.execute options
   end
-  
+
   def format_datetime(date)
     date.strftime "%Y-%m-%d %H:%M:%S"
   end
-  
+
   def format_date(date)
     date.strftime "%Y-%m-%d"
   end
-  
+
   def self.it_processes_single_select_column(query, id, type, value, label, options = {})
     it "processes select #{query}" do
       if block_given?
@@ -28,27 +28,27 @@ describe Executor do
       else
         Person.make
       end
-    
+
       table = exec "select #{query}", options
       table.cols.length.should == 1
-      
+
       table.cols[0].id.should == id
       table.cols[0].type.should == type
       table.cols[0].label.should == label
-      
+
       table.rows.length.should == 1
       table.rows[0].c.length.should == 1
-      
+
       table.rows[0].c[0].v.should == value
     end
   end
 
   it "processes select *" do
     p = Person.make
-    
+
     table = exec 'select *'
     table.cols.length.should == 7
-    
+
     i = 0
     [['id', :number], ['name', :string], ['age', :number], ['birthday', :date],
       ['created_at', :datetime], ['updated_at', :datetime],
@@ -58,12 +58,12 @@ describe Executor do
       table.cols[i].label.should == id
       i += 1
     end
-    
+
     table.rows.length.should == 1
     table.rows[0].c.length.should == 7
-    
+
     i = 0
-    [p.id, p.name, p.age, format_date(p.birthday), 
+    [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|
       table.rows[0].c[i].v.should == val
       i += 1
@@ -73,16 +73,16 @@ describe Executor do
   it_processes_single_select_column 'name', 'name', :string, 'foo', 'name' do
     Person.make :name => 'foo'
   end
-  
+
   it_processes_single_select_column '1', 'c0', :number, 1, '1'
   it_processes_single_select_column '1.2', 'c0', :number, 1.2, '1.2'
   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 '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 '1 + 2', 'c0', :number, 3, '1 + 2'
   it_processes_single_select_column '3 - 2', 'c0', :number, 1, '3 - 2'
   it_processes_single_select_column '2 * 3', 'c0', :number, 6, '2 * 3'
@@ -90,71 +90,71 @@ describe Executor do
   it_processes_single_select_column '3 * age', 'c0', :number, 60, '3 * age' do
     Person.make :age => 20
   end
-  
+
   it_processes_single_select_column 'sum(age)', 'c0', :number, 6, 'sum(age)' do
     [1, 2, 3].each{|i| Person.make :age => i}
   end
-  
+
   it_processes_single_select_column 'avg(age)', 'c0', :number, 30, 'avg(age)' do
     [10, 20, 60].each{|i| Person.make :age => i}
   end
-  
+
   it_processes_single_select_column 'count(age)', 'c0', :number, 3, 'count(age)' do
     3.times{|i| Person.make}
   end
-  
+
   it_processes_single_select_column 'max(age)', 'c0', :number, 3, 'max(age)' do
     [1, 2, 3].each{|i| Person.make :age => i}
   end
-  
+
   it_processes_single_select_column 'min(age)', 'c0', :number, 1, 'min(age)' do
     [1, 2, 3].each{|i| Person.make :age => i}
   end
-  
+
   it_processes_single_select_column 'age where age > 2', 'age', :number, 3, 'age' do
     [1, 2, 3].each{|i| Person.make :age => i}
   end
-  
+
   it_processes_single_select_column 'age where age > 2 and age <= 3', 'age', :number, 3, 'age' do
     [1, 2, 3, 4, 5].each{|i| Person.make :age => i}
   end
-  
+
   it_processes_single_select_column 'name where age is null', 'name', :string, 'b', 'name' do
     Person.make :age => 1, :name => 'a'
     Person.make :age => nil, :name => 'b'
   end
-  
+
   it_processes_single_select_column "age where city_name = 'Laos' and year(birthday) = '2010'", 'age', :number, 1, 'age' do
     Person.make :age => 1, :name => 'a', :city => City.make(:name => 'Laos'), :birthday => '2010-01-01'
   end
-  
+
   it_processes_single_select_column 'name where age is not null', 'name', :string, 'a', 'name' do
     Person.make :age => 1, :name => 'a'
     Person.make :age => nil, :name => 'b'
   end
-  
+
   it "processes group by" do
     Person.make :name => 'one', :age => 1
     Person.make :name => 'one', :age => 2
     Person.make :name => 'two', :age => 3
     Person.make :name => 'two', :age => 4
-  
+
     table = exec 'select max(age) group by name order by name'
-    
+
     table.rows.length.should == 2
     table.rows[0].c.length.should == 1
     table.rows[0].c[0].v.should == 2
     table.rows[1].c.length.should == 1
     table.rows[1].c[0].v.should == 4
   end
-  
+
   it "processes order by" do
     Person.make :age => 1
     Person.make :age => 3
     Person.make :age => 2
-  
+
     table = exec 'select age order by age desc'
-    
+
     table.rows.length.should == 3
     table.rows[0].c.length.should == 1
     table.rows[0].c[0].v.should == 3
@@ -163,153 +163,153 @@ describe Executor do
     table.rows[2].c.length.should == 1
     table.rows[2].c[0].v.should == 1
   end
-  
+
   it_processes_single_select_column 'age where age > 3 order by age limit 1', 'age', :number, 4, 'age' do
     [1, 2, 3, 4, 5].each{|i| Person.make :age => i}
   end
-  
+
   it_processes_single_select_column 'age where age > 3 order by age limit 1 offset 1', 'age', :number, 5, 'age' do
     [1, 2, 3, 4, 5].each{|i| Person.make :age => i}
   end
-  
+
   it_processes_single_select_column 'city_name', 'city_name', :string, 'Buenos Aires', 'city_name' do
-    Person.make :city => City.make(:name => 'Buenos Aires') 
+    Person.make :city => City.make(:name => 'Buenos Aires')
   end
-  
+
   it_processes_single_select_column 'city_country_name', 'city_country_name', :string, 'Argentina', 'city_country_name' do
-    Person.make :city => City.make(:country => Country.make(:name => 'Argentina')) 
+    Person.make :city => City.make(:country => Country.make(:name => 'Argentina'))
   end
-  
+
   it_processes_single_select_column 'city_country_name group by city_country_name', 'city_country_name', :string, 'Argentina', 'city_country_name' do
-    Person.make :city => City.make(:country => Country.make(:name => 'Argentina')) 
+    Person.make :city => City.make(:country => Country.make(:name => 'Argentina'))
   end
-  
+
   it "processes with conditions as string" do
     Person.make :age => 1
     Person.make :age => 2
     Person.make :age => 3
-  
+
     table = exec 'select age', :conditions => 'age = 2'
-    
+
     table.rows.length.should == 1
     table.rows[0].c.length.should == 1
     table.rows[0].c[0].v.should == 2
   end
-  
+
   it "processes with conditions as string and another filter" do
     Person.make :age => 1
     Person.make :age => 2
     Person.make :age => 3
-  
+
     table = exec 'select age where age > 1', :conditions => 'age < 3'
-    
+
     table.rows.length.should == 1
     table.rows[0].c.length.should == 1
     table.rows[0].c[0].v.should == 2
   end
-  
+
   it "processes with conditions as array" do
     Person.make :age => 1
     Person.make :age => 2
     Person.make :age => 3
-  
+
     table = exec 'select age', :conditions => ['age = ?', 2]
-    
+
     table.rows.length.should == 1
     table.rows[0].c.length.should == 1
     table.rows[0].c[0].v.should == 2
   end
-  
+
   it "processes with conditions as array and another filter" do
     Person.make :age => 1
     Person.make :age => 2
     Person.make :age => 3
-  
+
     table = exec 'select age where age > 1', :conditions => ['age < ?', 3]
-    
+
     table.rows.length.should == 1
     table.rows[0].c.length.should == 1
     table.rows[0].c[0].v.should == 2
   end
-  
-  [['year', 2006], ['month', 5], ['day', 2], 
+
+  [['year', 2006], ['month', 5], ['day', 2],
    ['hour', 3], ['minute', 4], ['second', 9],
    ['dayOfWeek', 3]].each do |str, val|
     it_processes_single_select_column "#{str}(created_at)", 'c0', :number, val, "#{str}(created_at)" do
-      Person.make :created_at => Time.parse('2006-05-02 3:04:09') 
+      Person.make :created_at => Time.parse('2006-05-02 3:04:09')
     end
   end
-  
+
 #  it_processes_single_select_column "quarter(created_at)", 'c0', :number, 2, 'quarter(created_at)' do
-#    Person.make :created_at => Time.parse('2006-05-02 3:04:09') 
+#    Person.make :created_at => Time.parse('2006-05-02 3:04:09')
 #  end
-  
+
   it_processes_single_select_column "dateDiff(date '2008-03-13', date '2008-03-10')", 'c0', :number, 3, "dateDiff(date '2008-03-13', date '2008-03-10')"
-  
+
 #  it_processes_single_select_column "now()", 'c0', :datetime, Time.now.utc.strftime("%Y-%m-%d %H:%M:%S"), "now()" do
-#    Person.make :created_at => Time.parse('2006-05-02 3:04:09') 
+#    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(created_at)", 'c0', :date, Date.parse('2008-03-13').to_s, "toDate(created_at)" do
-    Person.make :created_at => Time.parse('2008-03-13 3:04:09') 
+    Person.make :created_at => Time.parse('2008-03-13 3:04:09')
   end
-  
+
 #  it_processes_single_select_column "toDate(1234567890000)", 'c0', :date, Date.parse('2009-02-13').to_s, "toDate(1234567890000)"
-  
+
   it_processes_single_select_column "upper(name)", 'c0', :string, 'FOO', "upper(name)" do
     Person.make :name => 'foo'
   end
-  
+
   it_processes_single_select_column "lower(name)", 'c0', :string, 'foo', "lower(name)" do
     Person.make :name => 'FOO'
   end
-  
+
   it_processes_single_select_column "concat(age)", 'c0', :string, '20', "concat(age)", :extensions => true do
     Person.make :age => 20
   end
-  
+
   it_processes_single_select_column "concat(name, 'bar')", 'c0', :string, 'foobar', "concat(name, 'bar')", :extensions => true do
     Person.make :name => 'foo'
   end
-  
+
   it_processes_single_select_column "name label name 'my name'", 'name', :string, 'foo', "my name" do
     Person.make :name => 'foo'
   end
-  
+
   it_processes_single_select_column "1 + 2 label 1 + 2 'my name'", 'c0', :number, 3, "my name"
-  
+
   it_processes_single_select_column "sum(age) label sum(age) 'my name'", 'c0', :number, 2, "my name" do
     Person.make :age => 2
   end
-  
+
   it_processes_single_select_column "1 options no_values", 'c0', :number, nil, "1"
-  
+
   it "processes pivot" do
     Person.make :name => 'Eng', :birthday => '2000-01-12', :age => 1000
-    Person.make :name => 'Eng', :birthday => '2000-01-12', :age => 500 
+    Person.make :name => 'Eng', :birthday => '2000-01-12', :age => 500
     Person.make :name => 'Eng', :birthday => '2000-01-13', :age => 600
     Person.make :name => 'Sales', :birthday => '2000-01-12', :age => 400
     Person.make :name => 'Sales', :birthday => '2000-01-12', :age => 350
     Person.make :name => 'Marketing', :birthday => '2000-01-13', :age => 800
-  
+
     table = exec 'select name, sum(age) group by name pivot birthday order by name'
-    
+
     table.cols.length.should == 3
-    
+
     i = 0
     [['c0', :string, 'name'],
-     ['c1', :number, '2000-01-12 sum(age)'], 
+     ['c1', :number, '2000-01-12 sum(age)'],
      ['c2', :number, '2000-01-13 sum(age)']].each do |id, type, label|
       table.cols[i].id.should == id
       table.cols[i].type.should == type
       table.cols[i].label.should == label
       i += 1
     end
-    
+
     table.rows.length.should == 3
-    
+
     i = 0
     [['Eng', 1500, 600],
      ['Marketing', nil, 800],
@@ -321,21 +321,21 @@ describe Executor do
       i += 1
     end
   end
-  
+
   it "processes pivot2" do
     Person.make :name => 'Eng', :birthday => '2000-01-12', :age => 1000
-    Person.make :name => 'Eng', :birthday => '2000-01-12', :age => 500 
+    Person.make :name => 'Eng', :birthday => '2000-01-12', :age => 500
     Person.make :name => 'Eng', :birthday => '2000-01-13', :age => 600
     Person.make :name => 'Sales', :birthday => '2000-01-12', :age => 400
     Person.make :name => 'Sales', :birthday => '2000-01-12', :age => 350
     Person.make :name => 'Marketing', :birthday => '2000-01-13', :age => 800
-  
+
     table = exec 'select sum(age), name group by name pivot birthday order by name'
-    
+
     table.cols.length.should == 3
-    
+
     i = 0
-    [['c0', :number, '2000-01-12 sum(age)'], 
+    [['c0', :number, '2000-01-12 sum(age)'],
      ['c1', :number, '2000-01-13 sum(age)'],
      ['c2', :string, 'name']].each do |id, type, label|
       table.cols[i].id.should == id
@@ -343,9 +343,9 @@ describe Executor do
       table.cols[i].label.should == label
       i += 1
     end
-    
+
     table.rows.length.should == 3
-    
+
     i = 0
     [[1500, 600, 'Eng'],
      [nil, 800, 'Marketing'],
@@ -357,15 +357,15 @@ describe Executor do
       i += 1
     end
   end
-  
+
   it "processes pivot3" do
     Person.make :name => 'Eng', :birthday => '2000-01-12', :age => 10
     Person.make :name => 'Eng', :birthday => '2001-02-12', :age => 10
-  
+
     table = exec 'select name, sum(age) group by name pivot year(birthday), month(birthday)'
-    
+
     table.cols.length.should == 3
-    
+
     i = 0
     [['Eng', 10, 10]].each do |values|
       table.rows[i].c.length.should == 3
@@ -375,15 +375,15 @@ describe Executor do
       i += 1
     end
   end
-  
+
   it "processes pivot4" do
     Person.make :name => 'Eng', :birthday => '2000-01-12', :age => 10
     Person.make :name => 'Sales', :birthday => '2001-02-12', :age => 20
-  
+
     table = exec 'select birthday, month(birthday), sum(age) group by month(birthday) pivot name order by name'
-    
+
     table.cols.length.should == 5
-    
+
     i = 0
     [
       ['2000-01-12', nil, 1, 10, nil],
@@ -396,17 +396,51 @@ describe Executor do
       i += 1
     end
   end
-  
+
+  it "processes pivot without group by" do
+    Person.make :name => 'Eng', :birthday => '2000-01-12', :age => 1000
+    Person.make :name => 'Eng', :birthday => '2000-01-12', :age => 500
+    Person.make :name => 'Eng', :birthday => '2000-01-13', :age => 600
+    Person.make :name => 'Sales', :birthday => '2000-01-12', :age => 400
+    Person.make :name => 'Sales', :birthday => '2000-01-12', :age => 350
+    Person.make :name => 'Marketing', :birthday => '2000-01-13', :age => 800
+
+    table = exec 'select sum(age) pivot name order by name'
+
+    table.cols.length.should == 3
+
+    i = 0
+    [['c0', :number, 'Eng sum(age)'],
+     ['c1', :number, 'Marketing sum(age)'],
+     ['c2', :number, 'Sales sum(age)']].each do |id, type, label|
+      table.cols[i].id.should == id
+      table.cols[i].type.should == type
+      table.cols[i].label.should == label
+      i += 1
+    end
+
+    table.rows.length.should == 1
+
+    i = 0
+    [[2100, 800, 750]].each do |values|
+      table.rows[i].c.length.should == 3
+      values.each_with_index do |v, j|
+        table.rows[i].c[j].v.should == v
+      end
+      i += 1
+    end
+  end
+
   it "processes pivot with no results" do
     Person.make :name => 'Eng', :birthday => '2000-01-12', :age => 10
     Person.make :name => 'Sales', :birthday => '2001-02-12', :age => 20
-  
+
     table = exec 'select birthday, sum(age) where 1 = 2 group by month(birthday) pivot name order by name'
-    
+
     table.cols.length.should == 2
-    
+
     i = 0
-    [['birthday', :date, 'birthday'], 
+    [['birthday', :date, 'birthday'],
      ['c1', :number, 'sum(age)']].each do |id, type, label|
       table.cols[i].id.should == id
       table.cols[i].type.should == type
@@ -414,15 +448,15 @@ describe Executor do
       i += 1
     end
   end
-  
+
   it "processes pivot with group by not in select" do
     Person.make :name => 'Eng', :birthday => '2000-01-12', :age => 10
     Person.make :name => 'Sales', :birthday => '2001-02-12', :age => 20
-  
+
     table = exec 'select birthday, sum(age) group by month(birthday) pivot name order by name'
-    
+
     table.cols.length.should == 4
-    
+
     i = 0
     [
       ['2000-01-12', nil, 10, nil],
@@ -435,5 +469,5 @@ describe Executor do
       i += 1
     end
   end
-  
+
 end

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
-require 'spec'
 require 'logger'
 
 require 'active_record'
@@ -40,10 +39,11 @@ require File.dirname(__FILE__) + '/models/country'
 
 require File.dirname(__FILE__) + '/blueprints'
 
-require 'rgviz'
-require 'rgviz_rails'
+require File.dirname(__FILE__) + '/../../rgviz/lib/rgviz'
+#require 'rgviz'
+require 'rgviz_rails/executor'
 
 RAILS_ENV = 'test'
 
 # Add this directory so the ActiveSupport autoloading works
-ActiveSupport::Dependencies.load_paths << File.dirname(__FILE__)
+#ActiveSupport::Dependencies.load_paths << File.dirname(__FILE__)

metadata

@@ -1,27 +1,36 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz-rails
 version: !ruby/object:Gem::Version 
-  version: "0.46"
+  hash: 85
+  prerelease: 
+  segments: 
+  - 0
+  - 47
+  version: "0.47"
 platform: ruby
 authors: 
-  - Ary Borenszweig
+- Ary Borenszweig
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-12-30 00:00:00 -02:00
+date: 2011-07-07 00:00:00 -03:00
 default_executable: 
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: rgviz
-    type: :runtime
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-      version: 
+- !ruby/object:Gem::Dependency 
+  name: rgviz
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: aborenszweig@manas.com.ar
 executables: []
@@ -29,26 +38,26 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-  - README.rdoc
+- README.rdoc
 files: 
-  - lib/rgviz_rails.rb
-  - lib/rgviz_rails/executor.rb
-  - lib/rgviz_rails/js_renderer.rb
-  - lib/rgviz_rails/tqx.rb
-  - lib/rgviz_rails/view_helper.rb
-  - lib/rgviz_rails/adapters/mysql_adapter.rb
-  - lib/rgviz_rails/adapters/postgresql_adapter.rb
-  - lib/rgviz_rails/adapters/sqlite_adapter.rb
-  - lib/rgviz_rails/init.rb
-  - rails/init.rb
-  - spec/blueprints.rb
-  - spec/spec.opts
-  - spec/spec_helper.rb
-  - spec/models/city.rb
-  - spec/models/country.rb
-  - spec/models/person.rb
-  - spec/rgviz/executor_spec.rb
-  - README.rdoc
+- lib/rgviz_rails.rb
+- lib/rgviz_rails/executor.rb
+- lib/rgviz_rails/js_renderer.rb
+- lib/rgviz_rails/tqx.rb
+- lib/rgviz_rails/view_helper.rb
+- lib/rgviz_rails/adapters/mysql_adapter.rb
+- lib/rgviz_rails/adapters/postgresql_adapter.rb
+- lib/rgviz_rails/adapters/sqlite_adapter.rb
+- lib/rgviz_rails/init.rb
+- rails/init.rb
+- spec/blueprints.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/models/city.rb
+- spec/models/country.rb
+- spec/models/person.rb
+- spec/rgviz/executor_spec.rb
+- README.rdoc
 has_rdoc: true
 homepage: http://code.google.com/p/rgviz-rails
 licenses: []
@@ -57,23 +66,29 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  version: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  version: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: rgviz for rails