mondrian-rest 0.7.6-java → 0.7.7-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c13350ac3161dc2031518bc8a859f51d0bcff0165677b5a6c9017ab3a9d275c9
-  data.tar.gz: e008ffd131647f8b9ae31573904d2dae12054cd7b329cfa56db03017da8c9736
+  metadata.gz: 24a3d3f8c5d0384eb3fdea6de63ddc4e14eec9ba9154792538271e278accb967
+  data.tar.gz: 4c022c15f4f841119e29729258600791fa6999e7134bf4488d97fbd146c2a66f
 SHA512:
-  metadata.gz: 6ae80147fddcfdd6dc9df363708b913858c382e7efcf8f261e9671559625bd0d00200574a5dad0ed01d115935a9c6aa1977502cc6364a0e79173aaedea019b5f
-  data.tar.gz: d58de20609080395e1a7773a0b203d78c5f1d77b6c4d073111a9c89cfa697ac9cc7f81263cbe1c558e711807cd1ac3bae0e32e76a17c45e1c6c7fc0c91efb32d
+  metadata.gz: 366ce7c3500be274b4348b200c84d9fa0c7461475bd5121f563b6875fc7641ae5f5765f6edfb7022067979d10f9d66e3333d0f428135a05591e1611f136431d9
+  data.tar.gz: 6e669fe42ef9e7e3bf44c0b5ae547e1d350ee3c5226dfb439eb833373cc171ed6372a0bd9731a6794b6492f6d14d2886d896ad3f4b4033901705fe3100e78693

data/lib/mondrian_rest/api.rb

@@ -1,3 +1,4 @@
+require 'java'
 require 'uri'
 
 require_relative './api_helpers.rb'
@@ -139,6 +140,7 @@ module Mondrian::REST
             optional :cut, type: Array, desc: "Specification of slicer axis"
             optional :drilldown, type: Array, desc: "Dimension(s) to be drilled down"
             optional :nonempty, type: Boolean, desc: "Only return non empty cells"
+            optional :sparse, type: Boolean, desc: "Skip rows where all measures are null (only applies to CSV, XLS and JSONRECORDS)", default: !java.lang.System.getProperty('mondrian-rest.sparseDefault').nil?
             optional :distinct, type: Boolean, desc: "Apply DISTINCT() to every axis"
             optional :parents, type: Boolean, desc: "Include members' ancestors"
             optional :debug, type: Boolean, desc: "Include generated MDX", default: false
@@ -166,7 +168,7 @@ module Mondrian::REST
             get do
               cube = get_cube_or_404(params[:cube_name])
               dimension = cube.dimension(params[:dimension_name])
-              dimension.to_h
+              dimension.to_h(get_members: true)
             end
 
             resource :levels do

data/lib/mondrian_rest/api_formatters.rb

@@ -16,6 +16,7 @@ module Mondrian::REST::Formatters
 
     add_parents = options[:add_parents]
     properties = options[:properties]
+    sparse = options[:sparse]
     rs = result.to_h(add_parents, options[:debug])
 
     if rs[:values].empty?
@@ -71,6 +72,8 @@ module Mondrian::REST::Formatters
           (cidxs + [mi]).reduce(values) { |_, idx| _[idx] }
         }
 
