mondrian-rest 0.7.8-java → 0.7.9-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6023f46286466d2773e0bf1ac6cb52fe205bf2bbe584aea26170b4359e87385c
-  data.tar.gz: 384f5eaf3e30be55fa31c909e30880845499dba09f058361876d4bb62dc627a4
+  metadata.gz: fbd9d6692bb827f1b325d682e9df7872a83be6a5085b0af4ceb41cc4194b59d7
+  data.tar.gz: 8e1d250c08c9c88adec227560d816ee79afe1f6c236f0ab31fa5574e981d3d81
 SHA512:
-  metadata.gz: 4bcf966cbbad1d698004c825954bcc86b3b65b98234ae88d92bf9576e39dc9fe8dff89e973102e3ed14dead99894fae88a31bca0b59127edd19f33ec53bb79c5
-  data.tar.gz: e605341fc73f78a852b12f77e733ff919fa938f200201be2f810a5b4ba2f39c578f909766ba4845980df117365783566adf256ad6e5be903331b97faf2d646ba
+  metadata.gz: cc64f9b2911c3e3e7b4142ec91a2796a83190e4abb00a0cb340b0a841d0f706ff43aade8dad0c833e54273b9a4672cf7f2a53223281e4febf9e92fd15bbdaadb
+  data.tar.gz: 55e965893aec267dd80d1acac550d0b9b85443e36485357468c1c27dcc3e7851205dfef6bc0afcc2b0025786b3a2f07f1448da254cb2c3c826f763724e5c32bb

data/lib/mondrian_rest/query_helper.rb

@@ -21,13 +21,18 @@ module Mondrian::REST
       begin
         return cube.member(member_exp)
       rescue Java::JavaLang::IllegalArgumentException
-        error!("Illegal member expression: #{member_exp}", 400)
+        error!("Illegal expression: #{member_exp}", 400)
       end
     end
 
+    def get_named_set(cube, named_set_exp)
+      nss = cube.named_sets
+      nss.find { |ns| ns.name == named_set_exp }
+    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]`).
+    # It can be a set (`{Dim.Mem, Dim2.Mem2}`), a range (`([Time].[Year].[1997]:[Time].[Year].[1998])`), a member identifier (`[Time].[Year].[1998]`) or a NamedSet.
     def parse_cut(cube, cut_expr)
       p = mdx_parser.parseExpression(cut_expr)
 
@@ -70,6 +75,13 @@ module Mondrian::REST
           error!("Illegal cut: " + cut_expr, 400)
         end
       when org.olap4j.mdx.IdentifierNode
+
+        # does cut_expr look like a NamedSet?
+        s = get_named_set(cube, cut_expr)
+        if !s.nil?
+          return { level: nil, cut: cut_expr, type: :named_set }
+        end
+
         # if `cut_expr` looks like a member, check that it's level is
         # equal to `level`
         m = get_member(cube, cut_expr)
@@ -177,6 +189,7 @@ module Mondrian::REST
             cut[:cut]
           end
         elsif cut = slicer_axis.find { |lvl, cut|
+                next if cut[:type] == :named_set
                 qa.raw_level.hierarchy == lvl.hierarchy && lvl.depth < qa.depth
               }
           slicer_axis.delete(cut[0])
@@ -217,7 +230,14 @@ module Mondrian::REST
 
       # slicer axes (cut)
       if slicer_axis.size >= 1
-        query = query.where(slicer_axis.values.map { |v| v[:cut] }.join(' * '))
+        puts slicer_axis.inspect
+        query = query.where(slicer_axis.values.map { |v|
+                              if v[:type] == :named_set
+                                "[#{v[:cut]}]"
+                              else
+                                v[:cut]
+                              end
+                            }.join(' * '))
       end
       query
     end

data/lib/mondrian_rest/version.rb

@@ -1,5 +1,5 @@
 module Mondrian
   module REST
-    VERSION = "0.7.8"
+    VERSION = "0.7.9"
   end
 end

metadata

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