rgviz-rails 0.49 → 0.50

data/lib/rgviz_rails/executor.rb

@@ -8,6 +8,7 @@ module Rgviz
       @selects = []
       @joins = {}
       @labels = {}
+      @formats = {}
       @pivots = {}
       @group_bys = {}
       @original_columns = []
@@ -33,6 +34,7 @@ module Rgviz
 
       process_pivot
       process_labels
+      process_formats
 
       generate_columns
       generate_conditions
@@ -52,6 +54,14 @@ module Rgviz
       end
     end
 
+    def process_formats
+      return unless @query.formats.present?
+
+      @query.formats.each do |format|
+        @formats[format.column.to_s] = format.pattern
+      end
+    end
+
     def process_pivot
       if @query.pivot
         @query.pivot.columns.each do |column|
@@ -182,6 +192,10 @@ module Rgviz
           @table.cols.each do |col|
             hash = {}
             hash[:v] = column_value(col, result.send("c#{i}")) unless @query.options && @query.options.no_values
+
+            format = @formats[@original_columns[i]]
+            hash[:f] = format_value(col, format, hash[:v]) if format
+
             row.c << Cell.new(hash)
             i += 1
           end
@@ -261,6 +275,10 @@ module Rgviz
             if @group_bys.include?(original_column)
               hash = {}
               hash[:v] = key[group_i] unless @query.options && @query.options.no_values
+
+              format = @formats[original_column]
+              hash[:f] = format_value(@table.cols[i], format, hash[:v]) if format
+
               row.c << (Cell.new hash)
               group_i += 1
             elsif !@pivots.include?(original_column)
@@ -270,6 +288,10 @@ module Rgviz
 
                 hash = {}
                 hash[:v] = v unless @query.options && @query.options.no_values
+
+                format = @formats[original_column]
+                hash[:f] = format_value(@table.cols[i], format, hash[:v]) if format
+
                 row.c << (Cell.new hash)
               end
               value_i += 1
@@ -370,6 +392,17 @@ module Rgviz
       @labels[string] || string
     end
 
+    def format_value(col, format, value)
+      return nil if value.nil?
+
+      case col.type
+      when :boolean, :number, :string
+        format % value
+      when :date, :datetime, :timeofday
+        value.strftime(format)
+      end
+    end
+
     def to_string(node, visitor_class)
       visitor = visitor_class.new self
       node.accept visitor

data/spec/rgviz/executor_spec.rb

@@ -21,7 +21,7 @@ describe Executor do
     date.strftime "new Date(%Y, %m, %d)"
   end
 
-  def self.it_processes_single_select_column(query, id, type, value, label, options = {}, test_options = {})
+  def self.it_processes_single_select_column(query, id, type, value, label, format = nil, options = {}, test_options = {})
     it "processes select #{query}", test_options do
       if block_given?
         yield
@@ -40,6 +40,7 @@ describe Executor do
       table.rows[0].c.length.should == 1
 
       table.rows[0].c[0].v.should == value
+      table.rows[0].c[0].f.should == format
     end
   end
 
@@ -266,11 +267,11 @@ describe Executor do
     Person.make :name => 'FOO'
   end
 
-  it_processes_single_select_column "concat(age)", 'c0', :string, '20', "concat(age)", :extensions => true do
+  it_processes_single_select_column "concat(age)", 'c0', :string, '20', "concat(age)", nil, :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
+  it_processes_single_select_column "concat(name, 'bar')", 'c0', :string, 'foobar', "concat(name, 'bar')", nil, :extensions => true do
     Person.make :name => 'foo'
   end
 
@@ -470,4 +471,47 @@ describe Executor do
     end
   end
 
+  # Formatting
+  it_processes_single_select_column 'false format false "%s is falsey"', 'c0', :boolean, false, 'false', 'false is falsey'
+  it_processes_single_select_column '1 format 1 "%.2f"', 'c0', :number, 1, '1', '1.00'
+  it_processes_single_select_column '1.2 format 1.2 "%.2f"', 'c0', :number, 1.2, '1.2', '1.20'
+  it_processes_single_select_column '"hello" format "hello" "%s world"', 'c0', :string, "hello", "'hello'", 'hello world'
+  it_processes_single_select_column 'date "2001-01-02" format date "2001-01-02" "%Y"', 'c0', :date, Time.parse('2001-01-02').to_date, "date '2001-01-02'", '2001'
+
+  it "processes pivot with format" 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 name, sum(age) group by name pivot birthday order by name format name "x %s", sum(age) "%.2f"'
+
+    table.cols.length.should == 3
+
+    i = 0
+    [['c0', :string, 'name'],
+     ['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', 'x Eng'], [1500, '1500.00'], [600, '600.00']],
+     [['Marketing', 'x Marketing'], [nil, nil], [800, '800.00']],
+     [['Sales', 'x Sales'], [750, '750.00'], [nil, nil]]].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[0]
+        table.rows[i].c[j].f.should == v[1]
+      end
+      i += 1
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgviz-rails
 version: !ruby/object:Gem::Version
-  version: '0.49'
+  version: '0.50'
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgviz
-  requirement: &70297488435440 !ruby/object:Gem::Requirement
+  requirement: &70152760172220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297488435440
+  version_requirements: *70152760172220
 description: 
 email: aborenszweig@manas.com.ar
 executables: []