mondrian-rest 0.6.0-java → 0.7.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2710889190b4d58cd7592415468caf4b7f5b7b95
-  data.tar.gz: 79bfcad96399941a47c1ba2e553e466209b053af
+  metadata.gz: 9884ded4baf72e8778db0f38bd66689a098ba4c1
+  data.tar.gz: 41004cd22953933eb63c74f335c2ee55b9dfea1b
 SHA512:
-  metadata.gz: 81b615aa3796ac61ddd850dec37bfbcecd75a5565b3de5fad18acea59f212dae2445b2c4434d6d1910e9a5b433045cd46ef6d163b9182b314841b8d285006e1d
-  data.tar.gz: 6bbed693f2ba708a44688b9d85b0980afe343c52d7d9da2f26259e10d554b94b53e4abe88c89d77b2c39be453c6f532cb4dae2bf330e2ba0290f541d9c4beecf
+  metadata.gz: 7af0aa6def1e41782c5b517cef5199545a0be1f69baff8400499b5d5f1231f3f5a93d2bfec6a5c8f6f98c83c421ebada332b5e798a8104158721a7430a38ba7f
+  data.tar.gz: 8280d75f3484daba329486853a32aa306ec6b3935511345ad3887405de0b50c1879470e26e4aa2ded4d57426a9744c4cb84aab6d4cf945189294869cd2d0afa2

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+jdk:
+  - oraclejdk8
 rvm:
   - jruby-9.1.5.0
 env:

data/README.md

@@ -8,6 +8,8 @@ See [`mondrian-rest-demo`](https://github.com/jazzido/mondrian-rest-demo) and [`
 
 [`mondrian-rest-ui`](https://github.com/jazzido/mondrian-rest-ui) is an experimental visualization tool for `mondrian-rest`, inspired by [CubesViewer](https://github.com/jjmontesl/cubesviewer) and [Polestar](https://github.com/vega/polestar).
 
+*NOTE*: `mondrian-rest` expect the `mondrian.olap.SsasCompatibleNaming` Java property is set to `true`. Set a environment variable `JAVA_OPTS="-Dmondrian.olap.SsasCompatibleNaming=true""` to the process that uses `mondrian-rest`.
+
 ## Credits
 
 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.

data/Rakefile

@@ -1,6 +1,6 @@
 require "rspec/core/rake_task"
+require 'jars/installer'
 
-require_relative './lib/mondrian_rest.rb'
 
 desc "Run specs"
 RSpec::Core::RakeTask.new(:spec)
@@ -11,6 +11,7 @@ end
 
 desc "API Routes"
 task :routes do
+  require_relative './lib/mondrian_rest.rb'
   Mondrian::REST::Api.routes.each do |api|
     method = api.route_method.ljust(10)
     path = api.route_path
@@ -18,4 +19,8 @@ task :routes do
   end
 end
 
+task :install_jars do
+  Jars::Installer.vendor_jars!("lib/jars")
+end
+
 task :default => [:spec]

data/lib/jars/mondrian-rest_jars.rb

@@ -0,0 +1,28 @@
+# this is a generated file, to avoid over-writing it just delete this comment
+begin
+  require 'jar_dependencies'
+rescue LoadError
+  require 'com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.8.5/jackson-datatype-jdk8-2.8.5.jar'
+  require 'com/fasterxml/jackson/core/jackson-annotations/2.8.0/jackson-annotations-2.8.0.jar'
+  require 'me/yanaga/guava-stream/1.0/guava-stream-1.0.jar'
+  require 'com/fasterxml/jackson/core/jackson-databind/2.8.5/jackson-databind-2.8.5.jar'
+  require 'no/ssb/jsonstat/json-stat-java/0.2.2/json-stat-java-0.2.2.jar'
+  require 'com/fasterxml/jackson/core/jackson-core/2.8.5/jackson-core-2.8.5.jar'
+  require 'com/fasterxml/jackson/datatype/jackson-datatype-guava/2.8.5/jackson-datatype-guava-2.8.5.jar'
+  require 'com/google/guava/guava/19.0/guava-19.0.jar'
+  require 'com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.8.5/jackson-datatype-jsr310-2.8.5.jar'
+  require 'com/codepoetics/protonpack/1.9/protonpack-1.9.jar'
+end
+
+if defined? Jars
+  require_jar( 'com.fasterxml.jackson.datatype', 'jackson-datatype-jdk8', '2.8.5' )
+  require_jar( 'com.fasterxml.jackson.core', 'jackson-annotations', '2.8.0' )
+  require_jar( 'me.yanaga', 'guava-stream', '1.0' )
+  require_jar( 'com.fasterxml.jackson.core', 'jackson-databind', '2.8.5' )
+  require_jar( 'no.ssb.jsonstat', 'json-stat-java', '0.2.2' )
+  require_jar( 'com.fasterxml.jackson.core', 'jackson-core', '2.8.5' )
+  require_jar( 'com.fasterxml.jackson.datatype', 'jackson-datatype-guava', '2.8.5' )
+  require_jar( 'com.google.guava', 'guava', '19.0' )
+  require_jar( 'com.fasterxml.jackson.datatype', 'jackson-datatype-jsr310', '2.8.5' )
+  require_jar( 'com.codepoetics', 'protonpack', '1.9' )
+end

data/lib/mondrian_rest/api.rb

@@ -21,11 +21,16 @@ module Mondrian::REST
     resource :mdx 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
+
       desc "Execute an MDX query against a cube"
       content_type :txt, "text/plain"
       post do
@@ -37,22 +42,22 @@ module Mondrian::REST
     end
 
     resource :flush do
-        params do
-          requires :secret, type: String, desc: "Secret key"
-        end
-        content_type :json, "application/json"
-        desc "Flush the schema cache"
+      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
-          }
+      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
 
@@ -78,25 +83,25 @@ module Mondrian::REST
         end
 
         resource :members do
-            desc "return a member by its full name"
-            params do
-              requires :full_name,
-                       type: String,
-                       regexp: /[a-z0-9\.,\-\s%\[\]\(\)]+/i
-            end
-            get do
-              member_full_name = URI.decode(params[:full_name])
+          desc "return a member by its full name"
+          params do
+            requires :full_name,
+                     type: String,
+                     regexp: /[a-z0-9\.,\-\s%\[\]\(\)]+/i
+          end
+          get do
+            member_full_name = URI.decode(params[:full_name])
 
-              m = get_member(get_cube_or_404(params[:cube_name]),
-                             member_full_name)
-              if m.nil?
-                error!("Member `#{member_full_name}` not found in cube `#{params[:cube_name]}`", 404)
-              end
-              m.to_h.merge({
-                             ancestors: m.ancestors.map(&:to_h),
-                             dimension: m.dimension_info
-                           })
+            m = get_member(get_cube_or_404(params[:cube_name]),
+                           member_full_name)
+            if m.nil?
+              error!("Member `#{member_full_name}` not found in cube `#{params[:cube_name]}`", 404)
             end
+            m.to_h.merge({
+                           ancestors: m.ancestors.map(&:to_h),
+                           dimension: m.dimension_info
+                         })
+          end
         end
 
 
@@ -113,6 +118,9 @@ module Mondrian::REST
           content_type :jsonrecords, "application/x-jsonrecords"
           formatter :jsonrecords, Mondrian::REST::Formatters::JSONRecords
 
+          content_type :jsonstat, "application/x-jsonstat"
+          formatter :jsonstat, Mondrian::REST::Formatters::JSONStat
+
           rescue_from PropertyError do |e|
             error!({error: e}, 400)
           end
@@ -129,18 +137,13 @@ module Mondrian::REST
             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])
-            query = build_query(cube, params)
-            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
+          get do
+            run_from_params(params)
+          end
 
-            result
+          post do
+            run_from_params(params)
           end
         end
 
@@ -164,6 +167,8 @@ module Mondrian::REST
 
                   params do
                     optional :member_properties, type: Array, default: []
+                    optional :caption, type: String, desc: "Replace caption with property", default: nil
+                    optional :children, type: Boolean, default: false
                   end
 
                   get do
@@ -179,13 +184,21 @@ module Mondrian::REST
                       error!("level #{params[:level_name]} not found in dimension #{params[:dimension_name]}")
                     end
 
-                    level.to_h(params[:member_properties])
+                    level.to_h(params[:member_properties], params[:children], params[:caption])
                   end
 
                   route_param :member_key,
                               type: String,
-                              requirements: { member_key: /[a-z0-9\.\-\s]+/i } do
+                              requirements: { member_key: /[A-Za-z0-9\.\-\s%]+/i } do
+
+                    params do
+                      optional :caption, type: String, desc: "Replace caption with property", default: nil
+                      optional :member_properties, type: Array, default: []
+                      optional :children, type: Boolean, default: false
+                    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])
@@ -194,7 +207,9 @@ module Mondrian::REST
                         m.property_value('MEMBER_KEY').to_s == params[:member_key]
                       }
                       error!('member not found', 404) if member.nil?
