mondrian-rest 0.7.0-java → 0.7.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9884ded4baf72e8778db0f38bd66689a098ba4c1
-  data.tar.gz: 41004cd22953933eb63c74f335c2ee55b9dfea1b
+SHA256:
+  metadata.gz: 0226d216ac38421203f90d11844887ffc2070fd3683afa867d8df8204fbc932f
+  data.tar.gz: 7e802242a410efcb28018191c255d8508635117b3c4472dac452c68b4658d01c
 SHA512:
-  metadata.gz: 7af0aa6def1e41782c5b517cef5199545a0be1f69baff8400499b5d5f1231f3f5a93d2bfec6a5c8f6f98c83c421ebada332b5e798a8104158721a7430a38ba7f
-  data.tar.gz: 8280d75f3484daba329486853a32aa306ec6b3935511345ad3887405de0b50c1879470e26e4aa2ded4d57426a9744c4cb84aab6d4cf945189294869cd2d0afa2
+  metadata.gz: c8e362c9aab9cd50df5dab2b1ecb808ba94dc60b0c80087d97a0d65be80cfe266f0e311fbe2f5ddbccad877ebf1a78c37d1908c9fae4babed1445a3444dc1f3d
+  data.tar.gz: 33173f228cc7151a9a4b39dd78a943cbfe36de11e3b5ada4f2f3fbd4a0711d3f4624e1f095ba22164e75b281e40b7ed2d209d2bc61e39a99c25b888d759834f6

data/Gemfile

@@ -1,6 +1,4 @@
 source 'http://rubygems.org'
 gem 'coveralls', require: false
-gem 'ruby-debug'
-gem 'mondrian-olap', :path => '/Users/manuel/Work/code/mondrian-olap', :require => 'mondrian-olap'
 
 gemspec

data/lib/mondrian_rest/api.rb

@@ -33,10 +33,18 @@ module Mondrian::REST
 
       desc "Execute an MDX query against a cube"
       content_type :txt, "text/plain"
+
+      params do
+        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
+
       post do
         status 200
 
-        rbody = env['api.request.body'].force_encoding('utf-8')
+        rbody = request.body.read.force_encoding('utf-8')
         mdx(rbody)
       end
     end
@@ -198,7 +206,6 @@ module Mondrian::REST
                     end
 
                     get do
-                      puts params.inspect
                       cube = get_cube_or_404(params[:cube_name])
                       dimension = cube.dimension(params[:dimension_name])
                       level = dimension.hierarchies[0].level(params[:level_name])

data/lib/mondrian_rest/api_helpers.rb

@@ -44,6 +44,11 @@ module Mondrian::REST
       logger.info("Executing MDX query #{query}")
       begin
         result = olap.execute query
+        result.mdx = query if params[:debug]
+        result.properties = params[:properties]
+        result.caption_properties = params[:caption] 
+        result.cube = Mondrian::OLAP::Cube.new(olap,
+                                               olap.raw_connection.prepareOlapStatement(query).getCube)
         return result
       rescue Mondrian::OLAP::Error => st
         error!({error: st.backtrace}, 400)
@@ -56,11 +61,7 @@ module Mondrian::REST
       mdx_query = query.to_mdx
 
       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
     end
 

data/mondrian-rest.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |s|
   s.name        = "mondrian-rest"
-  s.version     = '0.7.0'
+  s.version     = '0.7.1'
   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.0
+  version: 0.7.1
 platform: java
 authors:
 - Manuel Aristarán
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - jar no.ssb.jsonstat:json-stat-java, 0.2.2
 rubyforge_project:
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key:
 specification_version: 4
 summary: A REST interface for Mondrian ROLAP server