mondrian-rest 0.7.4-java → 0.7.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4d1b0e972476646e06eb0eb12c02c06deb1ef65e8ecf37d4c88d75675283ccc
-  data.tar.gz: d7c3adad2231087c8920685472698fa51d07a62a2b59f49b47dc7bce9fb3fbeb
+  metadata.gz: 12334892d6921a2f8b3c510b692b6d023cf63fe791908fe6d9d43a8d99949443
+  data.tar.gz: 745982c6d9f325bfbc51ce61c188be7d9e8f1de7f76f657d1f49241a79fbb847
 SHA512:
-  metadata.gz: 7f0e224ca6f51b5f0db3297ddacbe08c0a316020911a3d9c90a00c70b49d3203d9edcaec6afbba0f21ad7156fe6915be0637375030db70f61aebc200a9c69152
-  data.tar.gz: 1e96dd371439ee9596511352893351bd43c9d11ac96eb3227d7bff289ef74ec3b7a1f1401436599c5485e2a34204cc953ca9ed464429a3c1433b8852333b84e9
+  metadata.gz: 699c648acab977a955a989f75bf0c14821f4eac55dc6418fdc32091773aa6b6d802add321e5e77ae689950da095ae791746a13c67ccc75002a48886bafed64ac
+  data.tar.gz: aa452fe99354a1c74f9535738bbb2fcb68e40fc8b7dd6fa1fb4412da26942d04ff48b09e924976dad1fcb522be3282ace9ae57aecdf39711f217f5071a51d5fb

data/lib/mondrian_rest/api.rb

@@ -192,7 +192,10 @@ module Mondrian::REST
                       error!("level #{params[:level_name]} not found in dimension #{params[:dimension_name]}")
                     end
 
-                    level.to_h(params[:member_properties], params[:children], params[:caption])
+                    level.to_h(member_properties: params[:member_properties],
+                               get_children: params[:children],
+                               member_caption: params[:caption],
+                               get_members: true)
                   end
 
                   route_param :member_key,

data/lib/mondrian_rest/mondrian_ext.rb

@@ -25,16 +25,7 @@ module Mondrian
                 :has_all => h.has_all?,
                 :all_member_name => h.all_member_name,
                 :levels => h.levels.map { |l|
-                  {
-                    :name => l.name,
-                    :full_name => l.full_name,
-                    :caption => l.caption,
-                    :depth => l.depth,
-                    :annotations => l.annotations,
-                    :properties => l.own_props.map { |p|
-                      p.getName
-                    }
-                  }
+                  l.to_h(get_members: false)
                 }
               }
             }
@@ -96,7 +87,9 @@ module Mondrian
             {
               name: h.name,
               has_all: h.has_all?,
-              levels: h.levels.map(&:to_h) #/levels
+              levels: h.levels.map { |l| 
+                l.to_h(get_members: true)
+              } #/levels
             } # /hierarchies
           } #/map
         } #/ dimension
@@ -120,17 +113,24 @@ module Mondrian
         "#{Java::MondrianOlap::Util.quoteMdxIdentifier(hierarchy.dimension.name)}.#{Java::MondrianOlap::Util.quoteMdxIdentifier(hierarchy.name)}.#{Java::MondrianOlap::Util.quoteMdxIdentifier(self.name)}"
       end
 
-      def to_h(member_properties=[], get_children=false, member_caption=nil)
-        {
+      def to_h(member_properties: [], get_children: false, member_caption: nil, get_members: false)
+        rv = {
           name: self.name,
+          full_name: self.full_name,
+          depth: self.depth,
           caption: self.caption,
-          members: self.members
-            .uniq { |m| m.property_value('MEMBER_KEY') }
-            .map { |m| m.to_h(member_properties, member_caption, get_children) },
+          annotations: self.annotations,
           :properties => self.own_props.map { |p|
             p.getName
           }
         }
+
+        if get_members
+          rv[:members] = self.members
+                           .uniq { |m| m.property_value('MEMBER_KEY') }
+                           .map { |m| m.to_h(member_properties, member_caption, get_children) }
+        end
+        rv
       end
 
       def own_props
@@ -180,14 +180,15 @@ module Mondrian
       end
 
       def dimension_info
-        d = @raw_member.getDimension
-        l = @raw_member.getLevel
-        {
-          name: d.getName,
-          caption: d.getCaption,
-          type: self.dimension_type,
-          level: l.getCaption,
-          level_depth: l.depth
+        d = @raw_member.getDimension()
+        l = @raw_member.getLevel()
+
+        x = {
+          :name => d.getName,
+          :caption => d.getCaption,
+          :type => self.dimension_type,
+          :level => l.getCaption,
+          :level_depth => l.depth
         }
       end
 

data/lib/mondrian_rest/version.rb

@@ -1,5 +1,5 @@
 module Mondrian
   module REST
-    VERSION = "0.7.4"
+    VERSION = "0.7.5"
   end
 end

metadata

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