kuji-cube 1.5.8 → 1.5.9

data/lib/cube/cube.rb

@@ -28,7 +28,11 @@ module XMLA
 
     def as_table
       return [table] if y_size == 0
-      clean_table(table, y_size).reduce([]) { |result, row| result << row.flatten }
+      clean_table(table).reduce([]) { |result, row|
+        flat_row = row.flatten
+        result << flat_row unless flat_row.all?(&:blank?)
+        result
+      }
     end
 
     def axes
@@ -58,7 +62,9 @@ module XMLA
         cell_data[0]
       else
         (0...y_axe.size).reduce(header) do |result, j|
-          result << ( y_axe[j] + (0...x_size).map { |i| cell_data[i + j + ((x_size - 1) * j)] })
+          values = (0...x_size).map { |i| cell_data[i + j + ((x_size - 1) * j)] }
+          result << ( y_axe[j] + values) if values.any?{|d| !d.blank? && !d[:value].blank? } && y_axe[j].any?{|d| !d.blank? }
+          result
         end
       end
     end
@@ -71,8 +77,8 @@ module XMLA
     def initialize(query, catalog)
       @query = query
       @catalog = catalog
-      # @response.http.raw_body
       @response = get_response
+      # puts @response.http.raw_body
       self
     end
 
@@ -88,20 +94,10 @@ module XMLA
     end
 
     #cleanup table so items don't repeat (if they are same)
-    def clean_table(table, number_of_colums)
-      above_row = []
-      #filter if they are not last column, and they are same as the item on the row above
-      table.reduce([]) { |result, row|
-        result <<  row.each_with_index.map do |item,i|
-          if i == number_of_colums
-            item
-          else
-            item == above_row[i] ? '' : item
-          end
-        end
-        above_row = row
-        result
-      }
+    def clean_table(table)
+      table.uniq_by do |row|
+        row.map(&:hash).join
+      end
     end
 
     def cell_data

data/lib/cube/version.rb

@@ -1,3 +1,3 @@
 module Cube
-  VERSION = "1.5.8"
+  VERSION = "1.5.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuji-cube
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpi
-  requirement: &70357147224700 !ruby/object:Gem::Requirement
+  requirement: &70234149259900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -22,10 +22,10 @@ dependencies:
         version: 0.9.7
   type: :runtime
   prerelease: false
-  version_requirements: *70357147224700
+  version_requirements: *70234149259900
 - !ruby/object:Gem::Dependency
   name: wasabi
-  requirement: &70357147224080 !ruby/object:Gem::Requirement
+  requirement: &70234149259280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -33,10 +33,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70357147224080
+  version_requirements: *70234149259280
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &70357147223420 !ruby/object:Gem::Requirement
+  requirement: &70234149258620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -44,7 +44,7 @@ dependencies:
         version: 0.9.7
   type: :runtime
   prerelease: false
-  version_requirements: *70357147223420
+  version_requirements: *70234149258620
 description: Eases the pain I had to go through to get to the data out of XMLA based
   OLAP provider(Mondiran, Pentaho, icCube)
 email: