rgviz-rails 0.9 → 0.10

data/lib/rgviz_rails/executor.rb

@@ -7,6 +7,7 @@ module Rgviz
       @model_class = model_class
       @query = query
       @joins = {}
+      @labels = {}
       case ActiveRecord::Base.connection.adapter_name.downcase
       when 'sqlite'
         @adapter = SqliteAdapter.new
@@ -19,6 +20,8 @@ module Rgviz
       @table = Table.new
       @extra_conditions = options[:conditions]
       
+      process_labels
+      
       generate_columns
       generate_conditions
       generate_group
@@ -28,6 +31,14 @@ module Rgviz
       @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 add_joins(joins)
       map = @joins
       joins.each do |join|
@@ -45,7 +56,7 @@ module Rgviz
         # Select the specified columns
         i = 0
         @query.select.columns.each do |col|
-          @table.cols << (Column.new :id => column_id(col, i), :type => column_type(col))
+          @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
         end
@@ -53,7 +64,7 @@ module Rgviz
         # Select all columns
         i = 0
         @model_class.send(:columns).each do |col|
-          @table.cols << (Column.new :id => col.name, :type => (rails_column_type col))
+          @table.cols << (Column.new :id => col.name, :type => (rails_column_type col), :label => column_label(col.name))
           @selects << "(#{col.name}) as c#{i}"
           i += 1
         end
@@ -167,6 +178,10 @@ module Rgviz
       end
     end
     
+    def column_label(string)
+      @labels[string] || string
+    end
+    
     def to_string(node, visitor_class)
       visitor = visitor_class.new self
       node.accept visitor

data/spec/rgviz/executor_spec.rb

@@ -25,7 +25,7 @@ describe Executor do
     date.strftime "%Y-%m-%d"
   end
   
-  def self.it_processes_single_select_column(query, id, type, value)
+  def self.it_processes_single_select_column(query, id, type, value, label)
     it "processes select #{query}" do
       if block_given?
         yield
@@ -38,6 +38,7 @@ describe Executor do
       
       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
@@ -58,6 +59,7 @@ describe Executor do
       ['city_id', :number]].each do |id, type|
       table.cols[i].id.should == id
       table.cols[i].type.should == type
+      table.cols[i].label.should == id
       i += 1
     end
     
@@ -72,61 +74,61 @@ describe Executor do
     end
   end
 
-  it_processes_single_select_column 'name', 'name', :string, 'foo' 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
-  it_processes_single_select_column '1.2', 'c0', :number, 1.2
-  it_processes_single_select_column '"hello"', 'c0', :string, 'hello'
-  it_processes_single_select_column 'false', 'c0', :boolean, false
-  it_processes_single_select_column 'true', 'c0', :boolean, true
-  it_processes_single_select_column 'date "2010-01-02"', 'c0', :date, '2010-01-02'
-  it_processes_single_select_column 'datetime "2010-01-02 10:11:12"', 'c0', :datetime, '2010-01-02 10:11:12'
-  it_processes_single_select_column 'timeofday "10:11:12"', 'c0', :timeofday, '10:11:12'
-  
-  it_processes_single_select_column '1 + 2', 'c0', :number, 3
-  it_processes_single_select_column '3 - 2', 'c0', :number, 1
-  it_processes_single_select_column '2 * 3', 'c0', :number, 6
-  it_processes_single_select_column '6 / 3', 'c0', :number, 2
-  it_processes_single_select_column '3 * age', 'c0', :number, 60 do
+  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 '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'
+  it_processes_single_select_column '6 / 3', 'c0', :number, 2, '6 / 3'
+  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 do
+  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 do
+  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 do
+  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 do
+  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 do
+  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 do
+  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 do
+  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' do
+  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 'name where age is not null', 'name', :string, 'a' do
+  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
@@ -162,23 +164,23 @@ describe Executor do
     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 do
+  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 do
+  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' do
+  it_processes_single_select_column 'city_name', 'city_name', :string, 'Buenos Aires', 'city_name' do
     Person.make :city => City.make(:name => 'Buenos Aires') 
   end
   
-  it_processes_single_select_column 'city_country_name', 'city_country_name', :string, 'Argentina' do
+  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')) 
   end
   
-  it_processes_single_select_column 'city_country_name group by city_country_name', 'city_country_name', :string, 'Argentina' do
+  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')) 
   end
   
@@ -232,38 +234,46 @@ describe Executor do
   
   [['year', 2006], ['month', 5], ['day', 2], 
    ['hour', 3], ['minute', 4], ['second', 9],
-   ['quarter', 2], ['dayOfWeek', 3]].each do |str, val|
-    it_processes_single_select_column "#{str}(created_at)", 'c0', :number, val do
+   ['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') 
     end
   end
   
-  it_processes_single_select_column "dateDiff(date '2008-03-13', date '2008-03-10')", 'c0', :number, 3 do
-    Person.make
-  end
+#  it_processes_single_select_column "quarter(created_at)", 'c0', :number, 5 do
+#    Person.make :created_at => Time.parse('2006-05-02 3:04:09') 
+#  end
   
-  it_processes_single_select_column "now()", 'c0', :datetime, Time.now.utc.strftime("%Y-%m-%d %H:%M:%S") do
-    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') 
+#  end
 
-  it_processes_single_select_column "toDate('2008-03-13')", 'c0', :date, Date.parse('2008-03-13').to_s do
-    Person.make
-  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 do
+  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') 
   end
   
-  it_processes_single_select_column "toDate(1234567890000)", 'c0', :date, Date.parse('2009-02-13').to_s do
-    Person.make
-  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' do
+  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' do
+  it_processes_single_select_column "lower(name)", 'c0', :string, 'foo', "lower(name)" 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
+  
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz-rails
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
-  - 9
-  version: "0.9"
+  - 10
+  version: "0.10"
 platform: ruby
 authors: 
 - Ary Borenszweig