mondrian-rest 0.7.1-java → 0.7.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0226d216ac38421203f90d11844887ffc2070fd3683afa867d8df8204fbc932f
-  data.tar.gz: 7e802242a410efcb28018191c255d8508635117b3c4472dac452c68b4658d01c
+  metadata.gz: ed1a89a7fd34fed09b05bbdc426156e4f6a6b5029e06706400c47bcd33dd96a9
+  data.tar.gz: 8e2c135b305e02740276f49f3792fa13ac5c83f58c814910c7e1b6916ebb182e
 SHA512:
-  metadata.gz: c8e362c9aab9cd50df5dab2b1ecb808ba94dc60b0c80087d97a0d65be80cfe266f0e311fbe2f5ddbccad877ebf1a78c37d1908c9fae4babed1445a3444dc1f3d
-  data.tar.gz: 33173f228cc7151a9a4b39dd78a943cbfe36de11e3b5ada4f2f3fbd4a0711d3f4624e1f095ba22164e75b281e40b7ed2d209d2bc61e39a99c25b888d759834f6
+  metadata.gz: 3bff20c0e4ee3b619ef4d4bf0e09d66aa5213778b7d9d97f444e914e809d611e2ee802e718210dfa5790020f76573a3c7c4aa9e61fa59b3d37dca8865e28fc6b
+  data.tar.gz: 7aba57e8652de450ce8ff897c392c196e5d5deb668f659cd7e56fca8a7d5520f812926a7b2732ac6f0426138dd3bf3d84371284a4230c97760e0eb9dcf16e1c4

data/.travis.yml

@@ -1,11 +1,18 @@
+sudo: false
 language: ruby
+before_install:
+  - gem update --system
+  - gem install bundler
+  - gem install jbundler
 jdk:
   - oraclejdk8
 rvm:
-  - jruby-9.1.5.0
+  - jruby-9.1.13.0
 env:
   - JRUBY_OPTS=--debug
 
+script: rake install_jars && rake 
+
 branches:
   only:
     - public

data/lib/mondrian_rest/api_helpers.rb

@@ -75,8 +75,11 @@ module Mondrian::REST
       end
 
       NEST.map(cprops.map { |cp|
-                 org.olap4j.mdx.IdentifierNode.parseIdentifier(cp).getSegmentList.to_a.map(&:name)
-             })
+                 names = org.olap4j.mdx.IdentifierNode.parseIdentifier(cp).getSegmentList.to_a.map(&:name)
+                 # IF prop in Dim.Hier.Lvl.Prop format, skip names[1]
+                 names.size == 4 ? [names[0], names[2], names[3]] : names
+               })
+
     end
 
     ##
@@ -86,7 +89,9 @@ module Mondrian::REST
     def self.parse_properties(properties, dimensions)
       properties.map { |p|
         sl = org.olap4j.mdx.IdentifierNode.parseIdentifier(p).getSegmentList.to_a
-        if sl.size != 3
+        slsize = sl.size
+
+        if slsize != 3 and slsize != 4
           raise PropertyError, "Properties must be in the form `Dimension.Level.Property Name`"
         end
 
@@ -96,9 +101,11 @@ module Mondrian::REST
         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)] }]
+      }
+            .group_by(&:first)
+            .reduce({}) { |h, (k,v)|
+        h[k] = Hash[v.group_by { |x| x.size == 4 ? x[2] : x[1] }
+                      .map { |k1, v1| [k1, v1.map(&:last)] }]
         h
       }
     end

data/lib/mondrian_rest/mondrian_ext.rb

@@ -210,7 +210,7 @@ module Mondrian
         # return the contents of the filter axis
         # puts self.raw_cell_set.getFilterAxis.inspect
 
-        dimensions = self.axis_members.map { |am| am.first.dimension_info }
+        dimensions = self.axis_members.map { |am| am.first ? am.first.dimension_info : nil }
 
         pprops = unless self.properties.nil?
                    Mondrian::REST::APIHelpers.parse_properties(self.properties,

data/mondrian-rest.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |s|
   s.name        = "mondrian-rest"
-  s.version     = '0.7.1'
+  s.version     = '0.7.2'
   s.authors     = ["Manuel Aristarán"]
   s.email       = ["manuel@jazzido.com"]
   s.homepage    = "https://github.com/jazzido/mondrian-rest"

metadata

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