-                      member.to_h.merge({ancestors: member.ancestors.map(&:to_h)})
+                      member
+                        .to_h(params[:member_properties], params[:caption], params[:children])
+                        .merge({ancestors: member.ancestors.map(&:to_h)})
                     end
                   end
                 end

data/lib/mondrian_rest/api_formatters.rb

@@ -1,81 +1,11 @@
-require 'csv'
-require 'writeexcel'
+require_relative './formatters/aggregation_json'
+require_relative './formatters/csv'
+require_relative './formatters/excel'
+require_relative './formatters/jsonrecords'
+require_relative './formatters/jsonstat'
 
-module Mondrian::REST::Formatters
-
-  module AggregationJSON
-    def self.call(result, env)
-      add_parents = env['rack.request.query_hash']['parents'] == 'true'
-      debug = env['rack.request.query_hash']['debug'] == 'true'
-
-      result.to_h(add_parents, debug).to_json
-    end
-  end
-
-  module XLS
-    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)
-      sheet = book.add_worksheet
-
-      Mondrian::REST::Formatters
-        .tidy(result,
-              add_parents: add_parents,
-              debug: debug,
-              properties: properties)
-        .each_with_index do |row, i|
-          row.each_with_index { |cell, j|
-            sheet.write(i, j, cell)
-          }
-      end
-
-      book.close
-      out.string
-    end
-  end
 
-  module CSV
-    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)
-
-      ::CSV.generate do |csv|
-        rows.each { |row| csv << row }
-      end
-    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
+module Mondrian::REST::Formatters
 
   ##
   # Generate 'tidy data' (http://vita.had.co.nz/papers/tidy-data.pdf)

data/lib/mondrian_rest/api_helpers.rb

@@ -50,6 +50,20 @@ module Mondrian::REST
       end
     end
 
+    def run_from_params(params)
+      cube = get_cube_or_404(params[:cube_name])
+      query = build_query(cube, params)
+      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
+
     NEST = Mondrian::REST::Nest.new
              .key { |d| d[0] }
              .key { |d| d[1] }

data/lib/mondrian_rest/formatters/aggregation_json.rb

@@ -0,0 +1,10 @@
+module Mondrian::REST::Formatters
+  module AggregationJSON
+    def self.call(result, env)
+      add_parents = env['rack.request.query_hash']['parents'] == 'true'
+      debug = env['rack.request.query_hash']['debug'] == 'true'
+
+      result.to_h(add_parents, debug).to_json
+    end
+  end
+end

data/lib/mondrian_rest/formatters/csv.rb

@@ -0,0 +1,21 @@
+require 'csv'
+
+module Mondrian::REST::Formatters
+  module CSV
+    def self.call(result, env)
+      qh = env['rack.request.query_hash']
+      add_parents = qh['parents'] == 'true'
+      debug = qh['debug'] == 'true'
+      properties = qh['properties'] || []
+
+      rows = Mondrian::REST::Formatters.tidy(result,
+                                             add_parents: add_parents,
+                                             debug: debug,
+                                             properties: properties)
+
+      ::CSV.generate do |csv|
+        rows.each { |row| csv << row }
+      end
+    end
+  end
+end

data/lib/mondrian_rest/formatters/excel.rb

@@ -0,0 +1,30 @@
+require 'writeexcel'
+
+module Mondrian::REST::Formatters
+  module XLS
+    def self.call(result, env)
+      qh = env['rack.request.query_hash']
+      add_parents = qh['parents'] == 'true'
+      debug = qh['debug'] == 'true'
+      properties = qh['properties'] || []
+
+      out = StringIO.new
+      book = WriteExcel.new(out)
+      sheet = book.add_worksheet
+
+      Mondrian::REST::Formatters
+        .tidy(result,
+              add_parents: add_parents,
+              debug: debug,
+              properties: properties)
+        .each_with_index do |row, i|
+        row.each_with_index { |cell, j|
+          sheet.write(i, j, cell)
+        }
+      end
+
+      book.close
+      out.string
+    end
+  end
+end

data/lib/mondrian_rest/formatters/jsonrecords.rb

@@ -0,0 +1,31 @@
+module Mondrian::REST::Formatters
+  module JSONRecords
+    def self.call(result, env)
+      qh = env['rack.request.query_hash']
+      add_parents = qh['parents'] == 'true'
+      debug = qh['debug'] == 'true'
+      properties = qh['properties'] || []
+      format = qh['format'] == 'array' ? 'array' : 'object'
+
+      rows = Mondrian::REST::Formatters.tidy(result,
+                                             add_parents: add_parents,
+                                             debug: debug,
+                                             properties: properties).lazy
+      keys = rows.first
+
+      if format == 'array'
+        {
+          variables: keys,
+          data: rows.drop(1).to_a
+        }.to_json
+      else
+        {
+          data: rows.with_index.with_object([]) { |(row, i), data|
+            next if i == 0
+            data << Hash[keys.zip(row)]
+          }
+        }.to_json
+      end
+    end
+  end
+end

