kuji-cube 1.5.7 → 1.5.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kuji-cube (1.5.5)
+    kuji-cube (1.5.7)
       httpi (= 0.9.7)
       savon (= 0.9.7)
       wasabi (= 2.0.0)
@@ -27,7 +27,6 @@ GEM
     linecache19 (0.5.13)
       ruby_core_source (>= 0.1.4)
     nokogiri (1.5.5)
-    nokogiri (1.5.5-java)
     nori (1.1.0)
     rack (1.4.1)
     rbx-require-relative (0.0.9)

data/lib/cube/cube.rb

@@ -23,10 +23,10 @@ module XMLA
     end
 
     def Cube.execute_scalar(query, catalog = XMLA.catalog)
-      BigDecimal.new Cube.new(query, catalog).as_table[0]
+      BigDecimal.new Cube.new(query, catalog).as_table[0][:value]
     end
 
-    def as_table 
+    def as_table
       return [table] if y_size == 0
       clean_table(table, y_size).reduce([]) { |result, row| result << row.flatten }
     end
@@ -37,12 +37,13 @@ module XMLA
         result << tuple(axe).reduce([]) { |y, member|
           data = (member[0] == :member) ? member[1] : member[:member]
           if ( data.class == Hash || data.size == 1 )
-            # y << [data[:caption].strip].flatten 
+            # y << [data[:caption].strip].flatten
             y << [data].flatten
+            # y << [Hash[*data.map{|d| [d.first,d.last.to_s]}.flatten]].flatten
           else
             y << data.select { |item_data| item_data.class == Hash }.reduce([]) do |z,item_data|
-              z << item_data
-              # z << item_data[:caption].strip 
+              z << [item_data].flatten
+              # z << item_data[:caption].strip
             end
           end
         }
@@ -57,7 +58,7 @@ 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] })
+          result << ( y_axe[j] + (0...x_size).map { |i| cell_data[i + j + ((x_size - 1) * j)] })
         end
       end
     end
@@ -70,6 +71,7 @@ module XMLA
     def initialize(query, catalog)
       @query = query
       @catalog = catalog
+      # @response.http.raw_body
       @response = get_response
       self
     end
@@ -92,9 +94,9 @@ module XMLA
       table.reduce([]) { |result, row|
         result <<  row.each_with_index.map do |item,i|
           if i == number_of_colums
-            item 
+            item
           else
-            item == above_row[i] ? '' : item 
+            item == above_row[i] ? '' : item
           end
         end
         above_row = row
@@ -104,16 +106,15 @@ module XMLA
 
     def cell_data
       cell_data = @response.to_hash[:execute_response][:return][:root][:cell_data]
-      return [""] if cell_data.nil? 
-      @data ||= cell_data.reduce([]) do |data, cell|
-        cell[1].reduce(data) do |data, value|
-          # data << (value.class == Hash ? (value[:fmt_value] || value[:value]) : value[1] )
-          data << (value.class == Hash ? value : {:value => value[1]} )
+      return {} if cell_data.nil?
+      @data ||= [(cell_data[:cell])].flatten.reduce({}) do |data,cell|
+        data.tap do|data|
+          data[cell.delete(:@cell_ordinal).to_i] = cell.class == Hash ? cell : {:value => cell[1]} rescue debugger
         end
       end
     end
 
-    def tuple axe 
+    def tuple axe
       axe[:tuples].nil? ? [] : axe[:tuples][:tuple]
     end
 
@@ -121,15 +122,15 @@ module XMLA
       @response.to_hash[:execute_response][:return][:root][:axes][:axis]
     end
 
-    def x_axe 
-      @x_axe ||= axes[0] 
+    def x_axe
+      @x_axe ||= axes[0]
     end
 
     def y_axe
       @y_axe ||= axes[1]
     end
 
-    def y_size 
+    def y_size
       (y_axe.nil? || y_axe[0].nil?) ? 0 : y_axe[0].size
     end
 
@@ -140,14 +141,14 @@ module XMLA
     def Cube.request_body(query, catalog)
       <<-REQUEST
       <Command>
-      <Statement> <![CDATA[ #{query} ]]> </Statement> 
+      <Statement> <![CDATA[ #{query} ]]> </Statement>
         </Command>
         <Properties>
-        <PropertyList> 
+        <PropertyList>
         <Catalog>#{catalog}</Catalog>
-        <Format>Multidimensional</Format> 
+        <Format>Multidimensional</Format>
         <AxisFormat>TupleFormat</AxisFormat>
-        </PropertyList> 
+        </PropertyList>
         </Properties>
         REQUEST
     end

data/lib/cube/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuji-cube
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8
   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: &70299165166140 !ruby/object:Gem::Requirement
+  requirement: &70357147224700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -22,10 +22,10 @@ dependencies:
         version: 0.9.7
   type: :runtime
   prerelease: false
-  version_requirements: *70299165166140
+  version_requirements: *70357147224700
 - !ruby/object:Gem::Dependency
   name: wasabi
-  requirement: &70299165165520 !ruby/object:Gem::Requirement
+  requirement: &70357147224080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -33,10 +33,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70299165165520
+  version_requirements: *70357147224080
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &70299165164860 !ruby/object:Gem::Requirement
+  requirement: &70357147223420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -44,7 +44,7 @@ dependencies:
         version: 0.9.7
   type: :runtime
   prerelease: false
-  version_requirements: *70299165164860
+  version_requirements: *70357147223420
 description: Eases the pain I had to go through to get to the data out of XMLA based
   OLAP provider(Mondiran, Pentaho, icCube)
 email: