rgviz-rails 0.16 → 0.17

data/lib/rgviz_rails/executor.rb

@@ -205,18 +205,17 @@ module Rgviz
               grouped_by << val
             elsif @pivots.include?(@original_columns[i])
               pivots << val
-              uniq_pivots << val unless uniq_pivots.include? val
             else
               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]
-          pivots.each do |pivot|
-            selections.each do |selection|
-              fin[grouped_by][pivot] = selection
-            end
+          selections.each do |selection|
+            fin[grouped_by][pivots] = selection
           end
         end
         
@@ -235,7 +234,7 @@ module Rgviz
             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} #{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

data/spec/rgviz/executor_spec.rb

@@ -350,4 +350,22 @@ describe Executor do
     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
+      values.each_with_index do |v, j|
+        table.rows[i].c[j].v.should == v
+      end
+      i += 1
+    end
+  end
+  
 end

data/spec/spec_helper.rb

@@ -6,8 +6,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 => 'Manas.03')
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+#ActiveRecord::Base.establish_connection(:adapter => 'mysql', :database => 'rgviz_rails', :username => 'root', :password => 'Manas.03')
 
 ActiveRecord::Schema.define do
   create_table "cities", :force => true do |t|

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz-rails
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: false
   segments: 
   - 0
-  - 16
-  version: "0.16"
+  - 17
+  version: "0.17"
 platform: ruby
 authors: 
 - Ary Borenszweig