data/lib/mondrian_rest/formatters/jsonstat.rb

@@ -0,0 +1,50 @@
+require 'java'
+
+module Mondrian::REST::Formatters
+  module JSONStat
+
+    def self.call(result, env)
+
+      mapper = Java::ComFasterxmlJacksonDatabind::ObjectMapper.new
+      mapper.registerModule(Java::NoSsbJsonstat::JsonStatModule.new)
+      mapper.registerModule(Java::ComFasterxmlJacksonDatatypeJdk8::Jdk8Module.new.configureAbsentsAsNulls(true))
+      mapper.setSerializationInclusion(Java::ComFasterxmlJacksonAnnotation::JsonInclude::Include::NON_NULL)
+      mapper.registerModule(Java::ComFasterxmlJacksonDatatypeGuava::GuavaModule.new.configureAbsentsAsNulls(false))
+
+      rs = result.to_h
+      rdims = rs[:axis_dimensions].reverse
+
+      builder = Java::NoSsbJsonstatV2::Dataset
+                  .create
+                  .withLabel('Aggregation: ')
+                  .withSource(env['REQUEST_URI'] || '')
+
+      dimensions = rdims.map.with_index do |d, i|
+        dim = Java::NoSsbJsonstatV2::Dimension
+                .create(d[:name])
+
+        if d[:type] == :measures
+          dim = dim.withMetricRole
+        elsif d[:type] == :time
+          dim = dim.withTimeRole
+        end
+
+        dim.withLabel(d[:caption])
+          .withIndexedLabels(
+            Java::ComGoogleCommonCollect::ImmutableMap.copyOf(
+              Hash[*(rs[:axes][-1 - i][:members].map { |m| [ m[:key].to_s, m[:caption] ] }.flatten)].to_java
+            )
+          )
+      end
+
+      dataset = builder
+                  .withDimensions(dimensions)
+                  .withValues(rs[:values].flatten)
+                  .build
+
+      mapper.writeValueAsString(dataset)
+
+    end
+
+  end
+end

data/lib/mondrian_rest/mondrian_ext.rb

@@ -102,6 +102,10 @@ module Mondrian
       end
     end
 
+    class Hierarchy
+      attr_reader :dimension
+    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
@@ -111,13 +115,17 @@ module Mondrian
         @full_name ||= @raw_level.getUniqueName
       end
 
-      def to_h(member_properties=[])
+      def unique_name
+        "#{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)
         {
           name: self.name,
           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, member_caption, get_children) },
           :properties => self.own_props.map { |p|
             p.getName
           }
@@ -140,7 +148,7 @@ module Mondrian
         @raw_member.getLevel
       end
 
