rgviz-rails 0.17 → 0.18

data/lib/rgviz_rails/executor.rb

@@ -26,7 +26,6 @@ module Rgviz
       
       process_pivot
       process_labels
-      process_options
       
       generate_columns
       generate_conditions
@@ -46,19 +45,6 @@ module Rgviz
       end
     end
     
-    def process_options
-      return unless @query.options.present?
-      
-      @query.options.each do |option|
-        case option.option
-        when Option::NoValues
-          @no_values = true
-        when Option::NoFormat
-          @no_format = true
-        end
-      end
-    end
-    
     def process_pivot
       if @query.pivot
         @query.pivot.columns.each do |column|
@@ -172,7 +158,7 @@ module Rgviz
           i = 0
           @table.cols.each do |col|
             hash = {}
-            hash[:v] = column_value(col, result.send("c#{i}")) unless @no_values
+            hash[:v] = column_value(col, result.send("c#{i}")) unless @query.options && @query.options.no_values
             row.c << Cell.new(hash)
             i += 1 
           end
@@ -250,11 +236,15 @@ module Rgviz
           group_i = 0
           @original_columns.each_with_index do |original_column, i|
             if @group_bys.include?(original_column)
-              row.c << (Cell.new :v => key[group_i])
+              hash = {}
+              hash[:v] = key[group_i] unless @query.options && @query.options.no_values
+              row.c << (Cell.new hash)
               group_i += 1
             elsif !@pivots.include?(original_column)
               uniq_pivots.each do |uniq_pivot|
-                row.c << (Cell.new :v => value[uniq_pivot])
+                hash = {}
+                hash[:v] = value[uniq_pivot] unless @query.options && @query.options.no_values
+                row.c << (Cell.new hash)
               end
             end
           end

metadata

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