+        next if sparse && msrs.all?(&:nil?)
+
         if add_parents
           vdim = cm.each.with_index.reduce([]) { |cnames, (member, j)|
             member[:ancestors][0...slices[j] - (level_has_all[j] ? 1 : 0)].reverse.each { |ancestor|

data/lib/mondrian_rest/formatters/aggregation_json.rb

@@ -1,8 +1,9 @@
 module Mondrian::REST::Formatters
   module AggregationJSON
     def self.call(result, env)
-      add_parents = env['rack.request.query_hash']['parents'] == 'true'
-      debug = env['rack.request.query_hash']['debug'] == 'true'
+      params = env['api.endpoint'].params
+      add_parents = params['parents']
+      debug = params['debug']
 
       result.to_h(add_parents, debug).to_json
     end

data/lib/mondrian_rest/formatters/csv.rb

@@ -3,15 +3,17 @@ require 'csv'
 module Mondrian::REST::Formatters
   module CSV
     def self.call(result, env)
-      qh = env['rack.request.query_hash']
-      add_parents = qh['parents'] == 'true'
-      debug = qh['debug'] == 'true'
-      properties = qh['properties'] || []
+      params = env['api.endpoint'].params
+      add_parents = params['parents']
+      debug = params['debug']
+      sparse = params['sparse']
+      properties = params['properties'] || []
 
       rows = Mondrian::REST::Formatters.tidy(result,
                                              add_parents: add_parents,
                                              debug: debug,
-                                             properties: properties)
+                                             properties: properties,
+                                             sparse: sparse)
 
       ::CSV.generate do |csv|
         rows.each { |row| csv << row }

data/lib/mondrian_rest/formatters/excel.rb

@@ -3,10 +3,11 @@ require 'writeexcel'
 module Mondrian::REST::Formatters
   module XLS
     def self.call(result, env)
-      qh = env['rack.request.query_hash']
-      add_parents = qh['parents'] == 'true'
-      debug = qh['debug'] == 'true'
-      properties = qh['properties'] || []
+      params = env['api.endpoint'].params
+      add_parents = params['parents']
+      debug = params['debug']
+      sparse = params['sparse']
+      properties = params['properties'] || []
 
       out = StringIO.new
       book = WriteExcel.new(out)
@@ -16,6 +17,7 @@ module Mondrian::REST::Formatters
         .tidy(result,
               add_parents: add_parents,
               debug: debug,
+              sparse: sparse,
               properties: properties)
         .each_with_index do |row, i|
         row.each_with_index { |cell, j|

data/lib/mondrian_rest/formatters/jsonrecords.rb

@@ -1,16 +1,20 @@
 module Mondrian::REST::Formatters
   module JSONRecords
     def self.call(result, env)
+      params = env['api.endpoint'].params
+      add_parents = params['parents']
+      debug = params['debug']
+      sparse = params['sparse']
+      properties = params['properties'] || []
+
       qh = env['rack.request.query_hash']
-      add_parents = qh['parents'] == 'true'
-      debug = qh['debug'] == 'true'
-      properties = qh['properties'] || []
       format = qh['format'] == 'array' ? 'array' : 'object'
 
       rows = Mondrian::REST::Formatters.tidy(result,
                                              add_parents: add_parents,
                                              debug: debug,
-                                             properties: properties).lazy
+                                             properties: properties,
+                                             sparse: sparse).lazy
       keys = rows.first
 
       if format == 'array'

data/lib/mondrian_rest/mondrian_ext.rb

@@ -10,28 +10,6 @@ module Mondrian
       end
 
       def to_h
-        # gather dimensions
-        dimensions = self.dimensions
-                       .find_all { |d| d.dimension_type != :measures }
-                       .map do |d|
-          {
-            :name => d.name,
-            :caption => d.caption,
-            :type => d.dimension_type,
-            :annotations => d.annotations,
-            :hierarchies => d.hierarchies.map { |h|
-              {
-                :name => h.name,
-                :has_all => h.has_all?,
-                :all_member_name => h.all_member_name,
-                :levels => h.levels.map { |l|
-                  l.to_h(get_members: false)
-                }
-              }
-            }
-          }
-        end
-
         # gather named sets
         named_sets = self.named_sets
                        .map do |ns|
@@ -58,7 +36,9 @@ module Mondrian
         return {
           :name => self.name,
           :annotations => self.annotations,
-          :dimensions => dimensions,
+          :dimensions => self.dimensions
+                           .find_all { |d| d.dimension_type != :measures }
+                           .map { |d| d.to_h(get_members: false) },
           :named_sets => named_sets,
           :measures => self.dimensions
                       .find(&:measures?)
@@ -81,14 +61,20 @@ module Mondrian
     end
 
     class Dimension
-      def to_h
+      def to_h(options={})
+        get_members = options[:get_members]
         {
+          name: self.name,
+          caption: self.caption,
+          type: self.dimension_type,
+          annotations: self.annotations,
           hierarchies: self.hierarchies.map { |h|
             {
               name: h.name,
               has_all: h.has_all?,
-              levels: h.levels.map { |l| 
-                l.to_h(get_members: true)
+              all_member_name: h.all_member_name,
+              levels: h.levels.map { |l|
+                l.to_h(get_members: get_members)
               } #/levels
             } # /hierarchies
           } #/map

data/lib/mondrian_rest/version.rb

@@ -1,5 +1,5 @@
 module Mondrian
   module REST
-    VERSION = "0.7.6"
+    VERSION = "0.7.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mondrian-rest
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: java
 authors:
 - Manuel Aristarán
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-19 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement