mondrian-rest 0.5.0-java → 0.6.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fca6cfddd8cf42e7d87ec8e35f10b8389fdd08ff
-  data.tar.gz: 08b4017a7cdc2eebc4f0b2218b51822396061dd5
+  metadata.gz: 2710889190b4d58cd7592415468caf4b7f5b7b95
+  data.tar.gz: 79bfcad96399941a47c1ba2e553e466209b053af
 SHA512:
-  metadata.gz: 9fba6d67d771da283e085b0d89784baa093b5676b0c737aa89cdc5ef2b4ba1e9f3c9a68574db21b85759733e7f1161ec538e2051820bc641d446a62ac6577fd9
-  data.tar.gz: 44ed30d9adf06ddfbb7fe157a8a2a6d5e1765936b82fbdbc2b24bbc12d2dbf88f23c41285d3c1f745034e82d4228d8b936128de6583c1e7e51b5d17d8fcacc59
+  metadata.gz: 81b615aa3796ac61ddd850dec37bfbcecd75a5565b3de5fad18acea59f212dae2445b2c4434d6d1910e9a5b433045cd46ef6d163b9182b314841b8d285006e1d
+  data.tar.gz: 6bbed693f2ba708a44688b9d85b0980afe343c52d7d9da2f26259e10d554b94b53e4abe88c89d77b2c39be453c6f532cb4dae2bf330e2ba0290f541d9c4beecf

data/Gemfile

@@ -1,5 +1,6 @@
 source 'http://rubygems.org'
-gem 'mondrian-olap', :git => 'https://github.com/rsim/mondrian-olap.git', :branch => 'master'
 gem 'coveralls', require: false
+gem 'ruby-debug'
+gem 'mondrian-olap', :path => '/Users/manuel/Work/code/mondrian-olap', :require => 'mondrian-olap'
 
 gemspec

data/README.md

@@ -10,7 +10,7 @@ See [`mondrian-rest-demo`](https://github.com/jazzido/mondrian-rest-demo) and [`
 
 ## Credits
 
-Initial inspiration for this project came from the [Stefan Urbanek](https://github.com/Stiivi)'s [`cubes`](http://cubes.databrewery.org/) OLAP server. `mondrian-rest` uses [Raimonds Simanovskis](https://github.com/rsim)'s fantastic [`mondrian-olap`](https://github.com/rsim/mondrian-olap) library.
+Initial inspiration for this project came from [Stefan Urbanek](https://github.com/Stiivi)'s [`cubes`](http://cubes.databrewery.org/) OLAP server. `mondrian-rest` uses [Raimonds Simanovskis](https://github.com/rsim)'s fantastic [`mondrian-olap`](https://github.com/rsim/mondrian-olap) library.
 
 
 ## License

data/lib/mondrian_rest/api.rb

@@ -8,7 +8,7 @@ module Mondrian::REST
 
   class Api < Grape::API
     version '1', using: :header, vendor: 'mondrian_rest'
-    format :json
+    default_format :json
 
     helpers Mondrian::REST::APIHelpers
     helpers Mondrian::REST::QueryHelper
@@ -36,7 +36,29 @@ module Mondrian::REST
       end
     end
 
+    resource :flush do
+        params do
+          requires :secret, type: String, desc: "Secret key"
+        end
+        content_type :json, "application/json"
+        desc "Flush the schema cache"
+
+        get do
+          if ENV['MONDRIAN_REST_SECRET'].nil?
+            error!("Please set MONDRIAN_REST_SECRET to use this endpoint", 403)
+          end
+          if params[:secret] != ENV['MONDRIAN_REST_SECRET']
+            error!("Invalid secret key.", 403)
+          end
+          {
+            'status' => olap_flush
+          }
+      end
+    end
+
     resource :cubes do
+      content_type :json, "application/json"
+      default_format :json
       desc "Returns the cubes defined in this server's schema"
       get do
         {
@@ -60,7 +82,7 @@ module Mondrian::REST
             params do
               requires :full_name,
                        type: String,
-                       regexp: /[a-z0-9\.,\-\s%\\[\\]\(\)]+/i
+                       regexp: /[a-z0-9\.,\-\s%\[\]\(\)]+/i
             end
             get do
               member_full_name = URI.decode(params[:full_name])
@@ -81,11 +103,20 @@ module Mondrian::REST
         resource :aggregate do
           content_type :xls, "application/vnd.ms-excel"
           formatter :xls, Mondrian::REST::Formatters::XLS
+
           content_type :csv, "text/csv"
           formatter :csv, Mondrian::REST::Formatters::CSV
+
           content_type :json, "application/json"
           formatter :json, Mondrian::REST::Formatters::AggregationJSON
 
+          content_type :jsonrecords, "application/x-jsonrecords"
+          formatter :jsonrecords, Mondrian::REST::Formatters::JSONRecords
+
+          rescue_from PropertyError do |e|
+            error!({error: e}, 400)
+          end
+
           desc "aggregate from query parameters"
           params do
             optional :measures, type: Array
@@ -96,6 +127,7 @@ module Mondrian::REST
             optional :parents, type: Boolean, desc: "Include members' ancestors"
             optional :debug, type: Boolean, desc: "Include generated MDX", default: false
             optional :properties, type: Array, desc: "Include member properties"
+            optional :caption, type: Array, desc: "Replace caption with property", default: []
           end
           get do
             cube = get_cube_or_404(params[:cube_name])
@@ -105,6 +137,7 @@ module Mondrian::REST
             result = mdx(query.to_mdx)
             result.mdx = mdx_query if params[:debug]
             result.properties = params[:properties]
+            result.caption_properties = params[:caption]
             result.cube = cube
 
             result
@@ -130,7 +163,7 @@ module Mondrian::REST
                 resource :members do
 
                   params do
-                    optional :member_properties, type: Array
+                    optional :member_properties, type: Array, default: []
                   end
 
                   get do

data/lib/mondrian_rest/api_formatters.rb

@@ -16,6 +16,7 @@ module Mondrian::REST::Formatters
     def self.call(result, env)
       add_parents = env['rack.request.query_hash']['parents'] == 'true'
       debug = env['rack.request.query_hash']['debug'] == 'true'
+      properties = env['rack.request.query_hash']['properties'] || []
 
       out = StringIO.new
       book = WriteExcel.new(out)
@@ -24,7 +25,8 @@ module Mondrian::REST::Formatters
       Mondrian::REST::Formatters
         .tidy(result,
               add_parents: add_parents,
-              debug: debug)
+              debug: debug,
+              properties: properties)
         .each_with_index do |row, i|
           row.each_with_index { |cell, j|
             sheet.write(i, j, cell)
@@ -40,10 +42,12 @@ module Mondrian::REST::Formatters
     def self.call(result, env)
       add_parents = env['rack.request.query_hash']['parents'] == 'true'
       debug = env['rack.request.query_hash']['debug'] == 'true'
+      properties = env['rack.request.query_hash']['properties'] || []
 
       rows = Mondrian::REST::Formatters.tidy(result,
                                              add_parents: add_parents,
-                                             debug: debug)
+                                             debug: debug,
+                                             properties: properties)
 
       ::CSV.generate do |csv|
         rows.each { |row| csv << row }
@@ -51,6 +55,28 @@ module Mondrian::REST::Formatters
     end
   end
 
+  module JSONRecords
+    def self.call(result, env)
+      add_parents = env['rack.request.query_hash']['parents'] == 'true'
+      debug = env['rack.request.query_hash']['debug'] == 'true'
+      properties = env['rack.request.query_hash']['properties'] || []
+
+      rows = Mondrian::REST::Formatters.tidy(result,
+                                             add_parents: add_parents,
+                                             debug: debug,
+                                             properties: properties).lazy
+      keys = rows.next
+
+      {
+        data: rows.with_index.with_object([]) { |(row, i), data|
+          next if i == 0
+          data << Hash[keys.zip(row)]
+        }
+      }.to_json
+
+    end
+  end
+
   ##
   # Generate 'tidy data' (http://vita.had.co.nz/papers/tidy-data.pdf)
   # from a result set.
@@ -58,6 +84,7 @@ module Mondrian::REST::Formatters
     cube = result.cube
 
     add_parents = options[:add_parents]
+    properties = options[:properties]
     rs = result.to_h(add_parents, options[:debug])
     measures = rs[:axes].first[:members]
     dimensions = rs[:axis_dimensions][1..-1]
@@ -70,7 +97,7 @@ module Mondrian::REST::Formatters
         if add_parents
           hier = cube.dimension(dd[:name])
                    .hierarchies
-                   .first
+                   .first # TODO: Support other hierarchies
 
           level_has_all << hier.has_all?
           slices << dd[:level_depth]
@@ -86,8 +113,13 @@ module Mondrian::REST::Formatters
         columns += ["ID #{dd[:level]}", dd[:level]]
       end
 
-      # append measure columns and yield table header
-      y.yield columns + pluck(measures, :name)
+      props = Mondrian::REST::APIHelpers.parse_properties(properties, dimensions)
+      pnames = properties.map { |p|
+        org.olap4j.mdx.IdentifierNode.parseIdentifier(p).getSegmentList.last.name
+      }
+
+      # append properties and measure columns and yield table header
+      y.yield columns + pnames + pluck(measures, :name)
 
       prod = rs[:axes][1..-1].map { |e|
         e[:members].map.with_index { |e_, i| [e_,i] }
@@ -102,24 +134,53 @@ module Mondrian::REST::Formatters
         msrs = measures.map.with_index { |m, mi|
           (cidxs + [mi]).reduce(values) { |_, idx| _[idx] }
         }
+
         if add_parents
           vdim = cm.each.with_index.reduce([]) { |cnames, (member, j)|
-            member[:ancestors][0...slices[j] - (level_has_all[j] ? 1 : 0)].each { |ancestor|
+            member[:ancestors][0...slices[j] - (level_has_all[j] ? 1 : 0)].reverse.each { |ancestor|
               cnames += [ancestor[:key], ancestor[:caption]]
             }
             cnames += [member[:key], member[:caption]]
           }
-          y.yield vdim + msrs
+
+          y.yield vdim + get_props(cm, pnames, props, dimensions) + msrs
         else
-          y.yield pluck(cm, :key)
-                    .zip(pluck(cm, :caption))
-                    .flatten \
-                  + msrs
+          row = pluck(cm, :key)
+                  .zip(pluck(cm, :caption))
+                  .flatten
+
+          y.yield row + get_props(cm, pnames, props, dimensions) + msrs
         end
       end
     end
   end
 
+  def self.get_props(cm, pnames, props, dimensions)
+    pvalues = cm.each.with_index.reduce({}) do |h, (member, ax_i)|
+      dname = dimensions[ax_i][:name]
+      if props[dname] # are there properties requested for members of this dimension?
+        mmbr_lvl = dimensions[ax_i][:level]
+        (props[dname][mmbr_lvl] || []).each { |p|
+          h[p] = member[:properties][p]
+        }
+        if member[:ancestors]
+          props[dname]
+            .select { |k, _| k != mmbr_lvl } # levels other than member's own
+            .each { |l, p|
+            p.each # get all requested props for this level's ancestor
+              .with_object(member[:ancestors].find { |anc|
+                             anc[:level_name] == l
+                           }) { |prop, anc|
+              h[prop] = anc[:properties][prop]
+            }
+          }
+        end
+      end
+      h
+    end # reduce
+    pnames.map { |pn| pvalues[pn] }
+  end
+
   def self.pluck(a, m)
     a.map { |e| e[m] }
   end

data/lib/mondrian_rest/api_helpers.rb

@@ -1,4 +1,8 @@
 module Mondrian::REST
+
+  class PropertyError < StandardError
+  end
+
   module APIHelpers
 
     @@olap = nil
@@ -46,5 +50,42 @@ module Mondrian::REST
       end
     end
 
+    NEST = Mondrian::REST::Nest.new
+             .key { |d| d[0] }
+             .key { |d| d[1] }
+
+    def self.parse_caption_properties(cprops)
+      if cprops.nil? or cprops.size < 1
+        return {}
+      end
+
+      NEST.map(cprops.map { |cp|
+                 org.olap4j.mdx.IdentifierNode.parseIdentifier(cp).getSegmentList.to_a.map(&:name)
+             })
+    end
+
+    ##
+    # parse an array of property specifications like so:
+    # input: ['ISICrev4.Level 2.Level 2 ES', 'ISICrev4.Level 1.Level 1 ES']
+    # output: {"ISICrev4"=>{"Level 2"=>["Level 2 ES"], "Level 1"=>["Level 1 ES"]}}
+    def self.parse_properties(properties, dimensions)
+      properties.map { |p|
+        sl = org.olap4j.mdx.IdentifierNode.parseIdentifier(p).getSegmentList.to_a
+        if sl.size != 3
+          raise PropertyError, "Properties must be in the form `Dimension.Level.Property Name`"
+        end
+
+        # check that the dimension is in the drilldown list
+        if dimensions.find { |ad| sl[0].name == ad[:name] }.nil?
+          raise PropertyError, "Dimension `#{sl[0].name}` not in drilldown list"
+        end
+
+        sl.map(&:name)
+      }.group_by(&:first)
+        .reduce({}) { |h, (k,v)|
+        h[k] = Hash[v.group_by { |x| x[1] }.map { |k1, v1| [k1, v1.map(&:last)] }]
+        h
+      }
+    end
   end
 end

data/lib/mondrian_rest/mondrian_ext.rb

@@ -1,12 +1,19 @@
+require 'set'
+
 module Mondrian
   module OLAP
 
     class Cube
+
+      def named_sets
+        raw_cube.getSets
+      end
+
       def to_h
         # gather dimensions
         dimensions = self.dimensions
-                     .find_all { |d| d.dimension_type != :measures }
-                     .map { |d|
+                       .find_all { |d| d.dimension_type != :measures }
+                       .map do |d|
           {
             :name => d.name,
             :caption => d.caption,
@@ -21,18 +28,47 @@ module Mondrian
                   {
                     :name => l.name,
                     :full_name => l.full_name,
-                    :caption => l.caption
+                    :caption => l.caption,
+                    :depth => l.depth,
+                    :annotations => l.annotations,
+                    :properties => l.own_props.map { |p|
+                      p.getName
+                    }
                   }
                 }
               }
             }
           }
-        }
+        end
+
+        # gather named sets
+        named_sets = self.named_sets
+                       .map do |ns|
+
+          t = ns.getExpression.getType
+          {
+            :name => ns.name,
+            :dimension => t.getDimension.getName,
+            :hierarchy => t.getHierarchy.getName,
+            :level => t.getLevel.getName,
+            :annotations => begin
+                              annotated = ns.unwrap(Java::MondrianOlap::Annotated.java_class)
+                              annotations_hash = annotated.getAnnotationMap.to_hash
+                              annotations_hash.each do |key, annotation|
+                                annotations_hash[key] = annotation.getValue
+                              end
+                              annotations_hash
+                            rescue
+                              {}
+                            end
+          }
+        end
 
         return {
           :name => self.name,
           :annotations => self.annotations,
           :dimensions => dimensions,
+          :named_sets => named_sets,
           :measures => self.dimensions
                       .find(&:measures?)
                       .hierarchy
@@ -66,6 +102,8 @@ module Mondrian
       end
     end
 
+    INTERNAL_PROPS = Set.new(['CATALOG_NAME', 'SCHEMA_NAME', 'CUBE_NAME', 'DIMENSION_UNIQUE_NAME', 'HIERARCHY_UNIQUE_NAME', 'LEVEL_UNIQUE_NAME', 'LEVEL_NUMBER', 'MEMBER_ORDINAL', 'MEMBER_NAME', 'MEMBER_UNIQUE_NAME', 'MEMBER_TYPE', 'MEMBER_GUID', 'MEMBER_CAPTION', 'CHILDREN_CARDINALITY', 'PARENT_LEVEL', 'PARENT_UNIQUE_NAME', 'PARENT_COUNT', 'DESCRIPTION', '$visible', 'MEMBER_KEY', 'IS_PLACEHOLDERMEMBER', 'IS_DATAMEMBER', 'DEPTH', 'DISPLAY_INFO', 'VALUE', '$scenario', 'CELL_FORMATTER', 'CELL_FORMATTER_SCRIPT', 'CELL_FORMATTER_SCRIPT_LANGUAGE', 'DISPLAY_FOLDER', 'FORMAT_EXP', 'KEY', '$name']).freeze
+
     class Level
       attr_reader :hierarchy
 
@@ -79,25 +117,39 @@ module Mondrian
           caption: self.caption,
           members: self.members
             .uniq { |m| m.property_value('MEMBER_KEY') }
-            .map { |m| m.to_h(member_properties) }
+            .map { |m| m.to_h(member_properties) },
+          :properties => self.own_props.map { |p|
+            p.getName
+          }
+        }
+      end
+
+      def own_props
+        @raw_level.properties.select { |p|
+          !INTERNAL_PROPS.include?(p.name)
         }
       end
+
     end
 
     class Member
 
+      alias_method :_caption, :caption
+
       def raw_level
         @raw_member.getLevel
       end
 
-      def to_h(properties=[])
-        kv = [:name, :full_name, :caption, :all_member?,
+      def to_h(properties=[], caption_property=nil)
+        kv = [:name, :full_name, :all_member?,
               :drillable?, :depth].map { |m|
           [m, self.send(m)]
         }
+        kv << [:caption, self.pcaption(caption_property)]
         kv << [:key, self.property_value('MEMBER_KEY')]
         kv << [:num_children, self.property_value('CHILDREN_CARDINALITY')]
         kv << [:parent_name, self.property_value('PARENT_UNIQUE_NAME')]
+        kv << [:level_name, self.raw_level.name]
 
         if properties.size > 0
           kv << [
@@ -109,6 +161,14 @@ module Mondrian
         Hash[kv]
       end
 
+      def pcaption(caption_property=nil)
+        if caption_property
+          self.property_value(caption_property)
+        else
+          self._caption
+        end
+      end
+
       def dimension_info
         d = @raw_member.getDimension
         l = @raw_member.getLevel
@@ -130,7 +190,7 @@ module Mondrian
 
     class Result
 
-      attr_accessor :cube, :mdx, :properties
+      attr_accessor :cube, :mdx, :properties, :caption_properties
 
       def to_json
         to_h.to_json
@@ -144,20 +204,31 @@ module Mondrian
         dimensions = self.axis_members.map { |am| am.first.dimension_info }
 
         pprops = unless self.properties.nil?
-                   parse_properties(dimensions[1..-1]) # exclude Measures dimension
+                   Mondrian::REST::APIHelpers.parse_properties(self.properties,
+                                                               dimensions[1..-1]) # exclude Measures dimension
                  else
                    {}
                  end
 
+        cprops = Mondrian::REST::APIHelpers.parse_caption_properties(
+          self.caption_properties
+        )
+
         rv = {
           axes: self.axis_members.each_with_index.map { |a, i|
             {
               members: a.map { |m|
-                mh = m.to_h(pprops[m.raw_member.getDimension.name] || [])
+                mh = m.to_h(
+                  pprops.dig(m.raw_member.getDimension.name, m.raw_level.name) || [],
+                  (cprops.dig(m.raw_member.getDimension.name, m.raw_level.name) || [[]])[0][-1]
+                )
                 if parents
                   mh.merge!({
                               ancestors: m.ancestors.map { |ma|
-                                ma.to_h(pprops[ma.raw_member.getDimension.name] || [])
+                                ma.to_h(
+                                  pprops.dig(ma.raw_member.getDimension.name, ma.raw_level.name) || [],
+                                  (cprops.dig(ma.raw_member.getDimension.name, ma.raw_level.name) || [[]])[0][-1]
+                                )
                               }
                             })
                 end
@@ -174,28 +245,6 @@ module Mondrian
         rv
 
       end
-
-      private
-
-      ##
-      #
-      def parse_properties(dimensions)
-        self.properties.reduce({}) { |h, p|
-          sl = org.olap4j.mdx.IdentifierNode.parseIdentifier(p).getSegmentList.to_a
-          if sl.size != 2
-            raise "Properties must be in the form `Dimension.Property Name`"
-          end
-
-          # check that the dimension is in the drilldown list
-          if dimensions.find { |ad| sl[0].name == ad[:name] }.nil?
-            raise "Dimension `#{sl[0].name}` not in drilldown list"
-          end
-
-          h[sl[0].name] ||= []
-          h[sl[0].name] << sl[1].name
-          h
-        }
-      end
     end
   end
 end

data/lib/mondrian_rest/nest.rb

@@ -0,0 +1,121 @@
+# D3 nest operator
+# from: https://gist.github.com/herrstucki/3974701
+module Mondrian::REST
+  class Nest
+    def initialize
+      @nest = {}
+      @keys = []
+      @sort_keys = []
+    end
+
+    def map(array)
+      _map(array, 0)
+    end
+
+    def entries(array)
+      _entries(_map(array, 0), 0)
+    end
+
+    def key(&f)
+      @keys << f
+      self
+    end
+
+    def sort_keys(&order)
+      @sort_keys[@keys.size - 1] = order
+      self
+    end
+
+    def sort_values(&order)
+      @sort_values = order
+      self
+    end
+
+    def rollup(&f)
+      @rollup = f
+      self
+    end
+
+    private
+
+    def _map(array, depth)
+      if depth >= @keys.size
+        return @rollup.call(array) if @rollup
+        return array.sort { |a, b| @sort_values.call(a, b) } if @sort_values
+        return array
+      end
+
+      key = @keys[depth]
+      depth += 1
+      values_by_key = {}
+
+      array.each_with_index do |object, i|
+        key_value = key.call(object)
+        values_by_key[key_value] ||= []
+        values_by_key[key_value] << object
+      end
+
+      o = {}
+      values_by_key.each do |key_value, values|
+        o[key_value] = _map(values, depth)
+      end
+      o
+    end
+
+    def _entries(map, depth)
+      return map if depth >= @keys.size
+
+      a = []
+      sort_key = @sort_keys[depth]
+      depth += 1
+
+      map.each do |key, values|
+        a << {
+          key: key,
+          values: _entries(values, depth)
+        }
+      end
+
+      if sort_key
+        a.sort { |a, b| sort_key.call(a[:key], b[:key]) }
+      else
+        a
+      end
+    end
+  end
+
+end
+
+
+# TEST
+
+# require 'pp'
+
+# data = [
+#   {year: "2013", category: "Cars", value: 1000},
+#   {year: "2011", category: "Cars", value: 1200},
+#   {year: "2012", category: "Cars", value: 1300},
+#   {year: "2011", category: "Planes", value: 1000},
+#   {year: "2011", category: "Planes", value: 1100},
+#   {year: "2012", category: "Planes", value: 1200},
+#   {year: "2011", category: "Planes", value: 1300},
+#   {year: "2012", category: "Bikes", value: 1000},
+#   {year: "2011", category: "Bikes", value: 1100},
+#   {year: "2011", category: "Bikes", value: 1200},
+# ]
+
+# nest = Nest.new
+# nest.key { |d| d[:year] }
+# nest.sort_keys { |a,b| a <=> b }
+# nest.key { |d| d[:category] }
+# # nest.sort_values { |a,b| b[:value] <=> a[:value] }
+# nest.rollup do |values|
+#   {
+#     count: values.size,
+#     total_value: values.map { |d| d[:value] }.reduce(:+),
+#     raw: values
+#   }
+# end
+
+# # pp nest.entries(data)
+# pp nest.map(data)

data/lib/mondrian_rest/query_helper.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 module Mondrian::REST
   module QueryHelper
 
@@ -18,18 +19,15 @@ module Mondrian::REST
 
     def get_member(cube, member_exp)
       begin
-        rm = cube.raw_cube
-           .lookupMember(org.olap4j.mdx.IdentifierNode.parseIdentifier(member_exp).getSegmentList)
+        return cube.member(member_exp)
       rescue Java::JavaLang::IllegalArgumentException
         error!("Illegal member expression: #{member_exp}", 400)
       end
-      member = nil
-      unless rm.nil?
-        member = Mondrian::OLAP::Member.new(rm)
-      end
-      member
     end
 
+    ##
+    # Parses a string containing a 'cut' expression
+    # It can be a set (`{Dim.Mem, Dim2.Mem2}`), a range (`([Time].[Year].[1997]:[Time].[Year].[1998])`) or a member identifier (`[Time].[Year].[1998]`).
     def parse_cut(cube, cut_expr)
       p = mdx_parser.parseExpression(cut_expr)
 
@@ -38,13 +36,14 @@ module Mondrian::REST
         case p.getOperatorName
         when "{}"
           # check that the set contains only Members of a single dimension level
-          ls = p.getArgList.map { |id_node|
-            get_member(cube, unparse_node(id_node)).raw_level
-          }.uniq
+          set_members = p.getArgList.map { |id_node|
+            get_member(cube, unparse_node(id_node))
+          }
+          ls = set_members.map(&:raw_level).uniq
           unless ls.size == 1
             error!("Illegal cut: " + cut_expr, 400)
           end
-          { level: ls.first, cut: unparse_node(p), type: :set }
+          { level: ls.first, cut: unparse_node(p), type: :set, set_members: set_members }
         when "()"
           # check that the range contains a valid range
 
@@ -69,6 +68,11 @@ module Mondrian::REST
         # if `cut_expr` looks like a member, check that it's level is
         # equal to `level`
         m = get_member(cube, cut_expr)
+
+        if m.nil?
+          error!("Illegal cut: #{cut_expr} — Member does not exist", 400)
+        end
+
         { level: m.raw_level, cut: cut_expr, type: :member }
       else
         error!("Illegal cut: " + cut_expr, 400)
@@ -79,6 +83,13 @@ module Mondrian::REST
     # Parses a drilldown specification
     # XXX TODO write doc
     def parse_drilldown(cube, drilldown)
+
+      # check if the drilldown is a named set
+      named_sets = cube.named_sets
+      if ns = named_sets.find { |ns| ns.name == drilldown }
+        return ns
+      end
+
       begin
         s = org.olap4j.mdx.IdentifierNode.parseIdentifier(drilldown).getSegmentList
       rescue Java::JavaLang::IllegalArgumentException
@@ -148,8 +159,11 @@ module Mondrian::REST
       }
 
       dd = query_axes.map do |qa|
+        # if drilling down on a named set
+        if qa.kind_of?(Java::MondrianOlap4j::MondrianOlap4jNamedSet)
+          "[#{qa.name}]"
         # there's a slice (cut) on this axis
-        if slicer_axis[qa.raw_level]
+        elsif slicer_axis[qa.raw_level]
           cut = slicer_axis.delete(qa.raw_level)
           case cut[:type]
           when :member
@@ -157,6 +171,24 @@ module Mondrian::REST
           else
             cut[:cut]
           end
+        elsif cut = slicer_axis.find { |lvl, cut|
+                qa.raw_level.hierarchy == lvl.hierarchy && lvl.depth < qa.depth
+              }
+          slicer_axis.delete(cut[0])
+          cut = cut[1]
+
+          case cut[:type]
+          when :member
+            "DESCENDANTS(#{cut[:cut]}, #{qa.full_name})"
+          when :set
+            # TODO
+            "{" + cut[:set_members].map { |m|
+              "DESCENDANTS(#{m.full_name}, #{qa.full_name})"
+            }.join(",") + "}"
+          when :range
+            # TODO
+            raise "Unsupported operation"
+          end
         else
           qa.raw_level.unique_name + '.Members'
         end
@@ -180,7 +212,7 @@ module Mondrian::REST
 
       # slicer axes (cut)
       if slicer_axis.size >= 1
-        query = query.where(slicer_axis.values.map { |v| v[:cut] })
+        query = query.where(slicer_axis.values.map { |v| v[:cut] }.join(' * '))
       end
       query
     end

data/lib/mondrian_rest.rb

@@ -5,5 +5,6 @@ Java::JavaLang::System.setProperty("jdbc.driver.autoload", "true")
 require 'mondrian-olap'
 require 'grape'
 
+require_relative './mondrian_rest/nest.rb'
 require_relative './mondrian_rest/api.rb'
 require_relative './mondrian_rest/mondrian_ext.rb'

data/mondrian-rest.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |s|
   s.name        = "mondrian-rest"
-  s.version     = '0.5.0'
+  s.version     = '0.6.0'
   s.authors     = ["Manuel Aristarán"]
   s.email       = ["manuel@jazzido.com"]
   s.homepage    = "https://github.com/jazzido/mondrian-rest"
@@ -14,14 +14,14 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n").reject { |f| f =~ /^spec\// }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'mondrian-olap', ["~> 0.7.0"]
-  s.add_runtime_dependency 'grape', ["~> 0.14.0"]
+  s.add_runtime_dependency 'mondrian-olap', ["~> 0.8.0"]
+  s.add_runtime_dependency 'grape', ["~> 0.19.0"]
   s.add_runtime_dependency 'writeexcel', '~> 1.0', '>= 1.0.5'
 
-  s.add_development_dependency 'rake', '~> 10.4', '>= 10.4.2'
-  s.add_development_dependency 'rspec', '~> 3.4', '>= 3.4.0'
-  s.add_development_dependency 'jdbc-derby', '~> 10.11', '>= 10.11.1.1'
-  s.add_development_dependency 'jdbc-sqlite3', '~> 3.8', '>= 3.8.11.2'
-  s.add_development_dependency 'rack-test', '~> 0.6.3'
-  s.add_development_dependency 'rubyzip', '~> 1.1', '>= 1.1.7'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'jdbc-derby'
+  s.add_development_dependency 'jdbc-sqlite3'
+  s.add_development_dependency 'rack-test'
+  s.add_development_dependency 'rubyzip'
 end

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: mondrian-rest
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: java
 authors:
 - Manuel Aristarán
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   name: mondrian-olap
   prerelease: false
   type: :runtime
@@ -23,13 +23,13 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.19.0
   name: grape
   prerelease: false
   type: :runtime
@@ -37,7 +37,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -61,117 +61,87 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: '0'
   name: rake
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
   name: rspec
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.11.1.1
+        version: '0'
   name: jdbc-derby
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.11.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.11.2
+        version: '0'
   name: jdbc-sqlite3
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.11.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '0'
   name: rack-test
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.7
+        version: '0'
   name: rubyzip
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.7
+        version: '0'
 description: A REST interface for Mondrian ROLAP server
 email:
 - manuel@jazzido.com
@@ -189,6 +159,7 @@ files:
 - lib/mondrian_rest/api_formatters.rb
 - lib/mondrian_rest/api_helpers.rb
 - lib/mondrian_rest/mondrian_ext.rb
+- lib/mondrian_rest/nest.rb
 - lib/mondrian_rest/query_helper.rb
 - lib/mondrian_rest/version.rb
 - mondrian-rest.gemspec
@@ -212,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key:
 specification_version: 4
 summary: A REST interface for Mondrian ROLAP server