.gitignore

@@ -2,3 +2,6 @@
 *.log
 spec/fixtures/foodmart/
 spec/fixtures/webshop.sqlite
+coverage
+Gemfile.lock
+

.travis.yml

@@ -3,11 +3,12 @@ language: ruby
 before_install:
   - gem update --system
   - gem install bundler
-  - gem install jbundler
 jdk:
-  - oraclejdk8
+  - openjdk10
+  - oraclejdk11
+  - oraclejdk12
 rvm:
-  - jruby-9.1.13.0
+  - jruby-9.2.5.0
 env:
   - JRUBY_OPTS=--debug
 

README.md

@@ -8,7 +8,11 @@ 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`.
+*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`.
+
+## In the wild
+
+`mondrian-rest` powers [Datachile](https://es.datachile.io)'s, [DataUSA](https://datausa.io), and other fine websites built by [Datawheel](http://datawheel.us).
 
 ## Credits
 

lib/mondrian_rest/query_helper.rb

@@ -4,7 +4,7 @@ module QueryHelper
     VALID_FILTER_OPS = [
       '>', '<', '>=', '<=', '=', '<>'
     ].freeze
-    VALID_FILTER_RE = /(?<measure>[a-zA-Z0-9\s]+)\s*(?<operand>#{VALID_FILTER_OPS.join("|")})\s*(?<value>-?\d+\.?\d*)/
+    VALID_FILTER_RE = /(?<measure>[a-zA-Z0-9\-!$%^&*()_+|@#~`{}\[\]:";'?,.\/\s]+)\s*(?<operand>#{VALID_FILTER_OPS.join("|")})\s*(?<value>-?\d+\.?\d*)/
     MEMBER_METHODS = %w[Caption Key Name UniqueName].freeze
 
     def unparse_node(node)
@@ -265,11 +265,19 @@ def build_query(cube, options = {})
 
       unless dd.empty?
         # Cross join all the drilldowns
-        axis_exp = dd.join(' * ')
+        axis_exp = if dd.size == 1
+                     dd
+                   else dd.size > 1
+                     cross = "Crossjoin(#{dd.pop(2).join(', ')})"
+                     while !dd.empty?
+                       cross = "Crossjoin(#{dd.pop}, #{cross})"
+                     end
+                     cross
+                   end
 
         # Apply filters
         unless filters.empty?
-          filter_exp = filters.map { |f| "[Measures].[#{org.olap4j.mdx.MdxUtil.mdxEncodeString(f[:measure])}] #{f[:operand]} #{f[:value]}" }.join(' AND ')
+          filter_exp = filters.map { |f| "[Measures].[#{f[:measure]}] #{f[:operand]} #{f[:value]}" }.join(' AND ')
           axis_exp = "FILTER(#{axis_exp}, #{filter_exp})"
         end
 

lib/mondrian_rest/version.rb

@@ -1,5 +1,5 @@
 module Mondrian
   module REST
-    VERSION = "1.0.0"
+    VERSION = "1.0.4"
   end
 end

mondrian-rest.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib", "lib/jars"]
 
 
-  s.add_runtime_dependency 'mondrian-olap', ["~> 0.8.0"]
-  s.add_runtime_dependency 'grape', '~> 1.0', '>= 1.0.0'
+  s.add_runtime_dependency 'mondrian-olap', [">= 1.1.0"]
+  s.add_runtime_dependency 'grape', '~> 1.2', '>= 1.2.3'
   s.add_runtime_dependency 'writeexcel', '~> 1.0', '>= 1.0.5'
   s.add_runtime_dependency 'activesupport', '~> 5.1', '>= 5.1.5'
 

spec/api_spec.rb

@@ -189,7 +189,7 @@ def app
       get '/cubes/Sales/aggregate?drilldown[]=Time.Month&drilldown[]=Customers.City&measures[]=Store%20Sales&debug=true'
       r = JSON.parse(last_response.body)
       expect(r.has_key?('mdx')).to be(true)
-      expect(r['mdx']).to eq("SELECT {[Measures].[Store Sales]} ON COLUMNS,\n[Time].[Time].[Month].Members * [Customers].[Customers].[City].Members ON ROWS\nFROM [Sales]")
+      expect(r['mdx']).to eq("SELECT {[Measures].[Store Sales]} ON COLUMNS,\nCrossjoin([Time].[Time].[Month].Members, [Customers].[Customers].[City].Members) ON ROWS\nFROM [Sales]")
     end
 
     it "should not include the generated MDX in the response if debug not given or if debug=false" do

spec/query_builder_spec.rb

@@ -158,4 +158,14 @@ def error!(*args)
       expect(q.to_mdx).to eq("SELECT {[Measures].[Store Invoice]} ON COLUMNS,\n{[Top Sellers]} ON ROWS\nFROM [Warehouse]")
     end
   end
+
+  describe "VALID_FILTER_RE" do
+    it "should match measures with special characters (except '<', '>' and '=')" do
+      m = QueryHelper::VALID_FILTER_RE.match(" \"#$%&'()*+,-./:;?@[\]^_`{|}~ > 100")
+      expect(m["measure"]).to eq(" \"#$%&'()*+,-./:;?@[\]^_`{|}~ ")
+
+      m = QueryHelper::VALID_FILTER_RE.match("#<=># > 100")
+      expect(m["measure"]).not_to eq("#<=># ")
+    end
+  end
 end