-      def to_h(properties=[], caption_property=nil)
+      def to_h(properties=[], caption_property=nil, get_children=false)
         kv = [:name, :full_name, :all_member?,
               :drillable?, :depth].map { |m|
           [m, self.send(m)]
@@ -150,6 +158,7 @@ module Mondrian
         kv << [:num_children, self.property_value('CHILDREN_CARDINALITY')]
         kv << [:parent_name, self.property_value('PARENT_UNIQUE_NAME')]
         kv << [:level_name, self.raw_level.name]
+        kv << [:children, get_children ? self.children.map { |c| c.to_h([], nil, get_children)} : []]
 
         if properties.size > 0
           kv << [

data/lib/mondrian_rest/query_helper.rb

@@ -39,6 +39,11 @@ module Mondrian::REST
           set_members = p.getArgList.map { |id_node|
             get_member(cube, unparse_node(id_node))
           }
+
+          if set_members.any? { |m| m.nil? }
+            error!("Illegal cut. Unknown member in cut set", 400)
+          end
+
           ls = set_members.map(&:raw_level).uniq
           unless ls.size == 1
             error!("Illegal cut: " + cut_expr, 400)
@@ -107,7 +112,7 @@ module Mondrian::REST
 
       if s.size > 1
         if s.size == 3 # 3 parts, means that a hierarchy was provided
-          hierarchy = dimension.hierarchies.find { |h_| h_.name == "#{dimension.name}.#{s[1].name}" }
+          hierarchy = dimension.hierarchies.find { |h_| h_.name == s[1].name }
           if hierarchy.nil?
             error!("Hierarchy `#{s[1].name}` does not exist in dimension #{dimension.name}", 404)
           end
@@ -136,7 +141,7 @@ module Mondrian::REST
       cm_names = measure_members.map(&:name)
 
       options['measures'].each { |m|
-        error!("Measure #{m} does not exist in cube #{cube.name}", 404) unless cm_names.include?(m)
+        error!("Measure #{m} does not exist in cube #{cube.name}", 400) unless cm_names.include?(m)
       }
 
       # measures go in axis(0) of the resultset
@@ -190,7 +195,7 @@ module Mondrian::REST
             raise "Unsupported operation"
           end
         else
-          qa.raw_level.unique_name + '.Members'
+          qa.unique_name + '.Members'
         end
       end
 

data/lib/mondrian_rest.rb

@@ -2,6 +2,8 @@ require 'json'
 
 Java::JavaLang::System.setProperty("jdbc.driver.autoload", "true")
 
+require_relative './jars/mondrian-rest_jars.rb'
+
 require 'mondrian-olap'
 require 'grape'
 

data/mondrian-rest.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |s|
   s.name        = "mondrian-rest"
-  s.version     = '0.6.0'
+  s.version     = '0.7.0'
   s.authors     = ["Manuel Aristarán"]
   s.email       = ["manuel@jazzido.com"]
   s.homepage    = "https://github.com/jazzido/mondrian-rest"
@@ -12,12 +12,15 @@ Gem::Specification.new do |s|
   s.platform = 'java'
 
   s.files         = `git ls-files`.split("\n").reject { |f| f =~ /^spec\// }
-  s.require_paths = ["lib"]
+  s.require_paths = ["lib", "lib/jars"]
+
+  s.requirements << 'jar no.ssb.jsonstat:json-stat-java, 0.2.2'
 
   s.add_runtime_dependency 'mondrian-olap', ["~> 0.8.0"]
-  s.add_runtime_dependency 'grape', ["~> 0.19.0"]
+  s.add_runtime_dependency 'grape', ["~> 1.0.0"]
   s.add_runtime_dependency 'writeexcel', '~> 1.0', '>= 1.0.5'
 
+  s.add_development_dependency "jar-dependencies", "~> 0.3.2"
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'jdbc-derby'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mondrian-rest
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: java
 authors:
 - Manuel Aristarán
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 1.0.0
   name: grape
   prerelease: false
   type: :runtime
@@ -37,7 +37,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -58,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.5
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  name: jar-dependencies
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -154,10 +168,26 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- lib/jars/com/codepoetics/protonpack/1.9/protonpack-1.9.jar
+- lib/jars/com/fasterxml/jackson/core/jackson-annotations/2.8.0/jackson-annotations-2.8.0.jar
+- lib/jars/com/fasterxml/jackson/core/jackson-core/2.8.5/jackson-core-2.8.5.jar
+- lib/jars/com/fasterxml/jackson/core/jackson-databind/2.8.5/jackson-databind-2.8.5.jar
+- lib/jars/com/fasterxml/jackson/datatype/jackson-datatype-guava/2.8.5/jackson-datatype-guava-2.8.5.jar
+- lib/jars/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.8.5/jackson-datatype-jdk8-2.8.5.jar
+- lib/jars/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.8.5/jackson-datatype-jsr310-2.8.5.jar
+- lib/jars/com/google/guava/guava/19.0/guava-19.0.jar
+- lib/jars/me/yanaga/guava-stream/1.0/guava-stream-1.0.jar
+- lib/jars/mondrian-rest_jars.rb
+- lib/jars/no/ssb/jsonstat/json-stat-java/0.2.2/json-stat-java-0.2.2.jar
 - lib/mondrian_rest.rb
 - lib/mondrian_rest/api.rb
 - lib/mondrian_rest/api_formatters.rb
 - lib/mondrian_rest/api_helpers.rb
+- lib/mondrian_rest/formatters/aggregation_json.rb
+- lib/mondrian_rest/formatters/csv.rb
+- lib/mondrian_rest/formatters/excel.rb
+- lib/mondrian_rest/formatters/jsonrecords.rb
+- lib/mondrian_rest/formatters/jsonstat.rb
 - lib/mondrian_rest/mondrian_ext.rb
 - lib/mondrian_rest/nest.rb
 - lib/mondrian_rest/query_helper.rb
@@ -171,6 +201,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- lib/jars
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -181,7 +212,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- jar no.ssb.jsonstat:json-stat-java, 0.2.2
 rubyforge_project:
 rubygems_version: 2.6.8
 signing_key: